diff --git a/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs b/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs
index 53ea17e788..f4569abdd0 100644
--- a/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs
+++ b/Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs
@@ -36,5 +36,6 @@ public class ConfigurationData
         public bool AdvancedLicense;
         public bool Batchmode;
         public bool EmitDataForBeeWhy;
+        public string NamedPipeOrUnixSocket;
     }
 }
diff --git a/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs b/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs
index 39cfeed30b..1a465f071b 100644
--- a/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs
+++ b/Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs
@@ -66,6 +66,7 @@ public class Il2CppConfig
         public bool EnableDeepProfilingSupport;
         public bool EnableFullGenericSharing;
         public string Profile;
+        public string Defines;
 
         public string ConfigurationName;
         public bool GcWBarrierValidation;
@@ -73,9 +74,13 @@ public class Il2CppConfig
 
         public string[] AdditionalCppFiles = new string[0];
         public string[] AdditionalArgs = new string[0];
+        public string CompilerFlags;
+        public string LinkerFlags;
         public string ExtraTypes;
         public bool CreateSymbolFiles;
         public bool AllowDebugging;
+        public string SysRootPath;
+        public string ToolChainPath;
     }
 
     public class Services
diff --git a/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs b/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs
index 283b502694..f8ce77bd32 100644
--- a/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs
+++ b/Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs
@@ -14,7 +14,6 @@ public static class Constants
     public class ScriptCompilationData
     {
         public AssemblyData[] Assemblies;
-        public AssemblyData[] CodegenAssemblies;
         public string DotnetRuntimePath;
         public string DotnetRoslynPath;
         public string MovedFromExtractorPath;
@@ -38,15 +37,18 @@ public class AssemblyData
         public int[] References = new int[0];
         public bool AllowUnsafeCode;
         public string RuleSet;
+        public string AnalyzerConfigPath;
         public string LanguageVersion;
         public bool UseDeterministicCompilation;
         public bool SuppressCompilerWarnings;
         public string[] Analyzers = new string[0];
+        public string[] AdditionalFiles = new string[0];
         public string Asmdef;
         public string[] BclDirectories = new string[0];
         public string[] CustomCompilerOptions = new string[0];
         public int DebugIndex;
         public bool SkipCodeGen;
+        public string Path;
     }
 
     public class ScriptCompilationData_Out
diff --git a/Editor/Mono/2D/Common/TexturePlatformSettingsView.cs b/Editor/Mono/2D/Common/TexturePlatformSettingsView.cs
index 9432ed2b11..e46d1314a0 100644
--- a/Editor/Mono/2D/Common/TexturePlatformSettingsView.cs
+++ b/Editor/Mono/2D/Common/TexturePlatformSettingsView.cs
@@ -20,7 +20,7 @@ class Styles
             public readonly GUIContent compressionQualityLabel = EditorGUIUtility.TrTextContent("Compressor Quality");
             public readonly GUIContent compressionQualitySliderLabel = EditorGUIUtility.TrTextContent("Compressor Quality", "Use the slider to adjust compression quality from 0 (Fastest) to 100 (Best)");
 
-            public readonly int[] kMaxTextureSizeValues = { 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
+            public readonly int[] kMaxTextureSizeValues = { 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384 };
             public readonly GUIContent[] kMaxTextureSizeStrings;
 
             public readonly GUIContent[] kTextureCompressionOptions =
diff --git a/Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs b/Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs
index a0d7556217..b1e65d7a46 100644
--- a/Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs
+++ b/Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs
@@ -412,12 +412,6 @@ protected override void Apply()
             base.Apply();
         }
 
-        public void ApplyAndImportSpriteAtlas()
-        {
-            Apply();
-            base.ApplyAndImport();
-        }
-
         protected void PackPreviewGUI()
         {
             EditorGUILayout.Space();
@@ -432,7 +426,7 @@ protected void PackPreviewGUI()
                     {
                         GUI.FocusControl(null);
                         SpriteAtlasUtility.EnableV2Import(true);
-                        ApplyAndImportSpriteAtlas();
+                        SaveChanges();
                         SpriteAtlasUtility.EnableV2Import(false);
                     }
                 }
@@ -447,26 +441,6 @@ private bool IsValidAtlas()
                 return true;
         }
 
-        public override void OnDisable()
-        {
-
-            if (Unsupported.IsDestroyScriptableObject(this))
-            {
-                if (spriteAtlasAsset && HasModified())
-                {
-                    if (EditorUtility.DisplayDialog("Unapplied import settings", "Unapplied import settings for \'" + m_AssetPath + "\'", "Apply", "Revert"))
-                    {
-                        ApplyAndImportSpriteAtlas();
-                    }
-                    else
-                    {
-                        ResetValues();
-                    }
-                }
-            }
-            base.OnDisable();
-        }
-
         public override bool HasModified()
         {
             return base.HasModified() || m_ContentHash != GetInspectorHash();
@@ -535,6 +509,8 @@ public override void OnInspectorGUI()
                 serializedAssetObject.ApplyModifiedProperties();
                 PackPreviewGUI();
             }
+
+            ApplyRevertGUI();
         }
 
         private void HandleCommonSettingUI()
diff --git a/Editor/Mono/ActiveEditorTracker.bindings.cs b/Editor/Mono/ActiveEditorTracker.bindings.cs
index 7b28d1e9aa..c682934cd9 100644
--- a/Editor/Mono/ActiveEditorTracker.bindings.cs
+++ b/Editor/Mono/ActiveEditorTracker.bindings.cs
@@ -7,6 +7,7 @@
 using System.Runtime.InteropServices;
 using UnityEngine;
 using UnityEngine.Bindings;
+using UnityEngine.Scripting;
 using UnityObject = UnityEngine.Object;
 
 namespace UnityEditor
@@ -15,6 +16,7 @@ namespace UnityEditor
     // Might want to add a manual dispose
     [NativeHeader("Editor/Src/Utility/ActiveEditorTracker.bindings.h")]
     [Serializable]
+    [RequiredByNativeCode]
     public sealed class ActiveEditorTracker
     {
         #pragma warning disable 649
@@ -113,6 +115,17 @@ public bool isLocked
             set { Internal_SetIsLocked(this, value); }
         }
 
+        [FreeFunction]
+        static extern bool Internal_HasUnsavedChanges(ActiveEditorTracker activeEditorTracker);
+        public bool hasUnsavedChanges => Internal_HasUnsavedChanges(this);
+
+        [FreeFunction]
+        static extern void Internal_UnsavedChangesStateChanged(ActiveEditorTracker self, int editorInstance, bool value);
+        internal void UnsavedChangesStateChanged(Editor editor, bool value)
+        {
+            Internal_UnsavedChangesStateChanged(this, editor.GetInstanceID(), value);
+        }
+
         [FreeFunction]
         static extern bool Internal_GetDelayFlushDirtyRebuild();
 
diff --git a/Editor/Mono/Animation/AnimationUtility.bindings.cs b/Editor/Mono/Animation/AnimationUtility.bindings.cs
index f3996af8d1..c8b1bdcd94 100644
--- a/Editor/Mono/Animation/AnimationUtility.bindings.cs
+++ b/Editor/Mono/Animation/AnimationUtility.bindings.cs
@@ -168,6 +168,7 @@ internal static System.Type GetEditorCurveValueType(ScriptableObject scriptableO
         extern private static System.Type Internal_GetScriptableObjectEditorCurveValueType([NotNull] ScriptableObject scriptableObject, EditorCurveBinding binding);
 
         extern public static bool GetFloatValue([NotNull] GameObject root, EditorCurveBinding binding, out float data);
+        extern public static bool GetDiscreteIntValue([NotNull] GameObject root, EditorCurveBinding binding, out int data);
         public static bool GetObjectReferenceValue(GameObject root, EditorCurveBinding binding, out Object data)
         {
             data = Internal_GetObjectReferenceValue(root, binding);
@@ -388,6 +389,7 @@ public static AnimationCurve GetEditorCurve(AnimationClip clip, string relativeP
         extern public static string CalculateTransformPath([NotNull] Transform targetTransform, Transform root);
 
         extern public static AnimationClipSettings GetAnimationClipSettings([NotNull] AnimationClip clip);
+        extern internal static void RebuildMecanimData([NotNull] AnimationClip clip);
         extern public static void SetAnimationClipSettings([NotNull] AnimationClip clip, AnimationClipSettings srcClipInfo);
         extern internal static void SetAnimationClipSettingsNoDirty([NotNull] AnimationClip clip, AnimationClipSettings srcClipInfo);
 
diff --git a/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs b/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs
index 738cf9fe1f..3424c023a9 100644
--- a/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyDataSource.cs
@@ -75,7 +75,7 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, GameObject
                     // Don't show for the root go
                     if (curveBinding.path != "")
                     {
-                        TreeViewItem newNode = CreateNode(singleObjectBindings.ToArray(), node);
+                        TreeViewItem newNode = CreateNode(singleObjectBindings.ToArray(), node, null);
                         if (newNode != null)
                             childNodes.Add(newNode);
                         singleObjectBindings.Clear();
@@ -111,20 +111,6 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, GameObject
                 }
             }
 
-            var animator = rootGameObject.GetComponent<Animator>();
-            if (animator != null)
-            {
-                //If the Animator has a human avatar, we need to check if the avatar's hierarchy matches that of the current GameObject. If they do not match, disable the node.
-                if (animator.avatarRoot != null && animator.isHuman)
-                {
-                    if (animator.avatarRoot.Find(path) == null)
-                    {
-                        node.propertyPathMismatchWithHumanAvatar = true;
-                    }
-                }
-            }
-
-
             if (showEntireHierarchy)
             {
                 // Iterate over all child GOs
@@ -137,6 +123,13 @@ private TreeViewItem AddGameObjectToHierarchy(GameObject gameObject, GameObject
                 }
             }
 
+            // Remove Leaf nodes without properties.
+            if (childNodes.Count == 0)
+            {
+                node.parent = null;
+                return null;
+            }
+
             TreeViewUtility.SetChildParentReferences(childNodes, node);
             return node;
         }
@@ -191,17 +184,24 @@ private TreeViewItem AddAnimatableObjectToHierarchy(EditorCurveBinding[] curveBi
 
             List<TreeViewItem> childNodes = new List<TreeViewItem>();
             List<EditorCurveBinding> singlePropertyBindings = new List<EditorCurveBinding>();
+            SerializedObject so = null;
 
             for (int i = 0; i < curveBindings.Length; i++)
             {
                 EditorCurveBinding curveBinding = curveBindings[i];
+                if (curveBinding.isSerializeReferenceCurve)
+                {
+                    var animatedObject = AnimationUtility.GetAnimatedObject(AddCurvesPopup.s_State.activeRootGameObject, curveBinding);
+                    if (animatedObject != null && (so == null || so.targetObject != animatedObject))
+                        so = new SerializedObject(animatedObject);
+                }
 
                 singlePropertyBindings.Add(curveBinding);
 
                 // We expect curveBindings to come sorted by propertyname
                 if (i == curveBindings.Length - 1 || AnimationWindowUtility.GetPropertyGroupName(curveBindings[i + 1].propertyName) != AnimationWindowUtility.GetPropertyGroupName(curveBinding.propertyName))
                 {
-                    TreeViewItem newNode = CreateNode(singlePropertyBindings.ToArray(), node);
+                    TreeViewItem newNode = CreateNode(singlePropertyBindings.ToArray(), node, so);
                     if (newNode != null)
                         childNodes.Add(newNode);
                     singlePropertyBindings.Clear();
@@ -214,9 +214,9 @@ private TreeViewItem AddAnimatableObjectToHierarchy(EditorCurveBinding[] curveBi
             return node;
         }
 
-        private TreeViewItem CreateNode(EditorCurveBinding[] curveBindings, TreeViewItem parentNode)
+        private TreeViewItem CreateNode(EditorCurveBinding[] curveBindings, TreeViewItem parentNode, SerializedObject so)
         {
-            var node = new AddCurvesPopupPropertyNode(parentNode, curveBindings);
+            var node = new AddCurvesPopupPropertyNode(parentNode, curveBindings, AnimationWindowUtility.GetNicePropertyDisplayName(curveBindings[0], so));
 
             // For RectTransform.position we only want .z
             if (AnimationWindowUtility.IsRectTransformPosition(node.curveBindings[0]))
@@ -234,7 +234,6 @@ public void UpdateData()
 
     internal class AddCurvesPopupGameObjectNode : TreeViewItem
     {
-        internal bool propertyPathMismatchWithHumanAvatar = false;
         public AddCurvesPopupGameObjectNode(GameObject gameObject, TreeViewItem parent, string displayName)
             : base(gameObject.GetInstanceID(), parent != null ? parent.depth + 1 : -1, parent, displayName)
         {
@@ -253,8 +252,8 @@ internal class AddCurvesPopupPropertyNode : TreeViewItem
     {
         public EditorCurveBinding[] curveBindings;
 
-        public AddCurvesPopupPropertyNode(TreeViewItem parent, EditorCurveBinding[] curveBindings)
-            : base(curveBindings[0].GetHashCode(), parent.depth + 1, parent, AnimationWindowUtility.NicifyPropertyGroupName(curveBindings[0].type, AnimationWindowUtility.GetPropertyGroupName(curveBindings[0].propertyName)))
+        public AddCurvesPopupPropertyNode(TreeViewItem parent, EditorCurveBinding[] curveBindings, string displayPath)
+            : base(curveBindings[0].GetHashCode(), parent.depth + 1, parent, displayPath)
         {
             this.curveBindings = curveBindings;
         }
diff --git a/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs b/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs
index 33897a16b6..b1b39169dc 100644
--- a/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AddCurvesPopupHierarchyGUI.cs
@@ -20,38 +20,17 @@ internal class AddCurvesPopupHierarchyGUI : TreeViewGUI
         private GUIContent addPropertiesContent = EditorGUIUtility.TrTextContent("Add Properties");
         private const float plusButtonWidth = 17;
 
-        static Texture2D warningIcon = (Texture2D)EditorGUIUtility.LoadRequired("Icons/ShortcutManager/alertDialog.png");
-        public static GUIStyle warningIconStyle;
-
         public AddCurvesPopupHierarchyGUI(TreeViewController treeView, EditorWindow owner)
             : base(treeView, true)
         {
             this.owner = owner;
-            warningIconStyle = new GUIStyle();
-            warningIconStyle.margin = new RectOffset(15, 15, 15, 15);
         }
 
         public override void OnRowGUI(Rect rowRect, TreeViewItem node, int row, bool selected, bool focused)
         {
-            bool propertyPathMismatchWithHumanAvatar = false;
-            AddCurvesPopupGameObjectNode addCurvesPopupNode = node as AddCurvesPopupGameObjectNode;
-            if (addCurvesPopupNode != null)
-            {
-                propertyPathMismatchWithHumanAvatar = addCurvesPopupNode.propertyPathMismatchWithHumanAvatar;
-            }
-
-            using (new EditorGUI.DisabledScope(propertyPathMismatchWithHumanAvatar))
-            {
-                base.OnRowGUI(rowRect, node, row, selected, focused);
-                DoAddCurveButton(rowRect, node);
-                HandleContextMenu(rowRect, node);
-            }
-
-            if (propertyPathMismatchWithHumanAvatar)
-            {
-                Rect iconRect = new Rect(rowRect.width - plusButtonWidth, rowRect.yMin, plusButtonWidth, buttonStyle.fixedHeight);
-                GUI.Label(iconRect, new GUIContent(warningIcon, "The Avatar definition does not match the property path. Please author using a hierarchy the Avatar was built with."), warningIconStyle);
-            }
+            base.OnRowGUI(rowRect, node, row, selected, focused);
+            DoAddCurveButton(rowRect, node);
+            HandleContextMenu(rowRect, node);
         }
 
         private void DoAddCurveButton(Rect rowRect, TreeViewItem node)
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationRecording.cs b/Editor/Mono/Animation/AnimationWindow/AnimationRecording.cs
index 81c8f4cd83..eff217eca1 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationRecording.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationRecording.cs
@@ -510,12 +510,6 @@ static void AddKey(IAnimationRecordingState state, EditorCurveBinding binding, T
                 {
                     if (state.currentFrame != 0)
                     {
-                        // case 1373924
-                        // In the case of a new curve, we also have to convert the previousValue to float for a discrete int
-                        if(binding.isDiscreteCurve)
-                        {
-                            previousValue = UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertDiscreteIntToFloat((int)previousValue);
-                        }
                         AnimationWindowUtility.AddKeyframeToCurve(curve, previousValue, type, AnimationKeyTime.Frame(0, clip.frameRate));
                     }
                 }
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindow.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindow.cs
index a0418795ad..2b5100aac3 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindow.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindow.cs
@@ -224,7 +224,7 @@ void OnEnable()
 
             OnSelectionChange();
 
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
         }
 
         void OnDisable()
@@ -232,7 +232,7 @@ void OnDisable()
             s_AnimationWindows.Remove(this);
             m_AnimEditor.OnDisable();
 
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
         }
 
         void OnDestroy()
@@ -452,7 +452,7 @@ private bool ShouldUpdateSelection(AnimationWindowSelectionItem selectedItem)
             return (selectedItem.GetRefreshHash() != currentSelection.GetRefreshHash());
         }
 
-        private void UndoRedoPerformed()
+        private void UndoRedoPerformed(in UndoRedoInfo info)
         {
             Repaint();
         }
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs
index 7f2caac0ce..9deb61f26e 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs
@@ -131,6 +131,7 @@ private static bool HasFlag(ResampleFlags flags, ResampleFlags flag)
         private AnimationClipPlayable m_CandidateClipPlayable;
         private AnimationClipPlayable m_DefaultPosePlayable;
         private bool m_UsesPostProcessComponents = false;
+        HashSet<Object> m_ObjectsModifiedDuringAnimationMode = new HashSet<Object>();
 
         private static ProfilerMarker s_ResampleAnimationMarker = new ProfilerMarker("AnimationWindowControl.ResampleAnimation");
 
@@ -417,13 +418,21 @@ public override bool StartPreview()
             AnimationMode.StartAnimationMode(GetAnimationModeDriver());
             AnimationPropertyContextualMenu.Instance.SetResponder(this);
             Undo.postprocessModifications += PostprocessAnimationRecordingModifications;
+            PrefabUtility.allowRecordingPrefabPropertyOverridesFor += AllowRecordingPrefabPropertyOverridesFor;
             DestroyGraph();
             CreateCandidateClip();
 
+            //If a hierarchy was created and array reorder happen in the inspector prior
+            //to the preview being started we will need to ensure that the display name
+            //reflects the binding path on an array element.
+            state.UpdateCurvesDisplayName();
+
             IAnimationWindowPreview[] previewComponents = FetchPostProcessComponents();
             m_UsesPostProcessComponents = previewComponents != null && previewComponents.Length > 0;
             if (previewComponents != null)
             {
+                // Animation preview affects inspector values, so make sure we ignore constrain proportions
+                ConstrainProportionsTransformScale.m_IsAnimationPreview = true;
                 foreach (var component in previewComponents)
                 {
                     component.StartPreview();
@@ -435,8 +444,14 @@ public override bool StartPreview()
 
         public override void StopPreview()
         {
+            if (previewing)
+                OnExitingAnimationMode();
+
             StopPlayback();
             StopRecording();
+
+            ConstrainProportionsTransformScale.m_IsAnimationPreview = false;
+
             ClearCandidates();
             DestroyGraph();
             DestroyCandidateClip();
@@ -471,8 +486,6 @@ public override void StopPreview()
 
                 m_UsesPostProcessComponents = false;
             }
-
-            Undo.postprocessModifications -= PostprocessAnimationRecordingModifications;
         }
 
         public override bool canRecord
@@ -757,12 +770,55 @@ private AnimationModeDriver GetCandidateDriver()
             return m_CandidateDriver;
         }
 
+        private bool AllowRecordingPrefabPropertyOverridesFor(UnityEngine.Object componentOrGameObject)
+        {
+            if (componentOrGameObject == null)
+                throw new ArgumentNullException(nameof(componentOrGameObject));
+
+            GameObject inputGameObject = null;
+            if (componentOrGameObject is Component)
+            {
+                inputGameObject = ((Component)componentOrGameObject).gameObject;
+            }
+            else if (componentOrGameObject is GameObject)
+            {
+                inputGameObject = (GameObject)componentOrGameObject;
+            }
+            else
+            {
+                return true;
+            }
+
+            var rootOfAnimation = state.activeRootGameObject;
+            if (rootOfAnimation == null)
+                return true;
+
+            // If the input object is a child of the current root of animation then disallow recording of prefab property overrides
+            // since the input object is currently being setup for animation recording
+            return inputGameObject.transform.IsChildOf(rootOfAnimation.transform) == false;
+        }
+
+        void OnExitingAnimationMode()
+        {
+            Undo.postprocessModifications -= PostprocessAnimationRecordingModifications;
+            PrefabUtility.allowRecordingPrefabPropertyOverridesFor -= AllowRecordingPrefabPropertyOverridesFor;
+
+            // Ensures Prefab instance overrides are recorded for properties that was changed while in AnimationMode
+            foreach (var obj in m_ObjectsModifiedDuringAnimationMode)
+            {
+                if (obj != null)
+                    EditorUtility.SetDirty(obj);
+            }
+
+            m_ObjectsModifiedDuringAnimationMode.Clear();
+        }
+
         private UndoPropertyModification[] PostprocessAnimationRecordingModifications(UndoPropertyModification[] modifications)
         {
-            //Fix for case 751009: The animationMode can be changed outside the AnimationWindow, and this callback needs to be unregistered.
+            //Fix for case 751009: The animationMode can be changed outside the AnimationWindow, and callbacks needs to be unregistered.
             if (!AnimationMode.InAnimationMode(GetAnimationModeDriver()))
             {
-                Undo.postprocessModifications -= PostprocessAnimationRecordingModifications;
+                OnExitingAnimationMode();
                 return modifications;
             }
 
@@ -771,13 +827,42 @@ private UndoPropertyModification[] PostprocessAnimationRecordingModifications(Un
             else if (previewing)
                 modifications = RegisterCandidates(modifications);
 
+            RefreshDisplayNamesOnArrayTopologicalChange(modifications);
+
             // Only resample when playable graph has been customized with post process nodes.
             if (m_UsesPostProcessComponents)
                 ResampleAnimation(ResampleFlags.None);
 
+            foreach (var mod in modifications)
+            {
+                m_ObjectsModifiedDuringAnimationMode.Add(mod.currentValue.target);
+            }
+
             return modifications;
         }
 
+        private void RefreshDisplayNamesOnArrayTopologicalChange(UndoPropertyModification[] modifications)
+        {
+            if (modifications.Length >= 2)
+            {
+                if (modifications[0].currentValue.propertyPath.EndsWith("]") &&
+                    modifications[0].currentValue.propertyPath.Contains(".Array.data[") &&
+                    modifications[1].currentValue.propertyPath.EndsWith("]") &&
+                    modifications[1].currentValue.propertyPath.Contains(".Array.data["))
+                {
+                    //Array reordering might affect curves display name
+                    state.UpdateCurvesDisplayName();
+                }
+                else if (modifications[0].currentValue.propertyPath.EndsWith(".Array.size") &&
+                         Convert.ToInt64(modifications[0].currentValue.value) <
+                         Convert.ToInt64(modifications[0].previousValue.value))
+                {
+                    //Array shrinking might affect curves display name
+                    state.UpdateCurvesDisplayName();
+                }
+            }
+        }
+
         private UndoPropertyModification[] ProcessAutoKey(UndoPropertyModification[] modifications)
         {
             BeginKeyModification();
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs
index f4bac4da2b..966a51b453 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowCurve.cs
@@ -28,6 +28,7 @@ internal class AnimationWindowCurve : IComparable<AnimationWindowCurve>, IEquata
         public EditorCurveBinding binding { get { return m_Binding;  } }
         public bool isPPtrCurve { get { return m_Binding.isPPtrCurve; } }
         public bool isDiscreteCurve { get { return m_Binding.isDiscreteCurve; } }
+        public bool isSerializeReferenceCurve{ get {return m_Binding.isSerializeReferenceCurve;}}
         public bool isPhantom { get { return m_Binding.isPhantom; } }
         public string propertyName { get { return m_Binding.propertyName; } }
         public string path { get { return m_Binding.path; } }
@@ -45,6 +46,18 @@ internal class AnimationWindowCurve : IComparable<AnimationWindowCurve>, IEquata
         public bool animationIsEditable { get { return m_SelectionBinding != null ? m_SelectionBinding.animationIsEditable : true; } }
         public int selectionID { get { return m_SelectionBinding != null ? m_SelectionBinding.id : 0; } }
 
+        private object defaultValue
+        {
+            get
+            {
+                if (isPPtrCurve)
+                    return null;
+                if (isDiscreteCurve)
+                    return 0;
+                return 0f;
+            }
+        }
+
         public AnimationWindowSelectionItem selectionBinding { get { return m_SelectionBinding; } set { m_SelectionBinding = value; } }
 
         public AnimationWindowCurve(AnimationClip clip, EditorCurveBinding binding, System.Type valueType)
@@ -228,7 +241,7 @@ public AnimationWindowKeyframe FindKeyAtTime(AnimationKeyTime keyTime)
         public object Evaluate(float time)
         {
             if (m_Keyframes.Count == 0)
-                return isPPtrCurve ? null : (object)0f;
+                return defaultValue;
 
             AnimationWindowKeyframe firstKey = m_Keyframes[0];
             if (time <= firstKey.time)
@@ -243,9 +256,9 @@ public object Evaluate(float time)
             {
                 AnimationWindowKeyframe nextKey = m_Keyframes[i];
 
-                if (key.time < time && nextKey.time >= time)
+                if (key.time <= time && nextKey.time > time)
                 {
-                    if (isPPtrCurve)
+                    if (isPPtrCurve || isDiscreteCurve)
                     {
                         return key.value;
                     }
@@ -266,7 +279,7 @@ public object Evaluate(float time)
             }
 
             // Shouldn't happen...
-            return isPPtrCurve ? null : (object)0f;
+            return defaultValue;
         }
 
         public void AddKeyframe(AnimationWindowKeyframe key, AnimationKeyTime keyTime)
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyDataSource.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyDataSource.cs
index 820a11e84c..79ff048efa 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyDataSource.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyDataSource.cs
@@ -77,6 +77,7 @@ public List<AnimationWindowHierarchyNode> CreateTreeFromCurves()
 
             AnimationWindowCurve[] curves = state.allCurves.ToArray();
             AnimationWindowHierarchyNode parentNode = (AnimationWindowHierarchyNode)m_RootItem;
+            SerializedObject so = null;
 
             for (int i = 0; i < curves.Length; i++)
             {
@@ -87,6 +88,13 @@ public List<AnimationWindowHierarchyNode> CreateTreeFromCurves()
 
                 AnimationWindowCurve nextCurve = i < curves.Length - 1 ? curves[i + 1] : null;
 
+                if (curve.isSerializeReferenceCurve && state.activeRootGameObject != null)
+                {
+                    var animatedObject = AnimationUtility.GetAnimatedObject(state.activeRootGameObject, curve.binding);
+                    if (animatedObject != null && (so == null || so.targetObject != animatedObject))
+                        so = new SerializedObject(animatedObject);
+                }
+
                 singlePropertyCurves.Add(curve);
 
                 bool areSameGroup = nextCurve != null && AnimationWindowUtility.GetPropertyGroupName(nextCurve.propertyName) == AnimationWindowUtility.GetPropertyGroupName(curve.propertyName);
@@ -97,9 +105,9 @@ public List<AnimationWindowHierarchyNode> CreateTreeFromCurves()
                 if (i == curves.Length - 1 || !areSameGroup || !areSamePathAndType)
                 {
                     if (singlePropertyCurves.Count > 1)
-                        nodes.Add(AddPropertyGroupToHierarchy(singlePropertyCurves.ToArray(), parentNode));
+                        nodes.Add(AddPropertyGroupToHierarchy(singlePropertyCurves.ToArray(), parentNode, so));
                     else
-                        nodes.Add(AddPropertyToHierarchy(singlePropertyCurves[0], parentNode));
+                        nodes.Add(AddPropertyToHierarchy(singlePropertyCurves[0], parentNode, so));
                     singlePropertyCurves.Clear();
                 }
             }
@@ -107,12 +115,12 @@ public List<AnimationWindowHierarchyNode> CreateTreeFromCurves()
             return nodes;
         }
 
-        private AnimationWindowHierarchyPropertyGroupNode AddPropertyGroupToHierarchy(AnimationWindowCurve[] curves, AnimationWindowHierarchyNode parentNode)
+        private AnimationWindowHierarchyPropertyGroupNode AddPropertyGroupToHierarchy(AnimationWindowCurve[] curves, AnimationWindowHierarchyNode parentNode, SerializedObject so)
         {
             List<AnimationWindowHierarchyNode> childNodes = new List<AnimationWindowHierarchyNode>();
 
             System.Type animatableObjectType = curves[0].type;
-            AnimationWindowHierarchyPropertyGroupNode node = new AnimationWindowHierarchyPropertyGroupNode(animatableObjectType, 0, AnimationWindowUtility.GetPropertyGroupName(curves[0].propertyName), curves[0].path, parentNode);
+            AnimationWindowHierarchyPropertyGroupNode node = new AnimationWindowHierarchyPropertyGroupNode(animatableObjectType, 0, AnimationWindowUtility.GetPropertyGroupName(curves[0].propertyName), curves[0].path, parentNode, AnimationWindowUtility.GetNicePropertyGroupDisplayName(curves[0].binding, so));
 
             node.icon = GetIcon(curves[0].binding);
 
@@ -121,7 +129,7 @@ private AnimationWindowHierarchyPropertyGroupNode AddPropertyGroupToHierarchy(An
 
             foreach (AnimationWindowCurve curve in curves)
             {
-                AnimationWindowHierarchyPropertyNode childNode = AddPropertyToHierarchy(curve, node);
+                AnimationWindowHierarchyPropertyNode childNode = AddPropertyToHierarchy(curve, node, so);
                 // For child nodes we do not want to display the type in front (It is already shown by the group node)
                 childNode.displayName = AnimationWindowUtility.GetPropertyDisplayName(childNode.propertyName);
                 childNodes.Add(childNode);
@@ -131,9 +139,9 @@ private AnimationWindowHierarchyPropertyGroupNode AddPropertyGroupToHierarchy(An
             return node;
         }
 
-        private AnimationWindowHierarchyPropertyNode AddPropertyToHierarchy(AnimationWindowCurve curve, AnimationWindowHierarchyNode parentNode)
+        private AnimationWindowHierarchyPropertyNode AddPropertyToHierarchy(AnimationWindowCurve curve, AnimationWindowHierarchyNode parentNode, SerializedObject so)
         {
-            AnimationWindowHierarchyPropertyNode node = new AnimationWindowHierarchyPropertyNode(curve.type, 0, curve.propertyName, curve.path, parentNode, curve.binding, curve.isPPtrCurve);
+            AnimationWindowHierarchyPropertyNode node = new AnimationWindowHierarchyPropertyNode(curve.type, 0, curve.propertyName, curve.path, parentNode, curve.binding, curve.isPPtrCurve, AnimationWindowUtility.GetNicePropertyDisplayName(curve.binding, so));
 
             if (parentNode.icon != null)
                 node.icon = parentNode.icon;
@@ -156,6 +164,34 @@ public Texture2D GetIcon(EditorCurveBinding curveBinding)
             return AssetPreview.GetMiniTypeThumbnail(curveBinding.type);
         }
 
+        public void UpdateSerializeReferenceCurvesArrayNiceDisplayName()
+        {
+            if (state.activeRootGameObject == null)
+                return;
+
+            //This is required in the case that there might have been a topological change
+            //leading to a different display name(topological path)
+            SerializedObject so = null;
+            foreach (AnimationWindowHierarchyNode hierarchyNode in GetRows())
+            {
+                if (hierarchyNode.curves != null)
+                {
+                    foreach (var curve in hierarchyNode.curves)
+                    {
+                        if (curve.isSerializeReferenceCurve && hierarchyNode.displayName.Contains(".Array.data["))
+                        {
+                            var animatedObject = AnimationUtility.GetAnimatedObject(state.activeRootGameObject, curve.binding);
+                            if (animatedObject != null && (so == null || so.targetObject != animatedObject))
+                                so = new SerializedObject(animatedObject);
+
+                            hierarchyNode.displayName = AnimationWindowUtility.GetNicePropertyDisplayName(curve.binding, so);
+                        }
+                    }
+                }
+            }
+
+        }
+
         public void UpdateData()
         {
             m_TreeView.ReloadData();
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
index af1655b959..0fbdbf0583 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs
@@ -330,13 +330,10 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
 
                 // We do valuefields for dopelines that only have single curve
                 AnimationWindowCurve curve = curves[0];
-                object objectValue = CurveBindingUtility.GetCurrentValue(state, curve);
-                int intValue = 0;
+                object value = CurveBindingUtility.GetCurrentValue(state, curve);
 
-                if (objectValue is float)
+                if (!curve.isPPtrCurve)
                 {
-                    float value = (float)objectValue;
-
                     Rect valueFieldDragRect = new Rect(rect.xMax - k_ValueFieldOffsetFromRightSide - k_ValueFieldDragWidth, rect.y, k_ValueFieldDragWidth, rect.height);
                     Rect valueFieldRect = new Rect(rect.xMax - k_ValueFieldOffsetFromRightSide, rect.y, k_ValueFieldWidth, rect.height);
 
@@ -347,7 +344,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
 
                     if (curve.valueType == typeof(bool))
                     {
-                        value = GUI.Toggle(valueFieldRect, m_HierarchyItemValueControlIDs[row], value != 0, GUIContent.none, EditorStyles.toggle) ? 1 : 0;
+                        value = GUI.Toggle(valueFieldRect, m_HierarchyItemValueControlIDs[row], (float)value != 0, GUIContent.none, EditorStyles.toggle) ? 1f : 0f;
                     }
                     else
                     {
@@ -366,12 +363,11 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
 
                         if (curve.isDiscreteCurve)
                         {
-                            intValue =  UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertFloatToDiscreteInt(value);
-                            intValue = EditorGUI.DoIntField(EditorGUI.s_RecycledEditor,
+                            value = EditorGUI.DoIntField(EditorGUI.s_RecycledEditor,
                                 valueFieldRect,
                                 valueFieldDragRect,
                                 id,
-                                intValue,
+                                (int)value,
                                 EditorGUI.kIntFieldFormatString,
                                 m_AnimationSelectionTextField,
                                 true,
@@ -388,7 +384,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 valueFieldRect,
                                 valueFieldDragRect,
                                 id,
-                                value,
+                                (float)value,
                                 "g5",
                                 m_AnimationSelectionTextField,
                                 true);
@@ -397,32 +393,18 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 GUI.changed = true;
                                 Event.current.Use();
                             }
+
+                            if (float.IsInfinity((float)value) || float.IsNaN((float)value))
+                                value = 0f;
                         }
                     }
 
-                    if (float.IsInfinity(value) || float.IsNaN(value))
-                        value = 0;
-
                     if (EditorGUI.EndChangeCheck())
                     {
                         string undoLabel = "Edit Key";
 
                         AnimationKeyTime newAnimationKeyTime = AnimationKeyTime.Time(state.currentTime, curve.clip.frameRate);
-
-                        AnimationWindowKeyframe existingKeyframe = null;
-                        foreach (AnimationWindowKeyframe keyframe in curve.m_Keyframes)
-                        {
-                            if (Mathf.Approximately(keyframe.time, state.currentTime))
-                                existingKeyframe = keyframe;
-                        }
-
-                        if (curve.isDiscreteCurve)
-                            value = UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertDiscreteIntToFloat(intValue);
-
-                        if (existingKeyframe == null)
-                            AnimationWindowUtility.AddKeyframeToCurve(curve, value, curve.valueType, newAnimationKeyTime);
-                        else
-                            existingKeyframe.value = value;
+                        AnimationWindowUtility.AddKeyframeToCurve(curve, value, curve.valueType, newAnimationKeyTime);
 
                         state.SaveCurve(curve.clip, curve, undoLabel);
                         curvesChanged = true;
@@ -431,7 +413,13 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
             }
 
             if (curvesChanged)
+            {
+                //Fix for case 1382193: Stop recording any candidates if a property value field is modified
+                if (AnimationMode.IsRecordingCandidates())
+                    state.ClearCandidates();
+
                 state.ResampleAnimation();
+            }
         }
 
         private bool DoTreeViewButton(int id, Rect position, GUIContent content, GUIStyle style)
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyNode.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyNode.cs
index 7ed4ca36a9..bcd960f940 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyNode.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyNode.cs
@@ -33,8 +33,8 @@ public AnimationWindowHierarchyNode(int instanceID, int depth, TreeViewItem pare
 
     internal class AnimationWindowHierarchyPropertyGroupNode : AnimationWindowHierarchyNode
     {
-        public AnimationWindowHierarchyPropertyGroupNode(System.Type animatableObjectType, int setId, string propertyName, string path, TreeViewItem parent)
-            : base(AnimationWindowUtility.GetPropertyNodeID(setId, path, animatableObjectType, propertyName), parent != null ? parent.depth + 1 : -1, parent, animatableObjectType, AnimationWindowUtility.GetPropertyGroupName(propertyName), path, AnimationWindowUtility.GetNicePropertyGroupDisplayName(animatableObjectType, propertyName))
+        public AnimationWindowHierarchyPropertyGroupNode(System.Type animatableObjectType, int setId, string propertyName, string path, TreeViewItem parent, string displayName)
+            : base(AnimationWindowUtility.GetPropertyNodeID(setId, path, animatableObjectType, propertyName), parent != null ? parent.depth + 1 : -1, parent, animatableObjectType, AnimationWindowUtility.GetPropertyGroupName(propertyName), path, displayName)
         {}
     }
 
@@ -42,8 +42,8 @@ internal class AnimationWindowHierarchyPropertyNode : AnimationWindowHierarchyNo
     {
         public bool isPptrNode;
 
-        public AnimationWindowHierarchyPropertyNode(System.Type animatableObjectType, int setId, string propertyName, string path, TreeViewItem parent, EditorCurveBinding binding, bool isPptrNode)
-            : base(AnimationWindowUtility.GetPropertyNodeID(setId, path, animatableObjectType, propertyName), parent != null ? parent.depth + 1 : -1, parent, animatableObjectType, propertyName, path, AnimationWindowUtility.GetNicePropertyDisplayName(animatableObjectType, propertyName))
+        public AnimationWindowHierarchyPropertyNode(System.Type animatableObjectType, int setId, string propertyName, string path, TreeViewItem parent, EditorCurveBinding binding, bool isPptrNode, string displayName)
+            : base(AnimationWindowUtility.GetPropertyNodeID(setId, path, animatableObjectType, propertyName), parent != null ? parent.depth + 1 : -1, parent, animatableObjectType, propertyName, path, displayName)
         {
             this.binding = binding;
             this.isPptrNode = isPptrNode;
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs
index 2a310b8c35..cbdfa58b5e 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using UnityEngine;
 using UnityEditor;
 
@@ -104,7 +105,16 @@ public AnimationWindowKeyframe(AnimationWindowKeyframe key)
         public AnimationWindowKeyframe(AnimationWindowCurve curve, Keyframe key)
         {
             this.time = key.time;
-            this.value = key.value;
+
+            if (curve.isDiscreteCurve)
+            {
+                this.value = UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertFloatToDiscreteInt(key.value);
+            }
+            else
+            {
+                this.value = key.value;
+            }
+
             this.curve = curve;
             this.m_InTangent = key.inTangent;
             this.m_OutTangent = key.outTangent;
@@ -151,7 +161,20 @@ public int GetIndex()
 
         public Keyframe ToKeyframe()
         {
-            var keyframe = new Keyframe(time, (float)value, inTangent, outTangent);
+            float floatValue;
+            if (curve.isDiscreteCurve)
+            {
+                // case 1395978
+                // Negative int values converted to float create NaN values. Limiting discrete int values to only positive values
+                // until we rewrite the animation backend with dedicated int curves.
+                floatValue = UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertDiscreteIntToFloat(Math.Max((int)value, 0));
+            }
+            else
+            {
+                floatValue = (float)value;
+            }
+
+            var keyframe = new Keyframe(time, floatValue, inTangent, outTangent);
 
             keyframe.tangentModeInternal = m_TangentMode;
             keyframe.weightedMode = weightedMode;
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
index cfa92e3ed0..1511a2bf16 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowState.cs
@@ -365,7 +365,7 @@ public void OnEnable()
         {
             hideFlags = HideFlags.HideAndDontSave;
             AnimationUtility.onCurveWasModified += CurveWasModified;
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             AssemblyReloadEvents.beforeAssemblyReload += PurgeSelection;
 
             // NoOps...
@@ -381,7 +381,7 @@ public void OnEnable()
         public void OnDisable()
         {
             AnimationUtility.onCurveWasModified -= CurveWasModified;
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
             AssemblyReloadEvents.beforeAssemblyReload -= PurgeSelection;
 
             m_ControlInterface.OnDisable();
@@ -434,7 +434,7 @@ public RefreshType refresh
             }
         }
 
-        public void UndoRedoPerformed()
+        public void UndoRedoPerformed(in UndoRedoInfo info)
         {
             refresh = RefreshType.Everything;
             controlInterface.ResampleAnimation();
@@ -577,6 +577,12 @@ public void StartPreview()
             controlInterface.ResampleAnimation();
         }
 
+        public void UpdateCurvesDisplayName()
+        {
+            if (hierarchyData != null)
+                hierarchyData.UpdateSerializeReferenceCurvesArrayNiceDisplayName();
+        }
+
         public void StopPreview()
         {
             controlInterface.StopPreview();
@@ -614,6 +620,11 @@ public void ResampleAnimation()
             controlInterface.ResampleAnimation();
         }
 
+        public void ClearCandidates()
+        {
+            controlInterface.ClearCandidates();
+        }
+
         public bool ShouldShowCurve(AnimationWindowCurve curve)
         {
             if (filterBySelection && activeRootGameObject != null)
@@ -844,7 +855,7 @@ public Bounds selectionBounds
                     {
                         AnimationWindowKeyframe key = keys[0];
                         float time = key.time;
-                        float val = key.isPPtrCurve ? 0.0f : (float)key.value;
+                        float val = key.isPPtrCurve || key.isDiscreteCurve ? 0.0f : (float)key.value;
 
                         Bounds bounds = new Bounds(new Vector2(time, val), Vector2.zero);
 
@@ -853,7 +864,7 @@ public Bounds selectionBounds
                             key = keys[i];
 
                             time = key.time;
-                            val = key.isPPtrCurve ? 0.0f : (float)key.value;
+                            val = key.isPPtrCurve || key.isDiscreteCurve ? 0.0f : (float)key.value;
 
                             bounds.Encapsulate(new Vector2(time, val));
                         }
@@ -1050,7 +1061,7 @@ public void TransformSelectedKeys(Matrix4x4 matrix, bool flipX, bool flipY, bool
                     if (snapshot.curve.animationIsEditable)
                     {
                         // Transform time value.
-                        Vector3 v = new Vector3(liveEditKey.keySnapshot.time, liveEditKey.keySnapshot.isPPtrCurve ? 0f : (float)liveEditKey.keySnapshot.value, 0f);
+                        Vector3 v = new Vector3(liveEditKey.keySnapshot.time, liveEditKey.keySnapshot.isPPtrCurve || liveEditKey.keySnapshot.isDiscreteCurve ? 0f : (float)liveEditKey.keySnapshot.value, 0f);
                         v = matrix.MultiplyPoint3x4(v);
 
                         liveEditKey.key.time = Mathf.Max((snapToFrame) ? SnapToFrame(v.x, snapshot.curve.clip.frameRate) : v.x, 0f);
@@ -1071,7 +1082,7 @@ public void TransformSelectedKeys(Matrix4x4 matrix, bool flipX, bool flipY, bool
                             liveEditKey.key.outWeight = liveEditKey.keySnapshot.inWeight;
                         }
 
-                        if (!liveEditKey.key.isPPtrCurve)
+                        if (!liveEditKey.key.isPPtrCurve && !liveEditKey.key.isDiscreteCurve)
                         {
                             liveEditKey.key.value = v.y;
 
diff --git a/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs b/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs
index b53d36c6c4..dfcbc37c23 100644
--- a/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs
+++ b/Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs
@@ -266,6 +266,18 @@ public static AnimationWindowKeyframe AddKeyframeToCurve(AnimationWindowCurve cu
                 keyframe.curve = curve;
                 curve.AddKeyframe(keyframe, time);
             }
+            else if (curve.isDiscreteCurve)
+            {
+                Keyframe tempKey = new Keyframe(time.time, 0f);
+                AnimationUtility.SetKeyLeftTangentMode(ref tempKey, TangentMode.Constant);
+                AnimationUtility.SetKeyRightTangentMode(ref tempKey, TangentMode.Constant);
+                AnimationUtility.SetKeyBroken(ref tempKey, true);
+
+                keyframe = new AnimationWindowKeyframe(curve, tempKey);
+                keyframe.value = Convert.ToInt32(value);
+
+                curve.AddKeyframe(keyframe, time);
+            }
             else if (type == typeof(bool) || type == typeof(float) || type == typeof(int))
             {
                 Keyframe tempKey = new Keyframe(time.time, (float)value);
@@ -281,11 +293,9 @@ public static AnimationWindowKeyframe AddKeyframeToCurve(AnimationWindowCurve cu
                     // Create temporary curve to get proper tangents
                     AnimationCurve animationCurve = curve.ToAnimationCurve();
 
-
-
                     if (animationCurve.length <= 1)
                     {
-                        TangentMode tangentMode = curve.isDiscreteCurve ? TangentMode.Constant : TangentMode.Linear;
+                        TangentMode tangentMode = TangentMode.Linear;
                         AnimationUtility.SetKeyLeftTangentMode(ref tempKey, tangentMode);
                         AnimationUtility.SetKeyRightTangentMode(ref tempKey, tangentMode);
                     }
@@ -460,14 +470,17 @@ public static object GetCurrentValue(GameObject rootGameObject, EditorCurveBindi
         {
             if (curveBinding.isPPtrCurve)
             {
-                Object value;
-                AnimationUtility.GetObjectReferenceValue(rootGameObject, curveBinding, out value);
+                AnimationUtility.GetObjectReferenceValue(rootGameObject, curveBinding, out var value);
+                return value;
+            }
+            else if (curveBinding.isDiscreteCurve)
+            {
+                AnimationUtility.GetDiscreteIntValue(rootGameObject, curveBinding, out var value);
                 return value;
             }
             else
             {
-                float value;
-                AnimationUtility.GetFloatValue(rootGameObject, curveBinding, out value);
+                AnimationUtility.GetFloatValue(rootGameObject, curveBinding, out var value);
                 return value;
             }
         }
@@ -617,7 +630,7 @@ public static PropertyModification[] SerializedPropertyToPropertyModifications(S
                             var modification = new PropertyModification();
 
                             modification.target = targetObjects[j];
-                            modification.propertyPath = singleProperty.propertyPath;
+                            modification.propertyPath = (singleProperty.isReferencingAManagedReferenceField ? singleProperty.managedReferencePropertyPath : singleProperty.propertyPath);
                             modification.value = value;
                             modification.objectReference = objectReference;
                             modifications.Add(modification);
@@ -635,6 +648,8 @@ public static PropertyModification[] SerializedPropertyToPropertyModifications(S
                             value = propertyIter.floatValue.ToString(CultureInfo.InvariantCulture);
                         else if (isInt)
                             value = propertyIter.intValue.ToString();
+                        else if (isEnum)
+                                value = propertyIter.enumValueIndex.ToString();
                         else // if (isBool)
                             value = propertyIter.boolValue ? "1" : "0";
 
@@ -643,7 +658,7 @@ public static PropertyModification[] SerializedPropertyToPropertyModifications(S
                             var modification = new PropertyModification();
 
                             modification.target = targetObjects[j];
-                            modification.propertyPath = propertyIter.propertyPath;
+                            modification.propertyPath = (propertyIter.isReferencingAManagedReferenceField ? propertyIter.managedReferencePropertyPath : propertyIter.propertyPath);
                             modification.value = value;
                             modification.objectReference = objectReference;
                             modifications.Add(modification);
@@ -747,6 +762,8 @@ public static string GetPropertyDisplayName(string propertyName)
             propertyName = propertyName.Replace("localEulerAnglesRaw", k_RotationDisplayName);
             propertyName = propertyName.Replace("localEulerAngles", k_RotationDisplayName);
             propertyName = propertyName.Replace("m_Materials.Array.data", k_MaterialReferenceDisplayName);
+            if (propertyName.StartsWith("managedReferences["))
+                propertyName = propertyName.Remove(0, propertyName.IndexOf('.')+1);
 
             propertyName = ObjectNames.NicifyVariableName(propertyName);
             propertyName = propertyName.Replace("m_", "");
@@ -766,6 +783,29 @@ public static bool ShouldPrefixWithTypeName(Type animatableObjectType, string pr
             return true;
         }
 
+        public static string GetNicePropertyDisplayName(EditorCurveBinding curveBinding, SerializedObject so)
+        {
+            if (curveBinding.isSerializeReferenceCurve)
+            {
+                if (so != null)
+                {
+                    var displayName = curveBinding.propertyName;
+                    var sp = so.FindFirstPropertyFromManagedReferencePath(displayName);
+                    if (sp != null)
+                        displayName = AnimationWindowUtility.GetPropertyDisplayName(AnimationWindowUtility.GetPropertyGroupName(sp.propertyPath));
+                    if (displayName != "")
+                        return displayName;
+                }
+                else
+                {
+                    return ObjectNames.NicifyVariableName(curveBinding.type.Name) + "." + curveBinding.propertyName;
+                }
+
+            }
+
+            return AnimationWindowUtility.GetNicePropertyDisplayName(curveBinding.type, AnimationWindowUtility.GetPropertyGroupName(curveBinding.propertyName));
+        }
+
         public static string GetNicePropertyDisplayName(Type animatableObjectType, string propertyName)
         {
             if (ShouldPrefixWithTypeName(animatableObjectType, propertyName))
@@ -774,6 +814,28 @@ public static string GetNicePropertyDisplayName(Type animatableObjectType, strin
                 return GetPropertyDisplayName(propertyName);
         }
 
+        public static string GetNicePropertyGroupDisplayName(EditorCurveBinding curveBinding, SerializedObject so)
+        {
+            if (curveBinding.isSerializeReferenceCurve )
+            {
+                if (so != null)
+                {
+                    var displayName = curveBinding.propertyName;
+                    var sp = so.FindFirstPropertyFromManagedReferencePath(displayName);
+                    if (sp != null)
+                        displayName = AnimationWindowUtility.GetPropertyDisplayName(AnimationWindowUtility.GetPropertyGroupName(sp.propertyPath));
+                    if (displayName != "")
+                        return displayName;
+                }
+                else
+                {
+                    return ObjectNames.NicifyVariableName(curveBinding.type.Name) + "." + curveBinding.propertyName;
+                }
+            }
+
+            return NicifyPropertyGroupName(curveBinding.type, AnimationWindowUtility.GetPropertyGroupName(curveBinding.propertyName));
+        }
+
         public static string GetNicePropertyGroupDisplayName(Type animatableObjectType, string propertyGroupName)
         {
             if (ShouldPrefixWithTypeName(animatableObjectType, propertyGroupName))
diff --git a/Editor/Mono/Animation/AnimationWindow/CurveBindingUtility.cs b/Editor/Mono/Animation/AnimationWindow/CurveBindingUtility.cs
index 21ee380a73..4d2baef4e2 100644
--- a/Editor/Mono/Animation/AnimationWindow/CurveBindingUtility.cs
+++ b/Editor/Mono/Animation/AnimationWindow/CurveBindingUtility.cs
@@ -4,6 +4,7 @@
 
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.Animations;
 
 namespace UnityEditorInternal
 {
@@ -37,6 +38,10 @@ public static object GetCurrentValue(GameObject rootGameObject, EditorCurveBindi
                     // Cannot extract type of PPtrCurve.
                     return null;
                 }
+                else if (curveBinding.isDiscreteCurve)
+                {
+                    return 0;
+                }
                 else
                 {
                     // Cannot extract type of AnimationCurve.  Default to float.
diff --git a/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs b/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs
index 6e8b33154e..81df882277 100644
--- a/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs
+++ b/Editor/Mono/Animation/AnimationWindow/CurveEditor.cs
@@ -652,13 +652,13 @@ public CurveEditor(Rect rect, CurveWrapper[] curves, bool minimalGUI) : base(min
         public void OnEnable()
         {
             // Only add callback once.
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
         }
 
         public void OnDisable()
         {
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
 
             if (m_PointRenderer != null)
                 m_PointRenderer.FlushCache();
@@ -672,7 +672,7 @@ public void OnDestroy()
                 ScriptableObject.DestroyImmediate(m_Selection);
         }
 
-        void UndoRedoPerformed()
+        void UndoRedoPerformed(in UndoRedoInfo info)
         {
             if (settings.undoRedoSelection)
                 InvalidateSelectionBounds();
diff --git a/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs b/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs
index 2ba63645a7..bcf4722b50 100644
--- a/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs
+++ b/Editor/Mono/Animation/AnimationWindow/DopeSheetEditor.cs
@@ -775,9 +775,7 @@ private void HandleDragAndDropToEmptyArea()
                         {
                             EditorCurveBinding? spriteBinding = CreateNewPptrDopeline(state.selection, typeof(Sprite));
                             if (spriteBinding != null)
-                            {
                                 DoSpriteDropAfterGeneratingNewDopeline(state.activeAnimationClip, spriteBinding);
-                            }
                         }
 
                         DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
@@ -794,8 +792,35 @@ private void DoSpriteDropAfterGeneratingNewDopeline(AnimationClip animationClip,
             // Create the new curve for our sprites
             AnimationWindowCurve newCurve = new AnimationWindowCurve(animationClip, (EditorCurveBinding)spriteBinding, typeof(Sprite));
 
-            // And finally perform the drop onto the curve
+            // Perform the drop onto the curve
             PerformDragAndDrop(newCurve, 0f);
+
+            // Assign the Sprite in the first keyframe to the SpriteRenderer's Sprite property
+            AssignSpriteToSpriteRenderer(newCurve);
+        }
+
+        private void AssignSpriteToSpriteRenderer(AnimationWindowCurve curve)
+        {
+            var rootGameObject = state.selection.rootGameObject;
+            if (rootGameObject == null)
+                return;
+
+            var hasValidCurve = curve.m_Keyframes.Count > 0 && curve.binding.type == typeof(SpriteRenderer);
+            if (!hasValidCurve)
+                return;
+
+            var spriteRenderer = AnimationUtility.GetAnimatedObject(rootGameObject, curve.binding) as SpriteRenderer;
+            var hasValidSpriteRenderer = spriteRenderer != null && spriteRenderer.sprite == null;
+            if (!hasValidSpriteRenderer)
+                return;
+
+            var keyframe = curve.m_Keyframes[0];
+            var sprite = keyframe.value as Sprite;
+            if (sprite != null)
+            {
+                Undo.RecordObject(spriteRenderer, "Add Sprite");
+                spriteRenderer.sprite = sprite;
+            }
         }
 
         private void HandleRectangleToolEvents()
diff --git a/Editor/Mono/Animation/EditorCurveBinding.bindings.cs b/Editor/Mono/Animation/EditorCurveBinding.bindings.cs
index d6ccd3d822..15e8f88f70 100644
--- a/Editor/Mono/Animation/EditorCurveBinding.bindings.cs
+++ b/Editor/Mono/Animation/EditorCurveBinding.bindings.cs
@@ -29,15 +29,24 @@ public struct EditorCurveBinding : IEquatable<EditorCurveBinding>
         //is it a discrete curve
         private int   m_isDiscreteCurve;
 
+        //is it a serialize reference curve
+        private int  m_isSerializeReferenceCurve;
+
         //is it placeholder curve
         private int   m_isPhantom;
 
+        //is it a unknow curve: mean it needs to be processed further more to find out what is this curve
+        // This is necessary to support old user code using FloatCurve for non float type
+        private int  m_isUnknowCurve;
+
         // This is only used internally for deleting curves
         internal int  m_ClassID;
         internal int  m_ScriptInstanceID;
 
         public bool  isPPtrCurve { get { return m_isPPtrCurve != 0; } }
         public bool  isDiscreteCurve { get { return m_isDiscreteCurve != 0; } }
+
+        public bool isSerializeReferenceCurve { get { return m_isSerializeReferenceCurve != 0; } }
         internal bool  isPhantom { get { return m_isPhantom != 0; } set { m_isPhantom = value == true ? 1 : 0; } }
 
         public static bool operator==(EditorCurveBinding lhs, EditorCurveBinding rhs)
@@ -49,7 +58,7 @@ public struct EditorCurveBinding : IEquatable<EditorCurveBinding>
                     return false;
             }
 
-            return lhs.m_isPPtrCurve == rhs.m_isPPtrCurve && lhs.m_isDiscreteCurve == rhs.m_isDiscreteCurve && lhs.path == rhs.path && lhs.type == rhs.type && lhs.propertyName == rhs.propertyName;
+            return lhs.m_isPPtrCurve == rhs.m_isPPtrCurve && lhs.m_isDiscreteCurve == rhs.m_isDiscreteCurve && lhs.m_isSerializeReferenceCurve == rhs.m_isSerializeReferenceCurve && lhs.path == rhs.path && lhs.type == rhs.type && lhs.propertyName == rhs.propertyName;
         }
 
         public static bool operator!=(EditorCurveBinding lhs, EditorCurveBinding rhs)
@@ -93,6 +102,8 @@ static public EditorCurveBinding FloatCurve(string inPath, System.Type inType, s
             BaseCurve(inPath, inType, inPropertyName, out binding);
             binding.m_isPPtrCurve = 0;
             binding.m_isDiscreteCurve = 0;
+            binding.m_isSerializeReferenceCurve = 0;
+            binding.m_isUnknowCurve = 1;
 
             return binding;
         }
@@ -103,6 +114,8 @@ static public EditorCurveBinding PPtrCurve(string inPath, System.Type inType, st
             BaseCurve(inPath, inType, inPropertyName, out binding);
             binding.m_isPPtrCurve = 1;
             binding.m_isDiscreteCurve = 1;
+            binding.m_isSerializeReferenceCurve = 0;
+            binding.m_isUnknowCurve = 0;
             return binding;
         }
 
@@ -112,6 +125,20 @@ static public EditorCurveBinding DiscreteCurve(string inPath, System.Type inType
             BaseCurve(inPath, inType, inPropertyName, out binding);
             binding.m_isPPtrCurve = 0;
             binding.m_isDiscreteCurve = 1;
+            binding.m_isSerializeReferenceCurve = 0;
+            binding.m_isUnknowCurve = 0;
+
+            return binding;
+        }
+
+        static public EditorCurveBinding SerializeReferenceCurve(string inPath, System.Type inType, long refID, string inPropertyName, bool isPPtr, bool isDiscrete)
+        {
+            EditorCurveBinding binding;
+            BaseCurve(inPath, inType, $"managedReferences[{refID}].{inPropertyName}", out binding);
+            binding.m_isPPtrCurve = isPPtr ? 1 : 0;
+            binding.m_isDiscreteCurve = isDiscrete || isPPtr ? 1 : 0;
+            binding.m_isSerializeReferenceCurve = 1;
+            binding.m_isUnknowCurve = 0;
 
             return binding;
         }
diff --git a/Editor/Mono/Animation/TransitionPreview.cs b/Editor/Mono/Animation/TransitionPreview.cs
index 5695841ed9..1c2433fb7a 100644
--- a/Editor/Mono/Animation/TransitionPreview.cs
+++ b/Editor/Mono/Animation/TransitionPreview.cs
@@ -36,6 +36,7 @@ internal class TransitionPreview
 
         private bool m_MustResample = true;
         private bool m_MustSampleMotions = false;
+        private bool m_MustResetParameterInfoList = false;
         public bool mustResample { set { m_MustResample = value; } get { return m_MustResample; } }
         private float m_LastEvalTime = -1.0f;
         private bool m_IsResampling = false;
@@ -398,6 +399,8 @@ private void ResampleTransition(AnimatorStateTransition transition, AvatarMask l
         public void SetTransition(AnimatorStateTransition transition, AnimatorState sourceState, AnimatorState destinationState, AnimatorControllerLayer srcLayer, Animator previewObject)
         {
             m_RefSrcState = sourceState;
+            m_MustResetParameterInfoList = m_RefDstState != destinationState;
+
             m_RefDstState = destinationState;
             TransitionInfo info = new TransitionInfo();
             info.Set(transition, sourceState, destinationState);
@@ -589,7 +592,12 @@ private void Init(Animator scenePreviewObject, Motion motion)
 
             CreateController();
 
-            CreateParameterInfoList();
+            if(m_ParameterInfoList == null || m_MustResetParameterInfoList)
+            {
+                m_MustResetParameterInfoList = false;
+                CreateParameterInfoList();
+            }
+
         }
 
         public void DoTransitionPreview()
diff --git a/Editor/Mono/Annotation/SceneRenderModeWindow.cs b/Editor/Mono/Annotation/SceneRenderModeWindow.cs
index cde408f01a..22e7108dfd 100644
--- a/Editor/Mono/Annotation/SceneRenderModeWindow.cs
+++ b/Editor/Mono/Annotation/SceneRenderModeWindow.cs
@@ -317,6 +317,8 @@ public static GUIContent GetGUIContent(DrawCameraMode drawCameraMode)
 
         internal static SceneView.CameraMode GetBuiltinCameraMode(DrawCameraMode drawMode)
         {
+            if (drawMode == DrawCameraMode.Normal)
+                drawMode = DrawCameraMode.Textured;
             return Styles.sBuiltinCameraModes.Single(mode => mode.drawMode == drawMode);
         }
 
diff --git a/Editor/Mono/Annotation/SceneViewCameraWindow.cs b/Editor/Mono/Annotation/SceneViewCameraWindow.cs
index 1c6d9f87dd..9cdb8a8d16 100644
--- a/Editor/Mono/Annotation/SceneViewCameraWindow.cs
+++ b/Editor/Mono/Annotation/SceneViewCameraWindow.cs
@@ -42,6 +42,8 @@ static Styles()
         GUIContent m_SceneCameraLabel = EditorGUIUtility.TrTextContent("Scene Camera");
         GUIContent m_NavigationLabel = EditorGUIUtility.TrTextContent("Navigation");
 
+        readonly string k_ClippingPlaneWarning = L10n.Tr("Using extreme values between the near and far planes may cause rendering issues. In general, to get better precision move the Near plane as far as possible.");
+
         const int kFieldCount = 13;
         const int kWindowWidth = 290;
         const int kContentPadding = 4;
@@ -132,6 +134,8 @@ void Draw()
                     EditorGUI.s_NearAndFarLabels[1], ref near, ref far,
                     EditorGUI.kNearFarLabelsWidth);
                 settings.SetClipPlanes(near, far);
+                if(far/near > 10000000 || near < 0.0001f)
+                    EditorGUILayout.HelpBox(k_ClippingPlaneWarning,MessageType.Warning);
             }
 
             settings.occlusionCulling = EditorGUILayout.Toggle(m_OcclusionCulling, settings.occlusionCulling);
diff --git a/Editor/Mono/AssemblyHelper.cs b/Editor/Mono/AssemblyHelper.cs
index 3aa7261772..cd9fd2c351 100644
--- a/Editor/Mono/AssemblyHelper.cs
+++ b/Editor/Mono/AssemblyHelper.cs
@@ -18,6 +18,8 @@
 using UnityEngine.Scripting;
 using Debug = UnityEngine.Debug;
 using Unity.Profiling;
+using UnityEditor.AssetImporters;
+using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEditor
 {
@@ -254,59 +256,35 @@ public static string[] GetDefaultAssemblySearchPaths()
             return searchPaths.ToArray();
         }
 
-        public static void ExtractAllClassesThatAreUserExtendedScripts(string path, out string[] classNamesArray, out string[] classNameSpacesArray, out string[] originalClassNameSpacesArray)
+        [RequiredByNativeCode]
+        public static void ExtractAllClassesThatAreUserExtendedScripts(string path, out string[] classNamesArray, out string[] classNameSpacesArray, out string[] movedFromNamespacesArray)
         {
-            List<string> classNames = new List<string>();
-            List<string> nameSpaces = new List<string>();
-            List<string> originalNamespaces = new List<string>();
-            var readerParameters = new ReaderParameters();
-
-            // this will resolve any types in assemblies within the same directory as the type's assembly
-            // or any folder which contains a currently available precompiled dll
-            var assemblyResolver = new DefaultAssemblyResolver();
-            var searchPaths = GetDefaultAssemblySearchPaths();
+            var typesDerivedFromMonoBehaviour = TypeCache.GetTypesDerivedFrom<MonoBehaviour>();
+            var typesDerivedFromScriptableObject = TypeCache.GetTypesDerivedFrom<ScriptableObject>();
+            var typesDerivedFromScriptedImporter = TypeCache.GetTypesDerivedFrom<ScriptedImporter>();
 
-            foreach (var asmpath in searchPaths)
-                assemblyResolver.AddSearchDirectory(asmpath);
+            var fullPath = Path.GetFullPath(path);
+            IEnumerable<Type> userTypes = typesDerivedFromMonoBehaviour.Where(x => Path.GetFullPath(x.Assembly.Location) == fullPath);
+            userTypes = userTypes
+                .Concat(typesDerivedFromScriptableObject.Where(x => Path.GetFullPath(x.Assembly.Location) == fullPath))
+                .Concat(typesDerivedFromScriptedImporter.Where(x => Path.GetFullPath(x.Assembly.Location) == fullPath)).ToList();
 
-            assemblyResolver.AddSearchDirectory(Path.GetDirectoryName(path));
-            readerParameters.AssemblyResolver = assemblyResolver;
+            List<string> classNames = new List<string>(userTypes.Count());
+            List<string> nameSpaces = new List<string>(userTypes.Count());
+            List<string> originalNamespaces = new List<string>(userTypes.Count());
 
-            AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(path, readerParameters);
-            foreach (ModuleDefinition module in assembly.Modules)
+            foreach (var userType in userTypes)
             {
-                foreach (TypeDefinition type in module.Types)
-                {
-                    TypeReference baseType = type.BaseType;
-
-                    try
-                    {
-                        if (IsTypeAUserExtendedScript(baseType))
-                        {
-                            classNames.Add(type.Name);
-                            nameSpaces.Add(type.Namespace);
+                classNames.Add(userType.Name);
+                nameSpaces.Add(userType.Namespace);
 
-                            var originalNamespace = string.Empty;
-                            var attribute = type.CustomAttributes.SingleOrDefault(a => a.AttributeType.FullName == typeof(UnityEngine.Scripting.APIUpdating.MovedFromAttribute).FullName);
-
-                            if (attribute != null)
-                            {
-                                originalNamespace = (string)attribute.ConstructorArguments[0].Value;
-                            }
-
-                            originalNamespaces.Add(originalNamespace);
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        Debug.LogError("Failed to extract " + type.FullName + " class of base type " + baseType.FullName + " when inspecting " + path);
-                    }
-                }
+                var movedFromAttribute = userType.GetCustomAttribute<MovedFromAttribute>();
+                originalNamespaces.Add(movedFromAttribute?.data.nameSpace);
             }
 
             classNamesArray = classNames.ToArray();
             classNameSpacesArray = nameSpaces.ToArray();
-            originalClassNameSpacesArray = originalNamespaces.ToArray();
+            movedFromNamespacesArray = originalNamespaces.ToArray();
         }
 
         /// Extract information about all types in the specified assembly, searchDirs might be used to resolve dependencies.
diff --git a/Editor/Mono/AssemblyValidation.cs b/Editor/Mono/AssemblyValidation.cs
index 0ea315cf59..41841e9827 100644
--- a/Editor/Mono/AssemblyValidation.cs
+++ b/Editor/Mono/AssemblyValidation.cs
@@ -380,12 +380,10 @@ public static void ResolveAndSetupReferences(int index,
                 Capacity = assemblyReferences.Length
             };
 
-            var assemblyVersionValidation = PlayerSettings.assemblyVersionValidation;
-
             bool isReferencingUnityAssemblies = false;
             foreach (var reference in assemblyReferences)
             {
-                if (!isReferencingUnityAssemblies && (Utility.FastStartsWith(reference.Name, "UnityEngine.", "unityengine.") || Utility.FastStartsWith(reference.Name, "UnityEditor.", "unityeditor.")))
+                if (!isReferencingUnityAssemblies && (Utility.FastStartsWith(reference.Name, "UnityEngine", "unityengine") || Utility.FastStartsWith(reference.Name, "UnityEditor", "unityeditor")))
                 {
                     isReferencingUnityAssemblies = true;
                 }
@@ -399,21 +397,8 @@ public static void ResolveAndSetupReferences(int index,
                         errors[index].Add(ErrorFlags.ReferenceHasErrors, $"{reference.Name} references itself.");
                     }
 
-                    if (assemblyVersionValidation && assemblyDefinitionNameToIndex.TryGetValue(referenceAssemblyDefinition.Name.Name,
-                        out int referenceAssemblyDefinitionIndex))
+                    if (assemblyDefinitionNameToIndex.TryGetValue(referenceAssemblyDefinition.Name.Name, out int referenceAssemblyDefinitionIndex))
                     {
-                        bool isSigned = IsSigned(reference);
-                        if (isSigned)
-                        {
-                            var definition = assemblyDefinitions[referenceAssemblyDefinitionIndex];
-
-                            if (definition.Name.Version.ToString() != reference.Version.ToString() && !IsInSameFolder(assemblyDefinition, referenceAssemblyDefinition))
-                            {
-                                errors[index].Add(ErrorFlags.UnresolvableReference,
-                                    $"{assemblyDefinition.Name.Name} references strong named {reference.Name} Assembly references: {reference.Version} Found in project: {definition.Name.Version}.\nAssembly Version Validation can be disabled in Player Settings \"Assembly Version Validation\"");
-                            }
-                        }
-
                         referenceIndieces.Add(referenceAssemblyDefinitionIndex);
                     }
                 }
diff --git a/Editor/Mono/AssetModificationProcessor.cs b/Editor/Mono/AssetModificationProcessor.cs
index d029b39a47..7a58f06380 100644
--- a/Editor/Mono/AssetModificationProcessor.cs
+++ b/Editor/Mono/AssetModificationProcessor.cs
@@ -97,7 +97,7 @@ static System.Collections.Generic.IEnumerable<System.Type> AssetModificationProc
 #pragma warning restore 0618
 
         [RequiredByNativeCode]
-        static void OnWillCreateAsset(string path)
+        internal static void OnWillCreateAsset(string path)
         {
             foreach (var assetModificationProcessorClass in AssetModificationProcessors)
             {
diff --git a/Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs b/Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs
index 0c4a34890e..92f7fe34f0 100644
--- a/Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs
+++ b/Editor/Mono/AssetPipeline/AssetImportContext.bindings.cs
@@ -164,6 +164,11 @@ public void DependsOnCustomDependency(string dependency)
                 throw new ArgumentNullException("dependency", "Cannot add custom dependency on an empty custom dependency.");
             }
 
+            if (string.CompareOrdinal(dependency,"srp/default-shader") == 0 && assetPath.EndsWith(".shader", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new Exception($"A shader '{assetPath}' cannot depend on the 'srp/default-shader' custom dependency because this operation is unsupported.");
+            }
+
             DependsOnCustomDependencyInternal(dependency);
         }
 
diff --git a/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs b/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs
index 608b4c6e90..75c8e32f37 100644
--- a/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs
+++ b/Editor/Mono/AssetPipeline/TextureImporter.bindings.cs
@@ -374,7 +374,8 @@ public extern TextureWrapMode wrapMode
 
         public extern SecondarySpriteTexture[] secondarySpriteTextures { get; set; }
 
-        public extern string spritePackingTag { get; set; }
+        [Obsolete("Support for packing sprites through spritePackingTag has been removed. Please use SpriteAtlas instead.")]
+        public string spritePackingTag { get { return ""; } set { } }
 
         // The number of pixels in one unit. Note: The C++ side still uses the name pixelsToUnits which is misleading,
         // but has not been changed yet to minimize merge conflicts.
@@ -467,5 +468,8 @@ public void SetTextureSettings(TextureImporterSettings src)
 
         // This is for remapping Sprite that are renamed.
         extern internal bool GetNameFromInternalIDMap(long id, ref string name);
+
+        [NativeName("GetSpriteMetaDatas")]
+        internal extern SpriteMetaData[] GetSpriteMetaDatas();
     }
 }
diff --git a/Editor/Mono/AssetPostprocessor.cs b/Editor/Mono/AssetPostprocessor.cs
index f8038d8a5b..79416847e8 100644
--- a/Editor/Mono/AssetPostprocessor.cs
+++ b/Editor/Mono/AssetPostprocessor.cs
@@ -12,6 +12,7 @@
 using UnityEditor.AssetImporters;
 using Object = UnityEngine.Object;
 using UnityEditor.Profiling;
+using UnityEditor.Callbacks;
 
 namespace UnityEditor
 {
@@ -95,6 +96,58 @@ public void LogError(string warning)
 
     }
 
+    class OnPostprocessAllAssetsCallbackCollection : OrderedCallbackCollection
+    {
+        public class MethodInfoCallback : Callback
+        {
+            public MethodInfo Method { get; }
+
+            public override Type classType => Method.DeclaringType;
+
+            public bool MethodDomainReload { get; }
+
+            public override string name => classType.FullName;
+
+            public MethodInfoCallback(MethodInfo method, bool methodDomainReload)
+            {
+                Method = method;
+                MethodDomainReload = methodDomainReload;
+            }
+
+            public override IEnumerable<T> GetCustomAttributes<T>() => Method.GetCustomAttributes<T>();
+        }
+
+        public override string name => "OnPostprocessAllAssets";
+
+        public override List<Callback> GetCallbacks()
+        {
+            var methodArgTypes = new Type[] { typeof(string).MakeArrayType(), typeof(string).MakeArrayType(), typeof(string).MakeArrayType(), typeof(string).MakeArrayType() };
+            var methodDomainReloadParamArgTypes = new Type[] { methodArgTypes[0], methodArgTypes[1], methodArgTypes[2], methodArgTypes[3], typeof(bool) };
+            const BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
+
+            var callbacks = new List<Callback>();
+            foreach (var assetPostprocessorClass in TypeCache.GetTypesDerivedFrom<AssetPostprocessor>())
+            {
+                var method = assetPostprocessorClass.GetMethod("OnPostprocessAllAssets", flags, null, methodArgTypes, null);
+                if (method != null)
+                {
+                    callbacks.Add(new MethodInfoCallback(method, false));
+                }
+                else
+                {
+                    // OnPostprocessAllAssets with didDomainReload parameter
+                    method = assetPostprocessorClass.GetMethod("OnPostprocessAllAssets", flags, null, methodDomainReloadParamArgTypes, null);
+                    if (method != null)
+                    {
+                        callbacks.Add(new MethodInfoCallback(method, true));
+                    }
+                }
+            }
+
+            return callbacks;
+        }
+    }
+
     internal class AssetPostprocessingInternal
     {
         // What is it:
@@ -189,6 +242,9 @@ internal class AssetPostprocessingInternal
         static Dictionary<Type, string[]> s_StaticPostprocessorMethodsByImporterType;
         static Dictionary<Type, string[]> s_DynamicPostprocessorMethodsByImporterType;
 
+        // Internal for debugging purposes. We can generate dependency graphs to help understand issues.
+        internal static OnPostprocessAllAssetsCallbackCollection s_OnPostprocessAllAssetsCallbacks = new OnPostprocessAllAssetsCallbackCollection();
+
         static AssetPostprocessingInternal()
         {
             s_StaticPostprocessorMethodsByImporterType = new Dictionary<Type, string[]>();
@@ -238,28 +294,23 @@ static void LogPostProcessorMissingDefaultConstructor(Type type)
         static void PostprocessAllAssets(string[] importedAssets, string[] addedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromPathAssets, bool didDomainReload)
         {
             object[] args = { importedAssets, deletedAssets, movedAssets, movedFromPathAssets };
-
             object[] argsWithDidDomainReload = { importedAssets, deletedAssets, movedAssets, movedFromPathAssets, didDomainReload};
-            foreach (var assetPostprocessorClass in GetCachedAssetPostprocessorClasses())
-            {
-                const string methodName = "OnPostprocessAllAssets";
-                MethodInfo method = assetPostprocessorClass.GetMethod(methodName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, null, new Type[] { typeof(string).MakeArrayType(), typeof(string).MakeArrayType(), typeof(string).MakeArrayType(), typeof(string).MakeArrayType() }, null);
+            var containsNoAssets = importedAssets.Length == 0 && addedAssets.Length == 0 && deletedAssets.Length == 0 && movedAssets.Length == 0 && movedFromPathAssets.Length == 0;
 
-                if (method != null)
+            foreach (OnPostprocessAllAssetsCallbackCollection.MethodInfoCallback assetPostProcessor in s_OnPostprocessAllAssetsCallbacks.sortedCallbacks)
+            {
+                if (assetPostProcessor.MethodDomainReload)
                 {
-                    if (importedAssets.Length != 0 || addedAssets.Length != 0 || deletedAssets.Length != 0 || movedAssets.Length != 0 || movedFromPathAssets.Length != 0)
-                        using (new EditorPerformanceMarker($"{assetPostprocessorClass.Name}.{methodName}", assetPostprocessorClass).Auto())
-                            InvokeMethod(method, args);
+                    using (new EditorPerformanceMarker($"{assetPostProcessor.classType.Name}.OnPostprocessAllAssets", assetPostProcessor.classType).Auto())
+                        InvokeMethod(assetPostProcessor.Method, argsWithDidDomainReload);
                 }
                 else
                 {
-                    // OnPostprocessAllAssets with didDomainReload parameter
-                    method = assetPostprocessorClass.GetMethod(methodName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static, null, new Type[] { typeof(string).MakeArrayType(), typeof(string).MakeArrayType(), typeof(string).MakeArrayType(), typeof(string).MakeArrayType(), typeof(bool)}, null);
-                    if (method != null)
-                    {
-                        using (new EditorPerformanceMarker($"{assetPostprocessorClass.Name}.{methodName}", assetPostprocessorClass).Auto())
-                            InvokeMethod(method, argsWithDidDomainReload);
-                    }
+                    if (containsNoAssets)
+                        continue;
+
+                    using (new EditorPerformanceMarker($"{assetPostProcessor.classType.Name}.OnPostprocessAllAssets", assetPostProcessor.classType).Auto())
+                        InvokeMethod(assetPostProcessor.Method, args);
                 }
             }
 
diff --git a/Editor/Mono/AssetStore/AssetStoreContext.cs b/Editor/Mono/AssetStore/AssetStoreContext.cs
index 0909c63e8b..b20682794b 100644
--- a/Editor/Mono/AssetStore/AssetStoreContext.cs
+++ b/Editor/Mono/AssetStore/AssetStoreContext.cs
@@ -53,9 +53,10 @@ public string GetAuthToken()
             return UnityEditorInternal.InternalEditorUtility.GetAuthToken();
         }
 
+        [Obsolete("GetLicenseFlags is no longer supported", error: true)]
         public int[] GetLicenseFlags()
         {
-            return UnityEditorInternal.InternalEditorUtility.GetLicenseFlags();
+            return new int[] {};
         }
 
         public string GetString(string key)
diff --git a/Editor/Mono/AssetStore/AssetStoreWindow.cs b/Editor/Mono/AssetStore/AssetStoreWindow.cs
index b61cedfa30..f0533b3eaa 100644
--- a/Editor/Mono/AssetStore/AssetStoreWindow.cs
+++ b/Editor/Mono/AssetStore/AssetStoreWindow.cs
@@ -5,6 +5,8 @@
 using UnityEngine;
 using UnityEngine.UIElements;
 using UnityEditor.Connect;
+using UnityEditor.PackageManager.UI;
+using UnityEditor.UIElements;
 
 namespace UnityEditor
 {
@@ -47,7 +49,7 @@ public void OnEnable()
             {
                 var root = windowResource.CloneTree();
 
-                var lightStyleSheet = EditorGUIUtility.Load(EditorUIService.instance.GetUIToolkitDefaultCommonLightStyleSheetPath()) as StyleSheet;
+                var lightStyleSheet = EditorGUIUtility.Load(UIElementsEditorUtility.s_DefaultCommonLightStyleSheetPath) as StyleSheet;
                 var assetStoreStyleSheet = EditorGUIUtility.Load("StyleSheets/AssetStore/AssetStoreWindow.uss") as StyleSheet;
                 var styleSheet = CreateInstance<StyleSheet>();
                 styleSheet.isDefaultStyleSheet = true;
@@ -93,7 +95,7 @@ private void OnVisitWebsiteButtonClicked()
 
         private void OnLaunchPackageManagerButtonClicked()
         {
-            EditorUIService.instance.PackageManagerOpen();
+            PackageManagerWindow.OpenPackageManager(null);
         }
 
         private void SetMinMaxSizes()
diff --git a/Editor/Mono/Audio/Effects/AudioMixerEffectPlugin.cs b/Editor/Mono/Audio/Effects/AudioMixerEffectPlugin.cs
index c2d159ed8b..7e16941054 100644
--- a/Editor/Mono/Audio/Effects/AudioMixerEffectPlugin.cs
+++ b/Editor/Mono/Audio/Effects/AudioMixerEffectPlugin.cs
@@ -4,25 +4,71 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using UnityEngine;
-using UnityEditor;
-using UnityEditor.Audio;
 
 namespace UnityEditor.Audio
 {
     public class AudioMixerEffectPlugin : IAudioEffectPlugin
     {
+        internal AudioMixerController m_Controller;
+        internal AudioMixerEffectController m_Effect;
+        internal MixerParameterDefinition[] m_ParamDefs;
+
+        static bool s_ParameterChangeUndoIsRecorded;
+        static bool s_ParameterChangeUndoGroupNameIsSet;
+
+        static readonly Dictionary<string, float> k_UpdatedParameterMap = new Dictionary<string, float>();
+
+        readonly HashSet<string> m_VerifiedParameters = new HashSet<string>();
+
         public override bool SetFloatParameter(string name, float value)
         {
+            if (!HasParameter(name))
+            {
+                return false;
+            }
+
+            GetFloatParameter(name, out var previousValue);
+
+            if (Mathf.Approximately(value, previousValue))
+            {
+                return true;
+            }
+
+            if (k_UpdatedParameterMap.Count == 0 && !s_ParameterChangeUndoIsRecorded)
+            {
+                Undo.RecordObject(m_Controller.TargetSnapshot, $"Change {name}");
+            }
+
+            k_UpdatedParameterMap[name] = value;
+
+            if (k_UpdatedParameterMap.Count > 1 && !s_ParameterChangeUndoGroupNameIsSet)
+            {
+                Undo.SetCurrentGroupName("Change Effect Parameters");
+                s_ParameterChangeUndoGroupNameIsSet = true;
+            }
+
             m_Effect.SetValueForParameter(m_Controller, m_Controller.TargetSnapshot, name, value);
+
             return true;
         }
 
         public override bool GetFloatParameter(string name, out float value)
         {
+            if (!HasParameter(name))
+            {
+                value = default;
+
+                return false;
+            }
+
+            if (k_UpdatedParameterMap.TryGetValue(name, out value))
+            {
+                return true;
+            }
+
             value = m_Effect.GetValueForParameter(m_Controller, m_Controller.TargetSnapshot, name);
+
             return true;
         }
 
@@ -38,6 +84,7 @@ public override bool GetFloatParameterInfo(string name, out float minRange, out
                     return true;
                 }
             }
+
             minRange = 0.0f;
             maxRange = 1.0f;
             defaultValue = 0.5f;
@@ -60,8 +107,32 @@ public override bool IsPluginEditableAndEnabled()
             return AudioMixerController.EditingTargetSnapshot() && !m_Effect.bypass;
         }
 
-        internal AudioMixerController m_Controller;
-        internal AudioMixerEffectController m_Effect;
-        internal MixerParameterDefinition[] m_ParamDefs;
+        // Call this after each interaction that changes effect parameters.
+        // NOTE: It is assumed that parameter changes can only happen on a single effect at a time.
+        internal static void OnParameterChangesDone()
+        {
+            k_UpdatedParameterMap.Clear();
+            s_ParameterChangeUndoIsRecorded = false;
+            s_ParameterChangeUndoGroupNameIsSet = false;
+        }
+
+        bool HasParameter(string name)
+        {
+            if (m_VerifiedParameters.Contains(name))
+            {
+                return true;
+            }
+
+            for (var i = 0; i < m_ParamDefs.Length; ++i)
+            {
+                if (m_ParamDefs[i].name.Equals(name))
+                {
+                    m_VerifiedParameters.Add(name);
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }
diff --git a/Editor/Mono/Audio/Effects/DuckVolumeGUI.cs b/Editor/Mono/Audio/Effects/DuckVolumeGUI.cs
index de297bec76..dfcf768afe 100644
--- a/Editor/Mono/Audio/Effects/DuckVolumeGUI.cs
+++ b/Editor/Mono/Audio/Effects/DuckVolumeGUI.cs
@@ -4,12 +4,14 @@
 
 //#define DEBUG_PLOT_GAIN
 
+using System;
 using System.Globalization;
+using UnityEditor.Audio;
 using UnityEngine;
 
 namespace UnityEditor
 {
-    internal class DuckVolumeGUI : IAudioEffectPluginGUI
+    class DuckVolumeGUI : IAudioEffectPluginGUI
     {
         public static string kThresholdName = "Threshold";
         public static string kRatioName = "Ratio";
@@ -68,7 +70,7 @@ public enum DragType
             MakeupGain,
         }
 
-        private static DragType dragtype = DragType.None;
+        static DragType dragtype = DragType.None;
 
         protected static Color ScaleAlpha(Color col, float blend)
         {
@@ -104,6 +106,7 @@ static float EvaluateDuckingVolume(float x, float ratio, float threshold, float
             }
             else if (t > 0.0f)
                 gain = duckThreshold + duckGradient * t;
+
             return (2.0f * (gain + duckMakeupGain - dbMin) / dbRange) - 1.0f;
         }
 
@@ -117,10 +120,14 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
             const float thresholdActiveWidth = 10f;
             float vuWidth = 10f;
 
-            float minThreshold, maxThreshold, defThreshold; plugin.GetFloatParameterInfo(kThresholdName, out minThreshold, out maxThreshold, out defThreshold);
-            float minRatio, maxRatio, defRatio; plugin.GetFloatParameterInfo(kRatioName, out minRatio, out maxRatio, out defRatio);
-            float minMakeupGain, maxMakeupGain, defMakeupGain; plugin.GetFloatParameterInfo(kMakeupGainName, out minMakeupGain, out maxMakeupGain, out defMakeupGain);
-            float minKnee, maxKnee, defKnee; plugin.GetFloatParameterInfo(kKneeName, out minKnee, out maxKnee, out defKnee);
+            float minThreshold, maxThreshold, defThreshold;
+            plugin.GetFloatParameterInfo(kThresholdName, out minThreshold, out maxThreshold, out defThreshold);
+            float minRatio, maxRatio, defRatio;
+            plugin.GetFloatParameterInfo(kRatioName, out minRatio, out maxRatio, out defRatio);
+            float minMakeupGain, maxMakeupGain, defMakeupGain;
+            plugin.GetFloatParameterInfo(kMakeupGainName, out minMakeupGain, out maxMakeupGain, out defMakeupGain);
+            float minKnee, maxKnee, defKnee;
+            plugin.GetFloatParameterInfo(kKneeName, out minKnee, out maxKnee, out defKnee);
 
             float dbRange = 100.0f, dbMin = -80.0f;
             float thresholdPosX = r.width * (threshold - dbMin) / dbRange;
@@ -142,6 +149,7 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
                         else
                             dragtype = DragType.ThresholdAndKnee;
                     }
+
                     break;
 
                 case EventType.MouseUp:
@@ -151,7 +159,9 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
                         GUIUtility.hotControl = 0;
                         EditorGUIUtility.SetWantsMouseJumping(0);
                         evt.Use();
+                        AudioMixerEffectPlugin.OnParameterChangesDone();
                     }
+
                     break;
 
                 case EventType.MouseDrag:
@@ -178,6 +188,7 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
                         modifiedValue = true;
                         evt.Use();
                     }
+
                     break;
             }
 
@@ -222,6 +233,7 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
                         }
                         else if (t > 0.0f)
                             gain = duckThreshold + duckGradient * t;
+
                         return (2.0f * (gain + duckMakeupGain - dbMin) / dbRange) - 1.0f;
                     }
                 );
@@ -243,6 +255,7 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
                             }
                             else if (t > 0.0f)
                                 gain = duckThreshold + duckGradient * t;
+
                             return (2.0f * (gain + duckMakeupGain - dbMin) / dbRange) - 1.0f;
                         },
                         Color.white
@@ -261,17 +274,17 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
 
                 if (dragtype == DragType.Ratio)
                 {
-                    float aspect = (float)r.height / (float)r.width;
+                    float aspect = r.height / r.width;
                     Handles.DrawAAPolyLine(2.0f,
-                        new Color[] { Color.black, Color.black },
-                        new Vector3[]
+                        new[] { Color.black, Color.black },
+                        new[]
                         {
                             new Vector3(r.x + thresholdPosX + r.width, r.y + thresholdPosY - aspect * r.width, 0.0f),
                             new Vector3(r.x + thresholdPosX - r.width, r.y + thresholdPosY + aspect * r.width, 0.0f)
                         });
                     Handles.DrawAAPolyLine(3.0f,
-                        new Color[] { Color.white, Color.white },
-                        new Vector3[]
+                        new[] { Color.white, Color.white },
+                        new[]
                         {
                             new Vector3(r.x + thresholdPosX + r.width, r.y + thresholdPosY - aspect * duckGradient * r.width, 0.0f),
                             new Vector3(r.x + thresholdPosX - r.width, r.y + thresholdPosY + aspect * duckGradient * r.width, 0.0f)
@@ -309,20 +322,21 @@ static bool CurveDisplay(IAudioEffectPlugin plugin, Rect r0, ref float threshold
 
         public override bool OnGUI(IAudioEffectPlugin plugin)
         {
-            float blend = plugin.IsPluginEditableAndEnabled() ? 1.0f : 0.5f;
+            var blend = plugin.IsPluginEditableAndEnabled() ? 1.0f : 0.5f;
 
-            float threshold, ratio, makeupGain, attackTime, releaseTime, knee;
-            plugin.GetFloatParameter(kThresholdName, out threshold);
-            plugin.GetFloatParameter(kRatioName, out ratio);
-            plugin.GetFloatParameter(kMakeupGainName, out makeupGain);
-            plugin.GetFloatParameter(kAttackTimeName, out attackTime);
-            plugin.GetFloatParameter(kReleaseTimeName, out releaseTime);
-            plugin.GetFloatParameter(kKneeName, out knee);
+            plugin.GetFloatParameter(kThresholdName, out var threshold);
+            plugin.GetFloatParameter(kRatioName, out var ratio);
+            plugin.GetFloatParameter(kMakeupGainName, out var makeupGain);
+            plugin.GetFloatParameter(kAttackTimeName, out var attackTime);
+            plugin.GetFloatParameter(kReleaseTimeName, out var releaseTime);
+            plugin.GetFloatParameter(kKneeName, out var knee);
 
-            float[] metering; plugin.GetFloatBuffer("Metering", out metering, 2);
+            plugin.GetFloatBuffer("Metering", out var metering, 2);
 
             GUILayout.Space(5f);
-            Rect r = GUILayoutUtility.GetRect(200, 160, GUILayout.ExpandWidth(true));
+
+            var r = GUILayoutUtility.GetRect(200, 160, GUILayout.ExpandWidth(true));
+
             if (CurveDisplay(plugin, r, ref threshold, ref ratio, ref makeupGain, ref attackTime, ref releaseTime, ref knee, metering[0], metering[1], blend))
             {
                 plugin.SetFloatParameter(kThresholdName, threshold);
diff --git a/Editor/Mono/Audio/Effects/ParamEQGUI.cs b/Editor/Mono/Audio/Effects/ParamEQGUI.cs
index 9eb719d14d..32eebe6f29 100644
--- a/Editor/Mono/Audio/Effects/ParamEQGUI.cs
+++ b/Editor/Mono/Audio/Effects/ParamEQGUI.cs
@@ -2,14 +2,14 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using UnityEngine;
-using UnityEditor;
 using System;
 using System.Globalization;
+using UnityEditor.Audio;
+using UnityEngine;
 
 namespace UnityEditor
 {
-    internal class ParamEqGUI : IAudioEffectPluginGUI
+    class ParamEqGUI : IAudioEffectPluginGUI
     {
         public static string kCenterFreqName = "Center freq";
         public static string kOctaveRangeName = "Octave range";
@@ -48,7 +48,7 @@ public static GUIStyle BuildGUIStyleForLabel(Color color, int fontSize, bool wra
 
         public static GUIStyle textStyle10 = BuildGUIStyleForLabel(Color.grey, 10, false, FontStyle.Normal, TextAnchor.MiddleCenter);
 
-        private static void DrawFrequencyTickMarks(Rect r, float samplerate, bool logScale, Color col)
+        static void DrawFrequencyTickMarks(Rect r, float samplerate, bool logScale, Color col)
         {
             textStyle10.normal.textColor = col;
             float px = r.x, w = 60.0f;
@@ -71,7 +71,7 @@ protected static Color ScaleAlpha(Color col, float blend)
         }
 
         // Maps from normalized frequency to real frequency
-        private static double MapNormalizedFrequency(double f, double sr, bool useLogScale, bool forward)
+        static double MapNormalizedFrequency(double f, double sr, bool useLogScale, bool forward)
         {
             double maxFreq = 0.5 * sr;
             if (useLogScale)
@@ -81,6 +81,7 @@ private static double MapNormalizedFrequency(double f, double sr, bool useLogSca
                     return lowestFreq * Math.Pow(maxFreq / lowestFreq, f);
                 return Math.Log(f / lowestFreq) / Math.Log(maxFreq / lowestFreq);
             }
+
             return (forward) ? (f * maxFreq) : (f / maxFreq);
         }
 
@@ -91,9 +92,12 @@ static bool ParamEqualizerCurveEditor(IAudioEffectPlugin plugin, Rect r, ref flo
 
             r = AudioCurveRendering.BeginCurveFrame(r);
 
-            float minCenterFreq, maxCenterFreq, defCenterFreq; plugin.GetFloatParameterInfo(kCenterFreqName, out minCenterFreq, out maxCenterFreq, out defCenterFreq);
-            float minOctaveRange, maxOctaveRange, defOctaveRange; plugin.GetFloatParameterInfo(kOctaveRangeName, out minOctaveRange, out maxOctaveRange, out defOctaveRange);
-            float minGain, maxGain, defGain; plugin.GetFloatParameterInfo(kFrequencyGainName, out minGain, out maxGain, out defGain);
+            float minCenterFreq, maxCenterFreq, defCenterFreq;
+            plugin.GetFloatParameterInfo(kCenterFreqName, out minCenterFreq, out maxCenterFreq, out defCenterFreq);
+            float minOctaveRange, maxOctaveRange, defOctaveRange;
+            plugin.GetFloatParameterInfo(kOctaveRangeName, out minOctaveRange, out maxOctaveRange, out defOctaveRange);
+            float minGain, maxGain, defGain;
+            plugin.GetFloatParameterInfo(kFrequencyGainName, out minGain, out maxGain, out defGain);
 
             bool modifiedValue = false;
             switch (evt.GetTypeForControl(controlID))
@@ -105,15 +109,19 @@ static bool ParamEqualizerCurveEditor(IAudioEffectPlugin plugin, Rect r, ref flo
                         EditorGUIUtility.SetWantsMouseJumping(1);
                         evt.Use();
                     }
+
                     break;
 
                 case EventType.MouseUp:
+                    // Signal
                     if (GUIUtility.hotControl == controlID && evt.button == 0)
                     {
                         GUIUtility.hotControl = 0;
                         EditorGUIUtility.SetWantsMouseJumping(0);
                         evt.Use();
+                        AudioMixerEffectPlugin.OnParameterChangesDone();
                     }
+
                     break;
 
                 case EventType.MouseDrag:
@@ -128,6 +136,7 @@ static bool ParamEqualizerCurveEditor(IAudioEffectPlugin plugin, Rect r, ref flo
                         modifiedValue = true;
                         evt.Use();
                     }
+
                     break;
             }
 
@@ -145,17 +154,17 @@ static bool ParamEqualizerCurveEditor(IAudioEffectPlugin plugin, Rect r, ref flo
                 double Q = 1.0 / bandwidth;
                 double A = gain;
                 double alpha = Math.Sin(w0) / (2.0 * Q);
-                double b0 =  1.0 + alpha * A;
+                double b0 = 1.0 + alpha * A;
                 double b1 = -2.0 * Math.Cos(w0);
-                double b2 =  1.0 - alpha * A;
-                double a0 =  1.0 + alpha / A;
+                double b2 = 1.0 - alpha * A;
+                double a0 = 1.0 + alpha / A;
                 double a1 = -2.0 * Math.Cos(w0);
-                double a2 =  1.0 - alpha / A;
+                double a2 = 1.0 - alpha / A;
                 AudioCurveRendering.DrawCurve(
                     r,
                     delegate(float x)
                     {
-                        double f = MapNormalizedFrequency((double)x, plugin.GetSampleRate(), useLogScale, true);
+                        double f = MapNormalizedFrequency(x, plugin.GetSampleRate(), useLogScale, true);
                         ComplexD w = ComplexD.Exp(wm * f);
                         ComplexD n = w * (w * b2 + b1) + b0;
                         ComplexD d = w * (w * a2 + a1) + a0;
@@ -176,15 +185,16 @@ static bool ParamEqualizerCurveEditor(IAudioEffectPlugin plugin, Rect r, ref flo
 
         public override bool OnGUI(IAudioEffectPlugin plugin)
         {
-            float blend = plugin.IsPluginEditableAndEnabled() ? 1.0f : 0.5f;
+            var blend = plugin.IsPluginEditableAndEnabled() ? 1.0f : 0.5f;
 
-            float centerFreq, octaveRange, frequencyGain;
-            plugin.GetFloatParameter(kCenterFreqName, out centerFreq);
-            plugin.GetFloatParameter(kOctaveRangeName, out octaveRange);
-            plugin.GetFloatParameter(kFrequencyGainName, out frequencyGain);
+            plugin.GetFloatParameter(kCenterFreqName, out var centerFreq);
+            plugin.GetFloatParameter(kOctaveRangeName, out var octaveRange);
+            plugin.GetFloatParameter(kFrequencyGainName, out var frequencyGain);
 
             GUILayout.Space(5f);
-            Rect r = GUILayoutUtility.GetRect(200, 100, GUILayout.ExpandWidth(true));
+
+            var r = GUILayoutUtility.GetRect(200, 100, GUILayout.ExpandWidth(true));
+
             if (ParamEqualizerCurveEditor(plugin, r, ref centerFreq, ref octaveRange, ref frequencyGain, blend))
             {
                 plugin.SetFloatParameter(kCenterFreqName, centerFreq);
diff --git a/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupTreeView.cs b/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupTreeView.cs
index 63c39688e2..cd6ce63f34 100644
--- a/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupTreeView.cs
+++ b/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupTreeView.cs
@@ -684,7 +684,7 @@ public void EndRenaming()
             m_AudioGroupTree.EndNameEditing(true);
         }
 
-        public void OnUndoRedoPerformed()
+        public void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             ReloadTree();
             if (m_Controller != null)
diff --git a/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupViewList.cs b/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupViewList.cs
index 4f62c30298..303fe4a939 100644
--- a/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupViewList.cs
+++ b/Editor/Mono/Audio/Mixer/GUI/AudioMixerGroupViewList.cs
@@ -38,7 +38,7 @@ public void OnMixerControllerChanged(AudioMixerController controller)
             RecreateListControl();
         }
 
-        public void OnUndoRedoPerformed()
+        public void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             RecreateListControl();
         }
diff --git a/Editor/Mono/Audio/Mixer/GUI/AudioMixerSnapshotView.cs b/Editor/Mono/Audio/Mixer/GUI/AudioMixerSnapshotView.cs
index fad4fc269b..c15493f81e 100644
--- a/Editor/Mono/Audio/Mixer/GUI/AudioMixerSnapshotView.cs
+++ b/Editor/Mono/Audio/Mixer/GUI/AudioMixerSnapshotView.cs
@@ -322,7 +322,7 @@ static void Delete(object userData)
             }
         }
 
-        public void OnUndoRedoPerformed()
+        public void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             LoadFromBackend();
         }
diff --git a/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs b/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs
index d5fa9b3a62..199bacfb82 100644
--- a/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs
+++ b/Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs
@@ -267,7 +267,7 @@ public void OnEnable()
 
             s_Instance = this;
 
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             EditorApplication.pauseStateChanged += OnPauseStateChanged;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
         }
@@ -276,7 +276,7 @@ public void OnDisable()
         {
             EditorApplication.pauseStateChanged -= OnPauseStateChanged;
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
         }
 
         void OnPauseStateChanged(PauseState state)
@@ -314,7 +314,7 @@ void EndRenaming()
                 m_MixersTree.EndRenaming();
         }
 
-        public void UndoRedoPerformed()
+        public void UndoRedoPerformed(in UndoRedoInfo info)
         {
             if (m_Controller == null)
                 return;
@@ -325,16 +325,16 @@ public void UndoRedoPerformed()
             m_Controller.OnUnitySelectionChanged();
 
             if (m_GroupTree != null)
-                m_GroupTree.OnUndoRedoPerformed();
+                m_GroupTree.OnUndoRedoPerformed(info);
 
             if (m_GroupViews != null)
-                m_GroupViews.OnUndoRedoPerformed();
+                m_GroupViews.OnUndoRedoPerformed(info);
 
             if (m_SnapshotListView != null)
-                m_SnapshotListView.OnUndoRedoPerformed();
+                m_SnapshotListView.OnUndoRedoPerformed(info);
 
             if (m_MixersTree != null)
-                m_MixersTree.OnUndoRedoPerformed();
+                m_MixersTree.OnUndoRedoPerformed(info);
 
             AudioMixerUtility.RepaintAudioMixerAndInspectors();
         }
diff --git a/Editor/Mono/Audio/Mixer/GUI/AudioMixersTreeView.cs b/Editor/Mono/Audio/Mixer/GUI/AudioMixersTreeView.cs
index 95826a6727..c76b2cc774 100644
--- a/Editor/Mono/Audio/Mixer/GUI/AudioMixersTreeView.cs
+++ b/Editor/Mono/Audio/Mixer/GUI/AudioMixersTreeView.cs
@@ -657,7 +657,7 @@ public void EndRenaming()
             m_TreeView.EndNameEditing(true);
         }
 
-        public void OnUndoRedoPerformed()
+        public void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             ReloadTree();
         }
diff --git a/Editor/Mono/BuildPipeline.bindings.cs b/Editor/Mono/BuildPipeline.bindings.cs
index d647247697..91304f909a 100644
--- a/Editor/Mono/BuildPipeline.bindings.cs
+++ b/Editor/Mono/BuildPipeline.bindings.cs
@@ -686,36 +686,6 @@ internal static string GetBuildTargetGroupName(BuildTarget target)
         [FreeFunction]
         internal static extern bool SupportsReflectionEmit(BuildTarget target);
 
-        internal static string[] GetReferencingPlayerAssembliesForDLL(string dllPath, string assembliesOutputPath)
-        {
-            DefaultAssemblyResolver resolverRoot = new DefaultAssemblyResolver();
-            resolverRoot.AddSearchDirectory(Path.GetDirectoryName(dllPath));
-            AssemblyDefinition assemblyRoot = AssemblyDefinition.ReadAssembly(dllPath, new ReaderParameters { AssemblyResolver = resolverRoot });
-
-            string[] assemblyPaths = BuildPipeline.GetManagedPlayerDllPaths(assembliesOutputPath);
-            List<string> referencingAssemblies = new List<string>();
-
-            // determine whether there is an assembly that is referencing the assembly path
-            foreach (string assemblyPath in assemblyPaths)
-            {
-                DefaultAssemblyResolver resolver = new DefaultAssemblyResolver();
-                resolver.AddSearchDirectory(Path.GetDirectoryName(assemblyPath));
-                AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(assemblyPath, new ReaderParameters { AssemblyResolver = resolver });
-
-                foreach (AssemblyNameReference anr in assembly.MainModule.AssemblyReferences)
-                {
-                    if (anr.FullName == assemblyRoot.Name.FullName)
-                    {
-                        referencingAssemblies.Add(assemblyPath);
-                    }
-                }
-            }
-
-            return referencingAssemblies.ToArray();
-        }
-
-        internal static extern string[] GetManagedPlayerDllPaths(string assembliesOutputPath);
-
         [RequiredByNativeCode]
         public static PlayerConnectionInitiateMode GetPlayerConnectionInitiateMode(BuildTarget targetPlatform, BuildOptions buildOptions)
         {
@@ -729,6 +699,10 @@ public static PlayerConnectionInitiateMode GetPlayerConnectionInitiateMode(Build
         private static bool DoesBuildTargetSupportPlayerConnectionPlayerToEditor(BuildTarget targetPlatform)
         {
             return
+                targetPlatform == BuildTarget.StandaloneOSX ||
+                targetPlatform == BuildTarget.StandaloneWindows ||
+                targetPlatform == BuildTarget.StandaloneWindows64 ||
+                targetPlatform == BuildTarget.StandaloneLinux64 ||
                 // Android: support connection from player to Editor in both cases
                 //          connecting to 127.0.0.1 (when both Editor and Android are on localhost using USB cable)
                 //          connecting to <ip of machine where the Editor is running>, the Android and PC has to be on the same subnet
diff --git a/Editor/Mono/BuildPipeline/AssemblyStripper.cs b/Editor/Mono/BuildPipeline/AssemblyStripper.cs
index 24af76cfc5..28518df3e3 100644
--- a/Editor/Mono/BuildPipeline/AssemblyStripper.cs
+++ b/Editor/Mono/BuildPipeline/AssemblyStripper.cs
@@ -157,7 +157,7 @@ private static bool RunAssemblyLinker(IEnumerable<string> args, out string @out,
             var argString = args.Aggregate((buff, s) => buff + " " + s);
             var responseFile = Path.Combine(workingDirectory, "response.rsp");
             File.WriteAllText(responseFile, argString);
-            Console.WriteLine("Invoking UnityLinker with response file. response.rsp contents: " + argString);
+            UnityLogWriter.WriteStringToUnityLog($"Invoking UnityLinker with response file. response.rsp contents: {argString}\n");
             Runner.RunNetCoreProgram(linkerPath, $"@{CommandLineFormatter.PrepareFileName(responseFile)}", workingDirectory, null, null);
 
             @out = "";
diff --git a/Editor/Mono/BuildPipeline/BuildUtils.cs b/Editor/Mono/BuildPipeline/BuildUtils.cs
index 93b59f1d92..77bd6668e0 100644
--- a/Editor/Mono/BuildPipeline/BuildUtils.cs
+++ b/Editor/Mono/BuildPipeline/BuildUtils.cs
@@ -107,7 +107,7 @@ private static void RunProgram(Program p, string exe, string args, string workin
                 p.WaitForExit();
 
                 stopwatch.Stop();
-                Console.WriteLine("{0} exited after {1} ms.", exe, stopwatch.ElapsedMilliseconds);
+                UnityLogWriter.WriteStringToUnityLog($"{exe} exited after {stopwatch.ElapsedMilliseconds} ms.\n");
 
                 var messages = new List<CompilerMessage>();
                 if (parser != null)
diff --git a/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs b/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs
index 62798b8f9f..0f56110de4 100644
--- a/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs
+++ b/Editor/Mono/BuildPipeline/DesktopStandaloneBuildWindowExtension.cs
@@ -18,15 +18,17 @@ internal abstract class DesktopStandaloneBuildWindowExtension : DefaultBuildWind
 
     protected bool m_HasMonoPlayers;
     protected bool m_HasIl2CppPlayers;
+    protected bool m_HasCoreCLRPlayers;
     protected bool m_HasServerPlayers;
     protected bool m_IsRunningOnHostPlatform;
 
-    public DesktopStandaloneBuildWindowExtension(bool hasMonoPlayers, bool hasIl2CppPlayers, bool hasServerPlayers)
+    public DesktopStandaloneBuildWindowExtension(bool hasMonoPlayers, bool hasIl2CppPlayers, bool hasCoreCLRPlayers, bool hasServerPlayers)
     {
         SetupStandaloneSubtargets();
 
         m_IsRunningOnHostPlatform = Application.platform == GetHostPlatform();
         m_HasIl2CppPlayers = hasIl2CppPlayers;
+        m_HasCoreCLRPlayers = hasCoreCLRPlayers;
         m_HasMonoPlayers = hasMonoPlayers;
         m_HasServerPlayers = hasServerPlayers;
     }
@@ -210,7 +212,7 @@ protected virtual string GetCannotBuildPlayerInCurrentSetupError()
         if (namedBuildTarget == NamedBuildTarget.Server)
         {
             if(!m_HasServerPlayers)
-                return $"Dedicated Server support for {GetHostPlatformName()} is not installed";
+                return $"Dedicated Server support for {GetHostPlatformName()} is not installed.";
 
             if (PlayerSettings.GetScriptingBackend(namedBuildTarget) == ScriptingImplementation.IL2CPP && !m_IsRunningOnHostPlatform)
                 return string.Format("{0} IL2CPP player can only be built on {0}.", GetHostPlatformName());
@@ -218,19 +220,36 @@ protected virtual string GetCannotBuildPlayerInCurrentSetupError()
             return null;
         }
 
-        if (PlayerSettings.GetScriptingBackend(namedBuildTarget) != ScriptingImplementation.IL2CPP)
+        switch(PlayerSettings.GetScriptingBackend(namedBuildTarget))
         {
-            if (!m_HasMonoPlayers)
-                return "Currently selected scripting backend (Mono) is not installed.";
+            case ScriptingImplementation.Mono2x:
+            {
+                if (!m_HasMonoPlayers)
+                    return "Currently selected scripting backend (Mono) is not installed.";
+                break;
+            }
+            #pragma warning disable 618
+            case ScriptingImplementation.CoreCLR:
+            {
+                if (!m_HasCoreCLRPlayers)
+                    return $"Currently selected scripting backend (CoreCLR) is not {(Unsupported.IsSourceBuild() ? "installed" : "supported")}.";
+                break;
+            }
+            case ScriptingImplementation.IL2CPP:
+            {
+                if (!m_IsRunningOnHostPlatform)
+                    return string.Format("{0} IL2CPP player can only be built on {0}.", GetHostPlatformName());
+                if (!m_HasIl2CppPlayers)
+                    return "Currently selected scripting backend (IL2CPP) is not installed.";
+                break;
+            }
+            default:
+            {
+                return $"Unknown scripting backend: {PlayerSettings.GetScriptingBackend(namedBuildTarget)}";
+            }
         }
-        else
-        {
-            if (!m_IsRunningOnHostPlatform)
-                return string.Format("{0} IL2CPP player can only be built on {0}.", GetHostPlatformName());
 
-            if (!m_HasIl2CppPlayers)
-                return "Currently selected scripting backend (IL2CPP) is not installed."; // Note: error should match UWP player error message for consistency.
-        }
+
 
         return null;
     }
diff --git a/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs b/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs
index 4e9887ba76..7f7c6ac294 100644
--- a/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs
+++ b/Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs
@@ -2,7 +2,9 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using UnityEngine;
@@ -25,11 +27,7 @@ protected virtual string GetVariationName(BuildPostProcessArgs args)
     }
 
     protected bool GetServer(BuildPostProcessArgs args) =>
-        (args.target == BuildTarget.StandaloneWindows ||
-            args.target == BuildTarget.StandaloneWindows64 ||
-            args.target == BuildTarget.StandaloneOSX ||
-            args.target == BuildTarget.StandaloneLinux64) &&
-        (StandaloneBuildSubtarget)args.subtarget == StandaloneBuildSubtarget.Server;
+        GetNamedBuildTarget(args) == NamedBuildTarget.Server;
 
     protected string GetVariationFolder(BuildPostProcessArgs args) =>
         $"{args.playerPackage}/Variations/{GetVariationName(args)}";
@@ -41,7 +39,7 @@ public override void UpdateBootConfig(BuildTarget target, BootConfigData config,
             config.AddKey("single-instance");
         if (!PlayerSettings.useFlipModelSwapchain)
             config.AddKey("force-d3d11-bitblt-mode");
-        if (IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(BuildPipeline.GetBuildTargetGroup(target)))
+        if (IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(NamedBuildTarget.FromActiveSettings(target)))
             config.Set("mono-codegen", "il2cpp");
         if ((options & BuildOptions.EnableCodeCoverage) != 0)
             config.Set("enableCodeCoverage", "1");
@@ -56,27 +54,43 @@ public override void LaunchPlayer(BuildLaunchPlayerArgs args)
 
     readonly bool m_HasMonoPlayers;
     readonly bool m_HasIl2CppPlayers;
+    readonly bool m_HasCoreCLRPlayers;
+    readonly bool m_HasServerMonoPlayers;
+    readonly bool m_HasServerIl2CppPlayers;
+    readonly bool m_HasServerCoreCLRPlayers;
 
-    protected DesktopStandalonePostProcessor(bool hasMonoPlayers, bool hasIl2CppPlayers)
+    protected DesktopStandalonePostProcessor(bool hasMonoPlayers, bool hasIl2CppPlayers, bool hasCoreCLRPlayers, bool hasServerMonoPlayers, bool hasServerIl2CppPlayers, bool hasServerCoreCLRPlayers)
     {
         m_HasMonoPlayers = hasMonoPlayers;
         m_HasIl2CppPlayers = hasIl2CppPlayers;
+        m_HasCoreCLRPlayers = hasCoreCLRPlayers;
+        m_HasServerMonoPlayers = hasServerMonoPlayers;
+        m_HasServerIl2CppPlayers = hasServerIl2CppPlayers;
+        m_HasServerCoreCLRPlayers = hasServerCoreCLRPlayers;
     }
 
     public override string PrepareForBuild(BuildOptions options, BuildTarget target)
     {
-        if (!m_HasMonoPlayers)
-        {
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(target);
-            if (PlayerSettings.GetScriptingBackend(buildTargetGroup) != ScriptingImplementation.IL2CPP)
-                return "Currently selected scripting backend (Mono) is not installed.";
-        }
+        var namedBuildTarget = NamedBuildTarget.FromActiveSettings(target);
+        var isServer = namedBuildTarget == NamedBuildTarget.Server;
 
-        if (!m_HasIl2CppPlayers)
+        switch (PlayerSettings.GetScriptingBackend(namedBuildTarget))
         {
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(target);
-            if (PlayerSettings.GetScriptingBackend(buildTargetGroup) == ScriptingImplementation.IL2CPP)
-                return "Currently selected scripting backend (IL2CPP) is not installed.";
+            case ScriptingImplementation.Mono2x:
+                if ((!isServer && !m_HasMonoPlayers) || (isServer && !m_HasServerMonoPlayers))
+                    return "Currently selected scripting backend (Mono) is not installed.";
+                break;
+            case ScriptingImplementation.IL2CPP:
+                if ((!isServer && !m_HasIl2CppPlayers) || (isServer && !m_HasServerIl2CppPlayers))
+                    return "Currently selected scripting backend (IL2CPP) is not installed.";
+                break;
+            #pragma warning disable 618
+            case ScriptingImplementation.CoreCLR:
+                if ((!isServer && !m_HasCoreCLRPlayers) || (isServer && !m_HasServerCoreCLRPlayers))
+                    return "Currently selected scripting backend (CoreCLR) is not installed.";
+                break;
+            default:
+                return $"Unknown scripting backend: {PlayerSettings.GetScriptingBackend(namedBuildTarget)}";
         }
 
         return base.PrepareForBuild(options, target);
diff --git a/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs b/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
index e834c5bc91..2f892ed3c0 100644
--- a/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
+++ b/Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs
@@ -9,6 +9,7 @@
 using System.Linq;
 using System.Text;
 using System.Runtime.InteropServices;
+using NiceIO;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Player;
@@ -34,6 +35,10 @@ public abstract class Sysroot
         public abstract string TargetPlatform { get; }
         public abstract string TargetArch { get; }
         public abstract IEnumerable<string> GetIl2CppArguments();
+        public abstract string GetSysrootPath();
+        public abstract string GetToolchainPath();
+        public abstract string GetIl2CppCompilerFlags();
+        public abstract string GetIl2CppLinkerFlags();
     }
 }
 
@@ -111,6 +116,10 @@ private static bool GetTargetPlatformAndArchFromBuildTarget(BuildTarget target,
                     targetPlatform = "webgl";
                     targetArch = "";
                     return true;
+                case BuildTarget.EmbeddedLinux:
+                    targetPlatform = "embeddedlinux";
+                    targetArch = "";
+                    return true;
             }
 
             targetPlatform = null;
@@ -212,7 +221,7 @@ public static string HostTargetTuple(BuildTarget buildTarget)
                             host = $"{_hostPlatform}-{_hostArch}";
                             break;
                     }
-                    string target = $"{targetPlatform}-{targetArch}";
+                    string target = String.IsNullOrEmpty(targetArch) ? targetPlatform : $"{targetPlatform}-{targetArch}";
                     return host == target ? target : $"{host}-{target}";
                 }
             }
@@ -275,21 +284,21 @@ internal static IIl2CppPlatformProvider PlatformProviderForNotModularPlatform(Bu
 
         internal static IL2CPPBuilder RunIl2Cpp(string tempFolder, string stagingAreaData, IIl2CppPlatformProvider platformProvider, Action<string> modifyOutputBeforeCompile, RuntimeClassRegistry runtimeClassRegistry)
         {
-            var builder = new IL2CPPBuilder(tempFolder, stagingAreaData, platformProvider, modifyOutputBeforeCompile, runtimeClassRegistry, IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(BuildPipeline.GetBuildTargetGroup(platformProvider.target)));
+            var builder = new IL2CPPBuilder(tempFolder, stagingAreaData, platformProvider, modifyOutputBeforeCompile, runtimeClassRegistry, IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(platformProvider.namedBuildTarget));
             builder.Run();
             return builder;
         }
 
         internal static IL2CPPBuilder RunIl2Cpp(string stagingAreaData, IIl2CppPlatformProvider platformProvider, Action<string> modifyOutputBeforeCompile, RuntimeClassRegistry runtimeClassRegistry)
         {
-            var builder = new IL2CPPBuilder(stagingAreaData, stagingAreaData, platformProvider, modifyOutputBeforeCompile, runtimeClassRegistry, IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(BuildPipeline.GetBuildTargetGroup(platformProvider.target)));
+            var builder = new IL2CPPBuilder(stagingAreaData, stagingAreaData, platformProvider, modifyOutputBeforeCompile, runtimeClassRegistry, IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(platformProvider.namedBuildTarget));
             builder.Run();
             return builder;
         }
 
         internal static IL2CPPBuilder RunCompileAndLink(string tempFolder, string stagingAreaData, IIl2CppPlatformProvider platformProvider, Action<string> modifyOutputBeforeCompile, RuntimeClassRegistry runtimeClassRegistry, string il2cppBuildCacheSource)
         {
-            var builder = new IL2CPPBuilder(tempFolder, stagingAreaData, platformProvider, modifyOutputBeforeCompile, runtimeClassRegistry, IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(BuildPipeline.GetBuildTargetGroup(platformProvider.target)));
+            var builder = new IL2CPPBuilder(tempFolder, stagingAreaData, platformProvider, modifyOutputBeforeCompile, runtimeClassRegistry, IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(platformProvider.namedBuildTarget));
             builder.RunCompileAndLink(il2cppBuildCacheSource);
             return builder;
         }
@@ -338,18 +347,18 @@ internal static string ApiCompatibilityLevelToDotNetProfileArgument(ApiCompatibi
             }
         }
 
-        internal static bool UseIl2CppCodegenWithMonoBackend(BuildTargetGroup targetGroup)
+        internal static bool UseIl2CppCodegenWithMonoBackend(NamedBuildTarget namedBuildTarget)
         {
             return EditorApplication.useLibmonoBackendForIl2cpp &&
-                PlayerSettings.GetScriptingBackend(targetGroup) == ScriptingImplementation.IL2CPP;
+                PlayerSettings.GetScriptingBackend(namedBuildTarget) == ScriptingImplementation.IL2CPP;
         }
 
-        internal static bool EnableIL2CPPDebugger(IIl2CppPlatformProvider provider, BuildTargetGroup targetGroup)
+        internal static bool EnableIL2CPPDebugger(IIl2CppPlatformProvider provider)
         {
             if (!provider.allowDebugging || !provider.development)
                 return false;
 
-            switch (PlayerSettings.GetApiCompatibilityLevel(targetGroup))
+            switch (PlayerSettings.GetApiCompatibilityLevel(provider.namedBuildTarget))
             {
                 case ApiCompatibilityLevel.NET_Unity_4_8:
                 case ApiCompatibilityLevel.NET_Standard:
@@ -360,10 +369,9 @@ internal static bool EnableIL2CPPDebugger(IIl2CppPlatformProvider provider, Buil
             }
         }
 
-        internal static string[] GetBuilderDefinedDefines(IIl2CppPlatformProvider il2cppPlatformProvider, BuildTargetGroup buildTargetGroup)
+        internal static string[] GetBuilderDefinedDefines(BuildTarget target, ApiCompatibilityLevel apiCompatibilityLevel, bool enableIl2CppDebugger)
         {
             List<string> defines = new List<string>();
-            var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup);
 
             switch (apiCompatibilityLevel)
             {
@@ -381,8 +389,6 @@ internal static string[] GetBuilderDefinedDefines(IIl2CppPlatformProvider il2cpp
                     throw new InvalidOperationException($"IL2CPP doesn't support building with {apiCompatibilityLevel} API compatibility level!");
             }
 
-
-            var target = il2cppPlatformProvider.target;
             if (target == BuildTarget.StandaloneWindows || target == BuildTarget.StandaloneWindows64 ||
                 target == BuildTarget.XboxOne || target == BuildTarget.WSAPlayer)
             {
@@ -398,7 +404,7 @@ internal static string[] GetBuilderDefinedDefines(IIl2CppPlatformProvider il2cpp
                 }
             }
 
-            if (EnableIL2CPPDebugger(il2cppPlatformProvider, buildTargetGroup))
+            if (enableIl2CppDebugger)
                 defines.Add("IL2CPP_MONO_DEBUGGER=1");
 
             if (BuildPipeline.IsFeatureSupported("ENABLE_SCRIPTING_GC_WBARRIERS", target))
@@ -424,21 +430,21 @@ internal static string[] GetBuilderDefinedDefines(IIl2CppPlatformProvider il2cpp
             return defines.ToArray();
         }
 
-        internal static string[] GetDebuggerIL2CPPArguments(IIl2CppPlatformProvider il2cppPlatformProvider, BuildTargetGroup buildTargetGroup)
+        internal static string[] GetDebuggerIL2CPPArguments(IIl2CppPlatformProvider il2cppPlatformProvider)
         {
             var arguments = new List<string>();
 
-            if (EnableIL2CPPDebugger(il2cppPlatformProvider, buildTargetGroup))
+            if (EnableIL2CPPDebugger(il2cppPlatformProvider))
                 arguments.Add("--enable-debugger");
 
             return arguments.ToArray();
         }
 
-        internal static string[] GetBuildingIL2CPPArguments(IIl2CppPlatformProvider il2cppPlatformProvider, BuildTargetGroup buildTargetGroup)
+        internal static string[] GetBuildingIL2CPPArguments(IIl2CppPlatformProvider il2cppPlatformProvider)
         {
             // When changing this function, don't forget to change GetBuilderDefinedDefines!
             var arguments = new List<string>();
-            var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup);
+            var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(il2cppPlatformProvider.namedBuildTarget);
 
             if (BuildPipeline.IsFeatureSupported("ENABLE_SCRIPTING_GC_WBARRIERS", il2cppPlatformProvider.target))
             {
@@ -466,43 +472,114 @@ internal static string[] GetBuildingIL2CPPArguments(IIl2CppPlatformProvider il2c
         }
 
         internal static string GetIl2CppFolder()
+        {
+            return GetIl2CppFolder(out var _);
+        }
+
+        internal static bool UsingDevelopmentBuild()
+        {
+            GetIl2CppFolder(out var isDevelopmentLocation);
+            return isDevelopmentLocation;
+        }
+
+        static string GetIl2CppFolder(out bool isDevelopmentLocation)
         {
             var pathOverride = System.Environment.GetEnvironmentVariable("UNITY_IL2CPP_PATH");
             if (!string.IsNullOrEmpty(pathOverride))
+            {
+                isDevelopmentLocation = true;
                 return pathOverride;
+            }
 
             pathOverride = Debug.GetDiagnosticSwitch("VMIl2CppPath").value as string;
             if (!string.IsNullOrEmpty(pathOverride))
+            {
+                isDevelopmentLocation = true;
                 return pathOverride;
+            }
 
+            isDevelopmentLocation = false;
             return Path.GetFullPath(Path.Combine(
                 EditorApplication.applicationContentsPath,
                 "il2cpp"));
         }
 
-        internal static string GetIl2CppBeeSettingsFolder()
+        static string GetBCLExtensionsFolder()
         {
-            return $"{GetIl2CppFolder()}/build/BeeSettings/offline";
-        }
+            var il2CppFolder = GetIl2CppFolder(out var isDevelopmentLocation);
+            if (isDevelopmentLocation)
+                return Path.Combine(il2CppFolder, "build", "tests", "BCLExtensions", "net471");
 
-        internal static string GetExePath(string executableFileName)
-        {
-            var platform = Application.platform;
-            var deployDirectory = $"{IL2CPPUtils.GetIl2CppFolder()}/build/deploy";
-            var il2cppPath = $"{deployDirectory}/{executableFileName}{(platform == RuntimePlatform.WindowsEditor ? ".exe" : "")}";
-            if (!File.Exists(il2cppPath))
-                il2cppPath = $"{deployDirectory}/{ExpectedTargetFrameworkDirectoryNameWhenUsingCustomBuild(platform)}/{BinaryDirectoryForPlatform(platform)}/{executableFileName}{(platform == RuntimePlatform.WindowsEditor ? ".exe" : "")}";
-            return il2cppPath;
+            return Paths.Combine(il2CppFolder, "BCLExtensions");
         }
 
-        internal static string GetTundraFolder()
+        internal static IEnumerable<string> GetBCLExtensionLibraries()
         {
-            return $"{GetIl2CppFolder()}/external/bee/tundra";
+            var bclExtensionsFolder = GetBCLExtensionsFolder();
+            return new string[]
+            {
+                Path.Combine(bclExtensionsFolder, "System.Runtime.WindowsRuntime.dll"),
+                Path.Combine(bclExtensionsFolder, "System.Runtime.WindowsRuntime.UI.Xaml.dll"),
+            };
         }
 
-        internal static string GetReapiCacheClientFolder()
+        internal static string GetExePath(string toolName)
         {
-            return $"{GetIl2CppFolder()}/external/bee/reapi-cache-client";
+            var platform = Application.platform;
+            var il2CppFolder = GetIl2CppFolder(out var isDevelopmentLocation);
+            var expectedToolExecutableName = $"{toolName}{(platform == RuntimePlatform.WindowsEditor ? ".exe" : "")}";
+
+            if (isDevelopmentLocation)
+            {
+                // Locating the correct development build to use is a little tricky.  Complications come from
+                // 1) We don't know if the Debug or Release build is desired.  To overcome this we will pick whichever was modified most recently
+                // 2) We don't know if the published or non-published build is desired.  Again, we'll use whichever was modified most recently
+                // 3) Published builds for all platforms may or may not be built.  We need to make sure not to pick a build for a different platform
+
+                // Note that this logic will intentionally avoid checking for an expected TFM.  This is a dev build.  Using w/e is newest is probably
+                // the most robust and maintainable approach.
+
+                var toolBinDirectory = Path.Combine(il2CppFolder, toolName, "bin").ToNPath();
+                var candidates = toolBinDirectory.Files($"*{expectedToolExecutableName}", recurse: true)
+                    .OrderByDescending(f => f.GetLastWriteTimeUtc())
+                    .ToArray();
+
+                if (candidates.Length == 0)
+                    throw new InvalidOperationException($"{toolName} does not appear to be built in {il2CppFolder}");
+
+                var expectedPublishDirectoryName = BinaryDirectoryForPlatform(platform).ToNPath();
+
+                foreach (var candidate in candidates)
+                {
+                    // Examples :
+                    // 1)   il2cpp/bin/Release/<tfm>/il2cpp.exe
+                    // 2)   il2cpp/bin/Debug/<tfm>/il2cpp.exe
+                    if (candidate.Parent.Parent.Parent.FileName == "bin")
+                    {
+                        // Found a non-published build
+                        return candidate.ToString();
+                    }
+
+                    // Examples :
+                    // 1)   il2cpp/bin/Release/<tfm>/<platform dir>/publish/il2cpp.exe
+                    // 2)   il2cpp/bin/Debug/<tfm>/<platform dir>/publish/il2cpp.exe
+                    if (candidate.Parent.FileName == "publish" && candidate.Parent.Parent.FileName == expectedPublishDirectoryName)
+                    {
+                        // found a published build
+                        return candidate.ToString();
+                    }
+
+                    // There is a 3rd path structure that we will ignore
+                    // Examples :
+                    // 1)   il2cpp/bin/Release/<tfm>/<platform dir>/il2cpp.exe
+                    // 2)   il2cpp/bin/Debug/<tfm>/<platform dir>/il2cpp.exe
+                }
+
+                throw new InvalidOperationException($"Could not determine which of the {candidates.Length} of {toolName} to use.  The expected TFM or expected directory layout may have changed and this logic may need to be updated");
+            }
+
+            var deployDirectory = $"{il2CppFolder}/build/deploy";
+            return $"{deployDirectory}/{expectedToolExecutableName}";
         }
 
         internal static string GetAdditionalArguments()
@@ -539,14 +616,6 @@ private static string BinaryDirectoryForPlatform(RuntimePlatform platform)
                 return "osx-arm64";
             return "osx-x64";
         }
-
-        private static string ExpectedTargetFrameworkDirectoryNameWhenUsingCustomBuild(RuntimePlatform platform)
-        {
-            var arch = RuntimeInformation.ProcessArchitecture.ToString().ToLower();
-            if (platform == RuntimePlatform.OSXEditor && arch == "arm64")
-                return "net6.0";
-            return "net5.0";
-        }
     }
 
     internal class IL2CPPBuilder
@@ -611,9 +680,7 @@ public void Run()
             // Make all assemblies in Staging/Managed writable for stripping.
             ClearReadOnlyFlagOnAllFilesNonRecursively(managedDir);
 
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(m_PlatformProvider.target);
-
-            var managedStrippingLevel = PlayerSettings.GetManagedStrippingLevel(buildTargetGroup);
+            var managedStrippingLevel = PlayerSettings.GetManagedStrippingLevel(m_PlatformProvider.namedBuildTarget);
 
             // IL2CPP does not support a managed stripping level of disabled. If the player settings
             // do try this (which should not be possible from the editor), use Low instead.
@@ -667,23 +734,22 @@ public void RunCompileAndLink(string il2cppBuildCacheSource)
                 Directory.CreateDirectory(buildCacheDirectory);
 
                 var buildCacheNativeOutputFile = Path.Combine(GetNativeOutputRelativeDirectory(buildCacheDirectory), m_PlatformProvider.nativeLibraryFileName);
-                var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(m_PlatformProvider.target);
-                var compilerConfiguration = PlayerSettings.GetIl2CppCompilerConfiguration(buildTargetGroup);
+                var compilerConfiguration = PlayerSettings.GetIl2CppCompilerConfiguration(m_PlatformProvider.namedBuildTarget);
                 var arguments = Il2CppNativeCodeBuilderUtils.AddBuilderArguments(il2CppNativeCodeBuilder, buildCacheNativeOutputFile, m_PlatformProvider.includePaths, m_PlatformProvider.libraryPaths, compilerConfiguration).ToList();
 
                 var additionalArgs = IL2CPPUtils.GetAdditionalArguments();
                 if (!string.IsNullOrEmpty(additionalArgs))
                     arguments.Add(additionalArgs);
 
-                foreach (var buildingArgument in IL2CPPUtils.GetBuildingIL2CPPArguments(m_PlatformProvider, buildTargetGroup))
+                foreach (var buildingArgument in IL2CPPUtils.GetBuildingIL2CPPArguments(m_PlatformProvider))
                 {
                     if (!arguments.Contains(buildingArgument))
                         arguments.Add(buildingArgument);
                 }
 
                 arguments.Add($"--generatedcppdir={CommandLineFormatter.PrepareFileName(GetCppOutputDirectory(il2cppBuildCacheSource))}");
-                arguments.Add($"--dotnetprofile=\"{IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup), m_PlatformProvider.target)}\"");
-                arguments.AddRange(IL2CPPUtils.GetDebuggerIL2CPPArguments(m_PlatformProvider, buildTargetGroup));
+                arguments.Add($"--dotnetprofile=\"{IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(PlayerSettings.GetApiCompatibilityLevel(m_PlatformProvider.namedBuildTarget), m_PlatformProvider.target)}\"");
+                arguments.AddRange(IL2CPPUtils.GetDebuggerIL2CPPArguments(m_PlatformProvider));
                 Action<ProcessStartInfo> setupStartInfo = il2CppNativeCodeBuilder.SetupStartInfo;
 
                 RunIl2CppWithArguments(arguments, setupStartInfo);
@@ -729,12 +795,10 @@ private void ConvertPlayerDlltoCpp(Il2CppBuildPipelineData data)
             if (m_BuildForMonoRuntime)
                 arguments.Add("--mono-runtime");
 
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(m_PlatformProvider.target);
-            var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup);
+            var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(m_PlatformProvider.namedBuildTarget);
             arguments.Add(string.Format("--dotnetprofile=\"{0}\"", IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(apiCompatibilityLevel, m_PlatformProvider.target)));
 
-            var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
-            var il2cppCodeGeneration = PlayerSettings.GetIl2CppCodeGeneration(namedBuildTarget);
+            var il2cppCodeGeneration = PlayerSettings.GetIl2CppCodeGeneration(m_PlatformProvider.namedBuildTarget);
             if (il2cppCodeGeneration == Il2CppCodeGeneration.OptimizeSize)
                 arguments.Add("--generics-option=EnableFullSharing");
 
@@ -742,7 +806,7 @@ private void ConvertPlayerDlltoCpp(Il2CppBuildPipelineData data)
             if (il2CppNativeCodeBuilder != null)
             {
                 var buildCacheNativeOutputFile = Path.Combine(GetNativeOutputRelativeDirectory(m_PlatformProvider.il2cppBuildCacheDirectory), m_PlatformProvider.nativeLibraryFileName);
-                var compilerConfiguration = PlayerSettings.GetIl2CppCompilerConfiguration(buildTargetGroup);
+                var compilerConfiguration = PlayerSettings.GetIl2CppCompilerConfiguration(m_PlatformProvider.namedBuildTarget);
                 Il2CppNativeCodeBuilderUtils.ClearAndPrepareCacheDirectory(il2CppNativeCodeBuilder);
                 arguments.AddRange(Il2CppNativeCodeBuilderUtils.AddBuilderArguments(il2CppNativeCodeBuilder, buildCacheNativeOutputFile, m_PlatformProvider.includePaths, m_PlatformProvider.libraryPaths, compilerConfiguration));
             }
@@ -755,8 +819,8 @@ private void ConvertPlayerDlltoCpp(Il2CppBuildPipelineData data)
             foreach (var additionalCppFile in Directory.GetFiles(GetAdditionalCppFilesDirectory(m_PlatformProvider.il2cppBuildCacheDirectory)))
                 arguments.Add($"--additional-cpp={CommandLineFormatter.PrepareFileName(GetShortPathName(Path.GetFullPath(additionalCppFile)))}");
 
-            arguments.AddRange(IL2CPPUtils.GetDebuggerIL2CPPArguments(m_PlatformProvider, buildTargetGroup));
-            foreach (var buildingArgument in IL2CPPUtils.GetBuildingIL2CPPArguments(m_PlatformProvider, buildTargetGroup))
+            arguments.AddRange(IL2CPPUtils.GetDebuggerIL2CPPArguments(m_PlatformProvider));
+            foreach (var buildingArgument in IL2CPPUtils.GetBuildingIL2CPPArguments(m_PlatformProvider))
             {
                 if (!arguments.Contains(buildingArgument))
                     arguments.Add(buildingArgument);
@@ -818,7 +882,7 @@ private void RunIl2CppWithArguments(List<string> arguments, Action<ProcessStartI
             arguments.Add("--convert-in-graph");
 
             var args = arguments.Aggregate(String.Empty, (current, arg) => current + arg + " ");
-            Console.WriteLine("Invoking il2cpp with arguments: " + args);
+            UnityLogWriter.WriteStringToUnityLog($"Invoking il2cpp with arguments: {args}\n");
             Runner.RunNetCoreProgram(GetIl2CppExe(), args, m_PlatformProvider.il2cppBuildCacheDirectory, il2cppOutputParser, setupStartInfo);
 
             // Copy IL2CPP outputs to StagingArea
@@ -845,37 +909,12 @@ public static string GetIl2CppExe()
         {
             return IL2CPPUtils.GetExePath("il2cpp");
         }
-
-        private string GetIl2CppTundraExe()
-        {
-            if (Application.platform == RuntimePlatform.OSXEditor)
-                return $"{IL2CPPUtils.GetTundraFolder()}/tundra-mac-x64/tundra2";
-            if (Application.platform == RuntimePlatform.LinuxEditor)
-                return $"{IL2CPPUtils.GetTundraFolder()}/tundra-linux-x64/tundra2";
-
-            return $"{IL2CPPUtils.GetTundraFolder()}/tundra-win-x64/tundra2.exe";
-        }
-
-        private string GetIl2CppReapiCacheClientExe()
-        {
-            if (Application.platform == RuntimePlatform.OSXEditor)
-                return $"{IL2CPPUtils.GetReapiCacheClientFolder()}/tundra-mac-x64/tundra2";
-            if (Application.platform == RuntimePlatform.LinuxEditor)
-                return $"{IL2CPPUtils.GetReapiCacheClientFolder()}/tundra-linux-x64/tundra2";
-
-            return $"{IL2CPPUtils.GetReapiCacheClientFolder()}/tundra-win-x64/tundra2.exe";
-        }
-
-        private string GetMonoBleedingEdgeExe()
-        {
-            var path = Path.Combine(MonoInstallationFinder.GetMonoInstallation("MonoBleedingEdge"), "bin");
-            return Path.Combine(path, "mono");
-        }
     }
 
     internal interface IIl2CppPlatformProvider
     {
         BuildTarget target { get; }
+        NamedBuildTarget namedBuildTarget { get; }
         bool emitNullChecks { get; }
         bool enableStackTraces { get; }
         bool enableArrayBoundsCheck { get; }
@@ -907,6 +946,7 @@ public BaseIl2CppPlatformProvider(BuildTarget target, string libraryFolder, Buil
                                           string baselibLibraryDirectory)
         {
             this.target = target;
+            this.namedBuildTarget = NamedBuildTarget.FromActiveSettings(target);
             this.libraryFolder = libraryFolder;
             this.buildReport = buildReport;
             _baselibLibraryDirectory = baselibLibraryDirectory;
@@ -914,6 +954,8 @@ public BaseIl2CppPlatformProvider(BuildTarget target, string libraryFolder, Buil
 
         public virtual BuildTarget target { get; private set; }
 
+        public virtual NamedBuildTarget namedBuildTarget { get; private set; }
+
         public virtual string libraryFolder { get; private set; }
 
         public virtual bool emitNullChecks
diff --git a/Editor/Mono/BuildPipeline/NamedBuildTarget.cs b/Editor/Mono/BuildPipeline/NamedBuildTarget.cs
index 82dfeec30a..6130437d89 100644
--- a/Editor/Mono/BuildPipeline/NamedBuildTarget.cs
+++ b/Editor/Mono/BuildPipeline/NamedBuildTarget.cs
@@ -118,6 +118,22 @@ public static NamedBuildTarget FromBuildTargetGroup(BuildTargetGroup buildTarget
             throw new ArgumentException($"There is no a valid NamedBuildTarget for BuildTargetGroup '{buildTargetGroup}'");
         }
 
+        // TODO: We shouldn't be assuming that the namedBuildTarget can be extracted from the
+        // active settings. This should be passed through the callstack instead when building.
+        // We will need to use BuildTargetSelection (BuildTarget + Subtarget) that is in the cpp side.
+        // For now this fixes an issue where Dedicated Server compiles with the Standalone settings.
+        internal static NamedBuildTarget FromActiveSettings(BuildTarget target)
+        {
+            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(target);
+
+            if (buildTargetGroup == BuildTargetGroup.Standalone && (StandaloneBuildSubtarget)EditorUserBuildSettings.GetActiveSubtargetFor(target) == StandaloneBuildSubtarget.Server)
+            {
+                return NamedBuildTarget.Server;
+            }
+
+            return NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
+        }
+
         public static bool operator==(NamedBuildTarget lhs, NamedBuildTarget rhs)
         {
             return lhs.Equals(rhs);
diff --git a/Editor/Mono/BuildPipeline/RuntimeClassMetadata.cs b/Editor/Mono/BuildPipeline/RuntimeClassMetadata.cs
index 965b55325b..08b7c66406 100644
--- a/Editor/Mono/BuildPipeline/RuntimeClassMetadata.cs
+++ b/Editor/Mono/BuildPipeline/RuntimeClassMetadata.cs
@@ -5,8 +5,10 @@
 using System.Collections.Generic;
 using System;
 using System.Linq;
+using System.Runtime.InteropServices;
 using UnityEditor.Compilation;
 using UnityEditor.Scripting.ScriptCompilation;
+using UnityEngine.Scripting;
 
 namespace UnityEditor
 {
@@ -17,11 +19,11 @@ namespace UnityEditor
     internal class RuntimeClassRegistry
     {
         protected Dictionary<string, HashSet<string>> serializedClassesPerAssembly = new Dictionary<string, HashSet<string>>();
-        protected Dictionary<string, string[]> m_UsedTypesPerUserAssembly = new Dictionary<string, string[]>();
+        protected Dictionary<string, HashSet<string>> m_UsedTypesPerUserAssembly = new Dictionary<string, HashSet<string>>();
         protected Dictionary<int, List<string>> classScenes = new Dictionary<int, List<string>>();
         protected UnityType objectUnityType = null;
 
-        public Dictionary<string, string[]> UsedTypePerUserAssembly
+        public Dictionary<string, HashSet<string>> UsedTypePerUserAssembly
         {
             get { return m_UsedTypesPerUserAssembly; }
         }
@@ -49,7 +51,21 @@ public void AddNativeClassID(int ID)
 
         public void SetUsedTypesInUserAssembly(string[] typeNames, string assemblyName)
         {
-            m_UsedTypesPerUserAssembly[assemblyName] = typeNames;
+            if (!m_UsedTypesPerUserAssembly.TryGetValue(assemblyName, out HashSet<string> types))
+                m_UsedTypesPerUserAssembly[assemblyName] = types = new HashSet<string>();
+
+            foreach (var typeName in typeNames)
+                types.Add(typeName);
+        }
+
+        [RequiredByNativeCode]
+        public void SetSerializedTypesInUserAssembly(string[] typeNames, string assemblyName)
+        {
+            if (!serializedClassesPerAssembly.TryGetValue(assemblyName, out HashSet<string> types))
+                serializedClassesPerAssembly[assemblyName] = types = new HashSet<string>();
+
+            foreach (var typeName in typeNames)
+                types.Add(typeName);
         }
 
         public bool IsDLLUsed(string dll)
@@ -68,6 +84,20 @@ public bool IsDLLUsed(string dll)
             return m_UsedTypesPerUserAssembly.ContainsKey(dll);
         }
 
+        protected void AddUsedClass(string assemblyName, string className)
+        {
+            if (string.IsNullOrEmpty(assemblyName))
+                throw new ArgumentException(nameof(assemblyName));
+
+            if (string.IsNullOrEmpty(className))
+                throw new ArgumentException(nameof(className));
+
+            if (!m_UsedTypesPerUserAssembly.TryGetValue(assemblyName, out HashSet<string> types))
+                m_UsedTypesPerUserAssembly[assemblyName] = types = new HashSet<string>();
+
+            types.Add(className);
+        }
+
         protected void AddSerializedClass(string assemblyName, string className)
         {
             if (string.IsNullOrEmpty(assemblyName))
@@ -115,7 +145,7 @@ public Dictionary<string, string[]> GetAllManagedTypesInScenes()
             items.Add("UnityEngine.dll", engineModuleTypes.ToArray());
 
             foreach (var userAssembly in m_UsedTypesPerUserAssembly)
-                items.Add(userAssembly.Key, userAssembly.Value);
+                items.Add(userAssembly.Key, userAssembly.Value.ToArray());
 
             return items;
         }
@@ -133,6 +163,24 @@ public IEnumerable<KeyValuePair<string, string[]>> GetAllSerializedClassesAsStri
             }
         }
 
+        [RequiredByNativeCode]
+        public MethodDescription[] GetAllMethodsToPreserve()
+        {
+            return m_MethodsToPreserve.ToArray();
+        }
+
+        [RequiredByNativeCode]
+        public string[] GetAllSerializedClassesAssemblies()
+        {
+            return serializedClassesPerAssembly.Keys.ToArray();
+        }
+
+        [RequiredByNativeCode]
+        public string[] GetAllSerializedClassesForAssembly(string assembly)
+        {
+            return serializedClassesPerAssembly[assembly].ToArray();
+        }
+
         public static RuntimeClassRegistry Create()
         {
             return new RuntimeClassRegistry();
@@ -155,6 +203,8 @@ public void SetSceneClasses(int[] nativeClassIDs, string scene)
             }
         }
 
+        // Needs to stay in sync with MethodDescription in Editor/Src/BuildPipeline/BuildSerialization.h
+        [StructLayout(LayoutKind.Sequential)]
         internal class MethodDescription
         {
             public string assembly;
@@ -165,12 +215,24 @@ internal class MethodDescription
         internal List<MethodDescription> m_MethodsToPreserve = new List<MethodDescription>();
 
         //invoked by native code
-        internal void AddMethodToPreserve(string assembly, string @namespace, string klassName, string methodName)
+        [RequiredByNativeCode]
+        public void AddMethodToPreserve(string assembly, string ns, string klassName, string methodName)
+        {
+            m_MethodsToPreserve.Add(new MethodDescription()
+            {
+                assembly = assembly,
+                fullTypeName = ns + (ns.Length > 0 ? "." : "") + klassName,
+                methodName = methodName
+            });
+        }
+
+        [RequiredByNativeCode]
+        public void AddMethodToPreserveWithFullTypeName(string assembly, string fullTypeName, string methodName)
         {
             m_MethodsToPreserve.Add(new MethodDescription()
             {
                 assembly = assembly,
-                fullTypeName = @namespace + (@namespace.Length > 0 ? "." : "") + klassName,
+                fullTypeName = fullTypeName,
                 methodName = methodName
             });
         }
diff --git a/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerArgumentValueProvider.cs b/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerArgumentValueProvider.cs
index b86479ee5b..80a98e4c92 100644
--- a/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerArgumentValueProvider.cs
+++ b/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerArgumentValueProvider.cs
@@ -20,7 +20,7 @@ public string Runtime
         {
             get
             {
-                var backend = PlayerSettings.GetScriptingBackend(m_RunInformation.buildTargetGroup);
+                var backend = PlayerSettings.GetScriptingBackend(m_RunInformation.namedBuildTarget);
                 switch (backend)
                 {
                     case ScriptingImplementation.IL2CPP:
@@ -33,7 +33,7 @@ public string Runtime
             }
         }
 
-        public string Profile => IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(PlayerSettings.GetApiCompatibilityLevel(m_RunInformation.buildTargetGroup), m_RunInformation.target);
+        public string Profile => IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(PlayerSettings.GetApiCompatibilityLevel(m_RunInformation.namedBuildTarget), m_RunInformation.target);
 
         public string RuleSet
         {
diff --git a/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerRunInformation.cs b/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerRunInformation.cs
index 0a5fdf6aab..998255a8d1 100644
--- a/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerRunInformation.cs
+++ b/Editor/Mono/BuildPipeline/UnityLinker/UnityLinkerRunInformation.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEditor.UnityLinker;
 
@@ -17,6 +18,7 @@ class UnityLinkerRunInformation
         public readonly string managedAssemblyFolderPath;
         public readonly BuildTarget target;
         public readonly BuildTargetGroup buildTargetGroup;
+        public readonly NamedBuildTarget namedBuildTarget;
         public readonly BaseUnityLinkerPlatformProvider platformProvider;
         public readonly RuntimeClassRegistry rcr;
         public readonly ManagedStrippingLevel managedStrippingLevel;
@@ -43,8 +45,9 @@ public UnityLinkerRunInformation(string managedAssemblyFolderPath,
             pipelineData = new UnityLinkerBuildPipelineData(target, managedAssemblyFolderPath);
 
             buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
+            namedBuildTarget = NamedBuildTarget.FromActiveSettings(buildTarget);
             argumentProvider = new UnityLinkerArgumentValueProvider(this);
-            isMonoBackend = PlayerSettings.GetScriptingBackend(buildTargetGroup) == ScriptingImplementation.Mono2x;
+            isMonoBackend = PlayerSettings.GetScriptingBackend(namedBuildTarget) == ScriptingImplementation.Mono2x;
             engineStrippingSupported = (platformProvider?.supportsEngineStripping ?? false) && !isMonoBackend;
             performEngineStripping = rcr != null && PlayerSettings.stripEngineCode && engineStrippingSupported;
         }
diff --git a/Editor/Mono/BuildPlayerWindow.cs b/Editor/Mono/BuildPlayerWindow.cs
index fda2e95fef..c560f60427 100644
--- a/Editor/Mono/BuildPlayerWindow.cs
+++ b/Editor/Mono/BuildPlayerWindow.cs
@@ -28,7 +28,8 @@ public partial class BuildPlayerWindow : EditorWindow
         class Styles
         {
             public GUIContent invalidColorSpaceMessage = EditorGUIUtility.TrTextContent("In order to build a player, go to 'Player Settings...' to resolve the incompatibility between the Color Space and the current settings.", EditorGUIUtility.GetHelpIcon(MessageType.Warning));
-            public GUIContent invalidLightmapEncodingMessage = EditorGUIUtility.TrTextContent("In order to build a player, go to 'Player Settings...' to resolve the incompatibility between the selected Lightmap Encoding and the current settings.", EditorGUIUtility.GetHelpIcon(MessageType.Warning));
+            public GUIContent invalidLightmapEncodingMessage = EditorGUIUtility.TrTextContent("In order to build a player, go to 'Player Settings...' to resolve the incompatibility between the Lightmap Encoding value you have selected and the current settings.", EditorGUIUtility.GetHelpIcon(MessageType.Warning));
+            public GUIContent invalidHDRCubemapEncodingMessage = EditorGUIUtility.TrTextContent("In order to build a player, go to 'Player Settings...' to resolve the incompatibility between the HDR Cubemap Encoding value you have selected and the current settings.", EditorGUIUtility.GetHelpIcon(MessageType.Warning));
             public GUIContent invalidVirtualTexturingSettingMessage = EditorGUIUtility.TrTextContent("Cannot build player because Virtual Texturing is enabled, but the target platform or graphics API does not support Virtual Texturing. Go to Player Settings to resolve the incompatibility.", EditorGUIUtility.GetHelpIcon(MessageType.Warning));
             public GUIContent compilingMessage = EditorGUIUtility.TrTextContent("Cannot build player while editor is importing assets or compiling scripts.", EditorGUIUtility.GetHelpIcon(MessageType.Warning));
             public GUIStyle title = EditorStyles.boldLabel;
@@ -71,6 +72,7 @@ public GUIContent GetDownloadErrorForTarget(BuildTarget target)
             public GUIContent buildWithDeepProfilerDisabled = EditorGUIUtility.TrTextContent("Deep Profiling", "Profiling is only enabled in a Development Player.");
             public GUIContent allowDebugging = EditorGUIUtility.TrTextContent("Script Debugging", "Enable this setting to allow your script code to be debugged.");
             public GUIContent waitForManagedDebugger = EditorGUIUtility.TrTextContent("Wait For Managed Debugger", "Show a dialog where you can attach a managed debugger before any script execution. Can also use volume Up or Down button to confirm on Android.");
+            public GUIContent managedDebuggerFixedPort = EditorGUIUtility.TrTextContent("Managed Debugger Fixed Port", "Use the specified port to attach to the managed debugger. If 0, the port will be automatically selected.");
             public GUIContent explicitNullChecks = EditorGUIUtility.TrTextContent("Explicit Null Checks");
             public GUIContent explicitDivideByZeroChecks = EditorGUIUtility.TrTextContent("Divide By Zero Checks");
             public GUIContent explicitArrayBoundsChecks = EditorGUIUtility.TrTextContent("Array Bounds Checks");
@@ -587,34 +589,42 @@ static bool IsColorSpaceValid(BuildPlatform platform)
             }
         }
 
+        static bool IsHDRCubemapEncodingValid(BuildPlatform platform)
+        {
+            var encoding = PlayerSettings.GetHDRCubemapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
+            return IsGITextureEncodingValid(platform, encoding == HDRCubemapEncodingQuality.Low);
+        }
+
         static bool IsLightmapEncodingValid(BuildPlatform platform)
         {
-            if (PlayerSettings.GetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup()) != LightmapEncodingQuality.Low)
-            {
-                var hasMinGraphicsAPI = true;
+            var encoding = PlayerSettings.GetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
+            return IsGITextureEncodingValid(platform, encoding == LightmapEncodingQuality.Low);
+        }
 
-                if (platform.namedBuildTarget == NamedBuildTarget.iOS)
-                {
-                    var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.iOS);
-                    hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.Metal) && !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
-                }
-                else if (platform.namedBuildTarget == NamedBuildTarget.tvOS)
-                {
-                    var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.tvOS);
-                    hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.Metal) && !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
-                }
-                else if (platform.namedBuildTarget == NamedBuildTarget.Android)
-                {
-                    var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.Android);
-                    hasMinGraphicsAPI = (apis.Contains(GraphicsDeviceType.Vulkan) || apis.Contains(GraphicsDeviceType.OpenGLES3)) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
-                }
+        static bool IsGITextureEncodingValid(BuildPlatform platform, bool isLowQuality)
+        {
+            if (isLowQuality)
+                return true;
 
-                return hasMinGraphicsAPI;
+            var hasMinGraphicsAPI = true;
+
+            if (platform.namedBuildTarget == NamedBuildTarget.iOS)
+            {
+                var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.iOS);
+                hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.Metal) && !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
             }
-            else
+            else if (platform.namedBuildTarget == NamedBuildTarget.tvOS)
             {
-                return true;
+                var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.tvOS);
+                hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.Metal) && !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
+            }
+            else if (platform.namedBuildTarget == NamedBuildTarget.Android)
+            {
+                var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.Android);
+                hasMinGraphicsAPI = (apis.Contains(GraphicsDeviceType.Vulkan) || apis.Contains(GraphicsDeviceType.OpenGLES3)) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
             }
+
+            return hasMinGraphicsAPI;
         }
 
         static bool IsVirtualTexturingSettingsValid(BuildPlatform platform)
@@ -929,11 +939,17 @@ void ShowBuildTargetSettings()
                         {
                             EditorUserBuildSettings.waitForManagedDebugger = EditorGUILayout.Toggle(styles.waitForManagedDebugger, EditorUserBuildSettings.waitForManagedDebugger);
                         }
+
+                        bool shouldDrawManagedDebuggerFixedPort = buildWindowExtension != null ? buildWindowExtension.ShouldDrawManagedDebuggerFixedPort() : false;
+                        if (EditorUserBuildSettings.allowDebugging && shouldDrawManagedDebuggerFixedPort)
+                        {
+                            EditorUserBuildSettings.managedDebuggerFixedPort = EditorGUILayout.IntField(styles.managedDebuggerFixedPort, EditorUserBuildSettings.managedDebuggerFixedPort);
+                        }
                     }
 
                     if (EditorUserBuildSettings.allowDebugging && PlayerSettings.GetScriptingBackend(namedBuildTarget) == ScriptingImplementation.IL2CPP)
                     {
-                        var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget.ToBuildTargetGroup());
+                        var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget);
                         bool isDebuggerUsable = apiCompatibilityLevel == ApiCompatibilityLevel.NET_4_6 || apiCompatibilityLevel == ApiCompatibilityLevel.NET_Standard_2_0 ||
                             apiCompatibilityLevel == ApiCompatibilityLevel.NET_Unity_4_8 || apiCompatibilityLevel == ApiCompatibilityLevel.NET_Standard;
 
@@ -1068,23 +1084,32 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
                 buildWindowExtension.ShowPlatformBuildWarnings();
 
             // Disable the 'Build' and 'Build And Run' buttons when the project setup doesn't satisfy the platform requirements
-            if (!IsColorSpaceValid(platform) && enableBuildButton && enableBuildAndRunButton)
-            {
-                enableBuildAndRunButton = false;
-                enableBuildButton = false;
-                EditorGUILayout.HelpBox(styles.invalidColorSpaceMessage);
-            }
-            else if (!IsLightmapEncodingValid(platform) && enableBuildButton && enableBuildAndRunButton)
+            if (enableBuildButton && enableBuildAndRunButton)
             {
-                enableBuildAndRunButton = false;
-                enableBuildButton = false;
-                EditorGUILayout.HelpBox(styles.invalidLightmapEncodingMessage);
-            }
-            else if (!IsVirtualTexturingSettingsValid(platform) && enableBuildButton && enableBuildAndRunButton)
-            {
-                enableBuildAndRunButton = false;
-                enableBuildButton = false;
-                EditorGUILayout.HelpBox(styles.invalidVirtualTexturingSettingMessage);
+                if (!IsColorSpaceValid(platform))
+                {
+                    enableBuildAndRunButton = false;
+                    enableBuildButton = false;
+                    EditorGUILayout.HelpBox(styles.invalidColorSpaceMessage);
+                }
+                else if (!IsLightmapEncodingValid(platform))
+                {
+                    enableBuildAndRunButton = false;
+                    enableBuildButton = false;
+                    EditorGUILayout.HelpBox(styles.invalidLightmapEncodingMessage);
+                }
+                else if (!IsHDRCubemapEncodingValid(platform))
+                {
+                    enableBuildAndRunButton = false;
+                    enableBuildButton = false;
+                    EditorGUILayout.HelpBox(styles.invalidHDRCubemapEncodingMessage);
+                }
+                else if (!IsVirtualTexturingSettingsValid(platform))
+                {
+                    enableBuildAndRunButton = false;
+                    enableBuildButton = false;
+                    EditorGUILayout.HelpBox(styles.invalidVirtualTexturingSettingMessage);
+                }
             }
 
             if (EditorApplication.isCompiling || EditorApplication.isUpdating)
@@ -1154,6 +1179,12 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
                                 CallBuildMethods(askForBuildLocation,
                                     BuildOptions.ShowBuiltPlayer | BuildOptions.CleanBuildCache);
                             });
+                        menu.AddItem(new GUIContent("Force skip data build"), false,
+                            () =>
+                            {
+                                CallBuildMethods(askForBuildLocation,
+                                    BuildOptions.ShowBuiltPlayer | BuildOptions.BuildScriptsOnly);
+                            });
                         menu.DropDown(buildRect);
                     }
                     else if (GUI.Button(buildRect, buildButton, EditorStyles.dropDownToggleButton))
diff --git a/Editor/Mono/BuildPlayerWindowBuildMethods.cs b/Editor/Mono/BuildPlayerWindowBuildMethods.cs
index 594dbd4dfe..eb36afe539 100644
--- a/Editor/Mono/BuildPlayerWindowBuildMethods.cs
+++ b/Editor/Mono/BuildPlayerWindowBuildMethods.cs
@@ -170,7 +170,7 @@ public static void BuildPlayer(BuildPlayerOptions options)
                 bool locationPathExistedBeforeBuild = System.IO.Directory.Exists(options.locationPathName);
                 // Trigger build.
                 // Note: report will be null, if delayToAfterScriptReload = true
-                var report = BuildPipeline.BuildPlayerInternalNoCheck(options.scenes, options.locationPathName, PostprocessBuildPlayer.GetStreamingAssetsBundleManifestPath(), options.targetGroup, options.target, options.subtarget, options.options, options.extraScriptingDefines, delayToAfterScriptReload);
+                var report = BuildPipeline.BuildPlayerInternalNoCheck(options.scenes, options.locationPathName, options.assetBundleManifestPath, options.targetGroup, options.target, options.subtarget, options.options, options.extraScriptingDefines, delayToAfterScriptReload);
 
                 if (report != null
                 )
@@ -308,7 +308,7 @@ internal static BuildPlayerOptions GetBuildPlayerOptionsInternal(bool askForBuil
                 options.subtarget = subtarget;
                 options.targetGroup = buildTargetGroup;
                 options.locationPathName = EditorUserBuildSettings.GetBuildLocation(buildTarget);
-                options.assetBundleManifestPath = null;
+                options.assetBundleManifestPath = PostprocessBuildPlayer.GetStreamingAssetsBundleManifestPath();
 
                 // Build a list of scenes that are enabled
                 ArrayList scenesList = new ArrayList();
diff --git a/Editor/Mono/BuildTargetConverter.cs b/Editor/Mono/BuildTargetConverter.cs
index 0c9674a106..1bc2a4e4eb 100644
--- a/Editor/Mono/BuildTargetConverter.cs
+++ b/Editor/Mono/BuildTargetConverter.cs
@@ -22,6 +22,8 @@ internal static class BuildTargetConverter
                     return RuntimePlatform.PS5;
                 case BuildTarget.StandaloneLinux64:
                     return RuntimePlatform.LinuxPlayer;
+                case BuildTarget.CloudRendering:
+                    return RuntimePlatform.LinuxPlayer;
                 case BuildTarget.StandaloneOSX:
                     return RuntimePlatform.OSXPlayer;
                 case BuildTarget.StandaloneWindows:
diff --git a/Editor/Mono/Clipboard/ClipboardContextMenu.cs b/Editor/Mono/Clipboard/ClipboardContextMenu.cs
index 9d2a16e164..c61316f7ed 100644
--- a/Editor/Mono/Clipboard/ClipboardContextMenu.cs
+++ b/Editor/Mono/Clipboard/ClipboardContextMenu.cs
@@ -145,10 +145,21 @@ internal static void SetupPropertyCopyPaste(SerializedProperty property, Generic
                         p => p.hash128Value = Clipboard.hash128Value);
                     break;
                 case SerializedPropertyType.Generic:
-                    SetupAction(property, menu, evt,
-                        Clipboard.SetSerializedProperty,
-                        p => Clipboard.HasSerializedProperty(),
-                        Clipboard.GetSerializedProperty);
+                    if (property.type == "MinMaxGradient")
+                    {
+                        SetupMinMaxGradient(property, menu, evt);
+                    }
+                    else if (property.type == "MinMaxCurve")
+                    {
+                        SetupMinMaxCurve(property, menu, evt);
+                    }
+                    else
+                    {
+                        SetupAction(property, menu, evt,
+                            Clipboard.SetSerializedProperty,
+                            p => Clipboard.HasSerializedProperty(),
+                            Clipboard.GetSerializedProperty);
+                    }
                     break;
                 case SerializedPropertyType.Integer:
                     SetupAction(property, menu, evt,
@@ -183,6 +194,14 @@ internal static void SetupPropertyCopyPaste(SerializedProperty property, Generic
         static readonly GUIContent kCopyQuatContent = EditorGUIUtility.TrTextContent("Copy Quaternion");
         static readonly GUIContent kCopyPathContent = EditorGUIUtility.TrTextContent("Copy Path");
         static readonly GUIContent kCopyGuidContent = EditorGUIUtility.TrTextContent("Copy GUID");
+        static readonly GUIContent kPasteMinColorContent = EditorGUIUtility.TrTextContent("Paste Min Color");
+        static readonly GUIContent kPasteMaxColorContent = EditorGUIUtility.TrTextContent("Paste Max Color");
+        static readonly GUIContent kPasteMinGradientContent = EditorGUIUtility.TrTextContent("Paste Min Gradient");
+        static readonly GUIContent kPasteMaxGradientContent = EditorGUIUtility.TrTextContent("Paste Max Gradient");
+        static readonly GUIContent kPasteMinScalarContent = EditorGUIUtility.TrTextContent("Paste Min Scalar");
+        static readonly GUIContent kPasteMaxScalarContent = EditorGUIUtility.TrTextContent("Paste Max Scalar");
+        static readonly GUIContent kPasteMinCurveContent = EditorGUIUtility.TrTextContent("Paste Min Curve");
+        static readonly GUIContent kPasteMaxCurveContent = EditorGUIUtility.TrTextContent("Paste Max Curve");
 
         static void AddSeparator(GenericMenu menu)
         {
@@ -220,6 +239,8 @@ static void SetupAction(SerializedProperty property, GenericMenu menu, Event evt
                             var prop = (SerializedProperty)o;
                             pasteFunc(prop);
                             prop.serializedObject.ApplyModifiedProperties();
+                            // Constrain proportions scale widget might need extra recalculation, notify if a paste
+                            ConstrainProportionsTransformScale.NotifyPropertyPasted(prop.propertyPath);
                         }, property);
                 }
                 else
@@ -308,6 +329,237 @@ static void SetupQuaternion(SerializedProperty property, GenericMenu menu, Event
             }
         }
 
+        static void SetupMinMaxGradient(SerializedProperty property, GenericMenu menu, Event evt)
+        {
+            var canCopy = !property.hasMultipleDifferentValues;
+            var canPasteWhole = GUI.enabled && Clipboard.HasSerializedProperty();
+
+            if (menu != null)
+            {
+                AddSeparator(menu);
+
+                var copyContent = overrideCopyContent ?? kCopyContent;
+                if (canCopy)
+                    menu.AddItem(copyContent, false, o => Clipboard.SetSerializedProperty((SerializedProperty)o), property);
+                else
+                    menu.AddDisabledItem(copyContent);
+
+                var pasteContent = overridePasteContent ?? kPasteContent;
+
+                if (canPasteWhole)
+                {
+                    menu.AddItem(pasteContent, false,
+                        delegate (object o)
+                        {
+                            var prop = (SerializedProperty)o;
+                            Clipboard.GetSerializedProperty(prop);
+                            prop.serializedObject.ApplyModifiedProperties();
+                        }, property);
+                }
+                else if (GUI.enabled && Clipboard.hasColor)
+                {
+                    MinMaxGradientState state = (MinMaxGradientState)property.FindPropertyRelative("minMaxState").intValue;
+                    if (state == MinMaxGradientState.k_Color)
+                    {
+                        AddPasteColorItem(property.FindPropertyRelative("maxColor"), menu, pasteContent);
+                    }
+                    else if (state == MinMaxGradientState.k_RandomBetweenTwoColors)
+                    {
+                        // Allow the user to choose whether to paste the color on their clipboard to either the max or min
+                        AddPasteColorItem(property.FindPropertyRelative("maxColor"), menu, kPasteMaxColorContent);
+                        AddPasteColorItem(property.FindPropertyRelative("minColor"), menu, kPasteMinColorContent);
+                    }
+                    else
+                    {
+                        menu.AddDisabledItem(pasteContent);
+                    }
+                }
+                else if (GUI.enabled && Clipboard.hasGradient)
+                {
+                    MinMaxGradientState state = (MinMaxGradientState)property.FindPropertyRelative("minMaxState").intValue;
+                    if (state == MinMaxGradientState.k_Gradient || state == MinMaxGradientState.k_RandomColor)
+                    {
+                        AddPasteGradientItem(property.FindPropertyRelative("maxGradient"), menu, pasteContent);
+                    }
+                    else if (state == MinMaxGradientState.k_RandomBetweenTwoGradients)
+                    {
+                        // Allow the user to choose whether to paste the gradient on their clipboard to either the max or min
+                        AddPasteGradientItem(property.FindPropertyRelative("maxGradient"), menu, kPasteMaxGradientContent);
+                        AddPasteGradientItem(property.FindPropertyRelative("minGradient"), menu, kPasteMinGradientContent);
+                    }
+                    else
+                    {
+                        menu.AddDisabledItem(pasteContent);
+                    }
+                }
+                else
+                {
+                    menu.AddDisabledItem(pasteContent);
+                }
+            }
+            if (evt != null)
+            {
+                if (canCopy && evt.commandName == EventCommandNames.Copy)
+                {
+                    if (evt.type == EventType.ValidateCommand)
+                        evt.Use();
+                    if (evt.type == EventType.ExecuteCommand)
+                    {
+                        Clipboard.SetSerializedProperty(property);
+                        evt.Use();
+                    }
+                }
+                if (canPasteWhole && evt.commandName == EventCommandNames.Paste)
+                {
+                    if (evt.type == EventType.ValidateCommand)
+                        evt.Use();
+                    if (evt.type == EventType.ExecuteCommand)
+                    {
+                        Clipboard.GetSerializedProperty(property);
+                        property.serializedObject.ApplyModifiedProperties();
+                        evt.Use();
+                    }
+                }
+            }
+        }
+        static void SetupMinMaxCurve(SerializedProperty property, GenericMenu menu, Event evt)
+        {
+            var canCopy = !property.hasMultipleDifferentValues;
+            var canPasteWhole = GUI.enabled && Clipboard.HasSerializedProperty();
+
+            if (menu != null)
+            {
+                AddSeparator(menu);
+
+                var copyContent = overrideCopyContent ?? kCopyContent;
+                if (canCopy)
+                    menu.AddItem(copyContent, false, o => Clipboard.SetSerializedProperty((SerializedProperty)o), property);
+                else
+                    menu.AddDisabledItem(copyContent);
+
+                var pasteContent = overridePasteContent ?? kPasteContent;
+
+                if (canPasteWhole)
+                {
+                    menu.AddItem(pasteContent, false,
+                        delegate (object o)
+                        {
+                            var prop = (SerializedProperty)o;
+                            Clipboard.GetSerializedProperty(prop);
+                            prop.serializedObject.ApplyModifiedProperties();
+                        }, property);
+                }
+                else if (GUI.enabled && Clipboard.hasFloat)
+                {
+                    MinMaxCurveState state = (MinMaxCurveState)property.FindPropertyRelative("minMaxState").intValue;
+                    if (state == MinMaxCurveState.k_Scalar)
+                    {
+                        AddPasteFloatItem(property.FindPropertyRelative("scalar"), menu, pasteContent);
+                    }
+                    else if (state == MinMaxCurveState.k_TwoScalars)
+                    {
+                        // Allow the user to choose whether to paste the float on their clipboard to either the min or max
+                        AddPasteFloatItem(property.FindPropertyRelative("minScalar"), menu, kPasteMinScalarContent);
+                        AddPasteFloatItem(property.FindPropertyRelative("scalar"), menu, kPasteMaxScalarContent);
+                    }
+                    else
+                    {
+                        menu.AddDisabledItem(pasteContent);
+                    }
+                }
+                else if (GUI.enabled && Clipboard.hasAnimationCurve)
+                {
+                    MinMaxCurveState state = (MinMaxCurveState)property.FindPropertyRelative("minMaxState").intValue;
+                    if (state == MinMaxCurveState.k_Curve)
+                    {
+                        AddPasteCurveItem(property.FindPropertyRelative("maxCurve"), menu, pasteContent);
+                    }
+                    else if (state == MinMaxCurveState.k_TwoCurves)
+                    {
+                        // Allow the user to choose whether to paste the color on their clipboard to either the max or min
+                        AddPasteCurveItem(property.FindPropertyRelative("maxCurve"), menu, kPasteMaxCurveContent);
+                        AddPasteCurveItem(property.FindPropertyRelative("minCurve"), menu, kPasteMinCurveContent);
+                    }
+                    else
+                    {
+                        menu.AddDisabledItem(pasteContent);
+                    }
+                }
+                else
+                {
+                    menu.AddDisabledItem(pasteContent);
+                }
+            }
+            if (evt != null)
+            {
+                if (canCopy && evt.commandName == EventCommandNames.Copy)
+                {
+                    if (evt.type == EventType.ValidateCommand)
+                        evt.Use();
+                    if (evt.type == EventType.ExecuteCommand)
+                    {
+                        Clipboard.SetSerializedProperty(property);
+                        evt.Use();
+                    }
+                }
+                if (canPasteWhole && evt.commandName == EventCommandNames.Paste)
+                {
+                    if (evt.type == EventType.ValidateCommand)
+                        evt.Use();
+                    if (evt.type == EventType.ExecuteCommand)
+                    {
+                        Clipboard.GetSerializedProperty(property);
+                        property.serializedObject.ApplyModifiedProperties();
+                        evt.Use();
+                    }
+                }
+            }
+        }
+
+        static void AddPasteColorItem(SerializedProperty property, GenericMenu menu, GUIContent menuItemContent)
+        {
+            menu.AddItem(menuItemContent, false,
+            delegate (object o)
+            {
+                var prop = (SerializedProperty)o;
+                prop.colorValue = Clipboard.colorValue;
+                prop.serializedObject.ApplyModifiedProperties();
+            }, property);
+        }
+
+        static void AddPasteGradientItem(SerializedProperty property, GenericMenu menu, GUIContent menuItemContent)
+        {
+            menu.AddItem(menuItemContent, false,
+            delegate (object o)
+            {
+                var prop = (SerializedProperty)o;
+                prop.gradientValue = Clipboard.gradientValue;
+                prop.serializedObject.ApplyModifiedProperties();
+                UnityEditorInternal.GradientPreviewCache.ClearCache();
+            }, property);
+        }
+        static void AddPasteFloatItem(SerializedProperty property, GenericMenu menu, GUIContent menuItemContent)
+        {
+            menu.AddItem(menuItemContent, false,
+            delegate (object o)
+            {
+                var prop = (SerializedProperty)o;
+                prop.floatValue = Clipboard.floatValue;
+                prop.serializedObject.ApplyModifiedProperties();
+            }, property);
+        }
+        static void AddPasteCurveItem(SerializedProperty property, GenericMenu menu, GUIContent menuItemContent)
+        {
+            menu.AddItem(menuItemContent, false,
+            delegate (object o)
+            {
+                var prop = (SerializedProperty)o;
+                prop.animationCurveValue = Clipboard.animationCurveValue;
+                prop.serializedObject.ApplyModifiedProperties();
+                UnityEditorInternal.AnimationCurvePreviewCache.ClearCache();
+            }, property);
+        }
+
         static void PasteObjectReference(SerializedProperty p)
         {
             if (Clipboard.hasObject)
@@ -464,7 +716,7 @@ static void PasteTransformScaleMenu(MenuCommand command)
             tr.localScale = Clipboard.vector3Value;
         }
 
-        [MenuItem("CONTEXT/Transform/Copy/Position (World)", false, 100101)] // ReSharper disable once UnusedMember.Local
+        [MenuItem("CONTEXT/Transform/Copy/World Transform", false, 100150)] // ReSharper disable once UnusedMember.Local
         static void CopyTransformWorldPlacementMenu(MenuCommand command)
         {
             var tr = command.context as Transform;
@@ -473,14 +725,14 @@ static void CopyTransformWorldPlacementMenu(MenuCommand command)
             Clipboard.SetCustomValue(new TransformWorldPlacement(tr));
         }
 
-        [MenuItem("CONTEXT/Transform/Paste/Position (World)", true)] // ReSharper disable once UnusedMember.Local
+        [MenuItem("CONTEXT/Transform/Paste/World Transform", true)] // ReSharper disable once UnusedMember.Local
         static bool PasteTransformWorldPlacementMenuValidate(MenuCommand command)
         {
             var tr = command.context as Transform;
             return tr != null && IsUserModifiable(tr) && Clipboard.HasCustomValue<TransformWorldPlacement>();
         }
 
-        [MenuItem("CONTEXT/Transform/Paste/Position (World)", false, 100101)] // ReSharper disable once UnusedMember.Local
+        [MenuItem("CONTEXT/Transform/Paste/World Transform", false, 100150)] // ReSharper disable once UnusedMember.Local
         static void PasteTransformWorldPlacementMenu(MenuCommand command)
         {
             var tr = command.context as Transform;
diff --git a/Editor/Mono/CutCopyPasteUtility.cs b/Editor/Mono/ClipboardUtility.cs
similarity index 56%
rename from Editor/Mono/CutCopyPasteUtility.cs
rename to Editor/Mono/ClipboardUtility.cs
index b26df32afe..5ee7bb7159 100644
--- a/Editor/Mono/CutCopyPasteUtility.cs
+++ b/Editor/Mono/ClipboardUtility.cs
@@ -2,15 +2,87 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace UnityEditor
 {
-    internal static class CutCopyPasteUtility
+    public static class ClipboardUtility
     {
+        public static Func<GameObject, bool> canCopyGameObject;
+        public static Func<GameObject, bool> canCutGameObject;
+        public static Func<GameObject, bool> canDuplicateGameObject;
+        public static event Action<GameObject[]> copyingGameObjects;
+        public static event Action<GameObject[]> cuttingGameObjects;
+        public static event Action<GameObject[]> duplicatingGameObjects;
+        public static event Action<GameObject[]> duplicatedGameObjects;
+        public static event Action<GameObject[]> rejectedGameObjects;
+        public static event Action<GameObject[]> pastedGameObjects;
+
+        private static void FilterSelection(Func<GameObject, bool> filter)
+        {
+            if (filter == null)
+                return;
+
+            // If we dont have any filters we really should just leave right now
+            Delegate[] invocationList = filter.GetInvocationList();
+            int invocationListLength = invocationList.Length;
+
+            if (invocationListLength == 0)
+                return;
+
+            // Make our tracking objects
+            int selectedGameObjectsLength = Selection.gameObjects.Length;
+            Queue<UnityEngine.Object> pass = new Queue<UnityEngine.Object>(selectedGameObjectsLength);
+            Queue<GameObject> fail = new Queue<GameObject>(selectedGameObjectsLength);
+
+            // Iterate through our selected game objects, checking each
+            for (int i = 0; i < selectedGameObjectsLength; i++)
+            {
+                GameObject currentGameObject = Selection.gameObjects[i];
+
+                bool shouldInclude = true;
+                for (int j = 0; j < invocationListLength; j++)
+                {
+                    Func<GameObject, bool> func = (Func<GameObject, bool>)invocationList[j];
+
+                    // Passed, next check
+                    if (func.Invoke(currentGameObject))
+                        continue;
+
+                    // Failed, add to failures
+                    if (fail.Contains(currentGameObject))
+                        continue;
+
+                    fail.Enqueue(currentGameObject);
+                    shouldInclude = false;
+                    break;
+                }
+
+                // Passed everything add to passed gameobjects
+                if (shouldInclude && !pass.Contains(currentGameObject))
+                {
+                    pass.Enqueue(currentGameObject);
+                }
+            }
+
+            // Update the selection with the filtered GameObjects
+            Selection.objects = pass.ToArray();
+
+            // Notify after filter, for that off chance someone wants to subscribe for logging OR be able to reintroduce
+            // into the selection an object at their control.
+            if (rejectedGameObjects != null && fail.Count > 0)
+            {
+                rejectedGameObjects.Invoke(fail.ToArray());
+            }
+        }
+
         internal static void CutGO()
         {
+            FilterSelection(canCutGameObject);
+            cuttingGameObjects?.Invoke(Selection.gameObjects);
             CutBoard.CutGO();
             RepaintHierarchyWindowsAfterPaste();
         }
@@ -18,6 +90,8 @@ internal static void CutGO()
         internal static void CopyGO()
         {
             CutBoard.Reset();
+            FilterSelection(canCopyGameObject);
+            copyingGameObjects?.Invoke(Selection.gameObjects);
             Unsupported.CopyGameObjectsToPasteboard();
         }
 
@@ -35,6 +109,7 @@ internal static void PasteGO(Transform fallbackParent)
                 if (customParentIsSelected)
                     Selection.activeTransform.SetParent(fallbackParent, true);
             }
+            pastedGameObjects?.Invoke(Selection.gameObjects);
         }
 
         internal static void PasteGOAsChild()
@@ -62,17 +137,22 @@ internal static void PasteGOAsChild()
                     if (pasteToSubScene)
                     {
                         if (subScene.handle != 0)
+                        {
                             CutBoard.PasteToScene(subScene, selected[0]);
+                            pastedGameObjects?.Invoke(Selection.gameObjects);
+                        }
                     }
                     else if (!isSubScene)
                     {
                         CutBoard.PasteAsChildren(selected[0]);
+                        pastedGameObjects?.Invoke(Selection.gameObjects);
                     }
                 }
                 // paste after copy
                 else if (pasteToSubScene || !isSubScene)
                 {
                     Unsupported.PasteGameObjectsFromPasteboard(selected[0], pasteToSubScene ? subScene.handle : 0);
+                    pastedGameObjects?.Invoke(Selection.gameObjects);
                 }
             }
             RepaintHierarchyWindowsAfterPaste();
@@ -81,10 +161,13 @@ internal static void PasteGOAsChild()
         internal static void DuplicateGO(Transform fallbackParent)
         {
             CutBoard.Reset();
+            FilterSelection(canDuplicateGameObject);
             bool customParentIsSelected = GetIsCustomParentSelected(fallbackParent);
+            duplicatingGameObjects?.Invoke(Selection.gameObjects);
             Unsupported.DuplicateGameObjectsUsingPasteboard();
             if (customParentIsSelected)
                 Selection.activeTransform.SetParent(fallbackParent, true);
+            duplicatedGameObjects?.Invoke(Selection.gameObjects);
         }
 
         internal static bool CanPasteAsChild()
diff --git a/Editor/Mono/CodeEditor/CodeEditor.cs b/Editor/Mono/CodeEditor/CodeEditor.cs
index d8fb9ffc77..ba3c86d927 100644
--- a/Editor/Mono/CodeEditor/CodeEditor.cs
+++ b/Editor/Mono/CodeEditor/CodeEditor.cs
@@ -31,7 +31,29 @@ public struct Installation
         private Installation m_CurrentInstallation;
         internal const string SystemDefaultPath = "";
 
-        public IExternalCodeEditor CurrentCodeEditor => m_CurrentEditor;
+        public IExternalCodeEditor CurrentCodeEditor {
+            get
+            {
+                if(m_CurrentEditor == m_DefaultEditor && !IsCurrentEditorPathExplicitlySet)
+                {
+                    // try to resolve first found visual studio installation and enable it
+                    try
+                    {
+                        var vs = m_ExternalCodeEditors.FirstOrDefault(e => e.GetType().Name == "VisualStudioEditor");
+                        var installs = vs?.Installations;
+                        if (installs != null && installs.Length > 0)
+                        {
+                            SetCodeEditor(installs[0].Path);
+                        }
+                    }
+                    catch(Exception ex)
+                    {
+                        Debug.LogWarning($"Can't locate Visual Studio installation: {ex.Message}");
+                    }
+                }
+                return m_CurrentEditor;
+            }
+        }
         public Installation CurrentInstallation => m_CurrentInstallation;
 
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
@@ -39,6 +61,7 @@ public struct Installation
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
         public static string CurrentEditorInstallation => CurrentEditorPath;
         public static string CurrentEditorPath => EditorPrefs.GetString("kScriptsDefaultApp", "");
+        private static bool IsCurrentEditorPathExplicitlySet => EditorPrefs.HasKey("kScriptsDefaultApp");
 
         public static CodeEditor Editor { get; } = new CodeEditor();
 
@@ -191,7 +214,10 @@ public static void Register(IExternalCodeEditor externalCodeEditor)
             if (Editor.m_ExternalCodeEditors.Select(editor => editor.GetType()).Any(editorType => editorType == externalCodeEditor.GetType()))
                 return;
             Editor.m_ExternalCodeEditors.Add(externalCodeEditor);
-            CodeEditor.Editor.SetCodeEditor(Editor.m_CurrentInstallation.Path);
+            if (IsCurrentEditorPathExplicitlySet)
+            {
+                CodeEditor.Editor.SetCodeEditor(Editor.m_CurrentInstallation.Path);
+            }
         }
 
         public static void Unregister(IExternalCodeEditor externalCodeEditor)
diff --git a/Editor/Mono/CodeEditor/DefaultExternalCodeEditor.cs b/Editor/Mono/CodeEditor/DefaultExternalCodeEditor.cs
index f8fa2cf6ca..9dcb83225e 100644
--- a/Editor/Mono/CodeEditor/DefaultExternalCodeEditor.cs
+++ b/Editor/Mono/CodeEditor/DefaultExternalCodeEditor.cs
@@ -135,6 +135,12 @@ public bool OpenProject(string path, int line, int column)
             }
 
             string applicationPath = CodeEditor.CurrentEditorPath.Trim();
+
+            if (!string.IsNullOrEmpty(applicationPath) && !File.Exists(applicationPath))
+            {
+                UnityEngine.Debug.LogWarning($"External Code Editor application path does not exist ({applicationPath})! Please select a different application");
+            }
+
             if (applicationPath == CodeEditor.SystemDefaultPath)
             {
                 return InternalEditorUtility.OpenFileAtLineExternal(path, -1, -1);
diff --git a/Editor/Mono/CompilationPipeline.bindings.cs b/Editor/Mono/CompilationPipeline.bindings.cs
index 4eeefa9cc9..134b372e48 100644
--- a/Editor/Mono/CompilationPipeline.bindings.cs
+++ b/Editor/Mono/CompilationPipeline.bindings.cs
@@ -11,10 +11,8 @@ namespace UnityEditor.Compilation
     enum CompilationSetupErrors     // Keep in sync with enum CompilationSetupErrors::Flags in ScriptCompilationPipeline.h
     {
         None                        = 0,
-        CyclicReferences            = 1 << 0, // set when CyclicAssemblyReferenceException is thrown
-        LoadError                   = 1 << 1, // set when AssemblyDefinitionException is thrown
-        PrecompiledAssemblyError    = 1 << 2, // set when PrecompiledAssemblyException is thrown
-        All                         = CyclicReferences | LoadError | PrecompiledAssemblyError,
+        LoadError                   = 1 << 0, // set when AssemblyDefinitionException is thrown
+        All                         = LoadError,
     };
 
     [NativeHeader("Editor/Src/ScriptCompilation/ScriptCompilationPipeline.h")]
diff --git a/Editor/Mono/ComponentUtility.bindings.cs b/Editor/Mono/ComponentUtility.bindings.cs
index 3306d3a144..f5edb0ef2a 100644
--- a/Editor/Mono/ComponentUtility.bindings.cs
+++ b/Editor/Mono/ComponentUtility.bindings.cs
@@ -17,19 +17,19 @@ public sealed partial class ComponentUtility
     {
         public static bool MoveComponentUp(Component component)
         {
-            return MoveComponentUp(new[] { component }, false);
+            return MoveComponentUp_Internal(new[] { component }, false, false);
         }
 
         [FreeFunction]
-        static extern bool MoveComponentUp(UnityObject[] context, bool validateOnly);
+        static extern bool MoveComponentUp_Internal(UnityObject[] context, bool validateOnly, bool showDialog);
 
         public static bool MoveComponentDown(Component component)
         {
-            return MoveComponentDown(new UnityObject[] { component }, false);
+            return MoveComponentDown_Internal(new UnityObject[] { component }, false, false);
         }
 
         [FreeFunction]
-        static extern bool MoveComponentDown(UnityObject[] context, bool validateOnly);
+        static extern bool MoveComponentDown_Internal(UnityObject[] context, bool validateOnly, bool showDialog);
 
         public static bool CopyComponent(Component component)
         {
diff --git a/Editor/Mono/ContainerWindow.cs b/Editor/Mono/ContainerWindow.cs
index a153eaca59..1570d7b02a 100644
--- a/Editor/Mono/ContainerWindow.cs
+++ b/Editor/Mono/ContainerWindow.cs
@@ -195,8 +195,7 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
                     s_MainWindow = this;
 
                 // Fit window to screen - needs to be done after bringing the window live
-                position = FitWindowRectToScreen(m_PixelRect, true, useMousePos);
-                rootView.position = new Rect(0, 0, GUIUtility.RoundToPixelGrid(m_PixelRect.width), GUIUtility.RoundToPixelGrid(m_PixelRect.height));
+                FitWindowToScreen(useMousePos);
 
                 rootView.Reflow();
 
@@ -213,6 +212,13 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
             }
         }
 
+        internal void FitWindowToScreen(bool useMousePos)
+        {
+            position = FitWindowRectToScreen(m_PixelRect, true, useMousePos);
+            if (rootView)
+                rootView.position = new Rect(0, 0, GUIUtility.RoundToPixelGrid(m_PixelRect.width), GUIUtility.RoundToPixelGrid(m_PixelRect.height));
+        }
+
         public void OnEnable()
         {
             if (m_RootView)
@@ -284,7 +290,7 @@ internal bool InternalRequestCloseAllExcept(EditorWindow editorWindow)
             return true;
         }
 
-        private static bool PrivateRequestClose(List<EditorWindow> allUnsaved)
+        internal static bool PrivateRequestClose(List<EditorWindow> allUnsaved)
         {
             Debug.Assert(allUnsaved.Count > 0);
 
diff --git a/Editor/Mono/Display/EditorFullscreenController.cs b/Editor/Mono/Display/EditorFullscreenController.cs
index 30498d4654..6c87f12a5c 100644
--- a/Editor/Mono/Display/EditorFullscreenController.cs
+++ b/Editor/Mono/Display/EditorFullscreenController.cs
@@ -41,6 +41,7 @@ internal class EditorFullscreenController : ScriptableSingleton<EditorFullscreen
         private int m_mainDisplayId;
 
         private EnumData m_buildTargetData;
+        private bool m_buildTargetDataInitialized;
 
         private Dictionary<Type, string> m_AvailableWindowTypes;
         private Dictionary<int, EditorDisplayFullscreenSetting> m_DisplaySettings;
@@ -266,7 +267,7 @@ private void OnEnable()
             EditorApplication.globalEventHandler += HandleToggleFullscreenKeyShortcut;
 
             UpdateDisplayNamesAndIds();
-            GetInstalledBuildTargetData();
+            m_buildTargetDataInitialized = false;
 
             if (m_profiles == null)
             {
@@ -354,6 +355,9 @@ private void UpdateDisplayNamesAndIds()
 
         private void GetInstalledBuildTargetData()
         {
+            if (m_buildTargetDataInitialized)
+                return;
+
             var buildTargetData = EnumDataUtility.GetCachedEnumData(typeof(BuildTarget));
             var installedBuildTargetCount =
                 (from BuildTarget target in buildTargetData.values
@@ -385,6 +389,8 @@ private void GetInstalledBuildTargetData()
                     ++j;
                 }
             }
+
+            m_buildTargetDataInitialized = true;
         }
 
         private EditorDisplayFullscreenSetting GetSettingForDisplay(int displayIndex)
@@ -1025,6 +1031,8 @@ private static bool DrawPreferenceProfileGUI(EditorDisplaySettingsProfile profil
                     profile.Name = newName;
                 }
 
+                instance.GetInstalledBuildTargetData();
+
                 var selectedIndex = Array.IndexOf(instance.m_buildTargetData.values, profile.Target);
                 var newSelectedIndex = EditorGUILayout.Popup(Styles.platformContent, selectedIndex, instance.m_buildTargetData.displayNames, GUILayout.Width(400));
                 if (selectedIndex != newSelectedIndex)
diff --git a/Editor/Mono/DragAndDrop.bindings.cs b/Editor/Mono/DragAndDrop.bindings.cs
index a4856d0aca..810bf40a23 100644
--- a/Editor/Mono/DragAndDrop.bindings.cs
+++ b/Editor/Mono/DragAndDrop.bindings.cs
@@ -100,6 +100,26 @@ internal static void RemoveDropHandler(int dropDstId, Delegate handler)
             }
         }
 
+        internal static DragAndDropVisualMode DropOnProjectBrowserWindow(int dragUponInstanceId, string dropUponPath, bool perform)
+        {
+            return Drop(DragAndDropWindowTarget.projectBrowser, dragUponInstanceId, dropUponPath, perform);
+        }
+
+        internal static DragAndDropVisualMode DropOnSceneWindow(UnityEngine.Object dropUpon, Vector3 worldPosition, Vector2 viewportPosition, Transform parentForDraggedObjects, bool perform)
+        {
+            return Drop(DragAndDropWindowTarget.sceneView, dropUpon, worldPosition, viewportPosition, parentForDraggedObjects, perform);
+        }
+
+        internal static DragAndDropVisualMode DropOnInspectorWindow(UnityEngine.Object[] targets, bool perform)
+        {
+            return Drop(DragAndDropWindowTarget.inspector, targets, perform);
+        }
+
+        internal static DragAndDropVisualMode DropOnHierarchyWindow(int dropTargetInstanceID, HierarchyDropFlags dropMode, Transform parentForDraggedObjects, bool perform)
+        {
+            return Drop(DragAndDropWindowTarget.hierarchy, dropTargetInstanceID, dropMode, parentForDraggedObjects, perform);
+        }
+
         internal static DragAndDropVisualMode Drop(int dropDstId, params object[] args)
         {
             SavedGUIState guiState = SavedGUIState.Create();
@@ -246,8 +266,12 @@ public static void SetGenericData(string type, object data)
         public static extern DragAndDropVisualMode visualMode { get; set; }
 
         public static extern void AcceptDrag();
-        [NativeMethod("PrepareStartDrag")] private static extern void PrepareStartDrag_Internal();
-        [NativeMethod("StartDrag")] private static extern void StartDrag_Internal(string title);
+        [NativeMethod("PrepareStartDrag")]
+        private static extern void PrepareStartDrag_Internal();
+        [NativeMethod("Cleanup")]
+        internal static extern void Cleanup();
+        [NativeMethod("StartDrag")]
+        private static extern void StartDrag_Internal(string title);
 
         public delegate DragAndDropVisualMode ProjectBrowserDropHandler(int dragInstanceId, string dropUponPath, bool perform);
         public delegate DragAndDropVisualMode SceneDropHandler(UnityEngine.Object dropUpon, Vector3 worldPosition, Vector2 viewportPosition, Transform parentForDraggedObjects, bool perform);
diff --git a/Editor/Mono/DrivenRectTransformUndo.cs b/Editor/Mono/DrivenRectTransformUndo.cs
index 816771f88a..19c2030978 100644
--- a/Editor/Mono/DrivenRectTransformUndo.cs
+++ b/Editor/Mono/DrivenRectTransformUndo.cs
@@ -14,12 +14,17 @@ static DrivenRectTransformUndo()
         {
             Undo.willFlushUndoRecord += ForceUpdateCanvases;
             // After undo or redo performed, the 'driven values' & 'driven properties mask' need to be updated.
-            Undo.undoRedoPerformed += ForceUpdateCanvases;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
         }
 
         static void ForceUpdateCanvases()
         {
             Canvas.ForceUpdateCanvases();
         }
+
+        static void OnUndoRedoPerformed(in UndoRedoInfo info)
+        {
+            Canvas.ForceUpdateCanvases();
+        }
     }
 }
diff --git a/Editor/Mono/EditorApplication.bindings.cs b/Editor/Mono/EditorApplication.bindings.cs
index f84c9037ef..d653fd9100 100644
--- a/Editor/Mono/EditorApplication.bindings.cs
+++ b/Editor/Mono/EditorApplication.bindings.cs
@@ -159,8 +159,43 @@ internal static extern bool useLibmonoBackendForIl2cpp
         [StaticAccessor("GetApplication()", StaticAccessorType.Dot)]
         internal static extern bool CanReloadAssemblies();
 
+        private static extern bool ExecuteMenuItemInternal(string menuItemPath, bool logErrorOnUnfoundItem);
+
         // Invokes the menu item in the specified path.
-        public static extern  bool ExecuteMenuItem(string menuItemPath);
+        public static bool ExecuteMenuItem(string menuItemPath)
+        {
+            var isDefaultMode = ModeService.currentId == ModeService.k_DefaultModeId;
+            var result = ExecuteMenuItemInternal(menuItemPath, isDefaultMode);
+            if (result)
+                return result;
+
+            if (!isDefaultMode)
+            {
+                var menuItems = TypeCache.GetMethodsWithAttribute<MenuItem>();
+                foreach (var item in menuItems)
+                {
+                    MenuItem itemData = (MenuItem)item.GetCustomAttributes(typeof(MenuItem), false)[0];
+                    if (!itemData.validate && itemData.menuItem == menuItemPath)
+                    {
+                        if (item.GetParameters().Length == 0)
+                        {
+                            item.Invoke(null, new object[0]);
+                            return true;
+                        }
+                        else if (item.GetParameters()[0].ParameterType == typeof(MenuCommand))
+                        {
+                            item.Invoke(null, new[] { new MenuCommand(null) });
+                            return true;
+                        }
+                        break;
+                    }
+                }
+
+                Debug.LogError($"ExecuteMenuItem failed because there is no menu named '{menuItemPath}'");
+            }
+
+            return false;
+        }
 
         // Validates the menu item in the specific path
         internal static extern bool ValidateMenuItem(string menuItemPath);
diff --git a/Editor/Mono/EditorApplication.cs b/Editor/Mono/EditorApplication.cs
index 9c02817ab5..a7592073b0 100644
--- a/Editor/Mono/EditorApplication.cs
+++ b/Editor/Mono/EditorApplication.cs
@@ -514,10 +514,17 @@ static void Internal_RestoreLastOpenedScenes()
                 // Open requested scene if any
                 if (!string.IsNullOrEmpty(lastOpenedScene))
                 {
-                    if (EditorSceneManager.CanOpenScene())
-                        EditorSceneManager.OpenScene(lastOpenedScene, OpenSceneMode.Single);
-                    else
-                        InstantiateDefaultScene();
+                    try
+                    {
+                        if (EditorSceneManager.CanOpenScene())
+                            EditorSceneManager.OpenScene(lastOpenedScene, OpenSceneMode.Single);
+                        else
+                            InstantiateDefaultScene();
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.LogWarning($"Error while opening specified scene \"{lastOpenedScene}\":\n {e.Message}");
+                    }
 
                     // Regardless of the operation outcome, reset last opened scene so that we don't
                     // force it next time around
diff --git a/Editor/Mono/EditorGUI.cs b/Editor/Mono/EditorGUI.cs
index 02715ebfb3..4e98ec840d 100644
--- a/Editor/Mono/EditorGUI.cs
+++ b/Editor/Mono/EditorGUI.cs
@@ -113,7 +113,7 @@ private enum DragCandidateState
         internal static string kDoubleFieldFormatString = UINumericFieldsUtils.k_DoubleFieldFormatString;
         internal static string kIntFieldFormatString = UINumericFieldsUtils.k_IntFieldFormatString;
         internal static int ms_IndentLevel = 0;
-        private const float kIndentPerLevel = 15;
+        internal const float kIndentPerLevel = 15;
         internal const int kControlVerticalSpacingLegacy = 2;
         internal const int kDefaultSpacing = 6;
         internal static readonly SVC<float> kControlVerticalSpacing = new SVC<float>("--theme-control-vertical-spacing", 2.0f);
@@ -141,6 +141,8 @@ private enum DragCandidateState
         private static readonly float[] s_Vector4Floats = {0, 0, 0, 0};
         private static readonly GUIContent[] s_XYZWLabels = {EditorGUIUtility.TextContent("X"), EditorGUIUtility.TextContent("Y"), EditorGUIUtility.TextContent("Z"), EditorGUIUtility.TextContent("W")};
 
+        private const float kQuaternionFloatPrecision = 1e-6f;
+
         private static readonly GUIContent[] s_WHLabels = {EditorGUIUtility.TextContent("W"), EditorGUIUtility.TextContent("H")};
 
         private static readonly GUIContent s_CenterLabel = EditorGUIUtility.TrTextContent("Center");
@@ -165,6 +167,9 @@ private enum DragCandidateState
         internal static Color k_OverrideMarginColorSelected = new Color(239f / 255f, 239f / 255f, 239f / 239f, 1f);
         internal static Color k_OverrideMarginColorNotApplicable = new Color(1f / 255f, 153f / 255f, 235f / 255f, 0.35f);
 
+        internal static Color k_LiveModifiedMarginLightThemeColor = new Color(183f / 255f, 60f / 255f, 21f / 255f, 1f);
+        internal static Color k_LiveModifiedMarginDarkThemeColor = new Color(255f / 255f, 165f / 255f, 60f / 255f, 1f);
+
         private const int kInspTitlebarSpacing = 4;
         private static readonly GUIContent s_PropertyFieldTempContent = new GUIContent();
         private static GUIContent s_IconDropDown;
@@ -243,21 +248,20 @@ public static void FocusTextInControl(string name)
 
         internal static void ClearStacks()
         {
-            s_PropertyCount = 0;
             s_EnabledStack.Clear();
+            s_IsInsideListStack.Clear();
+            GUI.isInsideList = false;
             s_ChangedStack.Clear();
             s_PropertyStack.Clear();
+            MaterialProperty.ClearStack();
             ScriptAttributeUtility.s_DrawerStack.Clear();
             s_FoldoutHeaderGroupActive = 0;
         }
 
-        // Property counting is required by ReorderableList. Element rendering callbacks can change and use
-        // different number of properties to represent an element each frame. We need a way to be able to track
-        // if the property count changed from the last frame so we can recache those elements.
-        internal static int s_PropertyCount = 0;
         private static readonly Stack<PropertyGUIData> s_PropertyStack = new Stack<PropertyGUIData>();
 
         private static readonly Stack<bool> s_EnabledStack = new Stack<bool>();
+        private static readonly Stack<(bool insideList, int depth)> s_IsInsideListStack = new Stack<(bool insideList, int depth)>();
 
         // @TODO: API soon to be deprecated but still in a grace period; documentation states that users
         //        are encouraged to use EditorGUI.DisabledScope instead. Uncomment next line when appropriate.
@@ -314,6 +318,28 @@ public void Dispose()
             }
         }
 
+        internal class DisabledGuiViewInputScope : GUI.Scope
+        {
+            GUIView m_View;
+            bool m_WasDisabled;
+
+            public DisabledGuiViewInputScope(GUIView view, bool disabled)
+            {
+                m_View = view;
+                if (m_View != null)
+                {
+                    m_WasDisabled = view.disableInputEvents;
+                    m_View.disableInputEvents = disabled;
+                }
+            }
+
+            protected override void CloseScope()
+            {
+                if (m_View != null)
+                    m_View.disableInputEvents = m_WasDisabled;
+            }
+        }
+
         internal struct LabelHighlightScope : IDisposable
         {
             bool m_Disposed;
@@ -365,6 +391,28 @@ internal static void EndDisabled()
                 GUI.enabled = s_EnabledStack.Pop();
         }
 
+        internal static void BeginIsInsideList(int depth)
+        {
+            s_IsInsideListStack.Push((GUI.isInsideList, depth));
+            GUI.isInsideList = true;
+        }
+
+        internal static int GetInsideListDepth()
+        {
+            if (s_IsInsideListStack.Count > 0)
+                return s_IsInsideListStack.Peek().depth;
+            return -1;
+        }
+
+        internal static void EndIsInsideList()
+        {
+            // Stack might have been cleared with ClearStack(), check before pop.
+            if (s_IsInsideListStack.Count > 0)
+                GUI.isInsideList = s_IsInsideListStack.Pop().insideList;
+            else
+                GUI.isInsideList = false;
+        }
+
         private static readonly Stack<bool> s_ChangedStack = new Stack<bool>();
 
         public class ChangeCheckScope : GUI.Scope
@@ -1604,7 +1652,7 @@ internal static bool DoObjectMouseInteraction(bool foldout, Rect interactionRect
 
                     if (interactionRect.Contains(evt.mousePosition))
                     {
-                        DragAndDrop.visualMode = DragAndDrop.Drop(DragAndDropWindowTarget.inspector, targetObjs, false);
+                        DragAndDrop.visualMode = DragAndDrop.DropOnInspectorWindow(targetObjs, false);
                         Event.current.Use();
                     }
                     break;
@@ -1612,7 +1660,7 @@ internal static bool DoObjectMouseInteraction(bool foldout, Rect interactionRect
                 case EventType.DragPerform:
                     if (interactionRect.Contains(evt.mousePosition))
                     {
-                        DragAndDrop.visualMode = DragAndDrop.Drop(DragAndDropWindowTarget.inspector, targetObjs, true);
+                        DragAndDrop.visualMode = DragAndDrop.DropOnInspectorWindow(targetObjs, true);
                         DragAndDrop.AcceptDrag();
                         Event.current.Use();
                     }
@@ -2939,37 +2987,33 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
 
                         pm.AddItem(EditorGUIUtility.TrTextContent("Duplicate Array Element"), false, (a) =>
                         {
-                            // Reorderable
-                            if (PropertyHandler.s_reorderableLists.ContainsKey(ReorderableListWrapper.GetPropertyIdentifier(parentArrayProperty)))
-                            {
-                                ReorderableListWrapper list = PropertyHandler.s_reorderableLists[ReorderableListWrapper.GetPropertyIdentifier(parentArrayProperty)];
+                            var list = ReorderableList.GetReorderableListFromSerializedProperty(parentArrayProperty);
 
-                                // If we have a ReorderableList associated with this property lets use list selection array
-                                // and apply this action to all selected elements thus having better integration with
-                                // ReorderableLists multi-selection features
-                                if (list != null && list.m_ReorderableList.selectedIndices.Count > 0)
+                            // If we have a ReorderableList associated with this property lets use list selection array
+                            // and apply this action to all selected elements thus having better integration with
+                            // ReorderableLists multi-selection features
+                            if (list != null && list.selectedIndices.Count > 0)
+                            {
+                                for (int i = list.selectedIndices.Count - 1; i >= 0; i--)
                                 {
-                                    for (int i = list.m_ReorderableList.selectedIndices.Count - 1; i >= 0; i--)
-                                    {
-                                        if (list.m_ReorderableList.selectedIndices[i] >= parentArrayProperty.arraySize) continue;
+                                    if (list.selectedIndices[i] >= parentArrayProperty.arraySize) continue;
 
-                                        SerializedProperty resolvedProperty = parentArrayProperty.GetArrayElementAtIndex(list.m_ReorderableList.selectedIndices[i]);
-                                        if (resolvedProperty != null)
-                                        {
-                                            if (!TargetChoiceHandler.DuplicateArrayElement(resolvedProperty)) continue;
-                                        }
+                                    SerializedProperty resolvedProperty = parentArrayProperty.GetArrayElementAtIndex(list.selectedIndices[i]);
+                                    if (resolvedProperty != null)
+                                    {
+                                        if (!TargetChoiceHandler.DuplicateArrayElement(resolvedProperty)) continue;
+                                    }
 
-                                        for (int j = i; j < list.m_ReorderableList.selectedIndices.Count; j++)
-                                        {
-                                            list.m_ReorderableList.m_Selection[j]++;
-                                        }
+                                    for (int j = i; j < list.selectedIndices.Count; j++)
+                                    {
+                                        list.m_Selection[j]++;
                                     }
+                                }
 
-                                    if (list.m_ReorderableList.onChangedCallback != null)
-                                        list.m_ReorderableList.onChangedCallback(list.m_ReorderableList);
+                                if (list.onChangedCallback != null)
+                                    list.onChangedCallback(list);
 
-                                    ReorderableList.ClearExistingListCaches();
-                                }
+                                ReorderableList.InvalidateExistingListCaches();
                             }
                             else // Non reorderable
                             {
@@ -2986,36 +3030,39 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                                     TargetChoiceHandler.DuplicateArrayElement(a);
                                 }
                             }
+
+                            if(list != null)
+                            {
+                                if (list.onChangedCallback != null) list.onChangedCallback(list);
+                                ReorderableList.InvalidateExistingListCaches();
+                            }
                             EditorGUIUtility.editingTextField = false;
                         }, propertyWithPath);
                         pm.AddItem(EditorGUIUtility.TrTextContent("Delete Array Element"), false, (a) =>
                         {
-                            // Reorderable
-                            if (PropertyHandler.s_reorderableLists.ContainsKey(ReorderableListWrapper.GetPropertyIdentifier(parentArrayProperty)))
-                            {
-                                ReorderableListWrapper list = PropertyHandler.s_reorderableLists[ReorderableListWrapper.GetPropertyIdentifier(parentArrayProperty)];
+                            var list = ReorderableList.GetReorderableListFromSerializedProperty(parentArrayProperty);
 
-                                // If we have a ReorderableList associated with this property lets use list selection array
-                                // and apply this action to all selected elements thus having better integration with
-                                // ReorderableLists multi-selection features
-                                if (list != null && list.m_ReorderableList.selectedIndices.Count > 0)
+                            // If we have a ReorderableList associated with this property lets use list selection array
+                            // and apply this action to all selected elements thus having better integration with
+                            // ReorderableLists multi-selection features
+                            if (list != null && list.selectedIndices.Count > 0)
+                            {
+                                foreach (var selected in list.selectedIndices.Reverse<int>())
                                 {
-                                    foreach (var selected in list.m_ReorderableList.selectedIndices.Reverse<int>())
-                                    {
-                                        if (selected >= parentArrayProperty.arraySize) continue;
+                                    if (selected >= parentArrayProperty.arraySize) continue;
 
-                                        SerializedProperty resolvedProperty = parentArrayProperty.GetArrayElementAtIndex(selected);
-                                        if (resolvedProperty != null)
-                                        {
-                                            if (!TargetChoiceHandler.DeleteArrayElement(resolvedProperty)) continue;
-                                        }
+                                    SerializedProperty resolvedProperty = parentArrayProperty.GetArrayElementAtIndex(selected);
+                                    if (resolvedProperty != null)
+                                    {
+                                        if (!TargetChoiceHandler.DeleteArrayElement(resolvedProperty)) continue;
                                     }
-
-                                    list.m_ReorderableList.m_Selection.Clear();
-                                    if (list.m_ReorderableList.onChangedCallback != null)
-                                        list.m_ReorderableList.onChangedCallback(list.m_ReorderableList);
-                                    ReorderableList.ClearExistingListCaches();
                                 }
+
+                                list.m_Selection.Clear();
+
+                                if (list.onChangedCallback != null)
+                                    list.onChangedCallback(list);
+                                ReorderableList.InvalidateExistingListCaches();
                             }
                             else // Non reorderable
                             {
@@ -3032,6 +3079,13 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                                     TargetChoiceHandler.DeleteArrayElement(a);
                                 }
                             }
+
+                            if(list != null)
+                            {
+                                list.m_Selection.Clear();
+                                if (list.onChangedCallback != null) list.onChangedCallback(list);
+                                ReorderableList.InvalidateExistingListCaches();
+                            }
                             EditorGUIUtility.editingTextField = false;
                         }, propertyWithPath);
                     }
@@ -3996,7 +4050,7 @@ internal static Enum EnumFlagsField(Rect position, GUIContent label, Enum enumVa
 
             var enumData = EnumDataUtility.GetCachedEnumData(enumType, !includeObsolete);
             if (!enumData.serializable)
-                // this is the same message used in ScriptPopupMenus.cpp
+                // this is the same message used in SerializedPropertyEnumHelper.cpp
                 throw new NotSupportedException(string.Format("Unsupported enum base type for {0}", enumType.Name));
 
             var id = GUIUtility.GetControlID(s_EnumFlagsField, FocusType.Keyboard, position);
@@ -4019,7 +4073,7 @@ internal static int EnumFlagsField(Rect position, GUIContent label, int enumValu
 
             var enumData = EnumDataUtility.GetCachedEnumData(enumType, !includeObsolete);
             if (!enumData.serializable)
-                // this is the same message used in ScriptPopupMenus.cpp
+                // this is the same message used in SerializedPropertyEnumHelper.cpp
                 throw new NotSupportedException(string.Format("Unsupported enum base type for {0}", enumType.Name));
 
             var id = GUIUtility.GetControlID(s_EnumFlagsField, FocusType.Keyboard, position);
@@ -4373,12 +4427,9 @@ internal static Vector3 LinkedVector3Field(Rect position, GUIContent label,  GUI
         {
             GUIContent copy = label;
             Rect fullLabelRect = position;
-            // If SerializedProperty is passed, make sure to call begin and end for property
 
-            // Since we have two separate properties to handle, make sure fields are not overlaping each other
-            // If only localScale property has override, make sure constrainProportionsScale property is in the layer behind
-            if (proportionalScaleProperty != null && property.prefabOverride && !proportionalScale)
-                label = BeginPropertyInternal(fullLabelRect, label, proportionalScaleProperty);
+            if(proportionalScaleProperty != null)
+                BeginPropertyInternal(fullLabelRect, label, proportionalScaleProperty);
 
             if (property != null)
                 label = BeginPropertyInternal(position, label, property);
@@ -4392,34 +4443,19 @@ internal static Vector3 LinkedVector3Field(Rect position, GUIContent label,  GUI
             float toggleOffset = toggleRect.width + kDefaultSpacing;
             toggleRect.x -= toggleOffset;
             toggle.x -= toggleOffset;
-            BeginChangeCheck();
             Styles.linkButton.alignment = TextAnchor.MiddleCenter;
 
-            if (proportionalScaleProperty != null)
-            {
-                // If proportional scaling is enabled, make sure to use full scale rect, to be able revert all axis and state at the same time,
-                // otherwise rect size should match label size
-                if (!property.prefabOverride && !proportionalScale)
-                    fullLabelRect.xMax = toggleRect.xMin;
+            // In case we have a background overlay, make sure Constrain proportions toggle won't be affected
+            Color currentColor = GUI.backgroundColor;
+            GUI.backgroundColor = Color.white;
 
-                // Make sure proportional scale property is used only if enabled, otherwise use localScale's one.
-                if (!property.prefabOverride || proportionalScale)
-                    label = BeginPropertyInternal(fullLabelRect, label, proportionalScale? proportionalScaleProperty : property);
+            bool previousProportionalScale = proportionalScale;
+            proportionalScale = GUI.Toggle(toggleRect, proportionalScale, toggleContent, Styles.linkButton);
 
-                BeginChangeCheck();
-                bool previousProportionalScale = proportionalScale;
-                proportionalScale = GUI.Toggle(toggleRect, proportionalScale, toggleContent, Styles.linkButton);
-                if (previousProportionalScale != proportionalScale)
-                    proportionalScaleProperty.boolValue = proportionalScale;
-                EndChangeCheck();
+            if (proportionalScaleProperty != null && previousProportionalScale != proportionalScale)
+                proportionalScaleProperty.boolValue = proportionalScale;
 
-                if (proportionalScale)
-                    EndProperty();
-            }
-            else
-            {
-                proportionalScale = GUI.Toggle(toggleRect, proportionalScale, toggleContent, Styles.linkButton);
-            }
+            GUI.backgroundColor = currentColor;
 
             position.x += toggle.x + kDefaultSpacing;
             position.width -= toggle.x + kDefaultSpacing;
@@ -4430,7 +4466,7 @@ internal static Vector3 LinkedVector3Field(Rect position, GUIContent label,  GUI
             if (property != null)
                 EndProperty();
 
-            if (proportionalScaleProperty != null && property.prefabOverride && !proportionalScale)
+            if(proportionalScaleProperty != null)
                 EndProperty();
 
             return newValue;
@@ -4459,8 +4495,7 @@ static Vector3 LinkedVector3Field(Rect position, Vector3 value, bool proportiona
                 valueAfterChangeCheck.z = s_Vector3Floats[2];
             }
 
-            return proportionalScale && valueAfterChangeCheck != value ?
-                ConstrainProportionsTransformScale.DoScaleProportions(valueAfterChangeCheck, value, initialScale, ref axisModified) : valueAfterChangeCheck;
+            return proportionalScale? ConstrainProportionsTransformScale.DoScaleProportions(valueAfterChangeCheck, value, ConstrainProportionsTransformScale.m_IsAnimationPreview? value : initialScale, ref axisModified) : valueAfterChangeCheck;
         }
 
         // Make an X, Y field - not public (use PropertyField instead)
@@ -4485,6 +4520,24 @@ private static void Vector3Field(Rect position, SerializedProperty property, GUI
             MultiPropertyFieldInternal(position, s_XYZLabels, cur, PropertyVisibility.All);
         }
 
+        // Make an X, Y and Z field for Quaternions - not public (use PropertyField instead)
+        private static void QuaternionEulerField(Rect position, SerializedProperty property, GUIContent label)
+        {
+            int id = GUIUtility.GetControlID(s_FoldoutHash, FocusType.Keyboard, position);
+            position = MultiFieldPrefixLabel(position, id, label, 3);
+            position.height = kSingleLineHeight;
+            Vector3 eulerValue = property.quaternionValue.eulerAngles;
+            s_Vector3Floats[0] = Mathf.Floor(eulerValue.x / kQuaternionFloatPrecision) * kQuaternionFloatPrecision;
+            s_Vector3Floats[1] = Mathf.Floor(eulerValue.y / kQuaternionFloatPrecision) * kQuaternionFloatPrecision;
+            s_Vector3Floats[2] = Mathf.Floor(eulerValue.z / kQuaternionFloatPrecision) * kQuaternionFloatPrecision;
+            BeginChangeCheck();
+            MultiFloatFieldInternal(position, s_XYZLabels, s_Vector3Floats);
+            if (EndChangeCheck())
+            {
+                property.quaternionValue = Quaternion.Euler(s_Vector3Floats[0], s_Vector3Floats[1], s_Vector3Floats[2]);
+            }
+        }
+
         // Make an X, Y, Z and W field - not public (use PropertyField instead)
         static void Vector4Field(Rect position, SerializedProperty property, GUIContent label)
         {
@@ -4927,9 +4980,12 @@ static void LockingMultiFloatFieldInternal(Rect position, bool locked, uint mixe
             bool hasMixedValues = mixedValues != 0;
             uint multiselectionLock = ConstrainProportionsTransformScale.GetMultiSelectionLockedFields(property?.serializedObject?.targetObjects);
 
-            if (initialValues == null)
+            if (initialValues == null || ConstrainProportionsTransformScale.m_IsAnimationPreview)
                 initialValues = values;
 
+            // In animation preview mode we scale using last valid value instead of initialScale, make sure we won't lock fields on Vector3.zero
+            bool forceEnableFields = ConstrainProportionsTransformScale.ShouldForceEnablePropertyFields(initialValues);
+
             bool mixedValueState = EditorGUI.showMixedValue;
 
             for (int i = 0; i < initialValues.Length; i++)
@@ -4943,7 +4999,7 @@ static void LockingMultiFloatFieldInternal(Rect position, bool locked, uint mixe
                     if (locked)
                     {
                         // If initial field value is 0, it must be locked not to break proportions
-                        GUI.enabled = !Mathf.Approximately(initialValues[i], 0) && (property != null && property.serializedObject.targetObjectsCount > 1 ? !ConstrainProportionsTransformScale.IsBit(multiselectionLock, i) : true);
+                        GUI.enabled = forceEnableFields || !Mathf.Approximately(initialValues[i], 0) && (property != null && property.serializedObject.targetObjectsCount > 1 ? !ConstrainProportionsTransformScale.IsBit(multiselectionLock, i) : true);
                     }
                     else
                     {
@@ -6499,7 +6555,6 @@ public static GUIContent BeginProperty(Rect totalPosition, GUIContent label, Ser
         // Create a Property wrapper, useful for making regular GUI controls work with [[SerializedProperty]].
         internal static GUIContent BeginPropertyInternal(Rect totalPosition, GUIContent label, SerializedProperty property)
         {
-            s_PropertyCount++;
             if (s_PendingPropertyKeyboardHandling != null)
             {
                 DoPropertyFieldKeyboardHandling(s_PendingPropertyKeyboardHandling);
@@ -6558,6 +6613,17 @@ internal static GUIContent BeginPropertyInternal(Rect totalPosition, GUIContent
                 }
             }
 
+            var isLiveModified = property.isLiveModified;
+            if (isLiveModified)
+                EditorGUIUtility.SetBoldDefaultFont(isLiveModified);
+
+            if (Event.current.type == EventType.Repaint && isLiveModified)
+            {
+                Rect highlightRect = totalPosition;
+                highlightRect.xMin += EditorGUI.indent;
+                DrawLiveModifiedBackground(highlightRect, false);
+            }
+
             s_PropertyStack.Push(new PropertyGUIData(property, totalPosition, wasBoldDefaultFont, GUI.enabled, GUI.backgroundColor));
 
             EditorGUIUtility.BeginPropertyCallback(totalPosition, property);
@@ -6596,7 +6662,7 @@ internal static GUIContent BeginPropertyInternal(Rect totalPosition, GUIContent
                         if (
                             (DrivenPropertyManagerInternal.IsDriving(driver, target, propertyPath))
                             ||
-                            ((target is Transform || property.propertyType == SerializedPropertyType.Color) && DrivenPropertyManagerInternal.IsDrivingPartial(driver, target, propertyPath)))
+                            ((target is Transform || target is ParticleSystem || property.propertyType == SerializedPropertyType.Color) && DrivenPropertyManagerInternal.IsDrivingPartial(driver, target, propertyPath)))
                         {
                             GUI.enabled = false;
                             if (isCollectingTooltips)
@@ -6701,6 +6767,18 @@ internal static void DrawMarginLineForRect(Rect position, Color color)
             Graphics.DrawTexture(position, EditorGUIUtility.whiteTexture, new Rect(), 0, 0, 0, 0, color, guiTextureClipVerticallyMaterial);
         }
 
+        internal static void DrawLiveModifiedBackground(Rect position, bool fixupRectForHeadersAndBackgrounds = false)
+        {
+            if (fixupRectForHeadersAndBackgrounds)
+            {
+                // Tweaks to match the specifics of how the horizontal lines between components are drawn.
+                position.yMin += 2;
+                position.yMax += 1;
+            }
+
+            DrawMarginLineForRect(position, EditorGUIUtility.isProSkin? k_LiveModifiedMarginDarkThemeColor : k_LiveModifiedMarginLightThemeColor);
+        }
+
         private static SerializedProperty s_PendingPropertyKeyboardHandling = null;
         private static SerializedProperty s_PendingPropertyDelete = null;
 
@@ -6955,7 +7033,7 @@ internal static void StreamTexture(Texture texture, Material mat, float mipLevel
         }
 
         // This will return appriopriate material to use with the texture according to its usage mode
-        internal static Material GetMaterialForSpecialTexture(Texture t, Material defaultMat = null, bool normals2Linear = false, bool useVTMaterialWhenPossible = true)
+        internal static Material GetMaterialForSpecialTexture(Texture t, Material defaultMat = null, bool manualTex2Linear = false, bool useVTMaterialWhenPossible = true)
         {
             bool useVT = useVTMaterialWhenPossible && UseVTMaterial(t);
 
@@ -6970,14 +7048,20 @@ internal static Material GetMaterialForSpecialTexture(Texture t, Material defaul
                 return lightmapDoubleLDRMaterial;
             else if (usage == TextureUsageMode.BakedLightmapFullHDR)
                 return lightmapFullHDRMaterial;
-            else if (usage == TextureUsageMode.NormalmapDXT5nm || (usage == TextureUsageMode.NormalmapPlain && format == TextureFormat.BC5))
+            else if (TextureUtil.IsNormalMapUsageMode(usage))
             {
                 var normalMat = useVT ? normalmapVTMaterial : normalmapMaterial;
-                normalMat.SetFloat("_ManualTex2Linear", normals2Linear ? 1.0f : 0.0f);
+                normalMat.SetFloat("_IsPlainNormalmap", usage == TextureUsageMode.NormalmapPlain && format != TextureFormat.BC5 ? 1.0f : 0.0f);
+                normalMat.SetFloat("_ManualTex2Linear", manualTex2Linear ? 1.0f : 0.0f);
                 return normalMat;
             }
             else if (TextureUtil.IsAlphaOnlyTextureFormat(format))
-                return useVT ? alphaVTMaterial : alphaMaterial;
+            {
+                var alphaOnlyMat = useVT ? alphaVTMaterial : alphaMaterial;
+                alphaOnlyMat.SetFloat("_ManualTex2Linear", manualTex2Linear ? 1.0f : 0.0f);
+                return alphaOnlyMat;
+            }
+
             return defaultMat;
         }
 
@@ -7052,16 +7136,32 @@ internal static Material guiTextureClipVerticallyMaterial
         internal static void SetExpandedRecurse(SerializedProperty property, bool expanded)
         {
             SerializedProperty search = property.Copy();
-            search.isExpanded = expanded;
-
             int depth = search.depth;
-            while (search.NextVisible(true) && search.depth > depth)
+            HashSet<long> visited = null;
+            bool visitChild;
+            do
             {
-                if (search.hasVisibleChildren)
+                visitChild = true;
+                if (search.propertyType == SerializedPropertyType.ManagedReference)
+                {
+                    // Managed reference objects can form a cyclical graph, so need to track visited objects
+                    if (visited == null)
+                        visited = new HashSet<long>();
+
+                    long refId = search.managedReferenceId;
+                    if (!visited.Add(refId))
+                    {
+                        visitChild = false;
+                        continue;
+                    }
+                }
+
+                if (depth == search.depth || search.hasVisibleChildren)
                 {
                     search.isExpanded = expanded;
                 }
             }
+            while (search.NextVisible(visitChild) && search.depth > depth);
         }
 
         // Get the height needed for a ::ref::PropertyField control, not including its children and not taking custom PropertyDrawers into account.
@@ -7076,7 +7176,7 @@ internal static float GetSinglePropertyHeight(SerializedProperty property, GUICo
         public static float GetPropertyHeight(SerializedPropertyType type, GUIContent label)
         {
             if (type == SerializedPropertyType.Vector3 || type == SerializedPropertyType.Vector2 || type == SerializedPropertyType.Vector4 ||
-                type == SerializedPropertyType.Vector3Int || type == SerializedPropertyType.Vector2Int)
+                type == SerializedPropertyType.Vector3Int || type == SerializedPropertyType.Vector2Int || type == SerializedPropertyType.Quaternion)
             {
                 return (!LabelHasContent(label) || EditorGUIUtility.wideMode ? 0f : kStructHeaderLineHeight + kVerticalSpacingMultiField) +
                     kSingleLineHeight;
@@ -7400,6 +7500,10 @@ internal static bool DefaultPropertyField(Rect position, SerializedProperty prop
                     }
                 }
             }
+            else if (type == SerializedPropertyType.Quaternion)
+            {
+                QuaternionEulerField(position, property, label);
+            }
             // Handle Foldout
             else
             {
@@ -8606,6 +8710,7 @@ internal static class EnumNamesCache
             static Dictionary<int, GUIContent[]> s_SerializedPropertyEnumLocalizedGUIContents = new Dictionary<int, GUIContent[]>();
             static Dictionary<Type, bool> s_IsEnumTypeUsingFlagsAttribute = new Dictionary<Type, bool>();
             static Dictionary<Type, string[]> s_SerializedPropertyEnumDisplayNames = new Dictionary<Type, string[]>();
+            static Dictionary<Type, string[]> s_SerializedPropertyEnumNames = new Dictionary<Type, string[]>();
 
             internal static GUIContent[] GetEnumTypeLocalizedGUIContents(Type enumType, EnumData enumData)
             {
@@ -8652,6 +8757,12 @@ internal static string[] GetEnumDisplayNames(SerializedProperty property)
                 Type enumType;
                 ScriptAttributeUtility.GetFieldInfoFromProperty(property, out enumType);
 
+                // For native properties, like Camera.m_ClearFlags, the enumType returned will be null.
+                // So we can't use it for the dict key below. Need to early out.
+                // Case: 1388694
+                if (enumType == null)
+                    return property.enumDisplayNames;
+
                 string[] result;
                 if (!s_SerializedPropertyEnumDisplayNames.TryGetValue(enumType, out result))
                 {
@@ -8661,6 +8772,20 @@ internal static string[] GetEnumDisplayNames(SerializedProperty property)
                 return result;
             }
 
+            internal static string[] GetEnumNames(SerializedProperty property)
+            {
+                Type enumType;
+                ScriptAttributeUtility.GetFieldInfoFromProperty(property, out enumType);
+
+                string[] result;
+                if (!s_SerializedPropertyEnumNames.TryGetValue(enumType, out result))
+                {
+                    result = property.enumNames;
+                    s_SerializedPropertyEnumNames.Add(enumType, result);
+                }
+                return result;
+            }
+
             internal static bool IsEnumTypeUsingFlagsAttribute(Type type)
             {
                 bool result;
@@ -10944,6 +11069,7 @@ static Rect GetTabRect(Rect rect, int tabIndex, int tabCount, out GUIStyle tabSt
         {
             if (s_TabOnlyOne == null)
             {
+                // Keep in sync with Tests/EditModeAndPlayModeTests/PlayerSettings/Assets/Editor/PlayerSettingsApplicationIdentifierTests.cs.
                 s_TabOnlyOne = "Tab onlyOne";
                 s_TabFirst = "Tab first";
                 s_TabMiddle = "Tab middle";
diff --git a/Editor/Mono/EditorGUIUtility.cs b/Editor/Mono/EditorGUIUtility.cs
index a427ee65c4..061998144d 100644
--- a/Editor/Mono/EditorGUIUtility.cs
+++ b/Editor/Mono/EditorGUIUtility.cs
@@ -408,6 +408,7 @@ internal class EditorLockTracker
             /// </summary>
             [SerializeField, HideInInspector]
             bool m_IsLocked;
+            PingData m_Ping = new PingData();
 
             internal virtual bool isLocked
             {
@@ -439,19 +440,55 @@ internal virtual void AddItemsToMenu(GenericMenu menu, bool disabled = false)
                 }
             }
 
-            internal void ShowButton(Rect position, GUIStyle lockButtonStyle, bool disabled = false)
+            internal virtual void PingIcon()
+            {
+                m_Ping.isPinging = true;
+
+                if (m_Ping.m_PingStyle == null)
+                {
+                    m_Ping.m_PingStyle = new GUIStyle("TV Ping");
+
+                    // The default padding is too high for such a small icon and causes the animation to become offset to the left.
+                    m_Ping.m_PingStyle.padding = new RectOffset(8, 0, 0, 0);
+                }
+            }
+
+            internal virtual void StopPingIcon()
+            {
+                m_Ping.isPinging = false;
+            }
+
+            internal bool ShowButton(Rect position, GUIStyle lockButtonStyle, bool disabled = false)
             {
                 using (new EditorGUI.DisabledScope(disabled))
                 {
                     EditorGUI.BeginChangeCheck();
                     bool newLock = GUI.Toggle(position, isLocked, GUIContent.none, lockButtonStyle);
 
+                    if (m_Ping.isPinging && Event.current.type == EventType.Layout)
+                    {
+                        m_Ping.m_ContentRect = position;
+                        m_Ping.m_ContentRect.width *= 2f;
+                        m_Ping.m_AvailableWidth = GUIView.current.position.width;
+
+                        m_Ping.m_ContentDraw = r =>
+                        {
+                            GUI.Toggle(r, newLock, GUIContent.none, lockButtonStyle);
+                        };
+                    }
+
+                    m_Ping.HandlePing();
+
                     if (EditorGUI.EndChangeCheck())
                     {
                         if (newLock != isLocked)
+                        {
                             FlipLocked();
+                            m_Ping.isPinging = false;
+                        }
                     }
                 }
+                return m_Ping.isPinging;
             }
 
             void FlipLocked()
diff --git a/Editor/Mono/EditorHandles/Button.cs b/Editor/Mono/EditorHandles/Button.cs
index 321f7fc0f6..ec224a36ed 100644
--- a/Editor/Mono/EditorHandles/Button.cs
+++ b/Editor/Mono/EditorHandles/Button.cs
@@ -10,6 +10,22 @@ namespace UnityEditorInternal
 {
     internal class Button
     {
+        internal static bool Do(int id, Vector3 position, Quaternion direction, float size, float pickSize, Handles.CapFunction capFunction, bool useLayoutAndMouseMove)
+        {
+            if(!useLayoutAndMouseMove)
+            {
+                Event evt = Event.current;
+                if(evt.type == EventType.Layout || evt.type == EventType.MouseMove)
+                {
+                    //Consuming event id
+                    evt.GetTypeForControl(id);
+                    return false;
+                }
+            }
+
+            return Do(id, position, direction, size, pickSize, capFunction);
+        }
+
         public static bool Do(int id, Vector3 position, Quaternion direction, float size, float pickSize, Handles.CapFunction capFunction)
         {
             Event evt = Event.current;
diff --git a/Editor/Mono/EditorHandles/FreeMove.cs b/Editor/Mono/EditorHandles/FreeMove.cs
index 2aff41d253..c19e283e72 100644
--- a/Editor/Mono/EditorHandles/FreeMove.cs
+++ b/Editor/Mono/EditorHandles/FreeMove.cs
@@ -55,7 +55,6 @@ public static Vector3 Do(int id, Vector3 position, float size, Vector3 snap, Han
                     if (GUIUtility.hotControl == id)
                     {
                         bool rayDrag = EditorGUI.actionKey && evt.shift;
-
                         if (rayDrag)
                         {
                             if (HandleUtility.ignoreRaySnapObjects == null)
@@ -64,7 +63,7 @@ public static Vector3 Do(int id, Vector3 position, float size, Vector3 snap, Han
                             if (HandleUtility.PlaceObject(evt.mousePosition, out Vector3 point, out Vector3 normal))
                             {
                                 float offset = 0;
-                                if (Tools.pivotMode == PivotMode.Center)
+                                if (Tools.pivotMode == PivotMode.Center && !Tools.vertexDragging)
                                 {
                                     float geomOffset = HandleUtility.CalcRayPlaceOffset(HandleUtility.ignoreRaySnapObjects, normal);
                                     if (geomOffset != Mathf.Infinity)
@@ -100,7 +99,7 @@ public static Vector3 Do(int id, Vector3 position, float size, Vector3 snap, Han
                                     position = Handles.inverseMatrix.MultiplyPoint(near);
                                 }
                             }
-
+                            else
                             if (EditorSnapSettings.incrementalSnapActive && !evt.shift)
                             {
                                 Vector3 delta = position - s_StartPosition;
diff --git a/Editor/Mono/EditorHandles/PositionHandle.cs b/Editor/Mono/EditorHandles/PositionHandle.cs
index 34268079b7..15fbff9304 100644
--- a/Editor/Mono/EditorHandles/PositionHandle.cs
+++ b/Editor/Mono/EditorHandles/PositionHandle.cs
@@ -9,8 +9,14 @@ namespace UnityEditor
 {
     public sealed partial class Handles
     {
-        internal struct PositionHandleIds
+        /// <summary>
+        /// Set of IDs corresponding to the handles of Handles.PositionHandle.
+        /// </summary>
+        public struct PositionHandleIds
         {
+            /// <summary>
+            /// Default set of IDs to pass to Handles.PositionHandle.
+            /// </summary>
             public static PositionHandleIds @default
             {
                 get
@@ -29,7 +35,7 @@ public static PositionHandleIds @default
 
             public readonly int x, y, z, xy, yz, xz, xyz;
 
-            public int this[int index]
+            internal int this[int index]
             {
                 get
                 {
@@ -47,7 +53,7 @@ public int this[int index]
                 }
             }
 
-            public bool Has(int id)
+            internal bool Has(int id)
             {
                 return x == id
                     || y == id
@@ -58,7 +64,7 @@ public bool Has(int id)
                     || xyz == id;
             }
 
-            public PositionHandleIds(int x, int y, int z, int xy, int xz, int yz, int xyz)
+            internal PositionHandleIds(int x, int y, int z, int xy, int xz, int yz, int xyz)
             {
                 this.x = x;
                 this.y = y;
@@ -184,7 +190,9 @@ internal static Vector3 DoPositionHandle(PositionHandleIds ids, Vector3 position
             {
                 case EventType.KeyDown:
                     // Holding 'V' turns on the FreeMove transform gizmo and enables vertex snapping.
-                    if (evt.keyCode == KeyCode.V && !currentlyDragging)
+                    if (evt.keyCode == Tools.vertexDraggingShortcutEvent.keyCode
+                        && evt.modifiers == Tools.vertexDraggingShortcutEvent.modifiers
+                        && !currentlyDragging)
                     {
                         s_FreeMoveMode = true;
                     }
@@ -197,13 +205,19 @@ internal static Vector3 DoPositionHandle(PositionHandleIds ids, Vector3 position
                     // implementation is a fair bit simpler this way.
                     // Basic idea: Leave this call above the 'if' statement.
                     position = DoPositionHandle_Internal(ids, position, rotation, PositionHandleParam.DefaultHandle);
-                    if (evt.keyCode == KeyCode.V && !evt.shift && !currentlyDragging)
+                    if (evt.keyCode == Tools.vertexDraggingShortcutEvent.keyCode
+                        && evt.modifiers == Tools.vertexDraggingShortcutEvent.modifiers
+                        && !evt.shift && !currentlyDragging)
                     {
                         s_FreeMoveMode = false;
                     }
                     return position;
 
                 case EventType.Layout:
+                    if (Tools.vertexDragging && !s_FreeMoveMode)
+                    {
+                        s_FreeMoveMode = true;
+                    }
                     if (!currentlyDragging && !Tools.vertexDragging)
                     {
                         s_FreeMoveMode = evt.shift;
diff --git a/Editor/Mono/EditorHandles/RotationHandle.cs b/Editor/Mono/EditorHandles/RotationHandle.cs
index 6704592a2e..4a1173da2e 100644
--- a/Editor/Mono/EditorHandles/RotationHandle.cs
+++ b/Editor/Mono/EditorHandles/RotationHandle.cs
@@ -10,8 +10,14 @@ namespace UnityEditor
 {
     public sealed partial class Handles
     {
-        internal struct RotationHandleIds
+        /// <summary>
+        /// Set of IDs corresponding to the handles of Handles.RotationHandle.
+        /// </summary>
+        public struct RotationHandleIds
         {
+            /// <summary>
+            /// Default set of IDs to pass to Handles.RotationHandle.
+            /// </summary>
             public static RotationHandleIds @default
             {
                 get
@@ -28,7 +34,7 @@ public static RotationHandleIds @default
 
             public readonly int x, y, z, cameraAxis, xyz;
 
-            public int this[int index]
+            internal int this[int index]
             {
                 get
                 {
@@ -44,7 +50,7 @@ public int this[int index]
                 }
             }
 
-            public bool Has(int id)
+            internal bool Has(int id)
             {
                 return x == id
                     || y == id
@@ -53,7 +59,7 @@ public bool Has(int id)
                     || xyz == id;
             }
 
-            public RotationHandleIds(int x, int y, int z, int cameraAxis, int xyz)
+            internal RotationHandleIds(int x, int y, int z, int cameraAxis, int xyz)
             {
                 this.x = x;
                 this.y = y;
diff --git a/Editor/Mono/EditorHandles/SliderScale.cs b/Editor/Mono/EditorHandles/SliderScale.cs
index cdf8fb0b2e..b30ea06703 100644
--- a/Editor/Mono/EditorHandles/SliderScale.cs
+++ b/Editor/Mono/EditorHandles/SliderScale.cs
@@ -81,7 +81,7 @@ internal static float DoAxis(int id, float scale, Vector3 position, Vector3 dire
                     break;
 
                 case EventType.MouseUp:
-                    if (GUIUtility.hotControl == id && (evt.button == 0 || evt.button == 2))
+                    if (GUIUtility.hotControl == id)
                     {
                         GUIUtility.hotControl = 0;
                         evt.Use();
@@ -169,7 +169,7 @@ public static float DoCenter(int id, float value, Vector3 position, Quaternion r
                     break;
 
                 case EventType.MouseUp:
-                    if (GUIUtility.hotControl == id && (evt.button == 0 || evt.button == 2))
+                    if (GUIUtility.hotControl == id)
                     {
                         GUIUtility.hotControl = 0;
                         Tools.UnlockHandlePosition();
diff --git a/Editor/Mono/EditorHandles/VertexSnapping.cs b/Editor/Mono/EditorHandles/VertexSnapping.cs
index c51b3f74d7..230dba08c2 100644
--- a/Editor/Mono/EditorHandles/VertexSnapping.cs
+++ b/Editor/Mono/EditorHandles/VertexSnapping.cs
@@ -9,9 +9,11 @@ namespace UnityEditor
 {
     internal class VertexSnapping
     {
+        internal const string k_VertexSnappingShortcut = "Scene View/Vertex Snapping";
+        internal const string k_VertexSnappingToggleShortcut = "Scene View/Toggle Vertex Snapping";
         private static Vector3 s_VertexSnappingOffset = Vector3.zero;
 
-        [Shortcut("Scene View/Toggle Vertex Snapping", typeof(SceneView), KeyCode.V, ShortcutModifiers.Shift)]
+        [Shortcut(k_VertexSnappingToggleShortcut, typeof(SceneView), KeyCode.V, ShortcutModifiers.Shift)]
         private static void ToggleVertexSnappingViaShortcut()
         {
             int id = GUIUtility.hotControl;
@@ -21,7 +23,7 @@ private static void ToggleVertexSnappingViaShortcut()
                 EnableVertexSnapping(id);
         }
 
-        [ClutchShortcut("Scene View/Vertex Snapping", typeof(SceneView), KeyCode.V)]
+        [ClutchShortcut(k_VertexSnappingShortcut, typeof(SceneView), KeyCode.V)]
         private static void ToggleVertexSnappingViaClutchShortcut(ShortcutArguments arguments)
         {
             int id = GUIUtility.hotControl;
@@ -62,7 +64,7 @@ public static void HandleMouseMove(int id)
         private static void EnableVertexSnapping(int id)
         {
             Tools.vertexDragging = true;
-            if (GUIUtility.hotControl == id)
+            if (GUIUtility.hotControl != 0 && GUIUtility.hotControl == id)
             {
                 Tools.handleOffset = s_VertexSnappingOffset;
             }
@@ -73,6 +75,14 @@ private static void EnableVertexSnapping(int id)
             }
         }
 
+        //Used in tests
+        internal static void DisableVertexSnapping_Internal()
+        {
+            Tools.vertexDragging = false;
+            Tools.handleOffset = Vector3.zero;
+            s_VertexSnappingOffset = Vector3.zero;
+        }
+
         private static void DisableVertexSnapping(int id)
         {
             Tools.vertexDragging = false;
@@ -85,6 +95,16 @@ private static void DisableVertexSnapping(int id)
         private static void UpdateVertexSnappingOffset()
         {
             Event evt = Event.current;
+
+            // If pressing ctrl/cmd key while using vertex snapping,
+            // then the pivot should be used to snap on vertices
+            if(EditorGUI.actionKey &&! evt.shift)
+            {
+                Tools.InvalidateHandlePosition();
+                Tools.handleOffset = Vector3.zero;
+                return;
+            }
+
             Tools.vertexDragging = true;
             Vector3 nearestVertex;
             Transform[] selection = Selection.GetTransforms(SelectionMode.Deep | SelectionMode.ExcludePrefab | SelectionMode.Editable);
diff --git a/Editor/Mono/EditorMode/ModeService.cs b/Editor/Mono/EditorMode/ModeService.cs
index c1b50b0b61..89384e9293 100644
--- a/Editor/Mono/EditorMode/ModeService.cs
+++ b/Editor/Mono/EditorMode/ModeService.cs
@@ -546,6 +546,17 @@ static private IList GetContextMenu(string menuId)
             return contextMenus[menuId] as IList;
         }
 
+        internal static bool HasDynamicLayout(int modeIndex = -1)
+        {
+            var layoutData = GetModeDataSection(modeIndex == -1 ? currentIndex : modeIndex, ModeDescriptor.LayoutKey) as JSONObject;
+            return layoutData != null;
+        }
+
+        internal static JSONObject GetDynamicLayout(int modeIndex = -1)
+        {
+            return GetModeDataSection(modeIndex == -1 ? currentIndex : modeIndex, ModeDescriptor.LayoutKey) as JSONObject;
+        }
+
         private static void BuildContextMenu(IList menus, string menuId, GenericMenu contextMenu, string prefix = "")
         {
             if (menus == null)
@@ -644,7 +655,11 @@ private static void OnModeChangeLayouts(ModeChangedArgs args)
 
             if (HasCapability(ModeCapability.LayoutSwitching, true))
             {
-                WindowLayout.SaveCurrentLayoutPerMode(GetModeId(args.prevIndex));
+                var dynamicLayout = GetDynamicLayout(args.prevIndex);
+                if (dynamicLayout == null || Convert.ToBoolean(dynamicLayout["restore_saved_layout"]))
+                {
+                    WindowLayout.SaveCurrentLayoutPerMode(GetModeId(args.prevIndex));
+                }
 
                 try
                 {
diff --git a/Editor/Mono/EditorSceneManager.bindings.cs b/Editor/Mono/EditorSceneManager.bindings.cs
index e13a85b2de..a8d1249749 100644
--- a/Editor/Mono/EditorSceneManager.bindings.cs
+++ b/Editor/Mono/EditorSceneManager.bindings.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -33,13 +34,6 @@ public sealed partial class EditorSceneManager : SceneManager
         [NativeMethod("IsReloading")]
         public extern static bool IsReloading(Scene scene);
 
-        public extern static int loadedSceneCount
-        {
-            [StaticAccessor("GetSceneManager()", StaticAccessorType.Dot)]
-            [NativeMethod("GetLoadedSceneCount")]
-            get;
-        }
-
         public extern static int loadedRootSceneCount
         {
             [StaticAccessor("GetSceneManager()", StaticAccessorType.Dot)]
diff --git a/Editor/Mono/EditorSceneManager.bindings.deprecated.cs b/Editor/Mono/EditorSceneManager.bindings.deprecated.cs
new file mode 100644
index 0000000000..c6e3faa8ec
--- /dev/null
+++ b/Editor/Mono/EditorSceneManager.bindings.deprecated.cs
@@ -0,0 +1,18 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine.SceneManagement;
+
+namespace UnityEditor.SceneManagement
+{
+    public sealed partial class EditorSceneManager : SceneManager
+    {
+        [Obsolete("EditorSceneManager.loadedSceneCount has been deprecated. Please use SceneManager.loadedSceneCount (UnityUpgradable) -> [UnityEngine] UnityEngine.SceneManagement.SceneManager.loadedSceneCount")]
+        new public static int loadedSceneCount
+        {
+            get => SceneManager.loadedSceneCount;
+        }
+    }
+}
diff --git a/Editor/Mono/EditorSerializationUtility.bindings.cs b/Editor/Mono/EditorSerializationUtility.bindings.cs
index a48de00d4f..30399e0c87 100644
--- a/Editor/Mono/EditorSerializationUtility.bindings.cs
+++ b/Editor/Mono/EditorSerializationUtility.bindings.cs
@@ -3,6 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEngine;
+using UnityEngine.Serialization;
 using UnityEngine.Bindings;
 using UnityObject = UnityEngine.Object;
 using RefId = System.Int64;
@@ -51,49 +53,33 @@ public int CompareTo(ManagedReferenceMissingType other)
     public sealed class SerializationUtility
     {
         // Must match the same declarations in "Runtime/Serialize/ReferenceId.h"
+        [System.Obsolete("Use Serialization.ManagedReferenceUtility.RefIdUnknown instead. (UnityUpgradable) -> [UnityEngine] UnityEngine.Serialization.ManagedReferenceUtility.RefIdUnknown", false)]
         public const RefId RefIdUnknown = -1;
+        [System.Obsolete("Use Serialization.ManagedReferenceUtility.RefIdNull instead. (UnityUpgradable) -> [UnityEngine] UnityEngine.Serialization.ManagedReferenceUtility.RefIdNull", false)]
         public const RefId RefIdNull = -2;
 
-        [NativeMethod("SetManagedReferenceIdForObject")]
-        static extern bool SetManagedReferenceIdForObjectInternal(UnityObject obj, object scriptObj, RefId refId);
-
+        [System.Obsolete("Use Serialization.ManagedReferenceUtility.SetManagedReferenceIdForObject instead. (UnityUpgradable) -> [UnityEngine] UnityEngine.Serialization.ManagedReferenceUtility.SetManagedReferenceIdForObject(*)", false)]
         public static bool SetManagedReferenceIdForObject(UnityObject obj, object scriptObj, RefId refId)
         {
-            if (scriptObj == null)
-                return refId == RefIdNull; // There is no need to explicitly register RefIdNull
-
-            var valueType = scriptObj.GetType();
-            if (valueType == typeof(UnityObject) || valueType.IsSubclassOf(typeof(UnityObject)))
-            {
-                throw new System.InvalidOperationException(
-                    $"Cannot assign an object deriving from UnityEngine.Object to a managed reference. This is not supported.");
-            }
-
-            return SetManagedReferenceIdForObjectInternal(obj, scriptObj, refId);
+            return ManagedReferenceUtility.SetManagedReferenceIdForObject(obj, scriptObj, refId);
         }
 
-        [NativeMethod("GetManagedReferenceIdForObject")]
-        static extern RefId GetManagedReferenceIdForObjectInternal(UnityObject obj, object scriptObj);
-
+        [System.Obsolete("Use Serialization.ManagedReferenceUtility::GetManagedReferenceIdForObject instead. (UnityUpgradable) -> [UnityEngine] UnityEngine.Serialization.ManagedReferenceUtility.GetManagedReferenceIdForObject(*)", false)]
         public static  RefId GetManagedReferenceIdForObject(UnityObject obj, object scriptObj)
         {
-            return GetManagedReferenceIdForObjectInternal(obj, scriptObj);
+            return ManagedReferenceUtility.GetManagedReferenceIdForObject(obj, scriptObj);
         }
 
-        [NativeMethod("GetManagedReference")]
-        static extern object GetManagedReferenceInternal(UnityObject obj, RefId id);
-
+        [System.Obsolete("Use Serialization.ManagedReferenceUtility::GetManagedReference instead. (UnityUpgradable) -> [UnityEngine] UnityEngine.Serialization.ManagedReferenceUtility.GetManagedReference(*)", false)]
         public static object GetManagedReference(UnityObject obj, RefId id)
         {
-            return GetManagedReferenceInternal(obj, id);
+            return ManagedReferenceUtility.GetManagedReference(obj, id);
         }
 
-        [NativeMethod("GetManagedReferenceIds")]
-        static extern RefId[] GetManagedReferenceIdsForObjectInternal(UnityObject obj);
-
+        [System.Obsolete("Use Serialization.ManagedReferenceUtility::GetManagedReferencesIds instead. (UnityUpgradable) -> [UnityEngine] UnityEngine.Serialization.ManagedReferenceUtility.GetManagedReferenceIds(*)", false)]
         public static RefId[] GetManagedReferenceIds(UnityObject obj)
         {
-            return GetManagedReferenceIdsForObjectInternal(obj);
+            return ManagedReferenceUtility.GetManagedReferenceIds(obj);
         }
 
         [NativeMethod("HasManagedReferencesWithMissingTypes")]
diff --git a/Editor/Mono/EditorSettings.bindings.cs b/Editor/Mono/EditorSettings.bindings.cs
index 5689447634..15a342512b 100644
--- a/Editor/Mono/EditorSettings.bindings.cs
+++ b/Editor/Mono/EditorSettings.bindings.cs
@@ -305,5 +305,8 @@ public enum NamingScheme
         public static extern NamingScheme gameObjectNamingScheme { get; set; }
         [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
         public static extern bool assetNamingUsesSpace { get; set; }
+
+        [StaticAccessor("GetEditorSettings()", StaticAccessorType.Dot)]
+        internal static extern bool inspectorUseIMGUIDefaultInspector { get; set; }
     }
 }
diff --git a/Editor/Mono/EditorUIService.cs b/Editor/Mono/EditorUIService.cs
deleted file mode 100644
index 31f7ffc440..0000000000
--- a/Editor/Mono/EditorUIService.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using UnityEditor.ShortcutManagement;
-using UnityEditor.UIElements;
-using UnityEditorInternal;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace UnityEditor
-{
-    internal interface IEditorUIService
-    {
-        // Editor window
-        IWindowBackend GetDefaultWindowBackend(IWindowModel model);
-
-        // Toolbar
-        Type GetDefaultToolbarType();
-        void AddSubToolbar(SubToolbar subToolbar);
-
-        // Inspector
-        IEditorElement CreateEditorElement(int editorIndex, IPropertyView iw, string title);
-        IEditorElement CreateCulledEditorElement(int editorIndex, IPropertyView iw, string title);
-
-        // PackageManagerUI
-        void PackageManagerOpen();
-
-        // ShortcutManager
-        IShortcutManagerWindowView CreateShortcutManagerWindowView(IShortcutManagerWindowViewController viewController, IKeyBindingStateProvider bindingStateProvider);
-
-        // Progress
-        void ProgressWindowShowDetails(bool shouldReposition);
-        void ProgressWindowHideDetails();
-        bool ProgressWindowCanHideDetails();
-
-        // UIToolkit
-        void AddDefaultEditorStyleSheets(VisualElement ve);
-
-        VisualElement CreateUnityEventItem();
-        void BindUnityEventItem(VisualElement item, UnityEventDrawer.PropertyData propertyData, Func<GenericMenu> createMenuCallback, Func<string, string> formatSelectedValueCallback, Func<SerializedProperty> getArgumentCallback);
-        BindableElement CreateObjectField();
-        void SetObjectField(VisualElement element, UnityEngine.Object value, Type type, string label);
-        ListView CreateListViewBinding(SerializedObject serializedObject);
-        VisualElement CreateDropdownField(string[] options, Func<int> getSelectedChoiceCallback);
-        VisualElement CreatePropertyField(SerializedProperty serializedProperty, string label);
-        BindableElement CreateFloatField(string name, Func<float, float> onValidateValue = null, bool isDelayed = false);
-        BindableElement CreateDoubleField(string name, Func<double, double> onValidateValue = null, bool isDelayed = false);
-        BindableElement CreateIntField(string name, Func<int, int> onValidateValue = null, bool isDelayed = false);
-        BindableElement CreateLongField(string name, Func<long, long> onValidateValue = null, bool isDelayed = false);
-        BindableElement CreateVector2Field(string name, Func<Vector2, Vector2> onValidateValue);
-        BindableElement CreateVector2IntField(string name, Func<Vector2Int, Vector2Int> onValidateValue);
-        BindableElement CreateVector3Field(string name, Func<Vector3, Vector3> onValidateValue);
-        BindableElement CreateVector3IntField(string name, Func<Vector3Int, Vector3Int> onValidateValue);
-        BindableElement CreateVector4Field(string name, Func<Vector4, Vector4> onValidateValue);
-        BindableElement CreateTextField(string name = null, bool isMultiLine = false, bool isDelayed = false);
-        BindableElement CreateColorField(string name, bool showAlpha, bool hdr);
-        BindableElement CreateGradientField(string name, bool hdr, ColorSpace colorSpace);
-
-        string GetUIToolkitDefaultCommonDarkStyleSheetPath();
-        string GetUIToolkitDefaultCommonLightStyleSheetPath();
-
-        StyleSheet GetUIToolkitDefaultCommonDarkStyleSheet();
-        StyleSheet GetUIToolkitDefaultCommonLightStyleSheet();
-        StyleSheet CompileStyleSheetContent(string styleSheetContent, bool disableValidation, bool reportErrors);
-    }
-
-    internal static class EditorUIService
-    {
-        public static IEditorUIService instance { get; set; }
-
-        public static bool disableInspectorElementThrottling { get; set; } = false;
-    }
-}
diff --git a/Editor/Mono/EditorUserBuildSettings.bindings.cs b/Editor/Mono/EditorUserBuildSettings.bindings.cs
index b52dd43bd7..9d51c22bc9 100644
--- a/Editor/Mono/EditorUserBuildSettings.bindings.cs
+++ b/Editor/Mono/EditorUserBuildSettings.bindings.cs
@@ -16,6 +16,9 @@ public enum StandaloneBuildSubtarget
     {
         Player = 0,
         Server = 1,
+        // *undocumented*
+        [System.ComponentModel.EditorBrowsable(EditorBrowsableState.Never)]
+        NoSubtarget = -1,
     }
 
     namespace Build
@@ -304,12 +307,28 @@ internal struct SwitchShaderCompilerConfig
         internal bool triggerGraphicsDebuggersConfigUpdate;
     }
 
+    // *undocumented*
+    [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
+    public enum SwitchRomCompressionType
+    {
+        None = 0,
+        Lz4 = 1,
+    }
+
+
     [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
     public enum EmbeddedLinuxArchitecture
     {
+        [UnityEngine.InspectorName("Arm64")]
         Arm64 = 0,
+
+        [UnityEngine.InspectorName("Arm32")]
         Arm32 = 1,
+
+        [UnityEngine.InspectorName("X64")]
         X64 = 2,
+
+        [UnityEngine.InspectorName("X86")]
         X86 = 3,
     }
 
@@ -318,6 +337,7 @@ public enum EmbeddedLinuxArchitecture
     public partial class EditorUserBuildSettings : Object
     {
         private const string kSettingWaitForManagedDebugger = "WaitForManagedDebugger";
+        private const string kSettingManagedDebuggerFixedPort = "ManagedDebuggerFixedPort";
         private EditorUserBuildSettings() {}
 
         internal static extern AppleBuildAndRunType appleBuildAndRunType { get; set; }
@@ -347,6 +367,13 @@ public static extern EmbeddedLinuxArchitecture selectedEmbeddedLinuxArchitecture
             set;
         }
 
+        // Embedded Linux remote device information
+        public static extern bool remoteDeviceInfo { get; set; }
+        public static extern string remoteDeviceAddress { get; set; }
+        public static extern string remoteDeviceUsername { get; set; }
+        public static extern string remoteDeviceExports { get; set; }
+        public static extern string pathOnRemoteDevice { get; set; }
+
         // The currently selected target for a standalone build.
         public static extern BuildTarget selectedStandaloneTarget
         {
@@ -684,10 +711,10 @@ public static string GetPlatformSettings(string platformName, string name)
         public static extern bool development { get; set; }
 
         [Obsolete("Use PlayerSettings.SetIl2CppCodeGeneration and PlayerSettings.GetIl2CppCodeGeneration instead.", true)]
-        public static Build.Il2CppCodeGeneration il2CppCodeGeneratione
+        public static Build.Il2CppCodeGeneration il2CppCodeGeneration
         {
             get { return Build.Il2CppCodeGeneration.OptimizeSpeed; }
-            set { Debug.LogWarning("EditorUserBuildSettings.il2CppCodeGeneratione is obsolete. Please use PlayerSettings.SetIl2CppCodeGeneration and PlayerSettings.GetIl2CppCodeGeneration instead." ); }
+            set { Debug.LogWarning("EditorUserBuildSettings.il2CppCodeGeneration is obsolete. Please use PlayerSettings.SetIl2CppCodeGeneration and PlayerSettings.GetIl2CppCodeGeneration instead." ); }
         }
 
         [Obsolete("Building with pre-built Engine option is no longer supported.", true)]
@@ -758,6 +785,45 @@ public static extern bool switchCreateRomFile
             set;
         }
 
+        public static extern bool switchEnableRomCompression
+        {
+            [NativeMethod("GetEnableRomCompressionForSwitch")]
+            get;
+            [NativeMethod("SetEnableRomCompressionForSwitch")]
+            set;
+        }
+
+        public static extern bool switchSaveADF
+        {
+            [NativeMethod("GetSaveADFForSwitch")]
+            get;
+            [NativeMethod("SetSaveADFForSwitch")]
+            set;
+        }
+
+        public static extern SwitchRomCompressionType switchRomCompressionType
+        {
+            [NativeMethod("GetRomCompressionTypeForSwitch")]
+            get;
+            [NativeMethod("SetRomCompressionTypeForSwitch")]
+            set;
+        }
+
+        public static extern int switchRomCompressionLevel
+        {
+            [NativeMethod("GetRomCompressionLevelForSwitch")]
+            get;
+            [NativeMethod("SetRomCompressionLevelForSwitch")]
+            set;
+        }
+
+        public static extern string switchRomCompressionConfig
+        {
+            [NativeMethod("GetRomCompressionConfigForSwitch")]
+            get;
+            [NativeMethod("SetRomCompressionConfigForSwitch")]
+            set;
+        }
 
         // Enable linkage of NVN Graphics Debugger for Nintendo Switch.
         public static extern bool switchNVNGraphicsDebugger
@@ -877,5 +943,24 @@ public static bool waitForManagedDebugger
                 SetPlatformSettings("Editor", kSettingWaitForManagedDebugger, value.ToString().ToLower());
             }
         }
+
+        public static int managedDebuggerFixedPort
+        {
+            get
+            {
+                if (Int32.TryParse(GetPlatformSettings("Editor", kSettingManagedDebuggerFixedPort), out int value)) {
+                    if (0 < value && value <= 65535)
+                    {
+                        return value;
+                    }
+                }
+                return 0;
+            }
+
+            set
+            {
+                SetPlatformSettings("Editor", kSettingManagedDebuggerFixedPort, value.ToString().ToLower());
+            }
+        }
     }
 }
diff --git a/Editor/Mono/EditorUtility.bindings.cs b/Editor/Mono/EditorUtility.bindings.cs
index da35c60e93..2f50f701e5 100644
--- a/Editor/Mono/EditorUtility.bindings.cs
+++ b/Editor/Mono/EditorUtility.bindings.cs
@@ -10,11 +10,13 @@
 using UnityEngine.Scripting;
 using System.Collections.Generic;
 using System.Linq;
+using static UnityEditor.EditorGUI;
 
 namespace UnityEditor
 {
     [NativeHeader("Editor/Mono/EditorUtility.bindings.h")]
     [NativeHeader("Editor/Mono/MonoEditorUtility.h")]
+    [NativeHeader("Editor/Src/AssetPipeline/UnityExtensions.h")]
     [NativeHeader("Runtime/Shaders/ShaderImpl/ShaderUtilities.h")]
     partial class EditorUtility
     {
@@ -32,7 +34,18 @@ public static string OpenFilePanelWithFilters(string title, string directory, st
         public static extern void RevealInFinder(string path);
 
         [FreeFunction("DisplayDialog")]
-        public static extern bool DisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
+        static extern bool DoDisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
+
+        public static bool DisplayDialog(string title, string message, string ok, [DefaultValue("\"\"")] string cancel)
+        {
+            using (new DisabledGuiViewInputScope(GUIView.current, true))
+            {
+                return DoDisplayDialog(title, message, ok, cancel);
+            }
+        }
+
+        [FreeFunction("GetDialogResponse")]
+        internal static extern bool GetDialogResponse(InteractionContext interactionContext, string title, string message, string ok, [DefaultValue("\"\"")] string cancel);
 
         [ExcludeFromDocs]
         public static bool DisplayDialog(string title, string message, string ok)
@@ -42,6 +55,9 @@ public static bool DisplayDialog(string title, string message, string ok)
 
         [FreeFunction("DisplayDialogComplex")]
         public static extern int DisplayDialogComplex(string title, string message, string ok, string cancel, string alt);
+        [FreeFunction("GetDialogResponseComplex")]
+        internal static extern int GetDialogResponseComplex(InteractionContext interactionContext, string title, string message, string ok, string cancel, string alt);
+
 
         [FreeFunction("RunOpenFolderPanel")]
         public static extern string OpenFolderPanel(string title, string folder, string defaultName);
@@ -52,6 +68,10 @@ public static bool DisplayDialog(string title, string message, string ok)
         [FreeFunction("WarnPrefab")]
         public static extern bool WarnPrefab(Object target, string title, string warning, string okButton);
 
+        [StaticAccessor("UnityExtensions::Get()", StaticAccessorType.Dot)]
+        [NativeMethod("IsInitialized")]
+        public extern static bool IsUnityExtensionsInitialized();
+
         public static extern bool IsPersistent(Object target);
         public static extern string SaveFilePanel(string title, string directory, string defaultName, string extension);
         public static extern int NaturalCompare(string a, string b);
diff --git a/Editor/Mono/EditorUtility.cs b/Editor/Mono/EditorUtility.cs
index 00b7f51972..a5b7a3fc5b 100644
--- a/Editor/Mono/EditorUtility.cs
+++ b/Editor/Mono/EditorUtility.cs
@@ -581,6 +581,10 @@ internal static void DisplayObjectContextMenu(Rect position, Object[] context, i
                     }
                 }
             }
+            else if (context != null && context.Length == 1 && context[0] is Material)
+            {
+                MaterialEditor.AddAdditionalMaterialMenuItems(pm);
+            }
 
             pm.ObjectContextDropDown(position, context, contextUserData);
 
diff --git a/Editor/Mono/EditorWindow.cs b/Editor/Mono/EditorWindow.cs
index 9ba3e9b413..53ea658316 100644
--- a/Editor/Mono/EditorWindow.cs
+++ b/Editor/Mono/EditorWindow.cs
@@ -1132,6 +1132,13 @@ internal void SetDisplayViewSize(int displayId, Vector2 targetSize)
                 m_Parent.SetDisplayViewSize(displayId, targetSize);
         }
 
+        internal Vector2 GetDisplayViewSize(int displayId)
+        {
+            if (m_Parent != null)
+               return m_Parent.GetDisplayViewSize(displayId);
+            return new Vector2(640, 480);
+        }
+
         internal void SetPlayModeView(bool value)
         {
             m_IsPlayModeView = value;
@@ -1297,7 +1304,7 @@ private static VisualElement CreateRoot()
                 renderHints = RenderHints.ClipWithScissors
             };
             root.pseudoStates |= PseudoStates.Root;
-            EditorUIService.instance.AddDefaultEditorStyleSheets(root);
+            UIElementsEditorUtility.AddDefaultEditorStyleSheets(root);
             root.style.overflow = UnityEngine.UIElements.Overflow.Hidden;
             return root;
         }
@@ -1327,8 +1334,7 @@ public bool active
             }
         }
 
-
-        [Shortcut("Overlays/Toggle All Overlays", typeof(OverlayShortcutContext), KeyCode.BackQuote)]
+        [Shortcut("Overlays/Toggle All Overlays", typeof(OverlayShortcutContext), KeyCode.BackQuote, ShortcutModifiers.Shift)]
         static void ToggleAllOverlays(ShortcutArguments args)
         {
             if (!(args.context is OverlayShortcutContext context))
@@ -1344,7 +1350,7 @@ static void HideOverlay(ShortcutArguments args)
                 context.editorWindow.overlayCanvas.HideHoveredOverlay();
         }
 
-        [Shortcut("Overlays/Show Overlay Menu", typeof(OverlayShortcutContext), KeyCode.Space)]
+        [Shortcut("Overlays/Show Overlay Menu", typeof(OverlayShortcutContext),  KeyCode.BackQuote)]
         static void ShowOverlayMenu(ShortcutArguments args)
         {
             if(args.context is OverlayShortcutContext context)
@@ -1365,6 +1371,15 @@ public bool TryGetOverlay(string id, out Overlay match)
             match = null;
             return false;
         }
+
+        internal void OnBackingScaleFactorChangedInternal()
+        {
+            if(overlayCanvas != null)
+                overlayCanvas.Rebuild();
+            OnBackingScaleFactorChanged();
+        }
+
+        protected virtual void OnBackingScaleFactorChanged() { }
     }
 
     [AttributeUsage(AttributeTargets.Class)]
diff --git a/Editor/Mono/FileUtil.bindings.cs b/Editor/Mono/FileUtil.bindings.cs
index 8136718e36..7ae78577ec 100644
--- a/Editor/Mono/FileUtil.bindings.cs
+++ b/Editor/Mono/FileUtil.bindings.cs
@@ -17,8 +17,16 @@ namespace UnityEditor
     public partial class FileUtil
     {
         // Deletes a file or a directory given a path.
-        [FreeFunction]
-        public static extern bool DeleteFileOrDirectory(string path);
+        public static bool DeleteFileOrDirectory(string path)
+        {
+            if (path is null) throw new ArgumentNullException("path");
+            if (path == string.Empty) throw new ArgumentException("path", "The path cannot be empty.");
+
+            return DeleteFileOrDirectoryInternal(path);
+        }
+
+        [FreeFunction("DeleteFileOrDirectory")]
+        private static extern bool DeleteFileOrDirectoryInternal(string path);
 
         [FreeFunction("IsPathCreated")]
         private static extern bool PathExists(string path);
diff --git a/Editor/Mono/FileUtil.cs b/Editor/Mono/FileUtil.cs
index 87e0188043..95c3136dd0 100644
--- a/Editor/Mono/FileUtil.cs
+++ b/Editor/Mono/FileUtil.cs
@@ -210,6 +210,25 @@ internal static void UnityFileCopy(string from, string to, bool overwrite)
             File.Copy(NiceWinPath(from), NiceWinPath(to), overwrite);
         }
 
+
+        internal static bool ReadFileContentBinary(string assetPath, out byte[] fileContent, out string errorMessage)
+        {
+            fileContent = null;
+            errorMessage = null;
+            string absolutePath = FileUtil.PathToAbsolutePath(assetPath);
+            try
+            {
+                fileContent = File.ReadAllBytes(absolutePath);
+            }
+            catch (Exception e)
+            {
+                fileContent = null;
+                errorMessage = e.Message;
+            }
+
+            return fileContent != null;
+        }
+
         internal static string NiceWinPath(string unityPath)
         {
             // IO functions do not like mixing of \ and / slashes, esp. for windows network paths (\\path)
diff --git a/Editor/Mono/GI/Lightmapping.bindings.cs b/Editor/Mono/GI/Lightmapping.bindings.cs
index 1335da13b8..4fb17a7da7 100644
--- a/Editor/Mono/GI/Lightmapping.bindings.cs
+++ b/Editor/Mono/GI/Lightmapping.bindings.cs
@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 using UnityEditor.SceneManagement;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
@@ -457,6 +458,11 @@ internal static void GetEnvironmentSamples(out Vector4[] outDirections, out Vect
         [FreeFunction]
         internal static extern void OnUpdateLightmapEncoding(BuildTargetGroup target);
 
+        // Called when the user changes the HDR Cubemap Encoding option,
+        // will reimport HDR cubemaps with the new encoding.
+        [FreeFunction]
+        internal static extern void OnUpdateHDRCubemapEncoding(BuildTargetGroup target);
+
         // Called when the user changes the Lightmap streaming settings:
         [FreeFunction]
         internal static extern void OnUpdateLightmapStreaming(BuildTargetGroup target);
@@ -568,7 +574,7 @@ public static void BakeMultipleScenes(string[] paths)
             EditorSceneManager.SceneOpenedCallback BakeOnAllOpen = null;
             BakeOnAllOpen = (UnityEngine.SceneManagement.Scene scene, SceneManagement.OpenSceneMode loadSceneMode) =>
             {
-                if (EditorSceneManager.loadedSceneCount == paths.Length)
+                if (SceneManager.loadedSceneCount == paths.Length)
                 {
                     BakeAsync();
                     Lightmapping.bakeCompleted += OnBakeFinish;
@@ -675,10 +681,36 @@ public sealed partial class Lightmapping
         public static extern bool probesIgnoreDirectEnvironment { get; set; }
 
         [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        public static extern void SetCustomBakeInputs(Vector4[] inputData, int sampleCount);
+        private unsafe static extern void SetCustomBakeInputs([Span("inputDataLength", isReadOnly:true)]Vector4* inputData, int inputDataLength, int sampleCount);
+
+        public static void SetCustomBakeInputs(Vector4[] inputData, int sampleCount)
+        {
+            SetCustomBakeInputs(inputData.AsSpan(), sampleCount);
+        }
+        public static unsafe void SetCustomBakeInputs(ReadOnlySpan<Vector4> inputData, int sampleCount)
+        {
+            fixed(Vector4* inputDataPtr = inputData)
+            {
+                SetCustomBakeInputs(inputDataPtr, inputData.Length, sampleCount);
+            }
+        }
+
+
+        [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
+        private static unsafe extern bool GetCustomBakeResultsCopy([Span("resultsLength")]Vector4* results, int resultsLength);
+        public static unsafe bool GetCustomBakeResults(Span<Vector4> results)
+        {
+            fixed (Vector4* resultsPtr = results) {
+                return GetCustomBakeResultsCopy(resultsPtr, results.Length);
+            }
+        }
+        public static bool GetCustomBakeResults([Out] Vector4[] results)
+        {
+            return GetCustomBakeResults(results.AsSpan());
+        }
 
         [StaticAccessor("ProgressiveRuntimeManager::Get()", StaticAccessorType.Arrow)]
-        public static extern bool GetCustomBakeResults([Out] Vector4[] results);
+        public static extern ReadOnlySpan<Vector4> GetCustomBakeResultsNoCopy();
 
         [Obsolete("UnityEditor.Experimental.Lightmapping.extractAmbientOcclusion is obsolete, use Lightmapping.lightingSettings.extractAO instead. ", false)]
         public static bool extractAmbientOcclusion
@@ -715,6 +747,30 @@ public unsafe static bool GetAdditionalBakedProbes(int id, NativeArray<Spherical
             return success;
         }
 
+        public unsafe static bool GetAdditionalBakedProbes(int id, Span<SphericalHarmonicsL2> outBakedProbeSH, Span<float> outBakedProbeValidity, Span<float> outBakedProbeOctahedralDepth)
+        {
+            const int octahedralDepthMapTexelCount = 64; // 8*8
+
+            int numEntries = outBakedProbeSH.Length;
+
+            if (outBakedProbeOctahedralDepth.Length != numEntries * octahedralDepthMapTexelCount)
+            {
+                Debug.LogError("Octahedral array must provide " + numEntries * octahedralDepthMapTexelCount + " floats.");
+                return false;
+            }
+
+            if (outBakedProbeValidity.Length != numEntries)
+            {
+                Debug.LogError("All output arrays must have equal size.");
+                return false;
+            }
+            fixed (void* shPtr = outBakedProbeSH)
+            fixed (void* validityPtr = outBakedProbeValidity)
+            fixed (void* octahedralDepthPtr = outBakedProbeOctahedralDepth)
+            {
+                return GetAdditionalBakedProbes(id, shPtr, validityPtr, octahedralDepthPtr, outBakedProbeSH.Length);
+            }
+        }
         public unsafe static bool GetAdditionalBakedProbes(int id, NativeArray<SphericalHarmonicsL2> outBakedProbeSH, NativeArray<float> outBakedProbeValidity, NativeArray<float> outBakedProbeOctahedralDepth)
         {
             if (outBakedProbeSH == null || !outBakedProbeSH.IsCreated ||
@@ -749,7 +805,19 @@ public unsafe static bool GetAdditionalBakedProbes(int id, NativeArray<Spherical
         }
 
         [FreeFunction]
-        public static extern void SetAdditionalBakedProbes(int id, Vector3[] positions);
+        private static extern unsafe void SetAdditionalBakedProbes(int id, [Span("positionsLength", isReadOnly:true)]Vector3 * positions, int positionsLength);
+
+        public static void SetAdditionalBakedProbes(int id, Vector3[] positions)
+        {
+            SetAdditionalBakedProbes(id, positions.AsSpan());
+        }
+        public static unsafe void SetAdditionalBakedProbes(int id, ReadOnlySpan<Vector3> positions)
+        {
+            fixed(Vector3* positionsPtr = positions)
+            {
+                SetAdditionalBakedProbes(id, positionsPtr, positions.Length);
+            }
+        }
 
         [FreeFunction]
         public static extern void SetLightDirty(Light light);
diff --git a/Editor/Mono/GUI/AppStatusBar.cs b/Editor/Mono/GUI/AppStatusBar.cs
index 3ce7f068ee..67cea790e6 100644
--- a/Editor/Mono/GUI/AppStatusBar.cs
+++ b/Editor/Mono/GUI/AppStatusBar.cs
@@ -205,11 +205,11 @@ private void DrawRefreshStatus()
             }
             else
             {
-                var canHide = EditorUIService.instance.ProgressWindowCanHideDetails();
+                var canHide = ProgressWindow.canHideDetails;
                 if (GUILayout.Button(canHide ? Styles.progressHideIcon : Styles.progressIcon, Styles.statusIcon))
                 {
                     if (canHide)
-                        EditorUIService.instance.ProgressWindowHideDetails();
+                        ProgressWindow.HideDetails();
                     else
                         Progress.ShowDetails(false);
                 }
diff --git a/Editor/Mono/GUI/ColorMutator.cs b/Editor/Mono/GUI/ColorMutator.cs
index 76c9bfa28e..8ddf00633e 100644
--- a/Editor/Mono/GUI/ColorMutator.cs
+++ b/Editor/Mono/GUI/ColorMutator.cs
@@ -46,11 +46,9 @@ internal static void DecomposeHdrColor(Color linearColorHdr, out Color32 baseLin
             }
         }
 
-        public Color originalColor
-        {
-            get { return m_OriginalColor; }
-        }
+        public Color originalColor => m_OriginalColor;
         [SerializeField] private Color m_OriginalColor;
+        [SerializeField] private Color m_HDRBaseColor;
 
         public Color32 color
         {
@@ -121,6 +119,7 @@ public void SetColorChannelHdr(RgbaChannel channel, float value)
             if (m_ColorHdr[(int)channel] == value)
                 return;
             m_ColorHdr[(int)channel] = value;
+            m_HDRBaseColor = new Color(m_ColorHdr[0], m_ColorHdr[1], m_ColorHdr[2], m_ColorHdr[3]);
             OnRgbaHdrChannelChanged((int)channel);
         }
 
@@ -157,6 +156,7 @@ public void SetColorChannel(HsvChannel channel, float value)
             m_ColorHdr[(int)RgbaChannel.R] = newColor.r;
             m_ColorHdr[(int)RgbaChannel.G] = newColor.g;
             m_ColorHdr[(int)RgbaChannel.B] = newColor.b;
+            m_HDRBaseColor = new Color(m_ColorHdr[0], m_ColorHdr[1], m_ColorHdr[2], m_ColorHdr[3]);
         }
 
         public float exposureValue
@@ -167,7 +167,7 @@ public float exposureValue
                 if (m_ExposureValue == value)
                     return;
                 m_ExposureValue = value;
-                var newRgbFloat = (Color)color * Mathf.Pow(2f, m_ExposureValue);
+                var newRgbFloat = m_HDRBaseColor * Mathf.Pow(2f, m_ExposureValue);
                 m_ColorHdr[(int)RgbaChannel.R] = newRgbFloat.r;
                 m_ColorHdr[(int)RgbaChannel.G] = newRgbFloat.g;
                 m_ColorHdr[(int)RgbaChannel.B] = newRgbFloat.b;
@@ -178,6 +178,7 @@ public float exposureValue
         public ColorMutator(Color originalColor)
         {
             m_OriginalColor = originalColor;
+            m_HDRBaseColor = originalColor;
             Reset();
         }
 
@@ -190,6 +191,7 @@ public void Reset()
             m_ColorHdr[(int)RgbaChannel.G] = m_OriginalColor.g;
             m_ColorHdr[(int)RgbaChannel.B] = m_OriginalColor.b;
             m_ColorHdr[(int)RgbaChannel.A] = m_OriginalColor.a;
+            m_HDRBaseColor = new Color(m_ColorHdr[0], m_ColorHdr[1], m_ColorHdr[2], m_ColorHdr[3]);
 
             if (m_Color == null || m_Color.Length != 4)
                 m_Color = new byte[4];
diff --git a/Editor/Mono/GUI/EditorApplicationLayout.cs b/Editor/Mono/GUI/EditorApplicationLayout.cs
index e284d0ee04..ea770e9a8b 100644
--- a/Editor/Mono/GUI/EditorApplicationLayout.cs
+++ b/Editor/Mono/GUI/EditorApplicationLayout.cs
@@ -134,11 +134,6 @@ static internal void InitPlaymodeLayout()
                     playModeView.m_Parent.SetAsStartView();
                     playModeView.m_Parent.SetAsLastPlayModeView();
 
-                    if (playModeView.maximized)
-                    {
-                        playModeView.m_Parent.Focus();
-                    }
-
                     if (playModeView is IGameViewOnPlayMenuUser)
                     {
                         if (((IGameViewOnPlayMenuUser)playModeView).playFocused)
@@ -155,11 +150,13 @@ static internal void FinalizePlaymodeLayout()
         {
             foreach (var playModeView in m_PlayModeViewList)
             {
-                if (playModeView != null && playModeView.enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayMaximized)
+                if (playModeView != null)
                 {
                     if (m_MaximizePending)
                         WindowLayout.MaximizePresent(playModeView);
 
+                    // All StartView references on all play mode views must be cleared before play mode starts. Otherwise it may cause issues
+                    // with input being routed to the correct game window. See case 1381985
                     playModeView.m_Parent.ClearStartView();
                 }
             }
diff --git a/Editor/Mono/GUI/GradientEditor.cs b/Editor/Mono/GUI/GradientEditor.cs
index 0f036f273d..aea7c9bd30 100644
--- a/Editor/Mono/GUI/GradientEditor.cs
+++ b/Editor/Mono/GUI/GradientEditor.cs
@@ -28,6 +28,19 @@ static GUIStyle GetStyle(string name)
                 GUISkin s = (GUISkin)EditorGUIUtility.LoadRequired("GradientEditor.GUISkin");
                 return s.GetStyle(name);
             }
+
+            public readonly GUIContent[] modeTexts =
+            {
+                EditorGUIUtility.TrTextContent("Blend (Classic)"),
+                EditorGUIUtility.TrTextContent("Blend (Perceptual)"),
+                EditorGUIUtility.TrTextContent("Fixed")
+            };
+            public readonly int[] modeValues =
+            {
+                (int)GradientMode.Blend,
+                (int)GradientMode.PerceptualBlend,
+                (int)GradientMode.Fixed
+            };
         }
         static Styles s_Styles;
         static Texture2D s_BackgroundTexture;
@@ -155,7 +168,7 @@ public void OnGUI(Rect position)
             float gradientTextureHeight = position.height - 2 * swatchHeight - editSectionHeight - modeHeight;
 
             position.height = modeHeight;
-            m_GradientMode = (GradientMode)EditorGUI.EnumPopup(position, s_Styles.modeText, m_GradientMode);
+            m_GradientMode = (GradientMode)EditorGUI.IntPopup(position, s_Styles.modeText, (int)m_GradientMode, s_Styles.modeTexts, s_Styles.modeValues);
             if (m_GradientMode != m_Gradient.mode)
                 AssignBack();
 
@@ -471,6 +484,7 @@ void AssignBack()
             m_Gradient.colorKeys = colorKeys;
             m_Gradient.alphaKeys = alphaKeys;
             m_Gradient.mode = m_GradientMode;
+            m_Gradient.colorSpace = m_ColorSpace;
 
             GUI.changed = true;
         }
diff --git a/Editor/Mono/GUI/GradientPicker.cs b/Editor/Mono/GUI/GradientPicker.cs
index cf13ddf013..3919ba7850 100644
--- a/Editor/Mono/GUI/GradientPicker.cs
+++ b/Editor/Mono/GUI/GradientPicker.cs
@@ -43,7 +43,7 @@ internal class GradientPicker : EditorWindow
         // Static methods
         public static void Show(Gradient newGradient, bool hdr, ColorSpace colorSpace = ColorSpace.Gamma)
         {
-            Show(newGradient, hdr, ColorSpace.Gamma, null, GUIView.current);
+            Show(newGradient, hdr, colorSpace, null, GUIView.current);
         }
 
         public static void Show(Gradient newGradient, bool hdr, System.Action<Gradient> onGradientChanged)
@@ -53,7 +53,7 @@ public static void Show(Gradient newGradient, bool hdr, System.Action<Gradient>
 
         public static void Show(Gradient newGradient, bool hdr, ColorSpace colorSpace, System.Action<Gradient> onGradientChanged)
         {
-            Show(newGradient, hdr, ColorSpace.Gamma, onGradientChanged, null);
+            Show(newGradient, hdr, colorSpace, onGradientChanged, null);
         }
 
         private static void Show(Gradient newGradient, bool hdr, ColorSpace colorSpace, System.Action<Gradient> onGradientChanged, GUIView currentView)
@@ -81,7 +81,7 @@ static void PrepareShow(bool hdr, ColorSpace colorSpace)
                 s_GradientPicker.minSize = minSize;
                 s_GradientPicker.maxSize = maxSize;
                 s_GradientPicker.wantsMouseMove = true;
-                Undo.undoRedoPerformed += s_GradientPicker.OnUndoPerformed;
+                Undo.undoRedoEvent += s_GradientPicker.OnUndoPerformed;
             }
 
             s_GradientPicker.ShowAuxWindow(); // Use this if auto close on lost focus is wanted.
@@ -286,10 +286,10 @@ public static void RepaintWindow()
 
         private void UnregisterEvents()
         {
-            Undo.undoRedoPerformed -= this.OnUndoPerformed;
+            Undo.undoRedoEvent -= this.OnUndoPerformed;
         }
 
-        private void OnUndoPerformed()
+        private void OnUndoPerformed(in UndoRedoInfo info)
         {
             this.Init(this.m_Gradient, this.m_HDR, this.m_ColorSpace);
         }
diff --git a/Editor/Mono/GUI/LazyLoadReferenceField.cs b/Editor/Mono/GUI/LazyLoadReferenceField.cs
index d94d2c43f7..31fed6affb 100644
--- a/Editor/Mono/GUI/LazyLoadReferenceField.cs
+++ b/Editor/Mono/GUI/LazyLoadReferenceField.cs
@@ -35,10 +35,10 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
         {
             ScriptAttributeUtility.GetFieldInfoFromProperty(property, out var fieldType);
 
-            var objectField = EditorUIService.instance.CreateObjectField();
+            var objectField = new UnityEditor.UIElements.ObjectField(property.displayName);
             var genericType = fieldType.GetGenericArguments()[0];
-
-            EditorUIService.instance.SetObjectField(objectField, property.objectReferenceValue, genericType, property.displayName);
+            objectField.objectType = genericType;
+            objectField.value = property.objectReferenceValue;
             objectField.bindingPath = property.propertyPath;
 
             return objectField;
diff --git a/Editor/Mono/GUI/ObjectField.cs b/Editor/Mono/GUI/ObjectField.cs
index c0c5faed64..0e160ecae6 100644
--- a/Editor/Mono/GUI/ObjectField.cs
+++ b/Editor/Mono/GUI/ObjectField.cs
@@ -161,12 +161,17 @@ static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Ob
             return DoObjectField(position, dropRect, id, obj, objBeingEdited, objType, null, property, validator, allowSceneObjects, style, EditorStyles.objectFieldButton);
         }
 
+        static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Object objBeingEdited, System.Type objType, System.Type additionalType, SerializedProperty property, ObjectFieldValidator validator, bool allowSceneObjects, GUIStyle style, Action<Object> onObjectSelectorClosed, Action<Object> onObjectSelectedUpdated = null)
+        {
+            return DoObjectField(position, dropRect, id, obj, objBeingEdited, objType, additionalType, property, validator, allowSceneObjects, style, EditorStyles.objectFieldButton, onObjectSelectorClosed, onObjectSelectedUpdated);
+        }
+
         static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Object objBeingEdited, System.Type objType, System.Type additionalType, SerializedProperty property, ObjectFieldValidator validator, bool allowSceneObjects, GUIStyle style)
         {
             return DoObjectField(position, dropRect, id, obj, objBeingEdited, objType, additionalType, property, validator, allowSceneObjects, style, EditorStyles.objectFieldButton);
         }
 
-        static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Object objBeingEdited, System.Type objType, System.Type additionalType, SerializedProperty property, ObjectFieldValidator validator, bool allowSceneObjects, GUIStyle style, GUIStyle buttonStyle)
+        static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Object objBeingEdited, System.Type objType, System.Type additionalType, SerializedProperty property, ObjectFieldValidator validator, bool allowSceneObjects, GUIStyle style, GUIStyle buttonStyle, Action<Object> onObjectSelectorClosed = null, Action<Object> onObjectSelectedUpdated = null)
         {
             if (validator == null)
                 validator = ValidateObjectFieldAssignment;
@@ -278,9 +283,9 @@ static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Ob
                                 GUIUtility.keyboardControl = id;
                                 var types = additionalType == null ? new Type[] {objType} : new Type[] { objType, additionalType };
                                 if (property != null)
-                                    ObjectSelector.get.Show(types, property, allowSceneObjects);
+                                    ObjectSelector.get.Show(types, property, allowSceneObjects, onObjectSelectorClosed: onObjectSelectorClosed, onObjectSelectedUpdated: onObjectSelectedUpdated);
                                 else
-                                    ObjectSelector.get.Show(obj, types, objBeingEdited, allowSceneObjects);
+                                    ObjectSelector.get.Show(obj, types, objBeingEdited, allowSceneObjects, onObjectSelectorClosed: onObjectSelectorClosed, onObjectSelectedUpdated: onObjectSelectedUpdated);
                                 ObjectSelector.get.objectSelectorID = id;
 
                                 evt.Use();
@@ -364,8 +369,8 @@ static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Ob
                                     var parentArrayProperty = property.serializedObject.FindProperty(parentArrayPropertyPath);
                                     bool isReorderableList = PropertyHandler.s_reorderableLists.ContainsKey(ReorderableListWrapper.GetPropertyIdentifier(parentArrayProperty));
 
-                                    // If it's an element of an non-orderable array, remove that element from the array
-                                    if (!isReorderableList)
+                                    // If it's an element of an non-orderable array and it is displayed inside a list, remove that element from the array (cases 1379541 & 1335322)
+                                    if (!isReorderableList && GUI.isInsideList && GetInsideListDepth() == parentArrayProperty.depth)
                                         TargetChoiceHandler.DeleteArrayElement(property);
                                     else
                                         property.objectReferenceValue = null;
diff --git a/Editor/Mono/GUI/PackageExport.cs b/Editor/Mono/GUI/PackageExport.cs
index 7b761009f0..af6f7d45d6 100644
--- a/Editor/Mono/GUI/PackageExport.cs
+++ b/Editor/Mono/GUI/PackageExport.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using UnityEditor.IMGUI.Controls;
 using UnityEngine;
@@ -189,6 +190,14 @@ void BottomArea()
 
             if (GUILayout.Button(EditorGUIUtility.TrTextContent("Export...")))
             {
+                string invalidChars = EditorUtility.GetInvalidFilenameChars();
+                var selectedItemWithInvalidChar = m_ExportPackageItems.FirstOrDefault(item => Path.GetFileNameWithoutExtension(item.assetPath).IndexOfAny(invalidChars.ToCharArray()) != -1 && item.enabledStatus > 0);
+                if (selectedItemWithInvalidChar != null && !EditorUtility.DisplayDialog(L10n.Tr("Cross platform incompatibility"), L10n.Tr($"The asset “{Path.GetFileNameWithoutExtension(selectedItemWithInvalidChar.assetPath)}” contains one or more characters that are not compatible across platforms: {invalidChars}"), L10n.Tr("I understand"), L10n.Tr("Cancel")))
+                {
+                    GUIUtility.ExitGUI();
+                    return;
+                }
+
                 Export();
                 GUIUtility.ExitGUI();
             }
diff --git a/Editor/Mono/GUI/PackageImportTreeView.cs b/Editor/Mono/GUI/PackageImportTreeView.cs
index ac7a8f04f9..5c48ee85c4 100644
--- a/Editor/Mono/GUI/PackageImportTreeView.cs
+++ b/Editor/Mono/GUI/PackageImportTreeView.cs
@@ -21,7 +21,7 @@ internal class PackageImportTreeView
         static readonly bool s_UseFoldouts = true;
         public enum EnabledState
         {
-            NotSet = -1,
+            Disabled = -1,
             None = 0,
             All = 1,
             Mixed = 2
@@ -71,6 +71,11 @@ void RecursiveComputeEnabledStateForFolders(PackageImportTreeViewItem pitem, Has
                     RecursiveComputeEnabledStateForFolders(child as PackageImportTreeViewItem, done);
                 }
             }
+            else if (pitem.item.isFolder)
+            {
+                // since the folder is empty, we don't need to set the enabled check depending of it's children
+                done.Add(pitem);
+            }
 
             // Now do logic
             if (!done.Contains(pitem))
@@ -107,6 +112,10 @@ bool ItemShouldBeConsideredForEnabledCheck(PackageImportTreeViewItem pitem)
             if (pitem.item == null)
                 return true;
 
+            // item is disabled
+            if (pitem.enableState == EnabledState.Disabled)
+                return false;
+
             var item = pitem.item;
             // Its a package asset or its changed
             if (item.projectAsset || !(item.isFolder || item.assetChanged))
@@ -123,7 +132,8 @@ EnabledState GetFolderChildrenEnabledState(PackageImportTreeViewItem folder)
             if (!folder.hasChildren)
                 return EnabledState.None;
 
-            EnabledState amount = EnabledState.NotSet;
+            // item is disabled if none of its children can be considered for enabled check
+            EnabledState amount = EnabledState.Disabled;
 
             int i = 0;
             for (; i < folder.children.Count; ++i)
@@ -154,9 +164,6 @@ EnabledState GetFolderChildrenEnabledState(PackageImportTreeViewItem folder)
                 }
             }
 
-            if (amount == EnabledState.NotSet)
-                return EnabledState.None;
-
             return amount;
         }
 
@@ -345,6 +352,7 @@ override public void OnRowGUI(Rect rowRect, TreeViewItem tvItem, int row, bool s
                     selectionStyle.Draw(rowRect, false, false, true, focused);
 
                 bool validItem    = (item != null);
+                bool isDisabled   = (item != null) ? item.enabledStatus == (int)EnabledState.Disabled : false;
                 bool isFolder     = (item != null) ? item.isFolder     : true;
                 bool assetChanged = (item != null) ? item.assetChanged : false;
                 bool pathConflict = (item != null) ? item.pathConflict : false;
@@ -372,7 +380,7 @@ override public void OnRowGUI(Rect rowRect, TreeViewItem tvItem, int row, bool s
                     DoPreviewPopup(pitem, rowRect);
 
                     // 4. Warning about file/GUID clashing.
-                    if (repainting && validItem)
+                    if (!isDisabled && repainting && validItem)
                     {
                         if (pathConflict)
                         {
@@ -392,7 +400,7 @@ override public void OnRowGUI(Rect rowRect, TreeViewItem tvItem, int row, bool s
                     }
 
                     // 5. Optional badge ("New")
-                    if (repainting && validItem && !(exists || pathConflict))
+                    if (!isDisabled && repainting && validItem && !(exists || pathConflict))
                     {
                         // FIXME: Need to enable tooltips here.
                         Texture badge = Constants.badgeNew.image;
@@ -401,7 +409,7 @@ override public void OnRowGUI(Rect rowRect, TreeViewItem tvItem, int row, bool s
                     }
 
                     // 7. Show what stuff has changed
-                    if (repainting && validItem && (exists || pathConflict) && assetChanged)
+                    if (!isDisabled && repainting && validItem && (exists || pathConflict) && assetChanged)
                     {
                         if (PackageImportWizard.instance.IsProjectSettingStep)
                         {
@@ -429,9 +437,14 @@ static void Toggle(ImportPackageItem[] items, PackageImportTreeViewItem pitem, R
                 if (setMixed)
                     style = EditorStyles.toggleMixed;
 
+                if (isFolder && (pitem.enableState == EnabledState.Disabled))
+                    GUI.enabled = false;
+
                 bool newEnabled =  GUI.Toggle(toggleRect, enabled, GUIContent.none, style);
                 if (newEnabled != enabled)
                     pitem.enableState = newEnabled ? EnabledState.All : EnabledState.None;
+
+                GUI.enabled = true;
             }
 
             void DoToggle(PackageImportTreeViewItem pitem, Rect toggleRect)
diff --git a/Editor/Mono/GUI/PragmaFixingWindow.cs b/Editor/Mono/GUI/PragmaFixingWindow.cs
deleted file mode 100644
index 796ec721bb..0000000000
--- a/Editor/Mono/GUI/PragmaFixingWindow.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using UnityEngine;
-using UnityEditorInternal;
-using UnityEditor.Scripting;
-
-namespace UnityEditor
-{
-    internal class PragmaFixingWindow : EditorWindow
-    {
-        public static void ShowWindow(string[] paths)
-        {
-            PragmaFixingWindow win = EditorWindow.GetWindow<PragmaFixingWindow>(true);
-            win.SetPaths(paths);
-            win.ShowModal();
-        }
-
-        class Styles
-        {
-            public GUIStyle selected = "OL SelectedRow";
-            public GUIStyle box = "OL Box";
-            public GUIStyle button = "LargeButton";
-        }
-
-        static Styles s_Styles = null;
-
-        ListViewState m_LV = new ListViewState();
-        string[] m_Paths;
-
-        public PragmaFixingWindow()
-        {
-            titleContent = EditorGUIUtility.TrTextContent("Unity - #pragma fixing");
-        }
-
-        public void SetPaths(string[] paths)
-        {
-            m_Paths = paths;
-            m_LV.totalRows = paths.Length;
-        }
-
-        void OnGUI()
-        {
-            if (s_Styles == null)
-            {
-                s_Styles = new Styles();
-                minSize = new Vector2(450, 300);
-                position = new Rect(position.x, position.y, minSize.x, minSize.y);
-            }
-
-            GUILayout.Space(10);
-            GUILayout.Label("#pragma implicit and #pragma downcast need to be added to following files\nfor backwards compatibility");
-            GUILayout.Space(10);
-
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(10);
-            foreach (ListViewElement el in ListViewGUILayout.ListView(m_LV, s_Styles.box))
-            {
-                if (el.row == m_LV.row && Event.current.type == EventType.Repaint)
-                    s_Styles.selected.Draw(el.position, false, false, false, false);
-
-                GUILayout.Label(m_Paths[el.row]);
-            }
-            GUILayout.Space(10);
-            GUILayout.EndHorizontal();
-            GUILayout.Space(10);
-
-            GUILayout.BeginHorizontal();
-            GUILayout.FlexibleSpace();
-            if (GUILayout.Button("Fix now", s_Styles.button))
-            {
-                Close();
-                PragmaFixing30.FixFiles(m_Paths);
-                // bugfix (377429): do not call AssetDatabase.Refresh here as that screws up project upgrading.
-                // When this script is invoked from Application::InitializeProject, the assets will be refreshed anyway.
-                GUIUtility.ExitGUI();
-            }
-
-            if (GUILayout.Button("Ignore", s_Styles.button))
-            {
-                Close();
-                GUIUtility.ExitGUI();
-            }
-
-            if (GUILayout.Button("Quit", s_Styles.button))
-            {
-                EditorApplication.Exit(0);
-                GUIUtility.ExitGUI();
-            }
-
-            GUILayout.Space(10);
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(10);
-        }
-    }
-}
diff --git a/Editor/Mono/GUI/RenameOverlay.cs b/Editor/Mono/GUI/RenameOverlay.cs
index 8b775288f4..85b8ab136e 100644
--- a/Editor/Mono/GUI/RenameOverlay.cs
+++ b/Editor/Mono/GUI/RenameOverlay.cs
@@ -95,8 +95,8 @@ void BeginRenameInternalCallback()
 
             m_IsWaitingForDelay = false;
 
-            Undo.undoRedoPerformed -= UndoRedoWasPerformed;
-            Undo.undoRedoPerformed += UndoRedoWasPerformed;
+            Undo.undoRedoEvent -= UndoRedoWasPerformed;
+            Undo.undoRedoEvent += UndoRedoWasPerformed;
         }
 
         public void EndRename(bool acceptChanges)
@@ -105,7 +105,7 @@ public void EndRename(bool acceptChanges)
             if (!m_IsRenaming)
                 return;
 
-            Undo.undoRedoPerformed -= UndoRedoWasPerformed;
+            Undo.undoRedoEvent -= UndoRedoWasPerformed;
             EditorApplication.update -= BeginRenameInternalCallback;
 
             RemoveMessage();
@@ -137,12 +137,12 @@ public void Clear()
             m_UserData = 0;
             m_IsWaitingForDelay = false;
             m_OriginalEventType = EventType.Ignore;
-            Undo.undoRedoPerformed -= UndoRedoWasPerformed;
+            Undo.undoRedoEvent -= UndoRedoWasPerformed;
 
             // m_IsRenamingFilename = false; // Only clear temp data used for renaming not state that we want to persist
         }
 
-        void UndoRedoWasPerformed()
+        void UndoRedoWasPerformed(in UndoRedoInfo info)
         {
             // If undo/redo was performed then close the rename overlay as it does not support undo/redo
             // We need to delay the EndRename until next OnGUI as clients poll the state of the rename overlay state there
@@ -243,7 +243,8 @@ public bool OnGUI(GUIStyle textFieldStyle)
             }
 
             // Detect if we clicked outside the text field (must be before text field below which steals keyboard control)
-            if (m_OriginalEventType == EventType.MouseDown && !m_EditFieldRect.Contains(Event.current.mousePosition))
+            // To workaround that, we assume that an used mousedown event means a click outside.
+            if (m_OriginalEventType == EventType.MouseDown && (Event.current.type == EventType.Used || !m_EditFieldRect.Contains(Event.current.mousePosition)))
             {
                 EndRename(true);
                 return false;
diff --git a/Editor/Mono/GUI/ReorderableList.cs b/Editor/Mono/GUI/ReorderableList.cs
index edc5547b5e..8aa4dd0f13 100644
--- a/Editor/Mono/GUI/ReorderableList.cs
+++ b/Editor/Mono/GUI/ReorderableList.cs
@@ -78,31 +78,37 @@ public class ReorderableList
         public bool displayAdd;
         public bool displayRemove;
 
-        bool scheduleRemove;
+        bool m_scheduleRemove;
 
         internal bool m_IsEditable;
         internal bool m_HasPropertyDrawer;
+        internal int m_CacheCount = 0; // This one has to be internal so that we can execute multiple tests in one frame
 
         private int id = -1;
 
-        internal class PropertyCacheEntry
+        bool m_ScheduleGUIChanged = false;
+        internal struct PropertyCacheEntry
         {
             public SerializedProperty property;
             public float height;
             public float offset;
-            public int lastControlCount;
+            public int controlCount;
 
-            public PropertyCacheEntry(SerializedProperty property, float height, float offset)
+            public bool Set(SerializedProperty property, float height, float offset)
             {
+                bool heightChange = this.height != height;
+
                 this.property = property;
                 this.height = height;
                 this.offset = offset;
-                lastControlCount = 0;
+
+                // Schedule recaching if height is changing. Otherwise we might mishandle animated GUI controls
+                return heightChange;
             }
         }
-        List<PropertyCacheEntry> m_PropertyCache = new List<PropertyCacheEntry>();
+        internal bool m_PropertyCacheValid = false;
+        PropertyCacheEntry[] m_PropertyCache = new PropertyCacheEntry[0];
         static List<string> m_OutdatedProperties = new List<string>();
-        internal bool IsCacheClear => m_PropertyCache.Count == 0;
 
         static string GetParentListPath(string propertyPath)
         {
@@ -127,7 +133,7 @@ bool CheckForChildInvalidation()
         {
             if (m_OutdatedProperties.BinarySearch(m_PropertyPath) >= 0)
             {
-                ClearCache();
+                InvalidateCache();
                 m_OutdatedProperties = m_OutdatedProperties.Where(e => !e.Equals(m_PropertyPath)).ToList();
                 return true;
             }
@@ -201,7 +207,7 @@ public void DrawFooter(Rect rect, ReorderableList list)
                                 DoAddButton(list);
 
                             list.onChangedCallback?.Invoke(list);
-                            list.ClearCacheRecursive();
+                            list.InvalidateCacheRecursive();
                         }
                     }
                 }
@@ -211,7 +217,7 @@ public void DrawFooter(Rect rect, ReorderableList list)
                         || (list.onCanRemoveCallback != null && !list.onCanRemoveCallback(list))
                         || list.isOverMaxMultiEditLimit))
                     {
-                        if (GUI.Button(removeRect, iconToolbarMinus, preButton) || GUI.enabled && list.scheduleRemove)
+                        if (GUI.Button(removeRect, iconToolbarMinus, preButton) || GUI.enabled && list.m_scheduleRemove)
                         {
                             if (list.onRemoveCallback == null)
                             {
@@ -221,13 +227,13 @@ public void DrawFooter(Rect rect, ReorderableList list)
                                 list.onRemoveCallback(list);
 
                             list.onChangedCallback?.Invoke(list);
-                            list.ClearCacheRecursive();
+                            list.InvalidateCacheRecursive();
                             GUI.changed = true;
                         }
                     }
                 }
 
-                list.scheduleRemove = false;
+                list.m_scheduleRemove = false;
             }
 
             // default add button behavior
@@ -273,7 +279,7 @@ internal void DoAddButton(ReorderableList list, Object value)
                         Debug.LogError("Cannot add element of type Null.");
                 }
                 Undo.SetCurrentGroupName(undoAdd);
-                list.ClearCache();
+                list.InvalidateCache();
             }
 
             public void DoAddButton(ReorderableList list)
@@ -317,7 +323,7 @@ public void DoRemoveButton(ReorderableList list)
                 }
                 list.index = Mathf.Clamp(lastDeletedIndex - 1, 0, list.count - 1);
                 Undo.SetCurrentGroupName(undoRemove);
-                list.ClearCache();
+                list.InvalidateCache();
             }
 
             // draw the default header background
@@ -376,8 +382,12 @@ public void DrawElement(Rect rect, SerializedProperty element, System.Object lis
                     float oldLabelWidth = EditorGUIUtility.labelWidth;
                     EditorGUIUtility.labelWidth = FieldLabelSize(rect, prop);
 
-                    var handler = ScriptAttributeUtility.GetHandler(prop);
-                    handler.OnGUI(rect, prop, null, true);
+                    try
+                    {
+                        var handler = ScriptAttributeUtility.GetHandler(prop);
+                        handler.OnGUI(rect, prop, null, true);
+                    }
+                    catch (ObjectDisposedException) { }
                     if (Event.current.type == EventType.ContextClick && rect.Contains(Event.current.mousePosition)) Event.current.Use();
 
                     EditorGUIUtility.labelWidth = oldLabelWidth;
@@ -411,12 +421,25 @@ public static Defaults defaultBehaviours
         }
 
         static List<WeakReference<ReorderableList>> s_Instances = new List<WeakReference<ReorderableList>>();
-        internal static void ClearExistingListCaches() => s_Instances.ForEach(list =>
+        internal static void InvalidateExistingListCaches() => s_Instances.ForEach(list =>
         {
             if (!list.TryGetTarget(out ReorderableList reorderableList)) return;
-            reorderableList.ClearCache();
+            reorderableList.InvalidateCache();
         });
 
+        public static ReorderableList GetReorderableListFromSerializedProperty(SerializedProperty prop)
+        {
+            var id = ReorderableListWrapper.GetPropertyIdentifier(prop);
+            ReorderableList list = null;
+            s_Instances?.FirstOrDefault(i =>
+            {
+                ReorderableList list2 = null;
+                if (!(i?.TryGetTarget(out list2) ?? false)) return false;
+                return ReorderableListWrapper.GetPropertyIdentifier(list2?.serializedProperty).Equals(id);
+            })?.TryGetTarget(out list);
+            return list;
+        }
+
         // constructors
         public ReorderableList(IList elements, Type elementType)
         {
@@ -509,90 +532,84 @@ public bool draggable
             set { m_Draggable = value; }
         }
 
+        void TryOverrideElementHeightWithPropertyDrawer(SerializedProperty property, ref float height)
+        {
+            if (m_HasPropertyDrawer)
+            {
+                try
+                {
+                    height = ScriptAttributeUtility.GetHandler(property).GetHeight(property, null, true);
+                }
+                catch (ObjectDisposedException)
+                {
+                    // Sometimes we find properties that no longer exist so we don't cache them
+                    height = int.MinValue;
+                    m_Count--;
+                }
+            }
+        }
+
         internal void CacheIfNeeded()
         {
-            if (isOverMaxMultiEditLimit) return;
+            // Don't allow recaching multiple times in one frame as we won't be able to handle animated foldouts
+            if (isOverMaxMultiEditLimit || m_PropertyCacheValid) return;
+            m_PropertyCacheValid = true;
+            m_CacheCount++;
 
-            m_PropertyCache.Capacity = Mathf.Max(m_PropertyCache.Capacity, m_Count - 1);
-            while (m_Count > m_PropertyCache.Count)
+            Array.Resize(ref m_PropertyCache, count);
+
+            SerializedProperty property = null;
+            float height = 0;
+            float offset = 0;
+
+            if (m_Count > 0)
             {
-                float offset;
                 if (m_Elements != null)
                 {
-                    SerializedProperty property;
-                    if (m_PropertyCache.Count == 0 && count != 0)
-                    {
-                        property = m_Elements.GetArrayElementAtIndex(0);
-                        offset = 0;
-                    }
-                    else
-                    {
-                        PropertyCacheEntry lastEntry = m_PropertyCache.Last();
+                    property = m_Elements.GetArrayElementAtIndex(0);
+                    TryOverrideElementHeightWithPropertyDrawer(property, ref height);
+                }
 
-                        property = lastEntry.property.Copy();
-                        property.Next(false);
-                        offset = lastEntry.offset + lastEntry.height;
-                    }
+                height = elementHeightCallback?.Invoke(0) ?? elementHeight;
+                m_ScheduleGUIChanged |= m_PropertyCache[0].Set(property, height + Defaults.ElementPadding(height), offset);
+            }
 
-                    float height = elementHeight;
-                    if (elementHeightCallback != null)
-                    {
-                        height = elementHeightCallback(m_PropertyCache.Count);
-                    }
-                    else if (m_HasPropertyDrawer)
-                    {
-                        try
-                        {
-                            height = ScriptAttributeUtility.GetHandler(property).GetHeight(property, null, true);
-                        }
-                        catch
-                        {
-                            // Sometimes we find properties that no longer exist so we don't cache them
-                            height = int.MinValue;
-                            m_Count--;
-                        }
-                    }
+            for (int i = 1; i < m_Count; i++)
+            {
+                PropertyCacheEntry lastEntry = m_PropertyCache[i - 1];
 
-                    if (height > int.MinValue) m_PropertyCache.Add(new PropertyCacheEntry(property, height + Defaults.ElementPadding(height), offset));
-                }
-                else
-                {
-                    if (m_PropertyCache.Count == 0)
-                    {
-                        offset = 0;
-                    }
-                    else
-                    {
-                        PropertyCacheEntry lastEntry = m_PropertyCache.Last();
-                        offset = lastEntry.offset + lastEntry.height;
-                    }
+                property = null;
+                height = elementHeightCallback?.Invoke(i) ?? elementHeight;
+                offset = lastEntry.offset + lastEntry.height;
 
-                    float height = elementHeight;
-                    if (elementHeightCallback != null)
-                    {
-                        height = elementHeightCallback(m_PropertyCache.Count);
-                    }
+                if (m_Elements != null)
+                {
+                    property = lastEntry.property.Copy();
+                    property.Next(false);
 
-                    m_PropertyCache.Add(new PropertyCacheEntry(null, height + Defaults.ElementPadding(height), offset));
+                    TryOverrideElementHeightWithPropertyDrawer(property, ref height);
                 }
+
+                if (height > int.MinValue) m_ScheduleGUIChanged |= m_PropertyCache[i].Set(property, height + Defaults.ElementPadding(height), offset);
             }
         }
 
-        internal void ClearCache()
+        internal void InvalidateCache()
         {
-            m_PropertyCache.Clear();
+            m_CacheCount = 0;
+            m_PropertyCacheValid = false;
         }
 
-        internal void ClearCacheRecursive()
+        internal void InvalidateCacheRecursive()
         {
             if (m_Elements != null)
             {
-                ClearCache();
-                PropertyHandler.ClearListCacheIncludingChildren(m_Elements.propertyPath);
+                InvalidateCache();
+                PropertyHandler.InvalidateListCacheIncludingChildren(m_Elements);
             }
             else
             {
-                ClearCache();
+                InvalidateCache();
             }
         }
 
@@ -664,7 +681,7 @@ private float GetElementYOffset(int index)
 
         private float GetElementYOffset(int index, int skipIndex)
         {
-            CacheIfNeeded();
+            if (m_PropertyCache.Length <= index) return 0;
 
             float skipOffset = 0;
             if (skipIndex >= 0 && skipIndex < index)
@@ -677,7 +694,7 @@ private float GetElementYOffset(int index, int skipIndex)
 
         private float GetElementHeight(int index)
         {
-            CacheIfNeeded();
+            if (m_PropertyCache.Length <= index) return 0;
             return m_PropertyCache[index].height;
         }
 
@@ -686,7 +703,7 @@ private Rect GetRowRect(int index, Rect listRect)
             return new Rect(listRect.x, listRect.y + GetElementYOffset(index), listRect.width, GetElementHeight(index));
         }
 
-        bool isOverMaxMultiEditLimit => m_Elements != null && smallerArraySize > m_Elements.serializedObject.maxArraySizeForMultiEditing && m_Elements.serializedObject.isEditingMultipleObjects;
+        bool isOverMaxMultiEditLimit => m_Elements != null && m_SmallerArraySize > m_Elements.serializedObject.maxArraySizeForMultiEditing && m_Elements.serializedObject.isEditingMultipleObjects;
 
         public int count
         {
@@ -694,17 +711,18 @@ public int count
             {
                 if (m_Elements != null)
                 {
-                    smallerArraySize = m_Elements.minArraySize;
+                    m_SmallerArraySize = m_Elements.minArraySize;
 
-                    if (isOverMaxMultiEditLimit) return 0;
+                    if (isOverMaxMultiEditLimit) return m_Count = 0;
 
-                    return smallerArraySize;
+                    return m_Count = m_SmallerArraySize;
                 }
-                return m_ElementList != null ? m_ElementList.Count : 0;
+                return m_Count = m_ElementList != null ? m_ElementList.Count : 0;
             }
         }
+        // Using count getter will automatically cache results here for quick reference;
         int m_Count;
-        int smallerArraySize;
+        int m_SmallerArraySize;
 
         public void DoLayoutList() //TODO: better API?
         {
@@ -754,18 +772,27 @@ public float GetHeight()
             return totalHeight;
         }
 
+        float lastHeight = -1;
         private float GetListElementHeight()
         {
+            float height;
             float listElementPadding = kListElementBottomPadding + listElementTopPadding;
 
-            m_Count = count;
-            if (m_Count == 0 || isOverMaxMultiEditLimit)
+            if (m_CacheCount == 0) CacheIfNeeded();
+
+            if (m_Count <= 0 || isOverMaxMultiEditLimit)
+                height = elementHeight * (isOverMaxMultiEditLimit ? 2 : 1) + listElementPadding;
+            else
+                height = GetElementYOffset(m_Count - 1) + GetElementHeight(m_Count - 1) + listElementPadding;
+
+            if(height != lastHeight)
             {
-                return elementHeight * (isOverMaxMultiEditLimit ? 2 : 1) + listElementPadding;
+                lastHeight = height;
+                InvalidateCache();
+                height = GetListElementHeight();
             }
 
-            CacheIfNeeded();
-            return GetElementYOffset(m_Count - 1) + GetElementHeight(m_Count - 1) + listElementPadding;
+            return height;
         }
 
         int recursionCounter = 0;
@@ -776,10 +803,10 @@ private void DoListElements(Rect listRect, Rect visibleRect)
             {
                 // Recalculate cache values in case their height changed due to window resize
                 lastRect = listRect;
-                ClearCacheRecursive();
+                InvalidateCacheRecursive();
             }
 
-            CacheIfNeeded();
+            if (m_CacheCount == 0) CacheIfNeeded();
 
             var prevIndent = EditorGUI.indentLevel;
             EditorGUI.indentLevel = 0;
@@ -806,6 +833,9 @@ private void DoListElements(Rect listRect, Rect visibleRect)
 
             bool handlingInput = Event.current.type == EventType.MouseDown;
 
+            // Cache element count so we don't try to draw elements that don't exist
+            _ = count;
+
             if ((m_Elements != null && m_Elements.isArray || m_ElementList != null) && m_Count > 0 && !isOverMaxMultiEditLimit)
             {
                 EditorGUI.BeginChangeCheck();
@@ -912,8 +942,6 @@ private void DoListElements(Rect listRect, Rect visibleRect)
                         if (visibleRect.y > GetElementYOffset(i) + GetElementHeight(i)) continue;
                         if (visibleRect.y + visibleRect.height < GetElementYOffset(i > 0 ? i - 1 : i)) break;
 
-                        int initialProperties = EditorGUI.s_PropertyCount;
-
                         bool activeElement = m_Selection.Any(id => id == i);
                         bool focusedElement = (activeElement && HasKeyboardControl());
 
@@ -929,13 +957,15 @@ private void DoListElements(Rect listRect, Rect visibleRect)
                         defaultBehaviours.DrawElementDraggingHandle(elementRect, i, activeElement, focusedElement, m_Draggable);
 
                         elementContentRect = GetContentRect(elementRect);
+                        int initialControlCount = GUIUtility.s_ControlCount;
 
                         // do the callback for the element
                         if (drawElementCallback == null)
                         {
                             if (m_Elements != null)
                             {
-                                s_Defaults.DrawElement(elementContentRect, m_PropertyCache[i].property, null, activeElement, focusedElement, m_Draggable, m_IsEditable);
+                                if (i < m_PropertyCache.Length && m_PropertyCache[i].property.isValid)
+                                    s_Defaults.DrawElement(elementContentRect, m_PropertyCache[i].property, null, activeElement, focusedElement, m_Draggable, m_IsEditable);
                             }
                             else
                                 defaultBehaviours.DrawElement(elementContentRect, null, m_ElementList[i], activeElement, focusedElement, m_Draggable, m_IsEditable);
@@ -953,16 +983,13 @@ private void DoListElements(Rect listRect, Rect visibleRect)
 
                         // Element drawing could be changed from distant properties or controls
                         // so if we detect any change in the way the property is drawn, clear cache
-                        int currentControlCount = EditorGUI.s_PropertyCount - initialProperties;
-                        if (m_PropertyCache[i].lastControlCount > 1 && currentControlCount > 1
-                            && m_PropertyCache[i].lastControlCount != currentControlCount)
+                        int currentControlCount = GUIUtility.s_ControlCount - initialControlCount;
+                        if (i < m_PropertyCache.Length && Event.current.type == EventType.Repaint && m_PropertyCache[i].controlCount != currentControlCount || m_ScheduleGUIChanged)
                         {
-                            ClearCacheRecursive();
-                            CacheIfNeeded();
-                            InspectorWindow.RepaintAllInspectors();
-                            if ((m_Count = count) >= i) break;
+                            InvalidateCache();
+                            m_PropertyCache[i].controlCount = currentControlCount;
+                            m_ScheduleGUIChanged = false;
                         }
-                        m_PropertyCache[i].lastControlCount = currentControlCount;
                     }
                 }
 
@@ -971,7 +998,7 @@ private void DoListElements(Rect listRect, Rect visibleRect)
 
                 if (EditorGUI.EndChangeCheck())
                 {
-                    ClearCacheRecursive();
+                    InvalidateCacheRecursive();
                 }
             }
             else
@@ -1012,6 +1039,8 @@ private void DoListElements(Rect listRect, Rect visibleRect)
                 recursionCounter++;
                 DoListElements(listRect, visibleRect);
             }
+
+            m_CacheCount = 0;
         }
 
         private void DoListHeader(Rect headerRect)
@@ -1019,7 +1048,7 @@ private void DoListHeader(Rect headerRect)
             // Ensure there's proper Prefab and context menu handling for the list as a whole.
             // This ensures a deleted element in the list is displayed as an override and can
             // be handled by the user via the context menu. Case 1292522
-            if (m_Elements != null)
+            if (m_Elements != null && m_DisplayHeader)
                 EditorGUI.BeginProperty(headerRect, GUIContent.none, m_Elements);
 
             recursionCounter = 0;
@@ -1039,7 +1068,7 @@ private void DoListHeader(Rect headerRect)
             else if (m_DisplayHeader)
                 defaultBehaviours.DrawHeader(headerRect, m_SerializedObject, m_Elements, m_ElementList);
 
-            if (m_Elements != null)
+            if (m_Elements != null && m_DisplayHeader)
                 EditorGUI.EndProperty();
         }
 
@@ -1109,7 +1138,7 @@ private void DoDraggingAndSelection(Rect listRect)
                     if (Application.platform != RuntimePlatform.OSXEditor && evt.keyCode == KeyCode.Delete
                         || Application.platform == RuntimePlatform.OSXEditor && evt.keyCode == KeyCode.Backspace && evt.modifiers.HasFlag(EventModifiers.Command))
                     {
-                        scheduleRemove = true;
+                        m_scheduleRemove = true;
                         InvalidateParentCaches(m_PropertyPath);
                         evt.Use();
                     }
@@ -1333,6 +1362,7 @@ private void DoDraggingAndSelection(Rect listRect)
                             onMouseUpCallback?.Invoke(this);
                         }
                     }
+                    catch (ObjectDisposedException) { }
                     finally
                     {
                         // It's quite possible a call to EndGUI was made in one of our callbacks
diff --git a/Editor/Mono/GUI/Splitter.cs b/Editor/Mono/GUI/Splitter.cs
index bb11754eee..af4da4bc3b 100644
--- a/Editor/Mono/GUI/Splitter.cs
+++ b/Editor/Mono/GUI/Splitter.cs
@@ -178,6 +178,9 @@ public void NormalizeRelativeSizes()
 
         public void RealToRelativeSizes()
         {
+            if (relativeSizes.Length == 0)
+                return;
+
             float check = 1.0f; // try to avoid rounding issues
             float total = 0;
             int k;
@@ -186,13 +189,23 @@ public void RealToRelativeSizes()
             for (k = 0; k < realSizes.Length; k++)
                 total += realSizes[k];
 
-            for (k = 0; k < realSizes.Length; k++)
+            if (total > 0.001f)
             {
-                relativeSizes[k] = realSizes[k] / total;
-                check -= relativeSizes[k];
-            }
-            if (relativeSizes.Length > 0)
+                for (k = 0; k < realSizes.Length; k++)
+                {
+                    relativeSizes[k] = realSizes[k] / total;
+                    check -= relativeSizes[k];
+                }
+
                 relativeSizes[relativeSizes.Length - 1] += check;
+            }
+            else
+            {
+                // Distribute evenly
+                float relativeSize = 1f / relativeSizes.Length;
+                for (k = 0; k < relativeSizes.Length; k++)
+                    relativeSizes[k] = relativeSize;
+            }
         }
 
         public void RelativeToRealSizes(float totalSpace)
diff --git a/Editor/Mono/GUI/Toolbar.cs b/Editor/Mono/GUI/Toolbar.cs
index e5882f33b4..1df88833c6 100644
--- a/Editor/Mono/GUI/Toolbar.cs
+++ b/Editor/Mono/GUI/Toolbar.cs
@@ -77,21 +77,24 @@ internal static string lastLoadedLayoutName
         protected override void OnEnable()
         {
             base.OnEnable();
-
             EditorApplication.modifierKeysChanged += Repaint;
-
             get = this;
+            m_EventInterests.wantsLessLayoutEvents = true;
+            CreateContents();
+        }
 
-            m_MainToolbarVisual = (MainToolbarVisual)Activator.CreateInstance(EditorUIService.instance.GetDefaultToolbarType());
-
+        void CreateContents()
+        {
+            m_MainToolbarVisual = (MainToolbarVisual)Activator.CreateInstance(typeof(DefaultMainToolbar));
+            m_Root?.RemoveFromHierarchy();
             m_Root = CreateRoot();
-            if (windowBackend.visualTree is VisualElement visualTree)
+
+            if (windowBackend?.visualTree is VisualElement visualTree)
             {
                 visualTree.Add(m_Root);
                 m_Root.Add(m_MainToolbarVisual.root);
             }
 
-            m_EventInterests.wantsLessLayoutEvents = true;
             RepaintToolbar();
         }
 
@@ -126,11 +129,16 @@ static VisualElement CreateRoot()
                 renderHints = RenderHints.ClipWithScissors
             };
             root.pseudoStates |= PseudoStates.Root;
-            EditorUIService.instance.AddDefaultEditorStyleSheets(root);
+            UIElementsEditorUtility.AddDefaultEditorStyleSheets(root);
             root.style.overflow = Overflow.Hidden;
             return root;
         }
 
+        protected override void OnBackingScaleFactorChanged()
+        {
+            CreateContents();
+        }
+
         internal static void RepaintToolbar()
         {
             if (get != null)
@@ -150,7 +158,7 @@ public Rect GetToolbarPosition()
         // @todo Remove when collab updates
         internal static void AddSubToolbar(SubToolbar subToolbar)
         {
-            EditorUIService.instance.AddSubToolbar(subToolbar);
+            MainToolbarImguiContainer.AddDeprecatedSubToolbar(subToolbar);
         }
 
         // Repaints all views, called from C++ when playmode entering is aborted
diff --git a/Editor/Mono/GUI/Tools/EditorTool.cs b/Editor/Mono/GUI/Tools/EditorTool.cs
index 04fedd38b1..74d08793c1 100644
--- a/Editor/Mono/GUI/Tools/EditorTool.cs
+++ b/Editor/Mono/GUI/Tools/EditorTool.cs
@@ -17,6 +17,8 @@ public interface IDrawSelectedHandles
 
     public abstract class EditorTool : ScriptableObject, IEditor
     {
+        bool m_Active;
+
         [HideInInspector]
         [SerializeField]
         internal UnityObject[] m_Targets;
@@ -55,6 +57,27 @@ public virtual bool gridSnapEnabled
             get { return false; }
         }
 
+        internal void Activate()
+        {
+            if(m_Active
+                // Prevent to reenable the tool if this is not the active one anymore
+                // Can happen when entering playmode due to the delayCall in EditorToolManager.OnEnable
+                || this != EditorToolManager.activeTool)
+                return;
+
+            OnActivated();
+            m_Active = true;
+        }
+
+        internal void Deactivate()
+        {
+            if(!m_Active)
+                return;
+
+            OnWillBeDeactivated();
+            m_Active = false;
+        }
+
         public virtual void OnActivated() {}
 
         public virtual void OnWillBeDeactivated() {}
diff --git a/Editor/Mono/GUI/Tools/EditorToolCache.cs b/Editor/Mono/GUI/Tools/EditorToolCache.cs
index f93de7524b..0e9458f3ff 100644
--- a/Editor/Mono/GUI/Tools/EditorToolCache.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolCache.cs
@@ -247,7 +247,6 @@ internal IEnumerable<EditorTypeAssociation> GetEditorsForTargetType(Type target)
 
         void CollectEditorsForTracker(EditorToolContext ctx, ActiveEditorTracker tracker, List<ComponentEditor> editors)
         {
-
             var trackerEditors = tracker.activeEditors;
 
             for (int i = 0, c = trackerEditors.Length; i < c; i++)
@@ -255,7 +254,7 @@ void CollectEditorsForTracker(EditorToolContext ctx, ActiveEditorTracker tracker
                 var editor = trackerEditors[i];
                 var target = editor != null ? editor.target : null;
 
-                if (target == null)
+                if (target == null || EditorUtility.IsPersistent(target))
                     return;
 
                 var eligible = GetEditorsForTargetType(editor.target.GetType());
diff --git a/Editor/Mono/GUI/Tools/EditorToolContext.cs b/Editor/Mono/GUI/Tools/EditorToolContext.cs
index ac0fd57160..5382033c23 100644
--- a/Editor/Mono/GUI/Tools/EditorToolContext.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolContext.cs
@@ -31,6 +31,8 @@ public override VisualElement CreateInspectorGUI()
 
     public abstract class EditorToolContext : ScriptableObject, IEditor
     {
+        bool m_Active;
+
         [HideInInspector]
         [SerializeField]
         internal UnityObject[] m_Targets;
@@ -45,6 +47,27 @@ public abstract class EditorToolContext : ScriptableObject, IEditor
 
         public UnityObject target => m_Target == null ? Selection.activeObject : m_Target;
 
+        internal void Activate()
+        {
+            if(m_Active
+            // Prevent to reenable the context if this is not the active one anymore
+            // Can happen when entering playmode due to the delayCall in EditorToolManager.OnEnable
+                || this != EditorToolManager.activeToolContext)
+                return;
+
+            OnActivated();
+            m_Active = true;
+        }
+
+        internal void Deactivate()
+        {
+            if(!m_Active)
+                return;
+
+            OnWillBeDeactivated();
+            m_Active = false;
+        }
+
         public virtual void OnActivated() {}
 
         public virtual void OnWillBeDeactivated() {}
diff --git a/Editor/Mono/GUI/Tools/EditorToolManager.cs b/Editor/Mono/GUI/Tools/EditorToolManager.cs
index 3e47adb2a6..5f35842af4 100644
--- a/Editor/Mono/GUI/Tools/EditorToolManager.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolManager.cs
@@ -58,9 +58,8 @@ internal static EditorToolContext activeToolContext
                 {
                     instance.m_ActiveToolContext = GetSingleton<GameObjectToolContext>();
                     ToolManager.ActiveContextDidChange();
-                    instance.m_ActiveToolContext.OnActivated();
+                    instance.m_ActiveToolContext.Activate();
                 }
-
                 return instance.m_ActiveToolContext;
             }
 
@@ -83,11 +82,12 @@ internal static EditorToolContext activeToolContext
                 // Make sure to get the active tool enum prior to setting the context, otherwise we'll be comparing
                 // apples to oranges. Ie, the transform tools will be different despite being the same `Tool` enum value.
                 var tool = Tools.current;
+                var wasAdditionalContextTool = tool == Tool.Custom && additionalContextToolTypesCache.Contains(activeTool.GetType());
                 var prev = instance.m_ActiveToolContext;
 
                 if (prev != null)
                 {
-                    prev.OnWillBeDeactivated();
+                    prev.Deactivate();
 
                     if (!(prev is GameObjectToolContext))
                         instance.m_LastCustomContext = prev.GetType();
@@ -96,7 +96,7 @@ internal static EditorToolContext activeToolContext
                 ToolManager.ActiveContextWillChange();
                 instance.m_ActiveToolContext = ctx;
 
-                ctx.OnActivated();
+                ctx.Activate();
 
                 instance.RebuildAvailableTools();
 
@@ -118,6 +118,15 @@ internal static EditorToolContext activeToolContext
                     // NoneTool for us.
                     activeTool = resolved;
                 }
+                // If the previous tool was an additional tool from the context, return to the Previous Persistent Tool
+                // when moving to that new context
+                else if(wasAdditionalContextTool)
+                {
+                    var isAdditionalContextTool = instance.m_ActiveToolContext.GetAdditionalToolTypes().Contains(activeTool.GetType());
+
+                    if(!isAdditionalContextTool)
+                        RestorePreviousPersistentTool();
+                }
 
                 ToolManager.ActiveContextDidChange();
 
@@ -154,7 +163,7 @@ internal static EditorTool activeTool
 
                 if (previous != null)
                 {
-                    previous.OnWillBeDeactivated();
+                    previous.Deactivate();
                     var prev = EditorToolUtility.GetEnumWithEditorTool(previous, activeToolContext);
 
                     if (prev != Tool.View && prev != Tool.None && !EditorToolUtility.IsComponentTool(previous.GetType()))
@@ -169,8 +178,7 @@ internal static EditorTool activeTool
                 }
 
                 instance.m_ActiveTool = tool;
-
-                instance.m_ActiveTool.OnActivated();
+                instance.m_ActiveTool.Activate();
 
                 ToolManager.ActiveToolDidChange();
 
@@ -269,24 +277,24 @@ void SaveComponentTool()
 
         void OnEnable()
         {
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             ActiveEditorTracker.editorTrackerRebuilt += TrackerRebuilt;
             Selection.selectedObjectWasDestroyed += SelectedObjectWasDestroyed;
             AssemblyReloadEvents.beforeAssemblyReload += BeforeAssemblyReload;
             ToolManager.activeContextChanged += ActiveContextChanged;
 
-            if (activeTool != null)
-                EditorApplication.delayCall += activeTool.OnActivated;
+            if(activeTool != null)
+                EditorApplication.delayCall += activeTool.Activate;
             if(activeToolContext != null)
             {
-                EditorApplication.delayCall += activeToolContext.OnActivated;
+                EditorApplication.delayCall += activeToolContext.Activate;
                 ActiveContextChanged();
             }
         }
 
         void OnDisable()
         {
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
             ActiveEditorTracker.editorTrackerRebuilt -= TrackerRebuilt;
             Selection.selectedObjectWasDestroyed -= SelectedObjectWasDestroyed;
             AssemblyReloadEvents.beforeAssemblyReload -= BeforeAssemblyReload;
@@ -296,10 +304,10 @@ void OnDisable()
         void BeforeAssemblyReload()
         {
             if (m_ActiveTool != null)
-                m_ActiveTool.OnWillBeDeactivated();
+                m_ActiveTool.Deactivate();
 
             if (m_ActiveToolContext != null)
-                m_ActiveToolContext.OnWillBeDeactivated();
+                m_ActiveToolContext.Deactivate();
         }
 
         void ActiveContextChanged()
@@ -347,7 +355,7 @@ void SelectedObjectWasDestroyed(int id)
             }
         }
 
-        void UndoRedoPerformed()
+        void UndoRedoPerformed(in UndoRedoInfo info)
         {
             RestoreCustomEditorTool();
         }
@@ -374,7 +382,7 @@ void ClearCustomEditorTools()
             foreach (var customEditorTool in m_ComponentTools)
             {
                 if (customEditorTool.editor == m_ActiveTool)
-                    m_ActiveTool.OnWillBeDeactivated();
+                    m_ActiveTool.Deactivate();
                 DestroyImmediate(customEditorTool.editor);
             }
 
@@ -386,7 +394,7 @@ void ClearComponentContexts()
             foreach (var context in m_ComponentContexts)
             {
                 if (context.GetEditor<EditorToolContext>() == m_ActiveToolContext)
-                    m_ActiveToolContext.OnWillBeDeactivated();
+                    m_ActiveToolContext.Deactivate();
                 DestroyImmediate(context.editor);
             }
 
@@ -465,6 +473,28 @@ public static void RestorePreviousPersistentTool()
             activeTool = instance.lastManipulationTool;
         }
 
+        // Used by tests - EditModeAndPlayModeTests/EditorTools/EscKeyTests
+        internal static bool TryPopToolState()
+        {
+            if(Tools.viewToolActive)
+                return false;
+
+            if(!EditorToolUtility.IsBuiltinOverride(activeTool))
+            {
+                RestorePreviousPersistentTool();
+                return true;
+            }
+
+            if(ToolManager.activeContextType != typeof(GameObjectToolContext))
+            {
+                //if is in a Manipulation or additional tool leaves the current context to return to GameObject Context
+                ToolManager.SetActiveContext<GameObjectToolContext>();
+                return true;
+            }
+
+            return false;
+        }
+
         internal static void OnToolGUI(EditorWindow window)
         {
             activeToolContext.OnToolGUI(window);
@@ -480,21 +510,8 @@ internal static void OnToolGUI(EditorWindow window)
             }
 
             var evt = Event.current;
-            if(evt.type == EventType.KeyDown && evt.keyCode == KeyCode.Escape)
-            {
-                if(!Tools.viewToolActive
-                    && !EditorToolUtility.IsManipulationTool(EditorToolUtility.GetEnumWithEditorTool(current, instance.m_ActiveToolContext))
-                    && additionalContextToolTypesCache.All(toolType => toolType != current.GetType()))
-                {
-                    RestorePreviousPersistentTool();
-                    evt.Use();
-                }
-                else
-                {
-                    //if is in a Manipulation or additional tool leaves the current context to return to GameObject Context
-                    ToolManager.SetActiveContext<GameObjectToolContext>();
-                }
-            }
+            if (evt.type == EventType.KeyDown && evt.keyCode == KeyCode.Escape && TryPopToolState())
+                evt.Use();
         }
 
         static bool IsCustomEditorTool(EditorTool tool)
diff --git a/Editor/Mono/GUI/Tools/EditorToolUtility.cs b/Editor/Mono/GUI/Tools/EditorToolUtility.cs
index d4bac72de5..c7b74a0836 100644
--- a/Editor/Mono/GUI/Tools/EditorToolUtility.cs
+++ b/Editor/Mono/GUI/Tools/EditorToolUtility.cs
@@ -186,6 +186,22 @@ internal static bool IsManipulationTool(Tool tool)
                 || tool == Tool.Transform;
         }
 
+        // In the current context, is this tool considered a built-in tool?
+        // Built-in tools are the first category of tools in the toolbar, and are always available while their parent
+        // context is active.
+        internal static bool IsBuiltinOverride(EditorTool tool)
+        {
+            if (tool == null)
+                return false;
+            if (IsManipulationTool(GetEnumWithEditorTool(tool)))
+                return true;
+            var type = tool.GetType();
+            foreach(var extra in EditorToolManager.activeToolContext.GetAdditionalToolTypes())
+                if (type == extra)
+                    return true;
+            return false;
+        }
+
         internal static bool IsComponentTool(Type type)
         {
             return s_ToolCache.GetTargetType(type) != null;
@@ -224,17 +240,22 @@ internal static GUIContent GetIcon(Type editorToolType, bool forceReload = false
 
             res = new GUIContent() { tooltip = GetToolName(editorToolType) };
 
-            // First check for the tool type itself
-            if ((res.image = EditorGUIUtility.FindTexture(editorToolType)) != null)
+            // First check if the tool as an icon attribute
+            var iconPath = EditorGUIUtility.GetIconPathFromAttribute(editorToolType);
+            if(!string.IsNullOrEmpty(iconPath) && (res.image = EditorGUIUtility.IconContent(iconPath).image))
+                goto ReturnToolbarIcon;
+
+            // Second check for the tool type itself
+            if(( res.image = EditorGUIUtility.FindTexture(editorToolType) ) != null)
                 goto ReturnToolbarIcon;
 
             // If it's a custom editor tool, try to get an icon for the tool's target type
             var attrib = GetEditorToolAttribute(editorToolType);
-            if (attrib?.targetType != null && (res.image = AssetPreview.GetMiniTypeThumbnailFromType(attrib.targetType)) != null)
+            if(attrib?.targetType != null && ( res.image = AssetPreview.GetMiniTypeThumbnailFromType(attrib.targetType) ) != null)
                 goto ReturnToolbarIcon;
 
             // And finally fall back to the default Custom Tool icon
-            res.image = EditorGUIUtility.LoadIconRequired("CustomTool");
+            res.image = EditorGUIUtility.IconContent("CustomTool").image;
 
         ReturnToolbarIcon:
             if (string.IsNullOrEmpty(res.tooltip))
diff --git a/Editor/Mono/GUI/Tools/ToolManager.cs b/Editor/Mono/GUI/Tools/ToolManager.cs
index 34abb68e45..991df48130 100644
--- a/Editor/Mono/GUI/Tools/ToolManager.cs
+++ b/Editor/Mono/GUI/Tools/ToolManager.cs
@@ -131,6 +131,18 @@ public static bool IsActiveTool(EditorTool tool)
             return EditorToolManager.activeTool == tool;
         }
 
+        public static void RefreshAvailableTools()
+        {
+            foreach (var obj in SceneView.sceneViews)
+            {
+                if (!(obj is SceneView scene))
+                    continue;
+                var overlay = scene.overlayCanvas?.overlays.FirstOrDefault(x => x is TransformToolsOverlayToolBar);
+                if(overlay != null)
+                    overlay.RebuildContent();
+            }
+        }
+
         public static bool IsActiveContext(EditorToolContext context)
         {
             return EditorToolManager.activeToolContext == context;
diff --git a/Editor/Mono/GUI/Tools/Tools.cs b/Editor/Mono/GUI/Tools/Tools.cs
index f10283999a..a324df9cb1 100644
--- a/Editor/Mono/GUI/Tools/Tools.cs
+++ b/Editor/Mono/GUI/Tools/Tools.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Linq;
 using Unity.Profiling;
 using UnityEditor.ShortcutManagement;
 using UnityEngine;
@@ -77,7 +78,13 @@ public static Tool current
             get { return EditorToolUtility.GetEnumWithEditorTool(EditorToolManager.GetActiveTool()); }
             set
             {
-                EditorToolManager.activeTool = EditorToolUtility.GetEditorToolWithEnum(value);
+                var tool = EditorToolUtility.GetEditorToolWithEnum(value);
+
+                //In case the new tool is leading to an incorrect tool type, return and leave the current tool as it is.
+                if(value != Tool.None && tool is NoneTool)
+                    return;
+
+                EditorToolManager.activeTool = tool;
                 ShortcutManager.RegisterTag(value);
             }
         }
@@ -346,6 +353,25 @@ public static bool hidden
 
         internal static bool vertexDragging;
 
+        static Event m_VertexDraggingShortcutEvent;
+        internal static Event vertexDraggingShortcutEvent
+        {
+            get
+            {
+                if(m_VertexDraggingShortcutEvent == null)
+                {
+                    var vertexSnappingBinding = ShortcutManager.instance.GetShortcutBinding(VertexSnapping.k_VertexSnappingShortcut);
+                    if(Enumerable.Count(vertexSnappingBinding.keyCombinationSequence) == 0)
+                        m_VertexDraggingShortcutEvent = new Event();
+                    else
+                        m_VertexDraggingShortcutEvent = vertexSnappingBinding.keyCombinationSequence.First().ToKeyboardEvent();
+                }
+
+                return m_VertexDraggingShortcutEvent;
+            }
+            set => m_VertexDraggingShortcutEvent = value;
+        }
+
         static Vector3 s_LockHandlePosition;
         static bool s_LockHandlePositionActive = false;
 
@@ -406,7 +432,10 @@ void OnEnable()
             visibleLayers = layerSettings.visibleLayersValue;
             lockedLayers = layerSettings.lockedLayersValue;
             Selection.selectionChanged += OnSelectionChange;
-            Undo.undoRedoPerformed += OnSelectionChange;
+            Undo.undoRedoEvent += OnUndoRedo;
+
+            ShortcutManager.instance.activeProfileChanged += args => vertexDraggingShortcutEvent = null;
+            ShortcutManager.instance.shortcutBindingChanged += args => vertexDraggingShortcutEvent = null;
 
             EditorToolManager.activeToolChanged += (previous, active) =>
             {
@@ -422,7 +451,7 @@ void OnEnable()
         void OnDisable()
         {
             Selection.selectionChanged -= OnSelectionChange;
-            Undo.undoRedoPerformed -= OnSelectionChange;
+            Undo.undoRedoEvent -= OnUndoRedo;
         }
 
         internal static void OnSelectionChange()
@@ -432,6 +461,11 @@ internal static void OnSelectionChange()
             localHandleOffset = Vector3.zero;
         }
 
+        internal static void OnUndoRedo(in UndoRedoInfo info)
+        {
+            OnSelectionChange();
+        }
+
         internal static void ResetGlobalHandleRotation()
         {
             get.m_GlobalHandleRotation = Quaternion.identity;
diff --git a/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs b/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs
index 4d0553c188..38722d2e08 100644
--- a/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs
+++ b/Editor/Mono/GUI/TreeView/AssetOrGameObjectTreeViewDragging.cs
@@ -56,7 +56,7 @@ public override void StartDrag(TreeViewItem draggedItem, List<int> draggedItemID
         public override DragAndDropVisualMode DoDrag(TreeViewItem parentItem, TreeViewItem targetItem, bool perform, DropPosition dropPos)
         {
             var dragToInstanceId = parentItem?.id ?? 0;
-            return DragAndDrop.Drop(DragAndDropWindowTarget.projectBrowser, dragToInstanceId, AssetDatabase.GetAssetPath(dragToInstanceId), perform);
+            return DragAndDrop.DropOnProjectBrowserWindow(dragToInstanceId, AssetDatabase.GetAssetPath(dragToInstanceId), perform);
         }
     }
 
@@ -164,7 +164,7 @@ public override DragAndDropVisualMode DoDrag(TreeViewItem parentItem, TreeViewIt
                 if (parentForDraggedObjectsOutsideItems != null)
                 {
                     // Use specific parent for DragAndDropForwarding
-                    return DragAndDrop.Drop(DragAndDropWindowTarget.hierarchy, 0, option, parentForDraggedObjectsOutsideItems, perform);
+                    return DragAndDrop.DropOnHierarchyWindow(0, option, parentForDraggedObjectsOutsideItems, perform);
                 }
                 else
                 {
@@ -174,7 +174,7 @@ public override DragAndDropVisualMode DoDrag(TreeViewItem parentItem, TreeViewIt
                         return DragAndDropVisualMode.Rejected;
 
                     option |= HierarchyDropFlags.DropUpon;
-                    return DragAndDrop.Drop(DragAndDropWindowTarget.hierarchy, lastScene.handle, option, null, perform);
+                    return DragAndDrop.DropOnHierarchyWindow(lastScene.handle, option, null, perform);
                 }
             }
 
@@ -214,7 +214,7 @@ public override DragAndDropVisualMode DoDrag(TreeViewItem parentItem, TreeViewIt
             if (perform && SubSceneGUI.IsUsingSubScenes() && !IsValidSubSceneDropTarget(gameObjectOrSceneInstanceID, dropPos, DragAndDrop.objectReferences))
                 return DragAndDropVisualMode.Rejected;
 
-            return DragAndDrop.Drop(DragAndDropWindowTarget.hierarchy, gameObjectOrSceneInstanceID, option, null, perform);
+            return DragAndDrop.DropOnHierarchyWindow(gameObjectOrSceneInstanceID, option, null, perform);
         }
 
         int GetDropTargetInstanceID(GameObjectTreeViewItem hierarchyTargetItem, DropPosition dropPosition)
diff --git a/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs b/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs
index 671a8e3d6e..65af813830 100644
--- a/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs
+++ b/Editor/Mono/GUI/TreeView/GameObjectTreeViewGUI.cs
@@ -226,6 +226,8 @@ void DoStickySceneHeaders()
                 var sceneHeaderItem = dataSource.sceneHeaderItems.FirstOrDefault(p => p.scene == firstItem.scene);
                 if (sceneHeaderItem != null)
                 {
+                    rect.y = Mathf.Round(rect.y); // Fix vertical render jittering due to fractional scroll values by rounding to nearest whole pixel
+
                     bool selected = m_TreeView.IsItemDragSelectedOrSelected(sceneHeaderItem);
                     bool focused = m_TreeView.HasFocus();
                     bool boldFont = sceneHeaderItem.scene == SceneManager.GetActiveScene();
@@ -237,6 +239,10 @@ void DoStickySceneHeaders()
                     m_TreeView.HandleUnusedMouseEventsForItem(rect, sceneHeaderItem, firstRow);
 
                     HandleStickyHeaderContextClick(rect, sceneHeaderItem);
+
+                    float indent = GetContentIndent(sceneHeaderItem);
+                    Rect indentedRect = new Rect(rect.x + indent, rect.y, rect.width - indent, rect.height);
+                    UserCallbackRowGUI(sceneHeaderItem.id, indentedRect);
                 }
             }
         }
@@ -419,6 +425,19 @@ override protected void DoItemGUI(Rect rect, int row, TreeViewItem item, bool se
             SceneVisibilityHierarchyGUI.DoItemGUI(rect, goItem, selected && !IsRenaming(item.id), m_TreeView.hoveredItem == goItem, focused, isDragging);
         }
 
+        internal static void UserCallbackRowGUI(int itemID, Rect rect)
+        {
+            if (EditorApplication.hierarchyWindowItemOnGUI != null)
+            {
+                // Adjust rect for the right aligned column for the prefab isolation button
+                rect.xMax -=
+                    GameObjectStyles.rightArrow.fixedWidth +
+                    GameObjectStyles.rightArrow.margin.horizontal;
+
+                EditorApplication.hierarchyWindowItemOnGUI(itemID, rect);
+            }
+        }
+
         private void HandlePrefabInstanceOverrideStatus(GameObjectTreeViewItem goItem, Rect rect, bool selected, bool focused)
         {
             GameObject go = goItem.objectPPTR as GameObject;
diff --git a/Editor/Mono/GUI/TreeView/TreeViewControl/TreeViewControl.cs b/Editor/Mono/GUI/TreeView/TreeViewControl/TreeViewControl.cs
index ce67fbd11b..d981fa2618 100644
--- a/Editor/Mono/GUI/TreeView/TreeViewControl/TreeViewControl.cs
+++ b/Editor/Mono/GUI/TreeView/TreeViewControl/TreeViewControl.cs
@@ -563,9 +563,13 @@ protected virtual void KeyEvent()
         // Used to reveal an item
         protected virtual IList<int> GetAncestors(int id)
         {
+            var item = FindItem(id);
+            if (item == null)
+                return new List<int>();
+
             // Default behavior assumes complete tree
             HashSet<int> parentsAbove = new HashSet<int>();
-            TreeViewUtility.GetParentsAboveItem(FindItem(id), parentsAbove);
+            TreeViewUtility.GetParentsAboveItem(item, parentsAbove);
             return parentsAbove.ToArray();
         }
 
@@ -583,10 +587,7 @@ TreeViewItem FindItem(int id)
             if (rootItem == null)
                 throw new InvalidOperationException("FindItem failed: root item has not been created yet");
 
-            var item = TreeViewUtility.FindItem(id, rootItem);
-            if (item == null)
-                throw new ArgumentException(string.Format("Could not find item with id: {0}. FindItem assumes complete tree is built. Most likely the item is not allocated because it is hidden under a collapsed item. Check if GetAncestors are overriden for the tree view.", id));
-            return item;
+            return TreeViewUtility.FindItem(id, rootItem);
         }
 
         // Selection
diff --git a/Editor/Mono/GUI/WindowLayout.cs b/Editor/Mono/GUI/WindowLayout.cs
index a39b2fe521..51a2f5f8d1 100644
--- a/Editor/Mono/GUI/WindowLayout.cs
+++ b/Editor/Mono/GUI/WindowLayout.cs
@@ -68,6 +68,10 @@ public float size
             }
         }
 
+        const string tabsLayoutKey = "tabs";
+        const string verticalLayoutKey = "vertical";
+        const string horizontalLayoutKey = "horizontal";
+
         private const string kMaximizeRestoreFile = "CurrentMaximizeLayout.dwlt";
         private const string kDefaultLayoutName = "Default.wlt";
         internal static string layoutResourcesPath => Path.Combine(EditorApplication.applicationContentsPath, "Resources/Layouts");
@@ -87,15 +91,15 @@ public static void LoadDefaultWindowPreferences()
         public static void LoadCurrentModeLayout(bool keepMainWindow)
         {
             InitializeLayoutPreferencesFolder();
-
-            var layoutData = ModeService.GetModeDataSection(ModeDescriptor.LayoutKey) as JSONObject;
-            if (layoutData == null)
+            var dynamicLayout = ModeService.GetDynamicLayout();
+            if (dynamicLayout == null)
                 LoadProjectLayout(keepMainWindow);
             else
             {
+
                 var projectLayoutExists = File.Exists(ProjectLayoutPath);
-                if ((projectLayoutExists && Convert.ToBoolean(layoutData["restore_saved_layout"]))
-                    || !LoadModeDynamicLayout(keepMainWindow, layoutData))
+                if ((projectLayoutExists && Convert.ToBoolean(dynamicLayout["restore_saved_layout"]))
+                    || !LoadModeDynamicLayout(keepMainWindow, dynamicLayout))
                     LoadProjectLayout(keepMainWindow);
             }
         }
@@ -129,12 +133,16 @@ private static View LoadLayoutView<T>(Type[] availableEditorWindowTypes, LayoutV
         {
             if (!viewInfo.used)
                 return null;
+
             View view = null;
             if (viewInfo.isContainer)
             {
-                bool useTabs = viewInfo.extendedData.Contains("tabs") && Convert.ToBoolean(viewInfo.extendedData["tabs"]);
-                bool useSplitter = viewInfo.extendedData.Contains("vertical") || viewInfo.extendedData.Contains("horizontal");
-                bool isVertical = viewInfo.extendedData.Contains("vertical") && Convert.ToBoolean(viewInfo.extendedData["vertical"]);
+                bool useTabs = viewInfo.extendedData.Contains(tabsLayoutKey) && Convert.ToBoolean(viewInfo.extendedData[tabsLayoutKey]);
+                bool useSplitter = viewInfo.extendedData.Contains(verticalLayoutKey) || viewInfo.extendedData.Contains(horizontalLayoutKey);
+                bool isVertical = viewInfo.extendedData.Contains(verticalLayoutKey) && Convert.ToBoolean(viewInfo.extendedData[verticalLayoutKey]);
+
+                if (useTabs && useSplitter)
+                    Debug.LogWarning($"{ModeService.currentId} defines both tabs and splitter (horizontal or vertical) layouts.\n You can only define one to true (i.e. tabs = true) in the editor mode file.");
 
                 if (useSplitter)
                 {
@@ -163,9 +171,9 @@ private static View LoadLayoutView<T>(Type[] availableEditorWindowTypes, LayoutV
 
                     var cw = useTabs ? width : (isVertical ? width : width * lvi.size);
                     var ch = useTabs ? height : (isVertical ? height * lvi.size : height);
-                    if (useTabs)
+                    if (useTabs && view is DockArea da)
                     {
-                        (view as DockArea).AddTab((EditorWindow)ScriptableObject.CreateInstance(lvi.type));
+                        da.AddTab((EditorWindow)ScriptableObject.CreateInstance(lvi.type));
                     }
                     else
                     {
@@ -239,8 +247,11 @@ private static ContainerWindow GenerateLayout(bool keepMainWindow, Type[] availa
                     mainContainerWindow.SetMinMaxSizes(mainWindowMinSize, mainWindowMaxSize);
                 }
 
-                mainContainerWindow.windowID = $"MainView_{ModeService.currentId}";
-                mainContainerWindow.LoadGeometry(true);
+                var mainViewID = $"MainView_{ModeService.currentId}";
+                var hasMainViewGeometrySettings = EditorPrefs.HasKey($"{mainViewID}h");
+                mainContainerWindow.windowID = mainViewID;
+                if (hasMainViewGeometrySettings)
+                    mainContainerWindow.LoadGeometry(true);
 
                 var width = mainContainerWindow.position.width;
                 var height = mainContainerWindow.position.height;
@@ -305,15 +316,16 @@ private static bool ParseViewData(Type[] availableEditorWindowTypes, object view
             if (viewData is string)
             {
                 viewInfo.className = Convert.ToString(viewData);
-                viewInfo.used = !String.IsNullOrEmpty(viewInfo.className);
+                viewInfo.used = !string.IsNullOrEmpty(viewInfo.className);
                 if (!viewInfo.used)
                     return true;
             }
-            else if (viewData is IDictionary)
+            else if (viewData is JSONObject viewExpandedData)
             {
-                var viewExpandedData = viewData as IDictionary;
-
-                if (viewExpandedData.Contains("children") || viewExpandedData.Contains("vertical") || viewExpandedData.Contains("horizontal") || viewExpandedData.Contains("tabs"))
+                if (viewExpandedData.Contains("children")
+                    || viewExpandedData.Contains(verticalLayoutKey)
+                    || viewExpandedData.Contains(horizontalLayoutKey)
+                    || viewExpandedData.Contains(tabsLayoutKey))
                 {
                     viewInfo.isContainer = true;
                     viewInfo.className = string.Empty;
@@ -363,7 +375,10 @@ private static void LoadProjectLayout(bool keepMainWindow)
             {
                 var currentLayoutPath = GetCurrentLayoutPath();
                 if (EnsureDirectoryCreated(ProjectLayoutPath))
+                {
+                    Console.WriteLine($"[LAYOUT] LoadProjectLayout: Copying Project Current Layout: {ProjectLayoutPath} from {currentLayoutPath}");
                     FileUtil.CopyFileOrDirectory(currentLayoutPath, ProjectLayoutPath);
+                }
             }
 
             Debug.Assert(File.Exists(ProjectLayoutPath));
@@ -418,6 +433,7 @@ private static void InitializeLayoutPreferencesFolder()
 
             if (!Directory.Exists(layoutsModePreferencesPath))
             {
+                Console.WriteLine($"[LAYOUT] {layoutsModePreferencesPath} does not exist. Copying base layouts.");
                 // Make sure we have a valid default mode folder initialized with the proper default layouts.
                 if (layoutsDefaultModePreferencesPath == layoutsModePreferencesPath)
                 {
@@ -448,7 +464,7 @@ private static void InitializeLayoutPreferencesFolder()
                     // No mode default layout, use the editor_resources Default:
                     defaultModeLayoutPath = Path.Combine(layoutResourcesPath, kDefaultLayoutName);
                 }
-
+                Console.WriteLine($"[LAYOUT] Copying {defaultModeLayoutPath} to {defaultLayoutPath}");
                 // If not copy our default file to the preferences folder
                 FileUtil.CopyFileOrDirectory(defaultModeLayoutPath, defaultLayoutPath);
             }
@@ -1364,7 +1380,10 @@ internal static void LoadDefaultLayout()
             FileUtil.DeleteFileOrDirectory(ProjectLayoutPath);
 
             if (EnsureDirectoryCreated(ProjectLayoutPath))
+            {
+                Console.WriteLine($"[LAYOUT] LoadDefaultLayout: Copying Project Current Layout: {ProjectLayoutPath} from {GetDefaultLayoutPath()}");
                 FileUtil.CopyFileOrDirectory(GetDefaultLayoutPath(), ProjectLayoutPath);
+            }
             Debug.Assert(File.Exists(ProjectLayoutPath));
 
             LoadWindowLayout(ProjectLayoutPath, true);
diff --git a/Editor/Mono/GUIView.bindings.cs b/Editor/Mono/GUIView.bindings.cs
index 7f625e474c..aac0a2d304 100644
--- a/Editor/Mono/GUIView.bindings.cs
+++ b/Editor/Mono/GUIView.bindings.cs
@@ -43,6 +43,7 @@ internal partial class GUIView
         internal extern void SetInternalGameViewDimensions(Rect rect, Rect clippedRect, Vector2 targetSize);
         internal extern void SetMainPlayModeViewSize(Vector2 targetSize);
         internal extern void SetDisplayViewSize(int displayId, Vector2 targetSize);
+        internal extern Vector2 GetDisplayViewSize(int displayId);
         internal extern void SetAsStartView();
         internal extern void SetAsLastPlayModeView();
         internal extern void SetPlayModeView(bool value);
diff --git a/Editor/Mono/GUIView.cs b/Editor/Mono/GUIView.cs
index 0bbf125639..a1c000a816 100644
--- a/Editor/Mono/GUIView.cs
+++ b/Editor/Mono/GUIView.cs
@@ -155,9 +155,7 @@ internal IWindowBackend windowBackend
             set
             {
                 if (m_WindowBackend != null)
-                {
                     m_WindowBackend.OnDestroy(this);
-                }
 
                 m_WindowBackend = value;
                 m_WindowBackend?.OnCreate(this);
@@ -195,6 +193,8 @@ protected virtual void OldOnGUI() {}
         // In that case, commands are not delegated (e.g., keyboard-based delete in Hierarchy/Project)
         protected virtual void OnGUI() {}
 
+        protected virtual void OnBackingScaleFactorChanged() { }
+
         protected override void SetPosition(Rect newPos)
         {
             Rect oldWinPos = windowPosition;
diff --git a/Editor/Mono/GameView/GameView.cs b/Editor/Mono/GameView/GameView.cs
index 2b9f97c1ab..f552368474 100644
--- a/Editor/Mono/GameView/GameView.cs
+++ b/Editor/Mono/GameView/GameView.cs
@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine;
+using UnityEngine.Bindings;
 using UnityEditorInternal;
 using UnityEditor.SceneManagement;
 using UnityEditor.Modules;
@@ -98,7 +99,10 @@ internal static class Styles
             public static GUIContent gizmosContent = EditorGUIUtility.TrTextContent("Gizmos");
             public static GUIContent zoomSliderContent = EditorGUIUtility.TrTextContent("Scale", "Size of the game view on the screen.");
             public static GUIContent vsyncContent = EditorGUIUtility.TrTextContent("VSync");
-            public static GUIContent muteContent = EditorGUIUtility.TrTextContent("Mute Audio");
+            public static GUIContent muteOffContent = EditorGUIUtility.TrIconContent("SceneviewAudio On", "Mute Audio");
+            public static GUIContent muteOnContent = EditorGUIUtility.TrIconContent("SceneviewAudio", "Mute Audio");
+            public static GUIContent shortcutsOnContent = EditorGUIUtility.TrIconContent("Keyboard", "Unity Shortcuts");
+            public static GUIContent shortcutsOffContent = EditorGUIUtility.TrIconContent("KeyboardShortcutsDisabled", "Unity Shortcuts");
             public static GUIContent statsContent = EditorGUIUtility.TrTextContent("Stats");
             public static GUIContent frameDebuggerOnContent = EditorGUIUtility.TrTextContent("Frame Debugger On");
             public static GUIContent loadRenderDocContent = EditorGUIUtility.TrTextContent(UnityEditor.RenderDocUtil.loadRenderDocLabel);
@@ -106,6 +110,7 @@ internal static class Styles
             public static GUIContent clearEveryFrameContextMenuContent = EditorGUIUtility.TrTextContent("Clear Every Frame in Edit Mode");
             public static GUIContent lowResAspectRatiosContextMenuContent = EditorGUIUtility.TrTextContent("Low Resolution Aspect Ratios");
             public static GUIContent metalFrameCaptureContent = EditorGUIUtility.TrIconContent("FrameCapture", "Capture the current view and open in Xcode frame debugger");
+            public static GUIContent frameDebuggerContent = EditorGUIUtility.TrIconContent("Debug_Frame_d", "Opens the Frame Debugger");
             public static GUIContent suppressMessage = EditorGUIUtility.TrTextContent("This GameView is suppressed from rendering during Fullscreen.");
             public static GUIContent disableFullscreenMainDisplayFormatContent = EditorGUIUtility.TrTextContent("Press {0} to exit fullscreen.");
 
@@ -146,6 +151,9 @@ static Styles()
 
         static double s_LastScrollTime;
 
+        [FreeFunction]
+        extern private static bool NeedToPerformRendering();
+
         public GameView()
         {
             autoRepaintOnSceneChange = true;
@@ -417,7 +425,7 @@ void InitializeZoomArea()
             m_ZoomArea = new ZoomableArea(true, false) {uniformScale = true, upDirection = ZoomableArea.YDirection.Negative};
         }
 
-        private void UndoRedoPerformed()
+        private void UndoRedoPerformed(in UndoRedoInfo info)
         {
             Repaint();
         }
@@ -432,7 +440,7 @@ public void OnEnable()
 
             ModeService.modeChanged += OnEditorModeChanged;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
 
             targetSize = targetRenderSize;
 
@@ -443,7 +451,7 @@ public void OnDisable()
         {
             ModeService.modeChanged -= OnEditorModeChanged;
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
 
             if (m_RenderTexture)
             {
@@ -510,9 +518,17 @@ internal override void OnResized()
 
         internal override void OnBackgroundViewResized(Rect pos)
         {
+            // Should only update the game view size if it's in Aspect Ratio mode, otherwise
+            // we keep the static size
+
             Rect viewInWindow = GetViewInWindow(pos);
             Rect viewPixelRect = GetViewPixelRect(viewInWindow);
-            SetDisplayViewSize(targetDisplay, new Vector2(viewPixelRect.width, viewPixelRect.height));
+            var newTargetSize =
+                GameViewSizes.GetRenderTargetSize(viewPixelRect, currentSizeGroupType, selectedSizeIndex, out m_TargetClamped);
+
+            if (newTargetSize == GetDisplayViewSize(targetDisplay) && currentGameViewSize.sizeType != GameViewSizeType.AspectRatio)
+                return;
+            SetDisplayViewSize(targetDisplay, new Vector2(newTargetSize.x, newTargetSize.y));
             UpdateZoomAreaAndParent();
         }
 
@@ -750,6 +766,9 @@ private void DoToolbarGUI()
                         m_Parent.CaptureMetalScene();
                 }
 
+                if (GUILayout.Button(Styles.frameDebuggerContent, EditorStyles.toolbarButton))
+                    FrameDebuggerWindow.ShowFrameDebuggerWindow();
+
                 if (RenderDoc.IsLoaded())
                 {
                     using (new EditorGUI.DisabledScope(!RenderDoc.IsSupported()))
@@ -796,12 +815,17 @@ private void DoToolbarGUI()
                 // Don't display the fullscreen selection dropdown on gameview toolbars that are already fullscreen.
                 if (!isFullscreen)
                 {
-                    EditorGUI.BeginDisabled(Application.isPlaying);
+                    EditorGUI.BeginDisabled(EditorApplication.isPlaying && !EditorApplication.isPaused);
                     EditorGUILayout.GameViewOnPlayPopup(playModeBehaviorIdx, this, EditorStyles.toolbarDropDown);
                     EditorGUI.EndDisabled();
                 }
 
-                EditorUtility.audioMasterMute = GUILayout.Toggle(EditorUtility.audioMasterMute, Styles.muteContent, EditorStyles.toolbarButton);
+                EditorUtility.audioMasterMute = GUILayout.Toggle(EditorUtility.audioMasterMute,
+                    EditorUtility.audioMasterMute ? Styles.muteOnContent : Styles.muteOffContent, EditorStyles.toolbarButton);
+
+                ShortcutIntegration.ignoreWhenPlayModeFocused = GUILayout.Toggle(ShortcutIntegration.ignoreWhenPlayModeFocused,
+                    ShortcutIntegration.ignoreWhenPlayModeFocused ? Styles.shortcutsOffContent : Styles.shortcutsOnContent, EditorStyles.toolbarButton);
+
                 m_Stats = GUILayout.Toggle(m_Stats, Styles.statsContent, EditorStyles.toolbarButton);
 
                 if (EditorGUILayout.DropDownToggle(ref m_Gizmos, Styles.gizmosContent, EditorStyles.toolbarDropDownToggleRight))
@@ -1115,8 +1139,11 @@ private void OnGUI()
                 showGizmos = m_Gizmos;
                 clearColor = kClearBlack;
                 renderIMGUI = true;
+                viewPadding = targetInParent.position;
+                viewMouseScale = gameMouseScale;
 
-                if (!EditorApplication.isPlaying || (EditorApplication.isPlaying && Time.frameCount % OnDemandRendering.renderFrameInterval == 0))
+                if (!EditorApplication.isPlaying ||
+                    (EditorApplication.isPlaying && NeedToPerformRendering() && !Unsupported.IsEditorPlayerLoopWaiting()))
                     m_RenderTexture = RenderView(gameMousePosition, clearTexture);
 
                 if (m_TargetClamped)
@@ -1226,6 +1253,39 @@ private void DrawDuringFullscreenBackground()
             EditorGUILayout.LabelField(content, Styles.smallCenteredText);
         }
 
+        internal void SetCustomResolution(Vector2 res, string baseName)
+        {
+            GameViewSize customSize = null;
+            var idx = -1;
+            var sizes = GameViewSizes.instance.currentGroup;
+            for (var i = 0; i < sizes.GetTotalCount(); ++i)
+            {
+                var sz = sizes.GetGameViewSize(i);
+                if (sz.displayText.StartsWith(baseName))
+                {
+                    customSize= sz;
+                    idx = i;
+                    sz.width = (int)res.x;
+                    sz.height = (int)res.y;
+                    break;
+                }
+            }
+
+            if (customSize == null)
+            {
+                customSize = new GameViewSize(GameViewSizeType.FixedResolution, (int)res.x, (int) res.y, baseName);
+                idx = sizes.GetTotalCount();
+                sizes.AddCustomSize(customSize);
+            }
+
+            GameViewSizes.instance.SaveToHDD();
+
+            selectedSizeIndex = idx;
+            UpdateZoomAreaAndParent();
+            targetSize = targetRenderSize;
+            SceneView.RepaintAll();
+        }
+
         void IGameViewOnPlayMenuUser.OnPlayPopupSelection(int indexClicked, object objectSelected)
         {
             playModeBehaviorIdx = indexClicked;
@@ -1241,6 +1301,7 @@ void IGameViewOnPlayMenuUser.OnPlayPopupSelection(int indexClicked, object objec
             {
                 enterPlayModeBehavior = EnterPlayModeBehavior.PlayMaximized;
                 fullscreenMonitorIdx = PlayModeView.kFullscreenNone;
+                GameViewOnPlayMenu.SetFocusedToggle(this, true);
             }
             else
             {
diff --git a/Editor/Mono/GameView/GameViewOnPlayMenu.cs b/Editor/Mono/GameView/GameViewOnPlayMenu.cs
index aa619d42d6..3713322037 100644
--- a/Editor/Mono/GameView/GameViewOnPlayMenu.cs
+++ b/Editor/Mono/GameView/GameViewOnPlayMenu.cs
@@ -16,6 +16,7 @@ private static class Styles
             public static readonly GUIContent gamePlayMaximizedContent = EditorGUIUtility.TrTextContent("Maximized", "Maximize the game view before entering play mode.");
             public static readonly GUIContent gamePlayFullscreenContent = EditorGUIUtility.TrTextContent("Fullscreen on ", "Play the game view on a fullscreen monitor");
             public static readonly GUIContent playFocusedToggleContent = EditorGUIUtility.TrTextContent("Focused", "Forcilby focus the game view when entering play mode.");
+            public static readonly GUIContent playFocusedToggleDisabledContent = EditorGUIUtility.TrTextContent("Focused", "Focus toggle is currently disabled because a view will play maximized.");
             public static GUIContent vSyncToggleContent = EditorGUIUtility.TrTextContent("VSync", "Enable VSync only for the game view while in playmode.");
             public static GUIContent vSyncUnsupportedContent = EditorGUIUtility.TrTextContent("No VSync", "VSync is not available because it is not supported by this device");
             public static GUIContent gamePlayModeBehaviorLabelContent = EditorGUIUtility.TrTextContent("Enter Play Mode:");
@@ -32,12 +33,14 @@ private static class Styles
         public const int kPlayModeBaseOptionCount = 2;
         private readonly IGameViewOnPlayMenuUser m_GameView;
         private bool m_ShowFullscreenOptions = true;
+        private IFlexibleMenuItemProvider m_ItemProvider;
 
         public GameViewOnPlayMenu(IFlexibleMenuItemProvider itemProvider, int selectionIndex, FlexibleMenuModifyItemUI modifyItemUi, IGameViewOnPlayMenuUser gameView, bool showFullscreenOptions = true)
            : base(itemProvider, selectionIndex, modifyItemUi, gameView.OnPlayPopupSelection)
         {
             m_GameView = gameView;
             m_ShowFullscreenOptions = showFullscreenOptions;
+            m_ItemProvider = itemProvider;
         }
 
         public override Vector2 GetWindowSize()
@@ -46,7 +49,7 @@ public override Vector2 GetWindowSize()
             var size = CalcSize();
 
             size.x = Mathf.Max(size.x, playFocusedToggleSize.x + Styles.kMargin * 2);
-            size.y += Styles.frameHeight + EditorGUI.kControlVerticalSpacing;
+            size.y += Styles.frameHeight + EditorGUI.kControlVerticalSpacing + EditorGUI.kSingleLineHeight;
             return size;
         }
 
@@ -61,33 +64,51 @@ private bool IsVSyncToggleVisible()
                 gfxDeviceType == UnityEngine.Rendering.GraphicsDeviceType.OpenGLCore;
         }
 
-        private void DoVSyncToggle()
+        private void DoVSyncToggle(Rect rect)
         {
             if (IsVSyncToggleVisible())
             {
-                m_GameView.vSyncEnabled = GUILayout.Toggle(m_GameView.vSyncEnabled, Styles.vSyncToggleContent);
+                m_GameView.vSyncEnabled = GUI.Toggle(rect, m_GameView.vSyncEnabled, Styles.vSyncToggleContent);
             }
             else
             {
                 m_GameView.vSyncEnabled = false;
-                GUILayout.Label(Styles.vSyncUnsupportedContent, EditorStyles.miniLabel);
+                GUI.Label(rect, Styles.vSyncUnsupportedContent, EditorStyles.miniLabel);
             }
         }
 
-        private void OnPlayFocusedToggleChanged(bool newValue)
+        private static void UncheckFocusToggleOnAllViews()
         {
             List<PlayModeView> playViewList;
             WindowLayout.ShowAppropriateViewOnEnterExitPlaymodeList(true, out playViewList);
-
             foreach (PlayModeView playView in playViewList)
             {
-                if (playView != (m_GameView as PlayModeView))
+                if (playView is IGameViewOnPlayMenuUser)
                 {
                     ((IGameViewOnPlayMenuUser)playView).playFocused = false;
                 }
             }
+        }
 
-            m_GameView.playFocused = newValue;
+        public static void SetFocusedToggle(IGameViewOnPlayMenuUser view, bool newValue)
+        {
+            UncheckFocusToggleOnAllViews();
+            view.playFocused = newValue;
+        }
+
+        private bool IsAnyViewInMaximizeMode()
+        {
+            List<PlayModeView> playViewList;
+            WindowLayout.ShowAppropriateViewOnEnterExitPlaymodeList(true, out playViewList);
+            foreach (PlayModeView playView in playViewList)
+            {
+                if (playView.enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayMaximized)
+                {
+                    SetFocusedToggle(playView as IGameViewOnPlayMenuUser, true);
+                    return true;
+                }
+            }
+            return false;
         }
 
         public override void OnGUI(Rect rect)
@@ -95,20 +116,23 @@ public override void OnGUI(Rect rect)
             var frameRect = new Rect(rect.x, rect.y, rect.width, rect.height);
             GUI.Label(frameRect, "", EditorStyles.viewBackground);
 
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(15); // Move everything slightly right so it doesn't overlap with our "repaint indicator"
-            bool playFocuedToggle = GUILayout.Toggle(m_GameView.playFocused, Styles.playFocusedToggleContent);
-            if (playFocuedToggle != m_GameView.playFocused)
+            var focusTextSize = EditorStyles.label.CalcSize(Styles.playFocusedToggleContent);
+            GUI.enabled = !IsAnyViewInMaximizeMode();
+            var focusToggleRect = new Rect(Styles.kMargin, Styles.kTopMargin, focusTextSize.x, EditorGUI.kSingleLineHeight);
+            bool playFocusedToggle = GUI.Toggle(focusToggleRect, m_GameView.playFocused, GUI.enabled ? Styles.playFocusedToggleContent : Styles.playFocusedToggleDisabledContent);
+            GUI.enabled = true;
+            if (playFocusedToggle != m_GameView.playFocused)
             {
-                OnPlayFocusedToggleChanged(playFocuedToggle);
+                SetFocusedToggle(m_GameView, playFocusedToggle);
             }
-            DoVSyncToggle();
-            GUILayout.EndHorizontal();
+            var vsyncToggleRect = new Rect(focusTextSize.x + Styles.kMargin*2, Styles.kTopMargin, rect.width, EditorGUI.kSingleLineHeight);
+            DoVSyncToggle(vsyncToggleRect);
 
-            GUILayout.Label(Styles.gamePlayModeBehaviorLabelContent, EditorStyles.boldLabel);
+            var labelSize = EditorStyles.boldLabel.CalcSize(Styles.gamePlayModeBehaviorLabelContent);
+            var labelRect = new Rect(Styles.kMargin, Styles.kTopMargin + EditorGUI.kSingleLineHeight, labelSize.x, labelSize.y + EditorGUI.kSingleLineHeight);
+            GUI.Label(labelRect, Styles.gamePlayModeBehaviorLabelContent, EditorStyles.boldLabel);
 
-            rect.height = rect.height - Styles.contentOffset;
-            rect.y = rect.y + Styles.contentOffset;
+            rect.y = rect.y + Styles.contentOffset + EditorGUI.kSingleLineHeight;
 
             base.OnGUI(rect);
         }
diff --git a/Editor/Mono/Graphics/EditorMaterialUtility.bindings.cs b/Editor/Mono/Graphics/EditorMaterialUtility.bindings.cs
index f7f6be0ca0..5f3bf014df 100644
--- a/Editor/Mono/Graphics/EditorMaterialUtility.bindings.cs
+++ b/Editor/Mono/Graphics/EditorMaterialUtility.bindings.cs
@@ -28,5 +28,11 @@ public sealed partial class EditorMaterialUtility
 
         [FreeFunction("EditorMaterialUtilityBindings::SetShaderNonModifiableDefaults")]
         extern public static void SetShaderNonModifiableDefaults([NotNull] Shader shader, string[] name, Texture[] textures);
+
+        [FreeFunction("EditorMaterialUtilityBindings::GetShaderDefaultTexture")]
+        extern internal static Texture GetShaderDefaultTexture([NotNull] Shader shader, string name);
+
+        [FreeFunction("EditorMaterialUtilityBindings::GetMaterialParentFromFile")]
+        extern internal static GUID GetMaterialParentFromFile(string assetPath);
     }
 }
diff --git a/Editor/Mono/Graphics/ShaderCompilerData.cs b/Editor/Mono/Graphics/ShaderCompilerData.cs
index 8a52c64462..d31085e31e 100644
--- a/Editor/Mono/Graphics/ShaderCompilerData.cs
+++ b/Editor/Mono/Graphics/ShaderCompilerData.cs
@@ -45,6 +45,7 @@ public struct ShaderCompilerData
         private ShaderRequirements m_ShaderRequirements;
         private GraphicsTier m_GraphicsTier;
         private ShaderCompilerPlatform m_ShaderCompilerPlatform;
+        private BuildTarget m_BuildTarget;
 
         public ShaderRequirements shaderRequirements
         {
@@ -60,6 +61,8 @@ public ShaderCompilerPlatform shaderCompilerPlatform
         {
             get { return m_ShaderCompilerPlatform; }
         }
+
+        public BuildTarget buildTarget { get { return m_BuildTarget; } }
     }
 
     public enum ShaderCompilerPlatform
@@ -75,9 +78,12 @@ public enum ShaderCompilerPlatform
         Vulkan          = 18, // Vulkan SPIR-V, compiled with MS D3DCompiler + HLSLcc
         Switch          = 19, // Nintendo Switch (NVN)
         XboxOneD3D12    = 20, // Xbox One D3D12
-        GameCore        = 21, // Game Core
+        GameCoreXboxOne = 21, // Game Core Xbox One
+        GameCoreXboxSeries= 22, // Game Core Scarlett
         PS5             = 23, // PS5
-        PS5NGGC         = 24  // PS5 NGGC
+        PS5NGGC         = 24,  // PS5 NGGC
+        [System.Obsolete(@"GameCore  is deprecated, please use GameCoreXboxOne (UnityUpgradable) -> GameCoreXboxOne ", true)]
+        GameCore = 25 // Game Core deprecated as single platform
     }
 
     public enum ShaderCompilerMessageSeverity
diff --git a/Editor/Mono/Grids/EditorSnap.cs b/Editor/Mono/Grids/EditorSnap.cs
index 81a9eec284..7af57679bd 100644
--- a/Editor/Mono/Grids/EditorSnap.cs
+++ b/Editor/Mono/Grids/EditorSnap.cs
@@ -60,9 +60,9 @@ internal static bool activeToolGridSnapEnabled
             }
         }
 
-        internal static bool gridSnapActive
+        public static bool gridSnapActive
         {
-            get { return !incrementalSnapActive && activeToolGridSnapEnabled && instance.snapEnabled; }
+            get { return !incrementalSnapActive && activeToolGridSnapEnabled && gridSnapEnabled; }
         }
 
         public static event Action gridSnapEnabledChanged;
@@ -85,12 +85,18 @@ public static bool gridSnapEnabled
             }
         }
 
+        public static Vector3 gridSize
+        {
+            get => GridSettings.size;
+            set => GridSettings.size = value;
+        }
+
         internal static bool hotkeyActive
         {
             get { return EditorGUI.actionKey; }
         }
 
-        internal static bool incrementalSnapActive
+        public static bool incrementalSnapActive
         {
             get { return Event.current != null && EditorGUI.actionKey; }
         }
diff --git a/Editor/Mono/HandleUtility.bindings.cs b/Editor/Mono/HandleUtility.bindings.cs
index 68ff58b519..d8cdb9fd30 100644
--- a/Editor/Mono/HandleUtility.bindings.cs
+++ b/Editor/Mono/HandleUtility.bindings.cs
@@ -16,7 +16,7 @@ public sealed partial class HandleUtility
 
         internal static extern GameObject[] Internal_PickRectObjects(Camera cam, Rect rect, bool selectPrefabRoots, bool drawGizmos);
 
-        internal static extern bool Internal_FindNearestVertex(Camera cam, Vector2 screenPoint, Transform[] objectsToSearch, Transform[] ignoreObjects, out Vector3 vertex);
+        internal static extern GameObject Internal_FindNearestVertex(Camera cam, Vector2 screenPoint, Transform[] objectsToSearch, Transform[] ignoreObjects, out Vector3 vertex, out bool found);
         internal static extern GameObject Internal_PickClosestGO(Camera cam, int layers, Vector2 position, GameObject[] ignore, GameObject[] filter, bool drawGizmos, out int materialIndex);
 
 
diff --git a/Editor/Mono/HandleUtility.cs b/Editor/Mono/HandleUtility.cs
index 0f8ad8420f..9b7cd6f576 100644
--- a/Editor/Mono/HandleUtility.cs
+++ b/Editor/Mono/HandleUtility.cs
@@ -924,6 +924,25 @@ public static GameObject[] PickRectObjects(Rect rect, bool selectPrefabRootsOnly
             return Internal_PickRectObjects(cam, rect, selectPrefabRootsOnly, allowGizmos);
         }
 
+        public static bool FindNearestVertex(Vector2 guiPoint, out Vector3 vertex, out GameObject gameObject)
+        {
+            return FindNearestVertex(guiPoint, null, ignoreRaySnapObjects, out vertex, out gameObject);
+        }
+
+        public static bool FindNearestVertex(Vector2 guiPoint, Transform[] objectsToSearch, out Vector3 vertex, out GameObject gameObject)
+        {
+            return FindNearestVertex(guiPoint, objectsToSearch, ignoreRaySnapObjects, out vertex, out gameObject);
+        }
+
+        public static bool FindNearestVertex(Vector2 guiPoint, Transform[] objectsToSearch, Transform[] objectsToIgnore, out Vector3 vertex, out GameObject gameObject)
+        {
+            Camera cam = Camera.current;
+            var screenPoint = EditorGUIUtility.PointsToPixels(guiPoint);
+            screenPoint.y = cam.pixelRect.yMax - screenPoint.y;
+            gameObject = Internal_FindNearestVertex(cam, screenPoint, objectsToSearch, objectsToIgnore, out vertex, out bool found);
+            return found;
+        }
+
         public static bool FindNearestVertex(Vector2 guiPoint, out Vector3 vertex)
         {
             return FindNearestVertex(guiPoint, null, ignoreRaySnapObjects, out vertex);
@@ -939,7 +958,8 @@ public static bool FindNearestVertex(Vector2 guiPoint, Transform[] objectsToSear
             Camera cam = Camera.current;
             var screenPoint = EditorGUIUtility.PointsToPixels(guiPoint);
             screenPoint.y = cam.pixelRect.yMax - screenPoint.y;
-            return Internal_FindNearestVertex(cam, screenPoint, objectsToSearch, objectsToIgnore, out vertex);
+            Internal_FindNearestVertex(cam, screenPoint, objectsToSearch, objectsToIgnore, out vertex, out bool found);
+            return found;
         }
 
         // Until `pickGameObjectCustomPasses` can handle sorting priority correctly, we need a way to override the
@@ -1567,71 +1587,78 @@ internal static void FilterRendererIDs(Renderer[] renderers, out int[] parentRen
                 return;
             }
 
-            var childCount = 0;
             var parentIndex = 0;
-            var childIndex = 0;
             parentRendererIDs = new int[renderers.Length];
 
             foreach (var renderer in renderers)
-            {
-                childCount += renderer.transform.hierarchyCount;
                 parentRendererIDs[parentIndex++] = renderer.GetInstanceID();
-            }
 
-            childRendererIDs = new int[childCount];
+            var tempChildRendererIDs = new HashSet<int>();
             foreach (var renderer in renderers)
             {
                 var children = renderer.GetComponentsInChildren<Renderer>();
                 for (int i = 1; i < children.Length; i++)
                 {
                     var id = children[i].GetInstanceID();
-                    if (!HasMatchingInstanceID(parentRendererIDs, id))
-                        childRendererIDs[childIndex++] = id;
+                    if (!HasMatchingInstanceID(parentRendererIDs, id, parentIndex))
+                        tempChildRendererIDs.Add(id);
                 }
             }
+
+            childRendererIDs = tempChildRendererIDs.ToArray();
         }
 
-        internal static void FilterRendererIDs(GameObject[] gameObjects, out int[] parentRendererIDs, out int[] childRendererIDs)
+        internal static void FilterInstanceIDs(GameObject[] gameObjects, out int[] parentInstanceIDs, out int[] childInstanceIDs)
         {
             if (gameObjects == null)
             {
                 Debug.LogWarning("The GameObject array is null. Handles.DrawOutline will not be rendered.");
-                parentRendererIDs = new int[0];
-                childRendererIDs = new int[0];
+                parentInstanceIDs = new int[0];
+                childInstanceIDs = new int[0];
                 return;
             }
 
-            var childCount = 0;
-            var parentIndex = 0;
-            var childIndex = 0;
-            parentRendererIDs = new int[gameObjects.Length];
-
+            var tempParentInstanceIDs = new HashSet<int>();
             foreach (var go in gameObjects)
             {
-                childCount += go.transform.hierarchyCount;
                 if (go.TryGetComponent(out Renderer renderer))
-                    parentRendererIDs[parentIndex++] = renderer.GetInstanceID();
+                    tempParentInstanceIDs.Add(renderer.GetInstanceID());
+                else if (go.TryGetComponent(out Terrain terrain))
+                    tempParentInstanceIDs.Add(terrain.GetInstanceID());
             }
 
-            childRendererIDs = new int[childCount];
+            var tempChildInstanceIDs = new HashSet<int>();
             foreach (var go in gameObjects)
             {
-                var children = go.GetComponentsInChildren<Renderer>();
-                for (int i = 1; i < children.Length; i++)
+                var childRenderers = go.GetComponentsInChildren<Renderer>();
+                for (int i = 0; i < childRenderers.Length; i++)
                 {
-                    var id = children[i].GetInstanceID();
-                    if (!HasMatchingInstanceID(parentRendererIDs, id))
-                        childRendererIDs[childIndex++] = id;
+                    var id = childRenderers[i].GetInstanceID();
+                    if (!tempParentInstanceIDs.Contains(id))
+                        tempChildInstanceIDs.Add(id);
+                }
+
+                var childTerrains = go.GetComponentsInChildren<Terrain>();
+                for (int i = 0; i < childTerrains.Length; i++)
+                {
+                    var id = childTerrains[i].GetInstanceID();
+                    if (!tempParentInstanceIDs.Contains(id))
+                        tempChildInstanceIDs.Add(id);
                 }
             }
+
+            parentInstanceIDs = tempParentInstanceIDs.ToArray();
+            childInstanceIDs = tempChildInstanceIDs.ToArray();
         }
 
-        static bool HasMatchingInstanceID(int[] ids, int id)
+        static bool HasMatchingInstanceID(int[] ids, int id, int cutoff)
         {
             for (int i = 0; i < ids.Length; i++)
             {
                 if (ids[i] == id)
                     return true;
+                if (i > cutoff)
+                    return false;
             }
             return false;
         }
diff --git a/Editor/Mono/Handles.bindings.cs b/Editor/Mono/Handles.bindings.cs
index c3bb6815d0..e93ce171f6 100644
--- a/Editor/Mono/Handles.bindings.cs
+++ b/Editor/Mono/Handles.bindings.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Bindings;
@@ -10,6 +11,13 @@
 
 namespace UnityEditor
 {
+    [Flags]
+    internal enum OutlineDrawMode
+    {
+        SelectionOutline = 1 << 0,
+        SelectionWire = 1 << 1,
+    }
+
     [NativeHeader("Editor/Src/Handles/Handles.bindings.h")]
     public sealed partial class Handles
     {
@@ -51,7 +59,7 @@ public static extern Matrix4x4 matrix
         static extern void Internal_DrawCameraWithGrid([NotNull("NullExceptionObject")] Camera cam, DrawCameraMode renderMode, ref DrawGridParameters gridParam, bool drawGizmos, bool drawSelection);
 
         [FreeFunction]
-        internal static extern void Internal_DrawOutline(Color parentNodeColor, Color childNodeColor, int submeshOutlineMaterialId, int[] parentRenderers, int[] childRenderers, float parentOutlineAlpha = 0, float childOutlineAlpha = 0, bool drawSelectionWire = false);
+        internal static extern void Internal_DrawOutline(Color parentNodeColor, Color childNodeColor, int submeshOutlineMaterialId, int[] parentRenderers, int[] childRenderers, OutlineDrawMode outlineMode, float parentOutlineAlpha = 0, float childOutlineAlpha = 0);
 
         [FreeFunction]
         static extern void Internal_DrawCamera([NotNull("NullExceptionObject")] Camera cam, DrawCameraMode renderMode, bool drawGizmos, bool drawSelection);
@@ -60,7 +68,7 @@ public static extern Matrix4x4 matrix
         static extern void Internal_DrawCameraWithFilter([NotNull("NullExceptionObject")] Camera cam, DrawCameraMode renderMode, bool drawGizmos, bool drawSelection, GameObject[] filter);
 
         [FreeFunction]
-        static extern void Internal_FinishDrawingCamera([NotNull("NullExceptionObject")] Camera cam, [DefaultValue("true")] bool drawGizmos);
+        internal static extern void Internal_FinishDrawingCamera([NotNull("NullExceptionObject")] Camera cam, [DefaultValue("true")] bool drawGizmos);
         static void Internal_FinishDrawingCamera(Camera cam) { Internal_FinishDrawingCamera(cam, true); }
 
         [FreeFunction]
diff --git a/Editor/Mono/Handles.cs b/Editor/Mono/Handles.cs
index 51dbf11201..e907a06238 100644
--- a/Editor/Mono/Handles.cs
+++ b/Editor/Mono/Handles.cs
@@ -336,7 +336,7 @@ internal static void DrawLine(Vector3 p1, Vector3 p2, bool dottedLine)
         static float ThicknessToPixels(float thickness)
         {
             var halfThicknessPixels = thickness * EditorGUIUtility.pixelsPerPoint * 0.5f;
-            if (halfThicknessPixels < 0.5f)
+            if (halfThicknessPixels < 0.9f)
                 halfThicknessPixels = 0;
             return halfThicknessPixels;
         }
@@ -511,16 +511,6 @@ public static void DrawGizmos(Camera camera)
                 Internal_DoDrawGizmos(camera);
         }
 
-        public static Quaternion Disc(int id, Quaternion rotation, Vector3 position, Vector3 axis, float size, bool cutoffPlane, float snap)
-        {
-            return UnityEditorInternal.Disc.Do(id, rotation, position, axis, size, cutoffPlane, snap);
-        }
-
-        public static Quaternion FreeRotateHandle(int id, Quaternion rotation, Vector3 position, float size)
-        {
-            return UnityEditorInternal.FreeRotate.Do(id, rotation, position, size);
-        }
-
         // Make a 3D slider
         public static Vector3 Slider(Vector3 position, Vector3 direction)
         {
@@ -591,6 +581,11 @@ internal static bool Button(int controlID, Vector3 position, Quaternion directio
             return UnityEditorInternal.Button.Do(controlID, position, direction, size, pickSize, capFunction);
         }
 
+        internal static bool Button(int controlID, Vector3 position, Quaternion direction, float size, float pickSize, CapFunction capFunction, bool checkMouseProximity)
+        {
+            return UnityEditorInternal.Button.Do(controlID, position, direction, size, pickSize, capFunction, checkMouseProximity);
+        }
+
         // Draw a cube. Pass this into handle functions.
         public static void CubeHandleCap(int controlID, Vector3 position, Quaternion rotation, float size, EventType eventType)
         {
@@ -631,7 +626,7 @@ public static void ConeHandleCap(int controlID, Vector3 position, Quaternion rot
                 case EventType.MouseMove:
                     HandleUtility.AddControl(controlID, HandleUtility.DistanceToCone(position, rotation, size));
                     break;
-                case (EventType.Repaint):
+                case EventType.Repaint:
                     Graphics.DrawMeshNow(coneMesh, StartCapDraw(position, rotation, size));
                     break;
             }
@@ -856,12 +851,23 @@ public static Vector3 PositionHandle(Vector3 position, Quaternion rotation)
             return DoPositionHandle(position, rotation);
         }
 
+        public static Vector3 PositionHandle(PositionHandleIds ids, Vector3 position, Quaternion rotation)
+        {
+            return DoPositionHandle(ids, position, rotation);
+        }
+
         // Make a Scene view rotation handle.
         public static Quaternion RotationHandle(Quaternion rotation, Vector3 position)
         {
             return DoRotationHandle(rotation, position);
         }
 
+        public static Quaternion RotationHandle(RotationHandleIds ids, Quaternion rotation, Vector3 position)
+        {
+            return DoRotationHandle(ids, rotation, position, RotationHandleParam.Default);
+        }
+
+
         // Make a Scene view scale handle
         public static Vector3 ScaleHandle(Vector3 scale, Vector3 position, Quaternion rotation)
         {
@@ -950,6 +956,11 @@ public static Vector3 Slider2D(Vector3 handlePos, Vector3 handleDir, Vector3 sli
         }
 
         // Make an unconstrained rotation handle.
+        public static Quaternion FreeRotateHandle(int id, Quaternion rotation, Vector3 position, float size)
+        {
+            return UnityEditorInternal.FreeRotate.Do(id, rotation, position, size);
+        }
+
         public static Quaternion FreeRotateHandle(Quaternion rotation, Vector3 position, float size)
         {
             int id = GUIUtility.GetControlID(s_FreeRotateHandleHash, FocusType.Passive);
@@ -957,6 +968,11 @@ public static Quaternion FreeRotateHandle(Quaternion rotation, Vector3 position,
         }
 
         // Make a directional scale slider
+        public static float ScaleSlider(int id, float scale, Vector3 position, Vector3 direction, Quaternion rotation, float size, float snap)
+        {
+            return UnityEditorInternal.SliderScale.DoAxis(id, scale, position, direction, rotation, size, snap);
+        }
+
         public static float ScaleSlider(float scale, Vector3 position, Vector3 direction, Quaternion rotation, float size, float snap)
         {
             int id = GUIUtility.GetControlID(s_ScaleSliderHash, FocusType.Passive);
@@ -964,6 +980,11 @@ public static float ScaleSlider(float scale, Vector3 position, Vector3 direction
         }
 
         // Make a 3D disc that can be dragged with the mouse
+        public static Quaternion Disc(int id, Quaternion rotation, Vector3 position, Vector3 axis, float size, bool cutoffPlane, float snap)
+        {
+            return UnityEditorInternal.Disc.Do(id, rotation, position, axis, size, cutoffPlane, snap);
+        }
+
         public static Quaternion Disc(Quaternion rotation, Vector3 position, Vector3 axis, float size, bool cutoffPlane, float snap)
         {
             int id = GUIUtility.GetControlID(s_DiscHash, FocusType.Passive);
@@ -1012,6 +1033,18 @@ public static void SnapToGrid(Transform[] transforms, SnapAxis axis = SnapAxis.A
             }
         }
 
+        // Snap all positions to the grid
+        public static void SnapToGrid(Vector3[] positions, SnapAxis axis = SnapAxis.All)
+        {
+            if (positions != null && positions.Length > 0)
+            {
+                for(int i = 0; i<positions.Length; i++)
+                {
+                    positions[i] = Snapping.Snap(positions[i], Vector3.Scale(GridSettings.size, new SnapAxisFilter(axis)));
+                }
+            }
+        }
+
         // The camera used for deciding where 3D handles end up
         public Camera currentCamera { get { return Camera.current; } set { Internal_SetCurrentCamera(value); } }
 
@@ -1400,14 +1433,14 @@ public static Vector2 GetMainGameViewSize()
 
         public static void DrawOutline(int[] parentRenderers, int[] childRenderers, Color parentNodeColor, Color childNodeColor, float fillOpacity = 0)
         {
-            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, fillOpacity, fillOpacity);
+            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, OutlineDrawMode.SelectionOutline, fillOpacity, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
 
         public static void DrawOutline(int[] renderers, Color color, float fillOpacity = 0)
         {
-            Internal_DrawOutline(color, color, 0, renderers, null, fillOpacity);
+            Internal_DrawOutline(color, color, 0, renderers, null, OutlineDrawMode.SelectionOutline, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
@@ -1416,7 +1449,7 @@ public static void DrawOutline(Renderer[] renderers, Color parentNodeColor, Colo
         {
             int[] parentRenderers, childRenderers;
             HandleUtility.FilterRendererIDs(renderers, out parentRenderers, out childRenderers);
-            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, fillOpacity, fillOpacity);
+            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, OutlineDrawMode.SelectionOutline, fillOpacity, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
@@ -1428,7 +1461,7 @@ public static void DrawOutline(Renderer[] renderers, Color color, float fillOpac
             foreach (var renderer in renderers)
                     ids[index++] = renderer.GetInstanceID();
 
-            Internal_DrawOutline(color, color, 0, ids, null, fillOpacity, fillOpacity);
+            Internal_DrawOutline(color, color, 0, ids, null, OutlineDrawMode.SelectionOutline, fillOpacity, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
@@ -1436,8 +1469,8 @@ public static void DrawOutline(Renderer[] renderers, Color color, float fillOpac
         public static void DrawOutline(GameObject[] objects, Color parentNodeColor, Color childNodeColor, float fillOpacity = 0)
         {
             int[] parentRenderers, childRenderers;
-            HandleUtility.FilterRendererIDs(objects, out parentRenderers, out childRenderers);
-            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, fillOpacity, fillOpacity);
+            HandleUtility.FilterInstanceIDs(objects, out parentRenderers, out childRenderers);
+            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, OutlineDrawMode.SelectionOutline, fillOpacity, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
@@ -1452,7 +1485,7 @@ public static void DrawOutline(GameObject[] objects, Color color, float fillOpac
                     ids[index++] = renderer.GetInstanceID();
             }
 
-            Internal_DrawOutline(color, color, 0, ids, null, fillOpacity, fillOpacity);
+            Internal_DrawOutline(color, color, 0, ids, null, OutlineDrawMode.SelectionOutline, fillOpacity, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
@@ -1460,8 +1493,8 @@ public static void DrawOutline(GameObject[] objects, Color color, float fillOpac
         public static void DrawOutline(List<GameObject> objects, Color parentNodeColor, Color childNodeColor, float fillOpacity = 0)
         {
             int[] parentRenderers, childRenderers;
-            HandleUtility.FilterRendererIDs((GameObject[])NoAllocHelpers.ExtractArrayFromList(objects), out parentRenderers, out childRenderers);
-            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, fillOpacity, fillOpacity);
+            HandleUtility.FilterInstanceIDs((GameObject[])NoAllocHelpers.ExtractArrayFromList(objects), out parentRenderers, out childRenderers);
+            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, OutlineDrawMode.SelectionOutline, fillOpacity, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
@@ -1476,25 +1509,25 @@ public static void DrawOutline(List<GameObject> objects, Color color, float fill
                     ids[index++] = renderer.GetInstanceID();
             }
 
-            Internal_DrawOutline(color, color, 0, ids, null, fillOpacity, fillOpacity);
+            Internal_DrawOutline(color, color, 0, ids, null, OutlineDrawMode.SelectionOutline, fillOpacity, fillOpacity);
 
             Internal_FinishDrawingCamera(Camera.current, true);
         }
 
-        internal static void DrawOutlineInternal(Color parentNodeColor, Color childNodeColor, float outlineAlpha, int[] parentRenderers, int[] childRenderers)
+        internal static void DrawOutlineOrWireframeInternal(Color parentNodeColor, Color childNodeColor, float outlineAlpha, int[] parentRenderers, int[] childRenderers, OutlineDrawMode outlineMode)
         {
             // RenderOutline will swap color.a and outlineAlpha so we reverse it here to preserve correct behavior wrt Color settings in Preferences
             var parentOutlineAlpha = parentNodeColor.a;
             var childOutlineAlpha = childNodeColor.a;
             parentNodeColor.a = outlineAlpha;
             childNodeColor.a = outlineAlpha;
-            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, parentOutlineAlpha, childOutlineAlpha, true);
+            Internal_DrawOutline(parentNodeColor, childNodeColor, 0, parentRenderers, childRenderers, outlineMode, parentOutlineAlpha, childOutlineAlpha);
         }
 
         internal static void DrawSubmeshOutline(Color parentNodeColor, Color childNodeColor, float outlineAlpha, int submeshOutlineMaterialId)
         {
             int[] parentRenderers, childRenderers;
-            HandleUtility.FilterRendererIDs(Selection.gameObjects, out parentRenderers, out childRenderers);
+            HandleUtility.FilterInstanceIDs(Selection.gameObjects, out parentRenderers, out childRenderers);
 
             // RenderOutline will swap color.a and outlineAlpha so we reverse it here to preserve correct behavior wrt Color settings in Preferences
             var parentOutlineAlpha = parentNodeColor.a;
@@ -1502,7 +1535,7 @@ internal static void DrawSubmeshOutline(Color parentNodeColor, Color childNodeCo
             parentNodeColor.a = outlineAlpha;
             childNodeColor.a = outlineAlpha;
 
-            Internal_DrawOutline(parentNodeColor, childNodeColor, submeshOutlineMaterialId, parentRenderers, childRenderers, parentOutlineAlpha, childOutlineAlpha);
+            Internal_DrawOutline(parentNodeColor, childNodeColor, submeshOutlineMaterialId, parentRenderers, childRenderers, OutlineDrawMode.SelectionOutline, parentOutlineAlpha, childOutlineAlpha);
             Internal_FinishDrawingCamera(Camera.current, true);
         }
 
diff --git a/Editor/Mono/Help.cs b/Editor/Mono/Help.cs
index 0faf3c1e25..2852dee68e 100644
--- a/Editor/Mono/Help.cs
+++ b/Editor/Mono/Help.cs
@@ -36,6 +36,7 @@ public partial class Help
             "https://docs-redirects.unity.com"
         };
 
+        internal static string k_AlphaReleaseNotesUrlBase = "https://unity3d.com/unity/alpha/";
         internal static string k_BetaReleaseNotesUrlBase = "https://unity3d.com/unity/beta/";
         internal static string k_ReleaseNotesUrlBase = "https://unity3d.com/unity/whats-new/";
 
@@ -340,16 +341,15 @@ internal static string HelpFileNameForObject(Object obj)
         [UnityEngine.Scripting.RequiredByNativeCode]
         internal static void OpenReleaseNotes()
         {
-            var version = InternalEditorUtility.GetUnityVersion();
-            var releaseNotesUrl = GetReleaseNotesUrl(InternalEditorUtility.IsUnityBeta(), InternalEditorUtility.GetUnityVersionDigits(), InternalEditorUtility.GetUnityDisplayVersion());
+            var releaseNotesUrl = GetReleaseNotesUrl(InternalEditorUtility.GetUnityVersionDigits(), InternalEditorUtility.GetUnityDisplayVersion());
             Application.OpenURL(releaseNotesUrl);
         }
 
-        internal static string GetReleaseNotesUrl(bool isBeta, string digitsOnlyVersion, string displayVersion)
+        internal static string GetReleaseNotesUrl(string digitsOnlyVersion, string displayVersion)
         {
             var url = "http://unity3d.com/whatsnew.html";
-
-            if (isBeta)
+            var isUnreleased = displayVersion.Contains("a") || displayVersion.Contains("b");
+            if (isUnreleased)
             {
                 var displayVersionWithBuildNumber = new Regex(@"(\d+\.\d+\.[a-z0-9]+)\.\d+");
                 var m = displayVersionWithBuildNumber.Match(displayVersion);
@@ -357,7 +357,15 @@ internal static string GetReleaseNotesUrl(bool isBeta, string digitsOnlyVersion,
                 {
                     displayVersion = m.Groups[1].Value;
                 }
-                url = $"{k_BetaReleaseNotesUrlBase}{displayVersion}";
+
+                if (displayVersion.Contains("a"))
+                {
+                    url = $"{k_AlphaReleaseNotesUrlBase}{displayVersion}";
+                }
+                else
+                {
+                    url = $"{k_BetaReleaseNotesUrlBase}{displayVersion}";
+                }
             }
             else
             {
diff --git a/Editor/Mono/HostView.cs b/Editor/Mono/HostView.cs
index 48fc052d84..360bf2e81c 100644
--- a/Editor/Mono/HostView.cs
+++ b/Editor/Mono/HostView.cs
@@ -2,18 +2,16 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using UnityEngine;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
-using UnityEditor.Profiling;
 using System.Linq;
+using System.Reflection;
 using UnityEditor.Overlays;
+using UnityEditor.ShortcutManagement;
 using UnityEditor.StyleSheets;
-using UnityEditor.UIElements;
 using UnityEditorInternal;
-using Directory = UnityEditor.ShortcutManagement.Directory;
+using UnityEngine;
 using Object = UnityEngine.Object;
 
 namespace UnityEditor
@@ -27,6 +25,31 @@ static class Styles
             public static readonly GUIStyle paneOptions = "PaneOptions";
             public static readonly GUIStyle tabWindowBackground = "TabWindowBackground";
 
+            public static class DataModes
+            {
+                public const float switchButtonWidth = 16.0f;
+
+                static readonly Texture2D k_AuthoringModeIcon = EditorGUIUtility.LoadIcon("DataMode.Authoring");
+                static readonly Texture2D k_MixedModeIcon = EditorGUIUtility.LoadIcon("DataMode.Mixed");
+                static readonly Texture2D k_RuntimeModeIcon = EditorGUIUtility.LoadIcon("DataMode.Runtime");
+
+                public static readonly GUIContent authoringModeContent = EditorGUIUtility.TrIconContent(k_AuthoringModeIcon, "Data Mode: Authoring");
+                public static readonly GUIContent mixedModeContent = EditorGUIUtility.TrIconContent(k_MixedModeIcon, "Data Mode: Mixed");
+                public static readonly GUIContent runtimeModeContent = EditorGUIUtility.TrIconContent(k_RuntimeModeIcon, "Data Mode: Runtime");
+
+                // Use an empty style to avoid the hover effect of normal buttons
+                public static readonly GUIStyle switchStyle = new GUIStyle();
+
+                public static readonly Dictionary<DataMode, GUIContent> dataModeNameLabels =
+                    new Dictionary<DataMode, GUIContent>
+                    {
+                        { DataMode.Disabled,  EditorGUIUtility.TrTextContent("Disabled")       },
+                        { DataMode.Authoring, EditorGUIUtility.TrTextContent("Authoring Mode") },
+                        { DataMode.Mixed,     EditorGUIUtility.TrTextContent("Mixed Mode")     },
+                        { DataMode.Runtime,   EditorGUIUtility.TrTextContent("Runtime Mode")   }
+                    };
+            }
+
             static Styles()
             {
                 // Fix annoying GUILayout issue: When using GUILayout in Utility windows there
@@ -307,6 +330,12 @@ internal void OnLostFocus()
             Repaint();
         }
 
+        protected override void OnBackingScaleFactorChanged()
+        {
+            if (m_ActualView != null)
+                m_ActualView.OnBackingScaleFactorChangedInternal();
+        }
+
         protected override void OnDestroy()
         {
             if (m_ActualView)
@@ -526,6 +555,9 @@ protected void RegisterSelectedPane(bool sendEvents)
                 EditorApplication.update += m_ActualView.CheckForWindowRepaint;
             }
 
+            if (m_ActualView is IDataModeHandlerAndDispatcher dataModesDispatcher)
+                dataModesDispatcher.dataModeChanged += OnViewDataModeChanged;
+
             if (sendEvents)
             {
                 try
@@ -562,6 +594,9 @@ protected void DeregisterSelectedPane(bool clearActualView, bool sendEvents)
                 EditorApplication.update -= m_ActualView.CheckForWindowRepaint;
             }
 
+            if (m_ActualView is IDataModeHandlerAndDispatcher dataModesDispatcher)
+                dataModesDispatcher.dataModeChanged -= OnViewDataModeChanged;
+
             if (clearActualView)
             {
                 var onLostFocus = m_OnLostFocus;
@@ -640,7 +675,12 @@ internal float GetExtraButtonsWidth()
         {
             float extraWidth = 0;
 
-            if (m_ShowButton != null) extraWidth += ContainerWindow.kButtonWidth;
+            // Generally reserved for the lock icon
+            if (m_ShowButton != null)
+                extraWidth += ContainerWindow.kButtonWidth;
+
+            if (ShouldDrawDataModesSwitch())
+                extraWidth += Styles.DataModes.switchButtonWidth + k_iconMargin;
 
             foreach (var item in windowActions)
             {
@@ -663,10 +703,51 @@ protected void ShowGenericMenu(float leftOffset, float topOffset)
                     leftOffset -= paneMenu.width + k_iconMargin;
             }
 
-            // Give panes an option of showing a small button next to the generic menu (used for inspector lock icon
+            // Give panes an option of showing a small button next to the generic menu (used for inspector lock icon)
             if (m_ShowButton != null)
                 m_ShowButton.Invoke(new Rect(leftOffset, topOffset, ContainerWindow.kButtonWidth, ContainerWindow.kButtonHeight));
 
+            // Note: We are assuming the value returned by ShouldDrawDataModesSwitch() hasn't changed since
+            // it was called from GetExtraButtonsWidth(); if GetExtraButtonsWidth() was called at all, that is.
+            if (ShouldDrawDataModesSwitch())
+            {
+                // This cast is guaranteed to work by ShouldDrawDataModesSwitch()
+                var dataModesClient = (IDataModeHandler) m_ActualView;
+                var switchContent = default(GUIContent);
+
+                switch (dataModesClient.dataMode)
+                {
+                    case DataMode.Authoring:
+                    {
+                        switchContent = Styles.DataModes.authoringModeContent;
+                        break;
+                    }
+                    case DataMode.Mixed:
+                    {
+                        switchContent = Styles.DataModes.mixedModeContent;
+                        break;
+                    }
+                    case DataMode.Runtime:
+                    {
+                        switchContent = Styles.DataModes.runtimeModeContent;
+                        break;
+                    }
+                }
+
+                // Last chance to bail in case something weird happened
+                if (switchContent != default)
+                {
+                    leftOffset -= Styles.DataModes.switchButtonWidth + k_iconMargin;
+                    var switchRect = new Rect(leftOffset, topOffset, Styles.DataModes.switchButtonWidth, ContainerWindow.kButtonHeight);
+
+                    if (EditorGUI.Button(switchRect, switchContent, Styles.DataModes.switchStyle))
+                    {
+                        dataModesClient.SwitchToNextDataMode();
+                        RefreshAfterDataModeChange();
+                    }
+                }
+            }
+
             foreach (var item in windowActions)
             {
                 if (item != null && (item.validateHandler == null || item.validateHandler(actualView, item)) && item.width.HasValue)
@@ -687,6 +768,39 @@ protected void ShowGenericMenu(float leftOffset, float topOffset)
             }
         }
 
+        bool ShouldDrawDataModesSwitch()
+        {
+            return m_ActualView is IDataModeHandler dataModesHandler
+                   && dataModesHandler.dataMode != DataMode.Disabled
+                   // We don't want to show this switch if there are not
+                   // at least 2 modes supported at the current moment.
+                   && dataModesHandler.supportedDataModes.Count > 1;
+        }
+
+        void SelectDataMode(object dataMode)
+        {
+            if (!(m_ActualView is IDataModeHandler dataModesHandler))
+                return; // Something very weird has happened...
+
+            if (dataMode is DataMode mode && dataModesHandler.IsDataModeSupported(mode))
+                dataModesHandler.SwitchToDataMode(mode);
+            else
+                dataModesHandler.SwitchToDefaultDataMode();
+        }
+
+        void OnViewDataModeChanged(DataMode newMode)
+        {
+            // Current implementation doesn't need to know the new data mode, but once
+            // we switch this to UITK (soon), knowing the new mode will be very useful.
+            RefreshAfterDataModeChange();
+        }
+
+        void RefreshAfterDataModeChange()
+        {
+            m_ActualView.Repaint();
+            RepaintImmediately();
+        }
+
         private static WindowAction[] FetchWindowActionFromAttribute()
         {
             var methods = AttributeHelper.GetMethodsWithAttribute<WindowActionAttribute>();
@@ -705,10 +819,23 @@ private static WindowAction[] FetchWindowActionFromAttribute()
             }).OrderBy(a => a.priority).ToArray();
         }
 
+        private static void FlushView(EditorWindow view)
+        {
+            if (view == null)
+                return;
+
+            int totalFrames = Math.Max(2, QualitySettings.maxQueuedFrames);
+            for (int i = 0; i < totalFrames; ++i)
+                view.RepaintImmediately();
+        }
+
         public void PopupGenericMenu(EditorWindow view, Rect pos)
         {
             if (!showGenericMenu)
                 return;
+
+            FlushView(view);
+
             GenericMenu menu = new GenericMenu();
 
             IHasCustomMenu menuProvider = view as IHasCustomMenu;
@@ -748,7 +875,7 @@ internal static void AddWindowActionMenu(GenericMenu menu, EditorWindow view)
 
         private void Inspect(object userData)
         {
-            Selection.activeObject = (UnityEngine.Object)userData;
+            Selection.activeObject = (Object)userData;
         }
 
         internal void Reload(object userData)
@@ -785,7 +912,29 @@ internal void Reload(object userData)
                     win.Show();
             }
 
-            System.IO.File.Delete(saveWindowPath);
+            File.Delete(saveWindowPath);
+        }
+
+        readonly List<DataMode> m_DataModeSanitizationCache = new List<DataMode>(3); // Number of modes, minus `Disabled`
+
+        static void SanitizeSupportedDataModesList(IReadOnlyList<DataMode> originalList, List<DataMode> sanitizedList)
+        {
+            sanitizedList.Clear();
+
+            foreach (var mode in originalList)
+            {
+                if (mode == DataMode.Disabled)
+                    continue; // Never list `DataMode.Disabled`
+
+                if (sanitizedList.Contains(mode))
+                    continue; // Prevent duplicate entries
+
+                sanitizedList.Add(mode);
+            }
+
+            // Ensure we are displaying the data modes in a predefined order, regardless of
+            // the order in which the user defined their list.
+            sanitizedList.Sort();
         }
 
         protected virtual void AddDefaultItemsToMenu(GenericMenu menu, EditorWindow window)
@@ -793,17 +942,38 @@ protected virtual void AddDefaultItemsToMenu(GenericMenu menu, EditorWindow wind
             if (menu.GetItemCount() != 0)
                 menu.AddSeparator("");
 
-            if (window is ISupportsOverlays)
+            if (window is IDataModeHandler dataModesHandler && dataModesHandler.dataMode != DataMode.Disabled)
             {
-                OverlayPresetManager.GenerateMenu(menu, "Overlays/Presets/", window);
-                foreach (var overlay in window.overlayCanvas.overlays)
+                SanitizeSupportedDataModesList(dataModesHandler.supportedDataModes, m_DataModeSanitizationCache);
+
+                // Don't show anything if only one mode is supported
+                if (m_DataModeSanitizationCache.Count > 1)
                 {
-                    if (overlay.userControlledVisibility)
-                        menu.AddItem(new GUIContent($"Overlays/{overlay.displayName}"), overlay.displayed,
-                            o => ((Overlay)o).displayed = !((Overlay)o).displayed, overlay);
+                    foreach (var mode in m_DataModeSanitizationCache)
+                    {
+                        menu.AddItem(Styles.DataModes.dataModeNameLabels[mode],
+                            dataModesHandler.dataMode == mode,
+                            SelectDataMode,
+                            mode);
+                    }
+
+                    menu.AddSeparator("");
                 }
             }
 
+            if(window is ISupportsOverlays)
+            {
+                var binding = ShortcutManager.instance.GetShortcutBinding("Overlays/Show Overlay Menu");
+                var visibleMenu = window.overlayCanvas.menuVisible;
+                menu.AddItem(EditorGUIUtility.TrTextContent($"Overlay Menu _{binding}"),
+                    visibleMenu,
+                    () =>
+                    {
+                        window.overlayCanvas.localMousePosition = Vector2.negativeInfinity;
+                        window.overlayCanvas.menuVisible = !visibleMenu;
+                    });
+            }
+
             if (window && Unsupported.IsDeveloperMode())
             {
                 menu.AddItem(EditorGUIUtility.TrTextContent("Inspect Window"), false, Inspect, window);
diff --git a/Editor/Mono/IDataModeHandler.cs b/Editor/Mono/IDataModeHandler.cs
new file mode 100644
index 0000000000..4182583de3
--- /dev/null
+++ b/Editor/Mono/IDataModeHandler.cs
@@ -0,0 +1,172 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor
+{
+    /// <summary>
+    /// Options for the different modes of an <see cref="EditorWindow"/> that implements
+    /// <see cref="IDataModeHandler"/> or <see cref="IDataModeHandlerAndDispatcher"/>.
+    /// </summary>
+    //
+    // Dev note:
+    //
+    // There should be no reason to ever add to this enum. It exists only to express the duality between author-time
+    // and runtime data. If you feel like you need to add to this, please reconsider: it will likely break the
+    // `Authoring VS Runtime` feature for DOTS.
+    //
+    // Thank you for your consideration and have a great day!
+    //
+    // Sincerely,
+    // The #dots-editor team
+    //
+    public enum DataMode
+    {
+        /// <summary>
+        /// Represents a situation or context in which the usage of data modes is not applicable.
+        /// </summary>
+        /// <remarks> <para>
+        /// This mode informs the docking area that the data modes switch should now be displayed.
+        /// </para> </remarks>
+        Disabled,
+        /// <summary>
+        /// Uses a mode where only authoring data is available.
+        /// </summary>
+        /// <remarks> <para>
+        /// In this mode, only authoring data is available. When exiting Play mode, Unity retains authoring data.
+        /// </para> </remarks>
+        Authoring,
+        /// <summary>
+        /// Uses a mode where a mix of authoring and runtime data is available.
+        /// </summary>
+        /// <remarks> <para>
+        /// In this mode, a mixture of authoring and runtime data is available. **Important:** When exiting Play mode,
+        /// Unity loses runtime data. However, it retains any authoring data.
+        /// </para> </remarks>
+        Mixed,
+        /// <summary>
+        /// Uses a mode where only runtime data is available.
+        /// </summary>
+        /// <remarks> <para>
+        /// In this mode, only runtime data is available. **Important:** When exiting Play mode, Unity loses runtime
+        /// data.
+        /// </para> </remarks>
+        Runtime
+    }
+
+    /// <summary>
+    /// Implement this interface to allow an <see cref="EditorWindow"/> to handle <see cref="DataMode"/> changes.
+    /// </summary>
+    /// <remarks> <para>
+    /// This interface displays a switch in the docking area when the window is visible and lists the supported modes in
+    /// the contextual menu for that window. Use this interface if your window only needs to react to direct user
+    /// interactions with the data mode switch or the contextual menu. If your window needs to change its state based on
+    /// other factors, like entering or exiting play mode, you should implement
+    /// <see cref="IDataModeHandlerAndDispatcher"/> instead.
+    /// </para> </remarks>
+    public interface IDataModeHandler
+    {
+        /// <summary>
+        /// Returns the <see cref="DataMode"/> currently active for the implementor <see cref="EditorWindow"/>.
+        /// </summary>
+        /// <remarks> <para>
+        /// Unity does not serialize or store this value. It is the window's responsibility to do so.
+        /// </para> </remarks>
+        DataMode dataMode { get; }
+
+        /// <summary>
+        /// <para>
+        /// A list of the <see cref="DataMode"/>s the <see cref="EditorWindow"/> supports.
+        /// </para>
+        /// <para>
+        /// That list of the <see cref="DataMode"/>s the <see cref="EditorWindow"/> supports varies based
+        /// on a number of factors, so it should only contain the modes available to the current context.
+        /// For example, a window might support the <see cref="DataMode.Authoring"/> and <see cref="DataMode.Runtime"/>
+        /// modes when in Edit mode, and the <see cref="DataMode.Mixed"/> and <see cref="DataMode.Runtime"/> modes when
+        /// in Play mode. A common pattern for that case is to store two lists internally and use
+        /// <see cref="EditorApplication.isPlaying"/> to select which one to return.
+        /// </para>
+        /// </summary>
+        IReadOnlyList<DataMode> supportedDataModes { get; }
+
+        /// <summary>
+        /// Unity calls this method automatically before any call to <see cref="SwitchToDataMode"/> is made. If the
+        /// method returns <code>false</code>, <see cref="SwitchToDefaultDataMode"/> is called instead.
+        /// </summary>
+        /// <param name="mode">
+        /// The <see cref="DataMode"/> for which support is being tested.
+        /// </param>
+        /// <returns>
+        /// Whether the <see cref="EditorWindow"/> currently supports the specified <see cref="DataMode"/>.
+        /// </returns>
+        bool IsDataModeSupported(DataMode mode);
+
+        /// <summary>
+        /// Unity calls this method automatically when a user clicks the <see cref="DataMode"/> switch in the docking
+        /// area tied to the implementing <see cref="EditorWindow"/>.
+        /// </summary>
+        /// <remarks> <para>
+        /// This method informs the window to change its <see cref="dataMode"/> to whatever mode should come after
+        /// the current. In most cases, a window only supports two data modes at a time, but it is possible to support
+        /// all three. Also, a window that supports all three modes might want the switch to only toggle between two
+        /// specific modes and rely on the contextual menu to change to the third mode.
+        /// </para> </remarks>
+        void SwitchToNextDataMode();
+
+        /// <summary>
+        /// Unity calls this method automatically whenever the Editor wants an <see cref="EditorWindow"/> to be in a
+        /// specific <see cref="DataMode"/>.
+        /// </summary>
+        /// <remarks> <para>
+        /// By convention, Unity always calls <see cref="IsDataModeSupported"/> before calling this method. If the
+        /// data mode is not supported, <see cref="SwitchToDefaultDataMode"/> is called instead.
+        /// </para> </remarks>
+        /// <param name="mode">
+        /// The explicit data mode to which the Editor window should change.
+        /// </param>
+        void SwitchToDataMode(DataMode mode);
+
+        /// <summary>
+        /// Unity calls this method automatically whenever going to a requested <see cref="DataMode"/> is impossible
+        /// because of the result of <see cref="IsDataModeSupported"/>.
+        /// </summary>
+        /// <remarks> <para>
+        /// This method is a fallback to make sure the <see cref="EditorWindow"/> is always in a valid state.
+        /// </para> </remarks>
+        /// <seealso cref="SwitchToDataMode"/>
+        void SwitchToDefaultDataMode();
+    }
+
+    /// <summary>
+    /// Implement this interface to allow an <see cref="EditorWindow"/> to handle <see cref="DataMode"/> changes and
+    /// alter its <see cref="IDataModeHandler.dataMode"/> internally.
+    /// </summary>
+    /// <remarks> <para>
+    /// This interface displays a switch in the docking area when the window is visible and lists the supported modes in
+    /// the contextual menu for that window. Use this interface if your window needs to control its mode internally
+    /// based on factors other than the user directly interacting with the data mode switch or the contextual menu, for
+    /// example, entering or exiting Play mode. If your window does not need to control its own mode, use
+    /// <see cref="IDataModeHandler"/> instead.
+    /// </para> </remarks>
+    public interface IDataModeHandlerAndDispatcher : IDataModeHandler
+    {
+        /// <summary>
+        /// <para>
+        /// Calls the methods in its invocation list when the <see cref="DataMode"/> changes due to an external factor
+        /// and passes the new data mode as an argument.
+        /// </para>
+        /// <para>
+        /// An external factor refers to any action which results in a data mode change that Unity did not initiate
+        /// directly through calling either <see cref="IDataModeHandler.SwitchToNextDataMode"/>,
+        /// <see cref="IDataModeHandler.SwitchToDefaultDataMode"/>, or <see cref="IDataModeHandler.SwitchToDataMode"/>.
+        /// </para>
+        /// <para>
+        /// For example, when entering or exiting Play mode, some windows might want to force a data mode switch.
+        /// </para>
+        /// </summary>
+        event Action<DataMode> dataModeChanged;
+    }
+}
diff --git a/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs b/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs
index 1d1041ffc3..ad1aa221cb 100644
--- a/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs
+++ b/Editor/Mono/ImportSettings/SpeedTreeImporterInspector.cs
@@ -121,7 +121,7 @@ protected override bool OnApplyRevertGUI()
 
                     if (hasModified || upgrade)
                     {
-                        ApplyAndImport();
+                        SaveChanges();
                         applied = true;
                     }
                 }
diff --git a/Editor/Mono/ImportSettings/TextureImporterInspector.cs b/Editor/Mono/ImportSettings/TextureImporterInspector.cs
index 7a18cd3fe0..52e077e04f 100644
--- a/Editor/Mono/ImportSettings/TextureImporterInspector.cs
+++ b/Editor/Mono/ImportSettings/TextureImporterInspector.cs
@@ -333,7 +333,6 @@ internal class Styles
                 EditorGUIUtility.TrTextContent("Tight"),
             };
 
-            public readonly GUIContent spritePackingTag = EditorGUIUtility.TrTextContent("Packing Tag", "Tag for the Sprite Packing system.");
             public readonly GUIContent spritePixelsPerUnit = EditorGUIUtility.TrTextContent("Pixels Per Unit", "How many pixels in the sprite correspond to one unit in the world.");
             public readonly GUIContent spriteExtrude = EditorGUIUtility.TrTextContent("Extrude Edges", "How much empty area to leave around the sprite in the generated mesh.");
             public readonly GUIContent spriteMeshType = EditorGUIUtility.TrTextContent("Mesh Type", "Type of sprite mesh to generate.");
@@ -447,7 +446,6 @@ void EnumPopup(SerializedProperty property, System.Type type, GUIContent label)
         SerializedProperty m_WrapV;
         SerializedProperty m_WrapW;
 
-        SerializedProperty m_SpritePackingTag;
         SerializedProperty m_SpritePixelsToUnits;
         SerializedProperty m_SpriteExtrude;
         SerializedProperty m_SpriteMeshType;
@@ -517,7 +515,6 @@ void CacheSerializedProperties()
             m_CubemapConvolution = serializedObject.FindProperty("m_CubemapConvolution");
 
             m_SpriteMode = serializedObject.FindProperty("m_SpriteMode");
-            m_SpritePackingTag = serializedObject.FindProperty("m_SpritePackingTag");
             m_SpritePixelsToUnits = serializedObject.FindProperty("m_SpritePixelsToUnits");
             m_SpriteExtrude = serializedObject.FindProperty("m_SpriteExtrude");
             m_SpriteMeshType = serializedObject.FindProperty("m_SpriteMeshType");
@@ -957,7 +954,10 @@ void ElementsAtlasGui(TextureInspectorGUIElement guiElements)
 
         void ColorSpaceGUI(TextureInspectorGUIElement guiElements)
         {
-            ToggleFromInt(m_sRGBTexture, s_Styles.sRGBTexture);
+            if (CountImportersWithHDR(targets, out int countHDR) && countHDR == 0)
+            {
+                ToggleFromInt(m_sRGBTexture, s_Styles.sRGBTexture);
+            }
         }
 
         void POTScaleGUI(TextureInspectorGUIElement guiElements)
@@ -991,7 +991,7 @@ void StreamingMipmapsGUI()
 
             // some texture types are not relevant for mip streaming
             var type = textureType;
-            if (type == TextureImporterType.Sprite || type == TextureImporterType.Cookie || type == TextureImporterType.GUI || type == TextureImporterType.Cursor)
+            if (type == TextureImporterType.Cookie || type == TextureImporterType.GUI || type == TextureImporterType.Cursor)
                 return;
 
             ToggleFromInt(m_StreamingMipmaps, s_Styles.streamingMipmaps);
@@ -1088,9 +1088,6 @@ private void SpriteGUI(TextureInspectorGUIElement guiElements)
             m_ShowGenericSpriteSettings.target = (m_SpriteMode.intValue != 0);
             if (EditorGUILayout.BeginFadeGroup(m_ShowGenericSpriteSettings.faded))
             {
-                using (new EditorGUI.DisabledScope(true))
-                    EditorGUILayout.PropertyField(m_SpritePackingTag, s_Styles.spritePackingTag);
-
                 EditorGUILayout.PropertyField(m_SpritePixelsToUnits, s_Styles.spritePixelsPerUnit);
 
                 m_ShowSpriteMeshTypeOption.target = ShouldShowSpriteMeshTypeOption();
@@ -1132,7 +1129,7 @@ private void SpriteGUI(TextureInspectorGUIElement guiElements)
                             dialogText += "Apply and continue to sprite editor or cancel.";
                             if (EditorUtility.DisplayDialog("Unapplied import settings", dialogText, "Apply", "Cancel"))
                             {
-                                ApplyAndImport();
+                                SaveChanges();
                                 SpriteUtilityWindow.ShowSpriteEditorWindow(this.assetTarget);
 
                                 // We reimported the asset which destroyed the editor, so we can't keep running the UI here.
@@ -1636,9 +1633,16 @@ public override bool HasModified()
             return false;
         }
 
+
+        [Obsolete("UnityUpgradeable () -> DiscardChanges")]
         protected override void ResetValues()
         {
-            base.ResetValues();
+            DiscardChanges();
+        }
+
+        public override void DiscardChanges()
+        {
+            base.DiscardChanges();
 
             CacheSerializedProperties();
 
diff --git a/Editor/Mono/Inspector/AddComponent/AddComponentDataSource.cs b/Editor/Mono/Inspector/AddComponent/AddComponentDataSource.cs
index 096b15d34a..a94f6c9094 100644
--- a/Editor/Mono/Inspector/AddComponent/AddComponentDataSource.cs
+++ b/Editor/Mono/Inspector/AddComponent/AddComponentDataSource.cs
@@ -13,12 +13,14 @@ internal class AddComponentDataSource : AdvancedDropdownDataSource
     {
         private static readonly string kSearchHeader = L10n.Tr("Search");
         AdvancedDropdownState m_State;
+        UnityEngine.GameObject[] m_Targets;
 
         internal static readonly string kScriptHeader = "Component/Scripts/";
 
-        public AddComponentDataSource(AdvancedDropdownState state)
+        public AddComponentDataSource(AdvancedDropdownState state, UnityEngine.GameObject[] targets)
         {
             m_State = state;
+            m_Targets = targets;
         }
 
         protected override AdvancedDropdownItem FetchData()
@@ -37,7 +39,7 @@ protected AdvancedDropdownItem RebuildTree()
         {
             m_SearchableElements = new List<AdvancedDropdownItem>();
             AdvancedDropdownItem root = new ComponentDropdownItem("ROOT");
-            List<MenuItemData> menuItems = GetSortedMenuItems();
+            List<MenuItemData> menuItems = GetSortedMenuItems(m_Targets);
 
             Dictionary<string, int> pathHashCodeMap = new Dictionary<string, int>();
 
@@ -86,7 +88,7 @@ protected AdvancedDropdownItem RebuildTree()
             return root;
         }
 
-        static List<MenuItemData> GetSortedMenuItems()
+        static List<MenuItemData> GetSortedMenuItems(UnityEngine.GameObject[] targets)
         {
             var menus = Unsupported.GetSubmenus("Component");
             var commands = Unsupported.GetSubmenusCommands("Component");
@@ -95,6 +97,8 @@ static List<MenuItemData> GetSortedMenuItems()
             var legacyMenuItems = new List<MenuItemData>(menus.Length);
             const string kLegacyString = "legacy";
 
+            var hasFilterOverride = ModeService.HasExecuteHandler("inspector_filter_component");
+
             for (var i = 0; i < menus.Length; i++)
             {
                 var menuPath = menus[i];
@@ -106,13 +110,16 @@ static List<MenuItemData> GetSortedMenuItems()
                     isLegacy = isLegacy
                 };
 
-                if (isLegacy)
-                {
-                    legacyMenuItems.Add(item);
-                }
-                else
+                if (!hasFilterOverride || ModeService.Execute("inspector_filter_component", targets, menuPath))
                 {
-                    menuItems.Add(item);
+                    if (isLegacy)
+                    {
+                        legacyMenuItems.Add(item);
+                    }
+                    else
+                    {
+                        menuItems.Add(item);
+                    }
                 }
             }
 
diff --git a/Editor/Mono/Inspector/AddComponent/AddComponentWindow.cs b/Editor/Mono/Inspector/AddComponent/AddComponentWindow.cs
index 023478c034..8941fa1739 100644
--- a/Editor/Mono/Inspector/AddComponent/AddComponentWindow.cs
+++ b/Editor/Mono/Inspector/AddComponent/AddComponentWindow.cs
@@ -45,7 +45,7 @@ internal static bool Show(Rect rect, GameObject[] gos)
         {
             CloseAllOpenWindows<AddComponentWindow>();
             var window = CreateInstance<AddComponentWindow>();
-            window.dataSource = new AddComponentDataSource(s_State);
+            window.dataSource = new AddComponentDataSource(s_State, gos);
             window.gui = new AddComponentGUI(window.dataSource, window.OnCreateNewScript);
             window.state = s_State;
             window.m_GameObjects = gos;
diff --git a/Editor/Mono/Inspector/AddComponent/NewScriptDropdownItem.cs b/Editor/Mono/Inspector/AddComponent/NewScriptDropdownItem.cs
index c8d0d0d987..e1a018fe51 100644
--- a/Editor/Mono/Inspector/AddComponent/NewScriptDropdownItem.cs
+++ b/Editor/Mono/Inspector/AddComponent/NewScriptDropdownItem.cs
@@ -110,11 +110,17 @@ private bool ClassAlreadyExists()
             return ClassExists(m_ClassName);
         }
 
+        private string GetTemplatePath(){
+            if(File.Exists("Assets/ScriptTemplates/81-C# Script-NewBehaviourScript.cs.txt"))
+            {
+                return "Assets/ScriptTemplates/81-C# Script-NewBehaviourScript.cs.txt";
+            }
+            var basePath = Path.Combine(EditorApplication.applicationContentsPath, kResourcesTemplatePath);
+            return Path.Combine(basePath, "81-C# Script-NewBehaviourScript.cs.txt");
+        }
         private void CreateScript()
         {
-            var basePath = Path.Combine(EditorApplication.applicationContentsPath, kResourcesTemplatePath);
-            var templatePath = Path.Combine(basePath, "81-C# Script-NewBehaviourScript.cs.txt");
-            ProjectWindowUtil.CreateScriptAssetFromTemplate(TargetPath(), templatePath);
+            ProjectWindowUtil.CreateScriptAssetFromTemplate(TargetPath(), GetTemplatePath());
             AssetDatabase.Refresh();
         }
     }
diff --git a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs
index fc86cea7f0..6fdf2c9ca8 100644
--- a/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs
+++ b/Editor/Mono/Inspector/AdvancedDropdown/AdvancedDropdownWindow.cs
@@ -157,6 +157,8 @@ void SetSelectionFromState()
                 var child = m_State.GetSelectedChild(m_CurrentlyRenderedTree);
                 if (child == null)
                     break;
+                if (child.id == m_CurrentlyRenderedTree.id)
+                    Debug.LogWarning($"Same id: {child.id} given to both {child.displayName} and {m_CurrentlyRenderedTree.displayName}. Selection may be wrong.");
                 selectedIndex = m_State.GetSelectedIndex(child);
                 if (selectedIndex < 0)
                     break;
diff --git a/Editor/Mono/Inspector/AdvancedDropdown/DataSources/MultiselectDataSource.cs b/Editor/Mono/Inspector/AdvancedDropdown/DataSources/MultiselectDataSource.cs
index 4b790d03f7..d778db0a9d 100644
--- a/Editor/Mono/Inspector/AdvancedDropdown/DataSources/MultiselectDataSource.cs
+++ b/Editor/Mono/Inspector/AdvancedDropdown/DataSources/MultiselectDataSource.cs
@@ -28,7 +28,7 @@ public MultiselectDataSource(Enum enumValue)
 
             var enumData = EnumDataUtility.GetCachedEnumData(enumType);
             if (!enumData.serializable)
-                // this is the same message used in ScriptPopupMenus.cpp
+                // this is the same message used in SerializedPropertyEnumHelper.cpp
                 throw new NotSupportedException(string.Format("Unsupported enum base type for {0}", enumType.Name));
 
             m_Mask = EnumDataUtility.EnumFlagsToInt(enumData, enumFlags);
diff --git a/Editor/Mono/Inspector/AnimationClipEditor.cs b/Editor/Mono/Inspector/AnimationClipEditor.cs
index a806b7c139..09dd5b3a6b 100644
--- a/Editor/Mono/Inspector/AnimationClipEditor.cs
+++ b/Editor/Mono/Inspector/AnimationClipEditor.cs
@@ -16,6 +16,7 @@
 namespace UnityEditor
 {
     [CustomEditor(typeof(AnimationClip))]
+    [CanEditMultipleObjects]
     internal class AnimationClipEditor : Editor
     {
         internal static void EditWithImporter(AnimationClip clip)
@@ -27,6 +28,7 @@ internal static void EditWithImporter(AnimationClip clip)
                 Selection.activeObject = AssetDatabase.LoadMainAssetAtPath(importer.assetPath);
                 ModelImporterEditor inspector = Editor.CreateEditor(importer) as ModelImporterEditor;
                 EditorPrefs.SetInt(inspector.GetType().Name + "ActiveEditorIndex", 2);
+                Object.DestroyImmediate(inspector);
 
                 int clipIndex = 0;
                 //The ModelImporter handles "ClipAnimations" and "DefaultClipAnimations" independently, where there are no user specified clips, this clip must be a default clip.
@@ -123,6 +125,8 @@ internal static class Styles
             public static GUIContent Events = EditorGUIUtility.TrTextContent("Events");
             public static GUIContent LoopMatch = EditorGUIUtility.TrTextContent("loop match");
 
+            public static string InvalidMultiSelection = L10n.Tr("Both legacy and non legacy Animation Clips have been selected. This combination cannot be edited together. Select either legacy or non legacy Animation Clips.");
+
             public static GUIContent AddEventContent = EditorGUIUtility.TrIconContent("Animation.AddEvent", "Add Event.");
 
             public static GUIContent GreenLightIcon = EditorGUIUtility.IconContent("lightMeter/greenLight");
@@ -175,12 +179,12 @@ public void ShowRange(AnimationClipInfoProperties info)
         {
             UpdateEventsPopupClipInfo(info);
             m_ClipInfo = info;
-            info.AssignToPreviewClip(m_Clip);
+            info.AssignToPreviewClip(m_Clips[0]);
         }
 
         public string[] takeNames { get; set; }
         public int takeIndex { get; set; }
-        private AnimationClip m_Clip = null;
+        private AnimationClip[] m_Clips = null;
         private AnimatorController m_Controller = null;
         private AnimatorStateMachine m_StateMachine;
         private AnimatorState m_State;
@@ -190,6 +194,21 @@ public void ShowRange(AnimationClipInfoProperties info)
         private TimeArea m_TimeArea;
         private TimeArea m_EventTimeArea;
 
+        private SerializedProperty m_WrapModeProperty;
+        private SerializedProperty m_ClipSettingsProperty;
+        private SerializedProperty m_LoopTimeProperty;
+        private SerializedProperty m_LoopBlendProperty;
+        private SerializedProperty m_CycleOffsetProperty;
+        private SerializedProperty m_LoopBlendOrientationProperty;
+        private SerializedProperty m_KeepOriginalOrientationProperty;
+        private SerializedProperty m_OrientationOffsetYProperty;
+        private SerializedProperty m_LoopBlendPositionYProperty;
+        private SerializedProperty m_KeepOriginalPositionYProperty;
+        private SerializedProperty m_HeightFromFeetProperty;
+        private SerializedProperty m_LevelProperty;
+        private SerializedProperty m_LoopBlendPositionXZProperty;
+        private SerializedProperty m_KeepOriginalPositionXZProperty;
+        private SerializedProperty m_MirrorProperty;
 
         private bool m_DraggingRange = false;
         private bool m_DraggingRangeBegin = false;
@@ -214,6 +233,7 @@ public void ShowRange(AnimationClipInfoProperties info)
         static private bool m_ShowEvents = false;
 
         bool m_NeedsToGenerateClipInfo = false;
+        bool m_IsSelectingMultipleClips = false;
 
         public bool needsToGenerateClipInfo
         {
@@ -232,7 +252,7 @@ public bool needsToGenerateClipInfo
 
         private void InitController()
         {
-            if (m_Clip.legacy)
+            if (m_Clips[0].legacy)
                 return;
 
             if (m_AvatarPreview != null && m_AvatarPreview.Animator != null)
@@ -263,7 +283,7 @@ private void InitController()
                     m_State = m_StateMachine.AddState("preview");
                     m_State.pushUndo = false;
                     AnimatorControllerLayer[] layers = m_Controller.layers;
-                    m_State.motion = m_Clip;
+                    m_State.motion = m_Clips[0];
                     m_Controller.layers = layers;
 
                     m_State.iKOnFeet = m_AvatarPreview.IKOnFeet;
@@ -293,7 +313,7 @@ private void InitController()
 
         internal override bool IsEnabled()
         {
-            if (FileUtil.IsReadOnly(m_Clip))
+            if (FileUtil.IsReadOnly(m_Clips[0]))
                 return false;
             return base.IsEnabled();
         }
@@ -365,7 +385,7 @@ private void SetPreviewAvatar()
             InitController();
         }
 
-        void Init()
+        void InitPreview()
         {
             if (m_AvatarPreview == null)
             {
@@ -385,7 +405,7 @@ void Init()
         public void InitClipTime()
         {
             //case 790259: The length of the clip will be changed by this inspector, so we can't use it for sampling
-            m_InitialClipLength = m_Clip.stopTime - m_Clip.startTime;
+            m_InitialClipLength = m_Clips[0].stopTime - m_Clips[0].startTime;
 
             if (m_TimeArea == null)
             {
@@ -394,13 +414,13 @@ public void InitClipTime()
                 m_TimeArea.vRangeLocked = true;
                 m_TimeArea.hSlider = true;
                 m_TimeArea.vSlider = false;
-                m_TimeArea.hRangeMin = m_Clip.startTime;
-                m_TimeArea.hRangeMax = m_Clip.stopTime;
+                m_TimeArea.hRangeMin = m_Clips[0].startTime;
+                m_TimeArea.hRangeMax = m_Clips[0].stopTime;
                 m_TimeArea.margin = 10;
                 m_TimeArea.scaleWithWindow = true;
-                m_TimeArea.minWidth = 1.0f / m_Clip.frameRate;
-                m_TimeArea.SetShownHRangeInsideMargins(m_Clip.startTime, m_Clip.stopTime);
-                m_TimeArea.hTicks.SetTickModulosForFrameRate(m_Clip.frameRate);
+                m_TimeArea.minWidth = 1.0f / m_Clips[0].frameRate;
+                m_TimeArea.SetShownHRangeInsideMargins(m_Clips[0].startTime, m_Clips[0].stopTime);
+                m_TimeArea.hTicks.SetTickModulosForFrameRate(m_Clips[0].frameRate);
                 m_TimeArea.ignoreScrollWheelUntilClicked = true;
             }
 
@@ -426,7 +446,33 @@ public void InitClipTime()
 
         internal void OnEnable()
         {
-            m_Clip = target as AnimationClip;
+            m_Clips = new AnimationClip[targets.Length];
+            for (var i = 0; i < targets.Length; ++i)
+                m_Clips[i] = targets[i] as AnimationClip;
+
+            m_IsSelectingMultipleClips = m_Clips.Length > 1;
+            InitSerializedProperties();
+
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
+        }
+
+        void InitSerializedProperties()
+        {
+            m_WrapModeProperty = serializedObject.FindProperty("m_WrapMode");
+            m_ClipSettingsProperty = serializedObject.FindProperty("m_AnimationClipSettings");
+            m_LoopTimeProperty = m_ClipSettingsProperty.FindPropertyRelative("m_LoopTime");
+            m_LoopBlendProperty = m_ClipSettingsProperty.FindPropertyRelative("m_LoopBlend");
+            m_CycleOffsetProperty = m_ClipSettingsProperty.FindPropertyRelative("m_CycleOffset");
+            m_LoopBlendOrientationProperty = m_ClipSettingsProperty.FindPropertyRelative("m_LoopBlendOrientation");
+            m_KeepOriginalOrientationProperty = m_ClipSettingsProperty.FindPropertyRelative("m_KeepOriginalOrientation");
+            m_OrientationOffsetYProperty = m_ClipSettingsProperty.FindPropertyRelative("m_OrientationOffsetY");
+            m_LoopBlendPositionYProperty = m_ClipSettingsProperty.FindPropertyRelative("m_LoopBlendPositionY");
+            m_KeepOriginalPositionYProperty = m_ClipSettingsProperty.FindPropertyRelative("m_KeepOriginalPositionY");
+            m_HeightFromFeetProperty = m_ClipSettingsProperty.FindPropertyRelative("m_HeightFromFeet");
+            m_LevelProperty = m_ClipSettingsProperty.FindPropertyRelative("m_Level");
+            m_LoopBlendPositionXZProperty = m_ClipSettingsProperty.FindPropertyRelative("m_LoopBlendPositionXZ");
+            m_KeepOriginalPositionXZProperty = m_ClipSettingsProperty.FindPropertyRelative("m_KeepOriginalPositionXZ");
+            m_MirrorProperty = m_ClipSettingsProperty.FindPropertyRelative("m_Mirror");
         }
 
         void OnDisable()
@@ -437,13 +483,27 @@ void OnDisable()
                 m_AvatarPreview.OnDisable();
                 m_AvatarPreview = null;
             }
+
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
+        }
+
+        void OnUndoRedoPerformed(in UndoRedoInfo info)
+        {
+            if (!m_IsSelectingMultipleClips)
+                return;
+
+            for (var i = 0; i < m_Clips.Length; ++i)
+                AnimationUtility.RebuildMecanimData(m_Clips[i]);
         }
 
         public override bool HasPreviewGUI()
         {
+            if (m_IsSelectingMultipleClips)
+                return false;
+
             if (Event.current.type == EventType.Layout)
             {
-                Init();
+                InitPreview();
             }
             return m_AvatarPreview != null;
         }
@@ -463,12 +523,12 @@ void CalculateQualityCurves()
                 // [case 491172]
                 // There is no need to sample the quality curve outside of the animation range [m_Clip.startTime, m_Clip.stopTime] because the Time area show only the animation range anyway
                 // so it not possible for the user to see curve outside of this range.
-                float clipStartTime = Mathf.Clamp(m_ClipInfo.firstFrame / m_Clip.frameRate, m_Clip.startTime, m_Clip.stopTime);
-                float clipStopTime = Mathf.Clamp(m_ClipInfo.lastFrame / m_Clip.frameRate, m_Clip.startTime, m_Clip.stopTime);
+                float clipStartTime = Mathf.Clamp(m_ClipInfo.firstFrame / m_Clips[0].frameRate, m_Clips[0].startTime, m_Clips[0].stopTime);
+                float clipStopTime = Mathf.Clamp(m_ClipInfo.lastFrame / m_Clips[0].frameRate, m_Clips[0].startTime, m_Clips[0].stopTime);
 
                 float fixedTime = (q == 0 ? clipStopTime : clipStartTime);
                 float startTime = (q == 0 ? 0 : clipStartTime);
-                float stopTime = (q == 0 ? clipStopTime : m_Clip.stopTime);
+                float stopTime = (q == 0 ? clipStopTime : m_Clips[0].stopTime);
                 // Start sample may be a bit before start time; stop sample may be a bit after stop time
                 int startSample = Mathf.FloorToInt(startTime * kSamplesPerSecond);
                 int stopSample = Mathf.CeilToInt(stopTime * kSamplesPerSecond);
@@ -484,7 +544,7 @@ void CalculateQualityCurves()
                 qualityCurvesTime.variableEndEnd = stopTime;
                 qualityCurvesTime.q = q;
 
-                MuscleClipUtility.CalculateQualityCurves(m_Clip, qualityCurvesTime,
+                MuscleClipUtility.CalculateQualityCurves(m_Clips[0], qualityCurvesTime,
                     m_QualityCurves[kPose][q], m_QualityCurves[kRotation][q],
                     m_QualityCurves[kHeight][q], m_QualityCurves[kPosition][q]);
             }
@@ -538,10 +598,10 @@ public void ClipRangeGUI(ref float startFrame, ref float stopFrame, out bool cha
             m_DraggingRangeEnd = false;
 
             bool invalidRange = (
-                startFrame + 0.01f < m_Clip.startTime * m_Clip.frameRate ||
-                startFrame - 0.01f > m_Clip.stopTime * m_Clip.frameRate ||
-                stopFrame + 0.01f < m_Clip.startTime * m_Clip.frameRate ||
-                stopFrame - 0.01f > m_Clip.stopTime * m_Clip.frameRate);
+                startFrame + 0.01f < m_Clips[0].startTime * m_Clips[0].frameRate ||
+                startFrame - 0.01f > m_Clips[0].stopTime * m_Clips[0].frameRate ||
+                stopFrame + 0.01f < m_Clips[0].startTime * m_Clips[0].frameRate ||
+                stopFrame - 0.01f > m_Clips[0].stopTime * m_Clips[0].frameRate);
             bool fixRange = false;
             if (invalidRange)
             {
@@ -574,19 +634,19 @@ public void ClipRangeGUI(ref float startFrame, ref float stopFrame, out bool cha
                 timeRect.x = timeRect.y = -1;
 
                 // Draw selected range as blue tint
-                float startPixel = m_TimeArea.FrameToPixel(startFrame, m_Clip.frameRate, timeRect);
-                float stopPixel = m_TimeArea.FrameToPixel(stopFrame, m_Clip.frameRate, timeRect);
+                float startPixel = m_TimeArea.FrameToPixel(startFrame, m_Clips[0].frameRate, timeRect);
+                float stopPixel = m_TimeArea.FrameToPixel(stopFrame, m_Clips[0].frameRate, timeRect);
                 GUI.Label(new Rect(startPixel, timeRect.y, stopPixel - startPixel, timeRect.height), "", EditorStyles.selectionRect);
 
                 // Draw time ruler
-                m_TimeArea.TimeRuler(timeRect, m_Clip.frameRate);
+                m_TimeArea.TimeRuler(timeRect, m_Clips[0].frameRate);
                 // Current time indicator
                 TimeArea.DrawPlayhead(m_TimeArea.TimeToPixel(m_AvatarPreview.timeControl.currentTime, timeRect), timeRect.yMin, timeRect.yMax, 2f, 1f);
 
                 using (new EditorGUI.DisabledScope(invalidRange))
                 {
                     // Range handles
-                    float startTime = startFrame / m_Clip.frameRate;
+                    float startTime = startFrame / m_Clips[0].frameRate;
                     TimeArea.TimeRulerDragMode inPoint = m_TimeArea.BrowseRuler(timeRect, startHandleId, ref startTime, 0, false, "TL InPoint");
                     if (inPoint == TimeArea.TimeRulerDragMode.Cancel)
                     {
@@ -594,12 +654,12 @@ public void ClipRangeGUI(ref float startFrame, ref float stopFrame, out bool cha
                     }
                     else if (inPoint != TimeArea.TimeRulerDragMode.None)
                     {
-                        startFrame = startTime * m_Clip.frameRate;
+                        startFrame = startTime * m_Clips[0].frameRate;
                         // Snapping bias. Snap to whole frames when zoomed out.
-                        startFrame = MathUtils.RoundBasedOnMinimumDifference(startFrame, m_TimeArea.PixelDeltaToTime(timeRect) * m_Clip.frameRate * 10);
+                        startFrame = MathUtils.RoundBasedOnMinimumDifference(startFrame, m_TimeArea.PixelDeltaToTime(timeRect) * m_Clips[0].frameRate * 10);
                         changedStart = true;
                     }
-                    float stopTime = stopFrame / m_Clip.frameRate;
+                    float stopTime = stopFrame / m_Clips[0].frameRate;
 
                     TimeArea.TimeRulerDragMode outPoint = m_TimeArea.BrowseRuler(timeRect, stopHandleId, ref stopTime, 0, false, "TL OutPoint");
                     if (outPoint == TimeArea.TimeRulerDragMode.Cancel)
@@ -608,16 +668,16 @@ public void ClipRangeGUI(ref float startFrame, ref float stopFrame, out bool cha
                     }
                     else if (outPoint != TimeArea.TimeRulerDragMode.None)
                     {
-                        stopFrame = stopTime * m_Clip.frameRate;
+                        stopFrame = stopTime * m_Clips[0].frameRate;
                         // Snapping bias. Snap to whole frames when zoomed out.
-                        stopFrame = MathUtils.RoundBasedOnMinimumDifference(stopFrame, m_TimeArea.PixelDeltaToTime(timeRect) * m_Clip.frameRate * 10);
+                        stopFrame = MathUtils.RoundBasedOnMinimumDifference(stopFrame, m_TimeArea.PixelDeltaToTime(timeRect) * m_Clips[0].frameRate * 10);
                         changedStop = true;
                     }
 
                     // Additive pose frame Handle
                     if (showAdditivePoseFrame)
                     {
-                        float additivePoseTime = additivePoseframe / m_Clip.frameRate;
+                        float additivePoseTime = additivePoseframe / m_Clips[0].frameRate;
                         TimeArea.TimeRulerDragMode additivePoint = m_TimeArea.BrowseRuler(timeRect, additiveHandleId, ref additivePoseTime, 0, false, "TL playhead");
                         if (additivePoint == TimeArea.TimeRulerDragMode.Cancel)
                         {
@@ -625,9 +685,9 @@ public void ClipRangeGUI(ref float startFrame, ref float stopFrame, out bool cha
                         }
                         else if (additivePoint != TimeArea.TimeRulerDragMode.None)
                         {
-                            additivePoseframe = additivePoseTime * m_Clip.frameRate;
+                            additivePoseframe = additivePoseTime * m_Clips[0].frameRate;
                             // Snapping bias. Snap to whole frames when zoomed out.
-                            additivePoseframe = MathUtils.RoundBasedOnMinimumDifference(additivePoseframe, m_TimeArea.PixelDeltaToTime(timeRect) * m_Clip.frameRate * 10);
+                            additivePoseframe = MathUtils.RoundBasedOnMinimumDifference(additivePoseframe, m_TimeArea.PixelDeltaToTime(timeRect) * m_Clips[0].frameRate * 10);
                             changedAdditivePoseframe = true;
                         }
                     }
@@ -667,13 +727,13 @@ public void ClipRangeGUI(ref float startFrame, ref float stopFrame, out bool cha
 
             // Start and stop time value clamping
             if (changedStart)
-                startFrame = Mathf.Clamp(startFrame, m_Clip.startTime * m_Clip.frameRate, Mathf.Clamp(stopFrame, m_Clip.startTime * m_Clip.frameRate, stopFrame));
+                startFrame = Mathf.Clamp(startFrame, m_Clips[0].startTime * m_Clips[0].frameRate, Mathf.Clamp(stopFrame, m_Clips[0].startTime * m_Clips[0].frameRate, stopFrame));
 
             if (changedStop)
-                stopFrame = Mathf.Clamp(stopFrame, startFrame, m_Clip.stopTime * m_Clip.frameRate);
+                stopFrame = Mathf.Clamp(stopFrame, startFrame, m_Clips[0].stopTime * m_Clips[0].frameRate);
 
             if (changedAdditivePoseframe)
-                additivePoseframe = Mathf.Clamp(additivePoseframe, m_Clip.startTime * m_Clip.frameRate, m_Clip.stopTime * m_Clip.frameRate);
+                additivePoseframe = Mathf.Clamp(additivePoseframe, m_Clips[0].startTime * m_Clips[0].frameRate, m_Clips[0].stopTime * m_Clips[0].frameRate);
 
             // Keep track of whether we're currently dragging the range or not
             if (changedStart || changedStop || changedAdditivePoseframe)
@@ -702,7 +762,7 @@ string GetStatsText()
             // Muscle clip info is currently only available for humanoid
             if (IsHumanClip)
             {
-                statsText = UnityString.Format(Styles.AverageVelocity, m_Clip.averageSpeed.ToString("0.000"), (m_Clip.averageAngularSpeed * 180.0f / Mathf.PI).ToString("0.0", CultureInfo.InvariantCulture.NumberFormat));
+                statsText = UnityString.Format(Styles.AverageVelocity, m_Clips[0].averageSpeed.ToString("0.000"), (m_Clips[0].averageAngularSpeed * 180.0f / Mathf.PI).ToString("0.0", CultureInfo.InvariantCulture.NumberFormat));
             }
 
             // Only show stats in final clip not for the preview clip
@@ -737,12 +797,12 @@ string GetStatsText()
             return statsText;
         }
 
-        private float GetClipLength()
+        private float GetClipLength(int clipIndex)
         {
             if (m_ClipInfo == null)
-                return m_Clip.length;
+                return m_Clips[clipIndex].length;
             else
-                return (m_ClipInfo.lastFrame - m_ClipInfo.firstFrame) / m_Clip.frameRate;
+                return (m_ClipInfo.lastFrame - m_ClipInfo.firstFrame) / m_Clips[clipIndex].frameRate;
         }
 
         // A minimal list of settings to be shown in the Asset Store preview inspector
@@ -753,7 +813,6 @@ internal override void OnAssetStoreInspectorGUI()
 
         public override void OnInspectorGUI()
         {
-            Init();
             EditorGUIUtility.labelWidth = 50;
             EditorGUIUtility.fieldWidth = 30;
 
@@ -761,15 +820,249 @@ public override void OnInspectorGUI()
             {
                 using (new EditorGUI.DisabledScope(true))
                 {
+                    var hasSameClipLength = true;
+                    var hasSameFrameRate = true;
+                    var firstClipLength = GetClipLength(0);
+                    var firstClipFrameRate = m_Clips[0].frameRate;
+                    for (var i = 1; i < m_Clips.Length; ++i)
+                    {
+                        if (Mathf.Abs(GetClipLength(i) - firstClipLength) > Mathf.Epsilon)
+                            hasSameClipLength = false;
+                        if (Mathf.Abs(m_Clips[i].frameRate - firstClipFrameRate) > Mathf.Epsilon)
+                            hasSameFrameRate = false;
+                    }
+
                     GUILayout.Label(Styles.Length, EditorStyles.label, GUILayout.Width(50 - 4));
-                    GUILayout.Label(GetClipLength().ToString("0.000", CultureInfo.InvariantCulture.NumberFormat), EditorStyles.label);
+                    var clipLengthStr = hasSameClipLength ? firstClipLength.ToString("0.000", CultureInfo.InvariantCulture.NumberFormat) : "-";
+                    GUILayout.Label(clipLengthStr, EditorStyles.label);
+
                     GUILayout.FlexibleSpace();
-                    GUILayout.Label(m_Clip.frameRate + " FPS", EditorStyles.label);
+
+                    var clipFrameRateStr = hasSameFrameRate ? firstClipFrameRate.ToString() : "-";
+                    GUILayout.Label(clipFrameRateStr + " FPS", EditorStyles.label);
                 }
             }
             EditorGUILayout.EndHorizontal();
 
-            if (!m_Clip.legacy)
+            if (m_IsSelectingMultipleClips)
+                MultiClipInspectorGUI();
+            else
+                SingleClipInspectorGUI();
+        }
+
+        private void MultiClipInspectorGUI()
+        {
+            var sameTypeOfClip = true;
+            for (var i = 1; i < m_Clips.Length; ++i)
+            {
+                if (m_Clips[i].legacy != m_Clips[0].legacy)
+                {
+                    sameTypeOfClip = false;
+                    break;
+                }
+            }
+
+            if (!sameTypeOfClip)
+            {
+                EditorGUILayout.HelpBox(Styles.InvalidMultiSelection, MessageType.Error);
+                return;
+            }
+
+            if (m_Clips[0].legacy)
+                MultiLegacyClipGUI();
+            else
+                MultiMuscleClipGUI();
+        }
+
+        private void MultiLegacyClipGUI()
+        {
+            serializedObject.Update();
+
+            EditorGUIUtility.labelWidth = 0;
+            EditorGUIUtility.fieldWidth = 0;
+
+            EditorGUI.BeginChangeCheck();
+
+            var wrapMode = serializedObject.FindProperty("m_WrapMode");
+            EditorGUILayout.PropertyField(wrapMode, Styles.WrapMode);
+
+            serializedObject.ApplyModifiedProperties();
+        }
+
+        private void MultiMuscleClipGUI()
+        {
+            serializedObject.Update();
+
+            EditorGUIUtility.labelWidth = 0;
+            EditorGUIUtility.fieldWidth = 0;
+
+            var toggleLoopTimeRect = EditorGUILayout.GetControlRect();
+            EditorGUI.PropertyField(toggleLoopTimeRect, m_LoopTimeProperty, Styles.LoopTime);
+
+            using (new EditorGUI.DisabledScope(!m_LoopTimeProperty.boolValue))
+            {
+                EditorGUI.indentLevel++;
+
+                var toggleLoopPoseRect = EditorGUILayout.GetControlRect();
+                EditorGUI.PropertyField(toggleLoopPoseRect, m_LoopBlendProperty, Styles.LoopPose);
+                EditorGUILayout.PropertyField(m_CycleOffsetProperty, Styles.LoopCycleOffset);
+
+                EditorGUI.indentLevel--;
+            }
+
+            EditorGUILayout.Space();
+
+            var areAllClipsEitherHumanOrNonHuman = true;
+            var isSelectionHumanClip = true;
+            var doesSelectionHaveRootCurves = true;
+            var doesSelectionHaveMotionCurves = false;
+            for (var i = 0; i < m_Clips.Length; ++i)
+            {
+                if (m_Clips[0].isHumanMotion != m_Clips[i])
+                    areAllClipsEitherHumanOrNonHuman = false;
+                if (!m_Clips[i].isHumanMotion)
+                    isSelectionHumanClip = false;
+                if (!m_Clips[i].hasRootCurves)
+                    doesSelectionHaveRootCurves = false;
+                if (m_Clips[i].hasMotionCurves)
+                    doesSelectionHaveMotionCurves = true;
+            }
+
+            if (doesSelectionHaveRootCurves && !doesSelectionHaveMotionCurves)
+            {
+                // Rotation
+                GUILayout.Label(Styles.RootTransformRotation, EditorStyles.label);
+                EditorGUI.indentLevel++;
+
+                // Toggle
+                var toggleRotRect = EditorGUILayout.GetControlRect();
+                EditorGUI.PropertyField(toggleRotRect, m_LoopBlendOrientationProperty, Styles.BakeIntoPoseOrientation);
+
+                // Reference
+                BoolPropertyPopup(m_KeepOriginalOrientationProperty,
+                    m_LoopBlendOrientationProperty.boolValue ? Styles.BasedUponOrientation : Styles.BasedUponStartOrientation,
+                    m_KeepOriginalOrientationProperty.boolValue ? 0 : 1,
+                    isSelectionHumanClip ? Styles.BasedUponRotationHumanOpt : Styles.BasedUponRotationOpt);
+
+                // Offset
+                EditorGUILayout.PropertyField(m_OrientationOffsetYProperty, Styles.OrientationOffsetY);
+                EditorGUI.indentLevel--;
+
+                EditorGUILayout.Space();
+
+                // Position Y
+                GUILayout.Label(Styles.RootTransformRotationY, EditorStyles.label);
+                EditorGUI.indentLevel++;
+
+                // Toggle
+                var toggleYRect = EditorGUILayout.GetControlRect();
+                EditorGUI.PropertyField(toggleYRect, m_LoopBlendPositionYProperty, Styles.BakeIntoPosePositionY);
+
+                // Reference
+                if (isSelectionHumanClip && areAllClipsEitherHumanOrNonHuman)
+                {
+                    int offsetHeight;
+                    if (m_KeepOriginalPositionYProperty.boolValue)
+                        offsetHeight = 0;
+                    else if (m_HeightFromFeetProperty.boolValue)
+                        offsetHeight = 2;
+                    else
+                        offsetHeight = 1;
+
+                    var showMixedValueDefault = EditorGUI.showMixedValue;
+                    EditorGUI.showMixedValue = m_KeepOriginalPositionYProperty.hasMultipleDifferentValues || m_HeightFromFeetProperty.hasMultipleDifferentValues;
+
+                    offsetHeight =
+                        EditorGUILayout.Popup(
+                            m_LoopBlendPositionYProperty.boolValue ? Styles.BasedUponStartPositionY : Styles.BasedUponPositionY,
+                            offsetHeight,
+                            Styles.BasedUponPositionYHumanOpt);
+
+                    EditorGUI.showMixedValue = showMixedValueDefault;
+
+                    if (offsetHeight == 0)
+                    {
+                        m_KeepOriginalPositionYProperty.boolValue = true;
+                        m_HeightFromFeetProperty.boolValue = false;
+                    }
+                    else if (offsetHeight == 1)
+                    {
+                        m_KeepOriginalPositionYProperty.boolValue = false;
+                        m_HeightFromFeetProperty.boolValue = false;
+                    }
+                    else
+                    {
+                        m_KeepOriginalPositionYProperty.boolValue = false;
+                        m_HeightFromFeetProperty.boolValue = true;
+                    }
+                }
+                else if (areAllClipsEitherHumanOrNonHuman)
+                {
+                    BoolPropertyPopup(m_KeepOriginalPositionYProperty,
+                        m_LoopBlendPositionYProperty.boolValue ? Styles.BasedUponStartPositionY : Styles.BasedUponPositionY,
+                        m_KeepOriginalPositionYProperty.boolValue ? 0 : 1,
+                        Styles.BasedUponPositionYOpt);
+                }
+
+                // Offset
+                EditorGUILayout.PropertyField(m_LevelProperty, Styles.PositionOffsetY);
+                EditorGUI.indentLevel--;
+
+                EditorGUILayout.Space();
+
+                // Position XZ
+                GUILayout.Label(Styles.RootTransformPositionXZ, EditorStyles.label);
+                EditorGUI.indentLevel++;
+
+                // Toggle
+                var toggleXZRect = EditorGUILayout.GetControlRect();
+                EditorGUI.PropertyField(toggleXZRect, m_LoopBlendPositionXZProperty, Styles.BakeIntoPosePositionXZ);
+
+                // Reference
+                BoolPropertyPopup(m_KeepOriginalPositionXZProperty,
+                    m_LoopBlendPositionXZProperty.boolValue ? Styles.BasedUponStartPositionXZ : Styles.BasedUponPositionXZ,
+                    m_KeepOriginalPositionXZProperty.boolValue ? 0 : 1,
+                    isSelectionHumanClip ? Styles.BasedUponPositionXZHumanOpt : Styles.BasedUponPositionXZOpt);
+
+                EditorGUI.indentLevel--;
+
+                EditorGUILayout.Space();
+            }
+
+            if (isSelectionHumanClip)
+            {
+                EditorGUILayout.PropertyField(m_MirrorProperty, Styles.Mirror);
+            }
+
+            if (serializedObject.hasModifiedProperties)
+            {
+                serializedObject.ApplyModifiedProperties();
+                foreach(var clip in m_Clips)
+                    AnimationUtility.RebuildMecanimData(clip);
+            }
+        }
+
+        private static void BoolPropertyPopup(SerializedProperty property, GUIContent label, int selectedIndex, GUIContent[] displayOptions)
+        {
+            var showMixedValueDefault = EditorGUI.showMixedValue;
+
+            var hasMultipleDifferentValues = property.hasMultipleDifferentValues;
+            EditorGUI.showMixedValue = hasMultipleDifferentValues;
+
+            EditorGUI.BeginChangeCheck();
+            selectedIndex = EditorGUILayout.Popup(label, hasMultipleDifferentValues ? -1 : selectedIndex, displayOptions);
+
+            if (EditorGUI.EndChangeCheck())
+                property.boolValue = (selectedIndex == 0);
+
+            EditorGUI.showMixedValue = showMixedValueDefault;
+        }
+
+        private void SingleClipInspectorGUI()
+        {
+            InitPreview();
+
+            if (!m_Clips[0].legacy)
                 MuscleClipGUI();
             else
                 AnimationClipGUI();
@@ -791,13 +1084,13 @@ private void AnimationClipGUI()
                 if (changedStop)
                     m_ClipInfo.lastFrame = stopFrame;
 
-                m_AvatarPreview.timeControl.startTime = startFrame / m_Clip.frameRate;
-                m_AvatarPreview.timeControl.stopTime = stopFrame / m_Clip.frameRate;
+                m_AvatarPreview.timeControl.startTime = startFrame / m_Clips[0].frameRate;
+                m_AvatarPreview.timeControl.stopTime = stopFrame / m_Clips[0].frameRate;
             }
             else
             {
                 m_AvatarPreview.timeControl.startTime = 0;
-                m_AvatarPreview.timeControl.stopTime = m_Clip.length;
+                m_AvatarPreview.timeControl.stopTime = m_Clips[0].length;
             }
 
             EditorGUIUtility.labelWidth = 0;
@@ -807,14 +1100,14 @@ private void AnimationClipGUI()
                 m_ClipInfo.loop = EditorGUILayout.Toggle(Styles.AddLoopFrame, m_ClipInfo.loop);
 
             EditorGUI.BeginChangeCheck();
-            int wrap = m_ClipInfo != null ? m_ClipInfo.wrapMode : (int)m_Clip.wrapMode;
+            int wrap = m_ClipInfo != null ? m_ClipInfo.wrapMode : (int)m_Clips[0].wrapMode;
             wrap = (int)(WrapModeFixed)EditorGUILayout.EnumPopup(Styles.WrapMode, (WrapModeFixed)wrap);
             if (EditorGUI.EndChangeCheck())
             {
                 if (m_ClipInfo != null)
                     m_ClipInfo.wrapMode = wrap;
                 else
-                    m_Clip.wrapMode = (WrapMode)wrap;
+                    m_Clips[0].wrapMode = (WrapMode)wrap;
             }
         }
 
@@ -1014,24 +1307,24 @@ private void MuscleClipGUI()
 
             InitController();
 
-            AnimationClipSettings animationClipSettings = AnimationUtility.GetAnimationClipSettings(m_Clip);
+            AnimationClipSettings animationClipSettings = AnimationUtility.GetAnimationClipSettings(m_Clips[0]);
 
-            m_StartFrame = m_DraggingRange ? m_StartFrame : animationClipSettings.startTime * m_Clip.frameRate;
-            m_StopFrame = m_DraggingRange ? m_StopFrame : animationClipSettings.stopTime * m_Clip.frameRate;
-            m_AdditivePoseFrame = m_DraggingRange ? m_AdditivePoseFrame : animationClipSettings.additiveReferencePoseTime * m_Clip.frameRate;
+            m_StartFrame = m_DraggingRange ? m_StartFrame : animationClipSettings.startTime * m_Clips[0].frameRate;
+            m_StopFrame = m_DraggingRange ? m_StopFrame : animationClipSettings.stopTime * m_Clips[0].frameRate;
+            m_AdditivePoseFrame = m_DraggingRange ? m_AdditivePoseFrame : animationClipSettings.additiveReferencePoseTime * m_Clips[0].frameRate;
 
-            float startTime = m_StartFrame / m_Clip.frameRate;
-            float stopTime = m_StopFrame / m_Clip.frameRate;
-            float additivePoseTime = m_AdditivePoseFrame / m_Clip.frameRate;
+            float startTime = m_StartFrame / m_Clips[0].frameRate;
+            float stopTime = m_StopFrame / m_Clips[0].frameRate;
+            float additivePoseTime = m_AdditivePoseFrame / m_Clips[0].frameRate;
 
-            MuscleClipQualityInfo clipQualityInfo = MuscleClipUtility.GetMuscleClipQualityInfo(m_Clip, startTime,
+            MuscleClipQualityInfo clipQualityInfo = MuscleClipUtility.GetMuscleClipQualityInfo(m_Clips[0], startTime,
                 stopTime);
 
             bool IsHumanClip = (target as Motion).isHumanMotion;
-            bool hasMotionCurves = m_Clip.hasMotionCurves;
-            bool hasRootCurves = m_Clip.hasRootCurves;
-            bool hasGenericRootTransform = m_Clip.hasGenericRootTransform;
-            bool hasMotionFloatCurves = m_Clip.hasMotionFloatCurves;
+            bool hasMotionCurves = m_Clips[0].hasMotionCurves;
+            bool hasRootCurves = m_Clips[0].hasRootCurves;
+            bool hasGenericRootTransform = m_Clips[0].hasGenericRootTransform;
+            bool hasMotionFloatCurves = m_Clips[0].hasMotionFloatCurves;
             bool hasAnyRootCurves = hasRootCurves || hasMotionCurves;
 
             bool changedStart = false;
@@ -1254,9 +1547,9 @@ private void MuscleClipGUI()
                     EditorGUI.indentLevel++;
 
                     m_AdditivePoseFrame = EditorGUILayout.FloatField(Styles.AdditiveReferencePoseFrame, m_AdditivePoseFrame);
-                    m_AdditivePoseFrame = Mathf.Clamp(m_AdditivePoseFrame, m_Clip.startTime * m_Clip.frameRate, m_Clip.stopTime * m_Clip.frameRate);
+                    m_AdditivePoseFrame = Mathf.Clamp(m_AdditivePoseFrame, m_Clips[0].startTime * m_Clips[0].frameRate, m_Clips[0].stopTime * m_Clips[0].frameRate);
 
-                    animationClipSettings.additiveReferencePoseTime = m_AdditivePoseFrame / m_Clip.frameRate;
+                    animationClipSettings.additiveReferencePoseTime = m_AdditivePoseFrame / m_Clips[0].frameRate;
                     EditorGUI.indentLevel--;
                 }
             }
@@ -1317,15 +1610,15 @@ private void MuscleClipGUI()
                 animationClipSettings.loopBlendPositionY = false;
                 animationClipSettings.loopBlendPositionXZ = false;
 
-                m_DraggingStartFrame = animationClipSettings.startTime * m_Clip.frameRate;
-                m_DraggingStopFrame = animationClipSettings.stopTime * m_Clip.frameRate;
-                m_DraggingAdditivePoseFrame = animationClipSettings.additiveReferencePoseTime * m_Clip.frameRate;
+                m_DraggingStartFrame = animationClipSettings.startTime * m_Clips[0].frameRate;
+                m_DraggingStopFrame = animationClipSettings.stopTime * m_Clips[0].frameRate;
+                m_DraggingAdditivePoseFrame = animationClipSettings.additiveReferencePoseTime * m_Clips[0].frameRate;
 
                 //case 790259: The length of the clip will be changed by this inspector, so we can't use it for sampling
                 animationClipSettings.startTime = 0;
                 animationClipSettings.stopTime = m_InitialClipLength;
 
-                AnimationUtility.SetAnimationClipSettingsNoDirty(m_Clip, animationClipSettings);
+                AnimationUtility.SetAnimationClipSettingsNoDirty(m_Clips[0], animationClipSettings);
 
                 DestroyController();
             }
@@ -1343,9 +1636,9 @@ private void MuscleClipGUI()
             {
                 if (!m_DraggingRange)
                 {
-                    Undo.RegisterCompleteObjectUndo(m_Clip, "Muscle Clip Edit");
-                    AnimationUtility.SetAnimationClipSettingsNoDirty(m_Clip, animationClipSettings);
-                    EditorUtility.SetDirty(m_Clip);
+                    Undo.RegisterCompleteObjectUndo(m_Clips, "Muscle Clip Edit");
+                    AnimationUtility.SetAnimationClipSettingsNoDirty(m_Clips[0], animationClipSettings);
+                    EditorUtility.SetDirty(m_Clips[0]);
                     DestroyController();
                 }
             }
@@ -1460,10 +1753,10 @@ private void LoopQualityLampAndCurve(Rect position, float value, int lightMeterH
                     // Draw start and end markers
                     GUI.color = new Color(0.3f, 0.6f, 1.0f);
                     // Draw marker for moving end
-                    float timePixel = matrix.MultiplyPoint3x4(new Vector3((changedStart ? m_StartFrame : m_StopFrame) / m_Clip.frameRate, 0, 0)).x;
+                    float timePixel = matrix.MultiplyPoint3x4(new Vector3((changedStart ? m_StartFrame : m_StopFrame) / m_Clips[0].frameRate, 0, 0)).x;
                     GUI.DrawTexture(new Rect(timePixel, 0, 1, r.height), EditorGUIUtility.whiteTexture);
                     // Draw marker for static end
-                    timePixel = matrix.MultiplyPoint3x4(new Vector3((changedStart ? m_StopFrame : m_StartFrame) / m_Clip.frameRate, 0, 0)).x;
+                    timePixel = matrix.MultiplyPoint3x4(new Vector3((changedStart ? m_StopFrame : m_StartFrame) / m_Clips[0].frameRate, 0, 0)).x;
                     GUI.DrawTexture(new Rect(timePixel, 0, 1, r.height), EditorGUIUtility.whiteTexture);
                     GUI.color = Color.white;
                 }
diff --git a/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs b/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs
index c0551a1c0c..27719993f8 100644
--- a/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs
+++ b/Editor/Mono/Inspector/AssemblyDefinitionImporterInspector.cs
@@ -306,7 +306,9 @@ public override void OnInspectorGUI()
                 GUILayout.Label(Styles.references, EditorStyles.boldLabel);
 
                 EditorGUILayout.BeginVertical(GUI.skin.box);
+                EditorGUI.BeginDisabled(m_ReferencesList.serializedProperty.arraySize == 0);
                 EditorGUILayout.PropertyField(m_UseGUIDs, Styles.useGUIDs);
+                EditorGUI.EndDisabled();
                 EditorGUILayout.EndVertical();
 
                 m_ReferencesList.DoLayoutList();
@@ -675,7 +677,10 @@ private void DrawPrecompiledReferenceListElement(Rect rect, int index, bool isac
             if (selectedIndex > 0)
             {
                 var selectedAssemblyName = m_PrecompileReferenceListEntry[selectedIndex];
-                var assembly = m_AssemblyProvider.GetPrecompiledAssemblies(true, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget)
+                var assembly = m_AssemblyProvider.GetPrecompiledAssemblies(
+                    EditorScriptCompilationOptions.BuildingForEditor | EditorScriptCompilationOptions.BuildingWithAsserts,
+                    EditorUserBuildSettings.activeBuildTargetGroup,
+                    EditorUserBuildSettings.activeBuildTarget)
                     .First(x => AssetPath.GetFileName(x.Path) == selectedAssemblyName);
                 nameProp.stringValue = selectedAssemblyName;
                 pathProp.stringValue = assembly.Path;
@@ -800,7 +805,10 @@ static void LoadAssemblyDefinitionState(AssemblyDefinitionState state, string pa
             }
 
             var nameToPrecompiledReference = EditorCompilationInterface.Instance.PrecompiledAssemblyProvider
-                .GetPrecompiledAssemblies(true, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget)
+                .GetPrecompiledAssemblies(
+                    EditorScriptCompilationOptions.BuildingForEditor | EditorScriptCompilationOptions.BuildingWithAsserts,
+                    EditorUserBuildSettings.activeBuildTargetGroup,
+                    EditorUserBuildSettings.activeBuildTarget)
                 .Where(x => (x.Flags & AssemblyFlags.UserAssembly) == AssemblyFlags.UserAssembly)
                 .Distinct()
                 .ToDictionary(x => AssetPath.GetFileName(x.Path), x => x);
diff --git a/Editor/Mono/Inspector/AssemblyDefinitionReferenceImporterInspector.cs b/Editor/Mono/Inspector/AssemblyDefinitionReferenceImporterInspector.cs
index edca56ff59..fff4954108 100644
--- a/Editor/Mono/Inspector/AssemblyDefinitionReferenceImporterInspector.cs
+++ b/Editor/Mono/Inspector/AssemblyDefinitionReferenceImporterInspector.cs
@@ -70,8 +70,9 @@ public override void OnInspectorGUI()
             }
 
             extraDataSerializedObject.Update();
-
+            EditorGUI.BeginDisabled(m_ReferenceAsset.objectReferenceValue == null);
             EditorGUILayout.PropertyField(m_UseGUIDs, Styles.useGUID);
+            EditorGUI.EndDisabled();
 
             EditorGUI.BeginChangeCheck();
             var obj = EditorGUILayout.ObjectField(Styles.assemblyDefinition, m_ReferenceAsset.objectReferenceValue, typeof(AssemblyDefinitionAsset), false);
diff --git a/Editor/Mono/Inspector/AutodeskInteractiveShaderGUI.cs b/Editor/Mono/Inspector/AutodeskInteractiveShaderGUI.cs
index 0db4b96c4e..0a26a40f74 100644
--- a/Editor/Mono/Inspector/AutodeskInteractiveShaderGUI.cs
+++ b/Editor/Mono/Inspector/AutodeskInteractiveShaderGUI.cs
@@ -188,7 +188,7 @@ public override void AssignNewShaderToMaterial(Material material, Shader oldShad
 
         void BlendModePopup()
         {
-            EditorGUI.showMixedValue = blendMode.hasMixedValue;
+            MaterialEditor.BeginProperty(blendMode);
             var mode = (BlendMode)blendMode.floatValue;
 
             EditorGUI.BeginChangeCheck();
@@ -199,7 +199,7 @@ void BlendModePopup()
                 blendMode.floatValue = (float)mode;
             }
 
-            EditorGUI.showMixedValue = false;
+            MaterialEditor.EndProperty();
         }
 
         void DoAlbedoArea(Material material)
diff --git a/Editor/Mono/Inspector/AvatarMaskInspector.cs b/Editor/Mono/Inspector/AvatarMaskInspector.cs
index d78ec705cc..a2ea8985cc 100644
--- a/Editor/Mono/Inspector/AvatarMaskInspector.cs
+++ b/Editor/Mono/Inspector/AvatarMaskInspector.cs
@@ -750,16 +750,19 @@ protected override void ToggleAll()
 
             static bool GetFirstActiveValue(SerializedNodeInfo parent, out bool value)
             {
-                foreach (var treeViewItem in parent.children)
+                if (parent.children != null)
                 {
-                    var child = (SerializedNodeInfo)treeViewItem;
-                    if (child.m_State != SerializedNodeInfo.State.Disabled)
+                    foreach (var treeViewItem in parent.children)
                     {
-                        value = child.nodeState;
-                        return true;
+                        var child = (SerializedNodeInfo)treeViewItem;
+                        if (child.m_State != SerializedNodeInfo.State.Disabled)
+                        {
+                            value = child.nodeState;
+                            return true;
+                        }
+                        if (GetFirstActiveValue(child, out value))
+                            return true;
                     }
-                    if (GetFirstActiveValue(child, out value))
-                        return true;
                 }
                 value = false;
                 return false;
diff --git a/Editor/Mono/Inspector/BoxCollider2DEditor.cs b/Editor/Mono/Inspector/BoxCollider2DEditor.cs
index 47b9a3f101..80a2ad5716 100644
--- a/Editor/Mono/Inspector/BoxCollider2DEditor.cs
+++ b/Editor/Mono/Inspector/BoxCollider2DEditor.cs
@@ -65,8 +65,6 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_EdgeRadius);
             EditorGUILayout.EndFadeGroup();
 
-            serializedObject.ApplyModifiedProperties();
-
             FinalizeInspectorGUI();
         }
     }
diff --git a/Editor/Mono/Inspector/CameraEditor.cs b/Editor/Mono/Inspector/CameraEditor.cs
index 7256123de5..a4fe8fd553 100644
--- a/Editor/Mono/Inspector/CameraEditor.cs
+++ b/Editor/Mono/Inspector/CameraEditor.cs
@@ -9,11 +9,9 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.XR;
-using UnityEngine.Experimental.Rendering;
 using AnimatedBool = UnityEditor.AnimatedValues.AnimBool;
 using UnityEngine.Scripting;
 using UnityEditor.Modules;
-using UnityEditor.Overlays;
 using UnityEditorInternal.VR;
 using Object = UnityEngine.Object;
 
@@ -34,9 +32,17 @@ private static class Styles
             public static GUIContent viewportRect = EditorGUIUtility.TrTextContent("Viewport Rect", "Four values that indicate where on the screen this camera view will be drawn. Measured in Viewport Coordinates (values 0-1).");
             public static GUIContent sensorSize = EditorGUIUtility.TrTextContent("Sensor Size", "The size of the camera sensor in millimeters.");
             public static GUIContent lensShift = EditorGUIUtility.TrTextContent("Lens Shift", "Offset from the camera sensor. Use these properties to simulate a shift lens. Measured as a multiple of the sensor size.");
+            public static GUIContent iso = EditorGUIUtility.TrTextContent("ISO", "The sensor sensitivity (ISO).");
+            public static GUIContent shutterSpeed = EditorGUIUtility.TrTextContent("Shutter Speed", "The exposure time, in second.");
+            public static GUIContent aperture = EditorGUIUtility.TrTextContent("Aperture", "The aperture number, in f-stop.");
+            public static GUIContent focusDistance = EditorGUIUtility.TrTextContent("FocusDistance", "The focus distance of the lens. The Depth of Field Volume override uses this value if you set focusDistanceMode to FocusDistanceMode.Camera.");
+            public static GUIContent bladeCount = EditorGUIUtility.TrTextContent("Blade Count", "The number of diaphragm blades.");
+            public static GUIContent curvature = EditorGUIUtility.TrTextContent("Curvature", "Maps an aperture range to blade curvature.");
+            public static GUIContent barrelClipping = EditorGUIUtility.TrTextContent("Barrel Clipping", "The strength of the \"cat eye\" effect on bokeh (optical vignetting).");
+            public static GUIContent anamorphism = EditorGUIUtility.TrTextContent("Anamorphism", "Stretches the sensor to simulate an anamorphic look. Positive values distort the Camera vertically, negative will distort the Camera horizontally.");
             public static GUIContent physicalCamera = EditorGUIUtility.TrTextContent("Physical Camera", "Enables Physical camera mode. When checked, the field of view is calculated from properties for simulating physical attributes (focal length, sensor size, and lens shift)");
             public static GUIContent cameraType = EditorGUIUtility.TrTextContent("Sensor Type", "Common sensor sizes. Choose an item to set Sensor Size, or edit Sensor Size for your custom settings.");
-            public static GUIContent renderingPath = EditorGUIUtility.TrTextContent("Rendering Path", "Choose a rendering method for this camera.\n\nUse Graphics Settings to use the rendering path specified in Player settings.\n\nUse Forward to render all objects with one pass per material.\n\nUse Deferred to draw all objects once without lighting and then draw the lighting of all objects at the end of the render queue.\n\nUse Legacy Vertex Lit to render all lights in a single pass, calculated in vertices.\n\nLegacy Deferred has been deprecated.");
+            public static GUIContent renderingPath = EditorGUIUtility.TrTextContent("Rendering Path", "Choose a rendering method for this camera.\n\nUse Graphics Settings to use the rendering path specified in graphics settings.\n\nUse Forward to render all objects with one pass per light.\n\nUse Deferred to draw all objects once without lighting and then draw the lighting of all objects at the end of the render queue.\n\nUse Legacy Vertex Lit to render all lights in a single pass, calculated at vertices.");
             public static GUIContent focalLength = EditorGUIUtility.TrTextContent("Focal Length", "The simulated distance between the lens and the sensor of the physical camera. Larger values give a narrower field of view.");
             public static GUIContent allowOcclusionCulling = EditorGUIUtility.TrTextContent("Occlusion Culling", "Occlusion Culling disables rendering of objects when they are not currently seen by the camera because they are obscured (occluded) by other objects.");
             public static GUIContent allowHDR = EditorGUIUtility.TrTextContent("HDR", "High Dynamic Range gives you a wider range of light intensities, so your lighting looks more realistic. With it, you can still see details and experience less saturation even with bright light.");
@@ -70,6 +76,10 @@ public Settings(SerializedObject so)
                 "35mm 2-perf",
                 "35mm Academy",
                 "Super-35",
+                "35mm TV Projection",
+                "35mm Full Aperture",
+                "35mm 1.85 Projection",
+                "35mm Anamorphic",
                 "65mm ALEXA",
                 "70mm",
                 "70mm IMAX",
@@ -83,12 +93,16 @@ public Settings(SerializedObject so)
                 new Vector2(4.8f, 3.5f) , // 8mm
                 new Vector2(5.79f, 4.01f) , // Super 8mm
                 new Vector2(10.26f, 7.49f) , // 16mm
-                new Vector2(12.52f, 7.41f) , // Super 16mm
+                new Vector2(12.522f, 7.417f) , // Super 16mm
                 new Vector2(21.95f, 9.35f) , // 35mm 2-perf
-                new Vector2(21.0f, 15.2f) , // 35mm academy
+                new Vector2(21.946f, 16.002f) , // 35mm academy
                 new Vector2(24.89f, 18.66f) , // Super-35
+                new Vector2(20.726f, 15.545f), // 35mm TV Projection
+                new Vector2(24.892f, 18.669f), // 35mm Full Aperture
+                new Vector2(20.955f, 11.328f), // 35mm 1.85 Projection
+                new Vector2(21.946f, 18.593f), // 35mm Anamorphic
                 new Vector2(54.12f, 25.59f) , // 65mm ALEXA
-                new Vector2(70.0f, 51.0f) , // 70mm
+                new Vector2(52.476f, 23.012f) , // 70mm
                 new Vector2(70.41f, 52.63f), // 70mm IMAX
             };
 
@@ -99,25 +113,31 @@ public Settings(SerializedObject so)
                 EditorGUIUtility.TrTextContent("Use Graphics Settings"),
                 EditorGUIUtility.TrTextContent("Forward"),
                 EditorGUIUtility.TrTextContent("Deferred"),
-                EditorGUIUtility.TrTextContent("Legacy Vertex Lit"),
-                EditorGUIUtility.TrTextContent("Legacy Deferred (light prepass)")
+                EditorGUIUtility.TrTextContent("Legacy Vertex Lit")
             };
             private static readonly int[] kCameraRenderPathValues =
             {
                 (int)RenderingPath.UsePlayerSettings,
                 (int)RenderingPath.Forward,
                 (int)RenderingPath.DeferredShading,
-                (int)RenderingPath.VertexLit,
-                (int)RenderingPath.DeferredLighting
+                (int)RenderingPath.VertexLit
             };
 
             public SerializedProperty clearFlags { get; private set; }
             public SerializedProperty backgroundColor { get; private set; }
             public SerializedProperty normalizedViewPortRect { get; private set; }
             internal SerializedProperty projectionMatrixMode { get; private set; }
+            public SerializedProperty iso { get; private set; }
+            public SerializedProperty shutterSpeed { get; private set; }
+            public SerializedProperty aperture { get; private set; }
+            public SerializedProperty focusDistance { get; private set; }
+            public SerializedProperty focalLength { get; private set; }
+            public SerializedProperty bladeCount { get; private set; }
+            public SerializedProperty curvature { get; private set; }
+            public SerializedProperty barrelClipping { get; private set; }
+            public SerializedProperty anamorphism { get; private set; }
             public SerializedProperty sensorSize { get; private set; }
             public SerializedProperty lensShift { get; private set; }
-            public SerializedProperty focalLength { get; private set; }
             public SerializedProperty gateFit { get; private set; }
             public SerializedProperty verticalFOV { get; private set; }
             public SerializedProperty orthographic { get; private set; }
@@ -154,9 +174,17 @@ public void OnEnable()
                 clearFlags = m_SerializedObject.FindProperty("m_ClearFlags");
                 backgroundColor = m_SerializedObject.FindProperty("m_BackGroundColor");
                 normalizedViewPortRect = m_SerializedObject.FindProperty("m_NormalizedViewPortRect");
+                iso = m_SerializedObject.FindProperty("m_Iso");
+                shutterSpeed = m_SerializedObject.FindProperty("m_ShutterSpeed");
+                aperture = m_SerializedObject.FindProperty("m_Aperture");
+                focusDistance = m_SerializedObject.FindProperty("m_FocusDistance");
+                focalLength = m_SerializedObject.FindProperty("m_FocalLength");
+                bladeCount = m_SerializedObject.FindProperty("m_BladeCount");
+                curvature = m_SerializedObject.FindProperty("m_Curvature");
+                barrelClipping = m_SerializedObject.FindProperty("m_BarrelClipping");
+                anamorphism = m_SerializedObject.FindProperty("m_Anamorphism");
                 sensorSize = m_SerializedObject.FindProperty("m_SensorSize");
                 lensShift = m_SerializedObject.FindProperty("m_LensShift");
-                focalLength = m_SerializedObject.FindProperty("m_FocalLength");
                 gateFit = m_SerializedObject.FindProperty("m_GateFitMode");
                 projectionMatrixMode = m_SerializedObject.FindProperty("m_projectionMatrixMode");
                 nearClippingPlane = m_SerializedObject.FindProperty("near clip plane");
@@ -297,6 +325,15 @@ public void DrawProjection()
                         {
                             using (new EditorGUI.IndentLevelScope())
                             {
+                                EditorGUILayout.PropertyField(iso, Styles.iso);
+                                EditorGUILayout.PropertyField(shutterSpeed, Styles.shutterSpeed);
+                                EditorGUILayout.PropertyField(aperture, Styles.aperture);
+                                EditorGUILayout.PropertyField(focusDistance, Styles.focusDistance);
+                                EditorGUILayout.PropertyField(bladeCount, Styles.bladeCount);
+                                EditorGUILayout.PropertyField(curvature, Styles.curvature);
+                                EditorGUILayout.PropertyField(barrelClipping, Styles.barrelClipping);
+                                EditorGUILayout.PropertyField(anamorphism, Styles.anamorphism);
+
                                 using (var horizontal = new EditorGUILayout.HorizontalScope())
                                 using (new EditorGUI.PropertyScope(horizontal.rect, Styles.focalLength, focalLength))
                                 using (var checkScope = new EditorGUI.ChangeCheckScope())
@@ -474,7 +511,7 @@ protected Camera previewCamera
         }
 
 
-        private static bool IsDeferredRenderingPath(RenderingPath rp) { return rp == RenderingPath.DeferredLighting || rp == RenderingPath.DeferredShading; }
+        private static bool IsDeferredRenderingPath(RenderingPath rp) { return rp == RenderingPath.DeferredShading; }
 
         private bool wantDeferredRendering
         {
diff --git a/Editor/Mono/Inspector/CameraOverlay.cs b/Editor/Mono/Inspector/CameraOverlay.cs
index 9ff80d77ec..944fd580b0 100644
--- a/Editor/Mono/Inspector/CameraOverlay.cs
+++ b/Editor/Mono/Inspector/CameraOverlay.cs
@@ -34,6 +34,11 @@ class SceneViewCameraOverlay : TransientSceneViewOverlay
 
         public SceneViewCameraOverlay()
         {
+            minSize = new Vector2(40, 40);
+            maxSize = new Vector2(4000, 4000);
+
+            sizeOverridenChanged += UpdateSize;
+
             OnSelectionChanged();
         }
 
@@ -97,8 +102,21 @@ RenderTexture GetPreviewTextureWithSizeAndAA(int width, int height)
             return m_PreviewTexture;
         }
 
+        void UpdateSize()
+        {
+            if (!sizeOverridden)
+                size = new Vector2(240, 135);
+        }
+
         public override void OnGUI()
         {
+            UpdateSize();
+
+            imguiContainer.style.minWidth = collapsed ? new StyleLength(240) : new StyleLength(StyleKeyword.Auto);
+            imguiContainer.style.minHeight = collapsed ? new StyleLength(135) : new StyleLength(StyleKeyword.Auto);
+            imguiContainer.parent.style.flexGrow = 1;
+            imguiContainer.style.flexGrow = 1;
+
             if (selectedCamera == null)
             {
                 GUILayout.Label("No camera selected", EditorStyles.centeredGreyMiniLabel);
@@ -115,66 +133,16 @@ public override void OnGUI()
             if (!sceneView.IsGameObjectInThisSceneView(selectedCamera.gameObject))
                 return;
 
-            Vector2 previewSize = selectedCamera.targetTexture
-                ? new Vector2(selectedCamera.targetTexture.width, selectedCamera.targetTexture.height)
-                : PlayModeView.GetMainPlayModeViewTargetSize();
-
-            if (previewSize.x < 0f)
-            {
-                // Fallback to Scene View of not a valid game view size
-                previewSize.x = sceneView.position.width;
-                previewSize.y = sceneView.position.height;
-            }
-
-            // Apply normalized viewport rect of camera
-            Rect normalizedViewPortRect = selectedCamera.rect;
-
-            // clamp normalized rect in [0,1]
-            normalizedViewPortRect.xMin = Math.Max(normalizedViewPortRect.xMin, 0f);
-            normalizedViewPortRect.yMin = Math.Max(normalizedViewPortRect.yMin, 0f);
-            normalizedViewPortRect.xMax = Math.Min(normalizedViewPortRect.xMax, 1f);
-            normalizedViewPortRect.yMax = Math.Min(normalizedViewPortRect.yMax, 1f);
-
-            previewSize.x *= Mathf.Max(normalizedViewPortRect.width, 0f);
-            previewSize.y *= Mathf.Max(normalizedViewPortRect.height, 0f);
+            var cameraRect = imguiContainer.rect;
+            cameraRect.width = Mathf.Floor(cameraRect.width);
 
-            // Prevent using invalid previewSize
-            if (previewSize.x < 1f || previewSize.y < 1f)
+            if (cameraRect.width < 1 || cameraRect.height < 1)
                 return;
 
-            float aspect = previewSize.x / previewSize.y;
-
-            // Scale down (fit to scene view)
-            previewSize.y = kPreviewNormalizedSize * sceneView.position.height;
-            previewSize.x = previewSize.y * aspect;
-            if (previewSize.y > sceneView.position.height * 0.5f)
-            {
-                previewSize.y = sceneView.position.height * 0.5f;
-                previewSize.x = previewSize.y * aspect;
-            }
-            if (previewSize.x > sceneView.position.width * 0.5f)
-            {
-                previewSize.x = sceneView.position.width * 0.5f;
-                previewSize.y = previewSize.x / aspect;
-            }
-
-            // Get and reserve rect
-            drawingContainer.style.minWidth = previewSize.x;
-            drawingContainer.style.minHeight = previewSize.y;
-            var cameraRect = drawingContainer.rect;
-            cameraRect.width = Mathf.Floor(cameraRect.width);
-
             if (Event.current.type == EventType.Repaint)
             {
                 Graphics.DrawTexture(cameraRect, Texture2D.whiteTexture, new Rect(0, 0, 1, 1), 0, 0, 0, 0, Color.black);
-            }
-
-            var properWidth = cameraRect.height * aspect;
-            cameraRect.x += (cameraRect.width - properWidth) * 0.5f;
-            cameraRect.width = properWidth;
 
-            if (Event.current.type == EventType.Repaint)
-            {
                 // setup camera and render
                 previewCamera.CopyFrom(selectedCamera);
 
@@ -200,9 +168,34 @@ public override void OnGUI()
                     }
                 }
 
-                var previewTexture = GetPreviewTextureWithSizeAndAA((int)cameraRect.width, (int)cameraRect.height);
+                Vector2 previewSize = selectedCamera.targetTexture
+                    ? new Vector2(selectedCamera.targetTexture.width, selectedCamera.targetTexture.height)
+                    : PlayModeView.GetMainPlayModeViewTargetSize();
+
+                if (previewSize.x < 0f)
+                {
+                    // Fallback to Scene View of not a valid game view size
+                    previewSize.x = sceneView.position.width;
+                    previewSize.y = sceneView.position.height;
+                }
+
+                float rectAspect = cameraRect.width / cameraRect.height;
+                float previewAspect = previewSize.x / previewSize.y;
+                Rect previewRect = cameraRect;
+                if (rectAspect > previewAspect)
+                {
+                    float stretch = previewAspect / rectAspect;
+                    previewRect = new Rect(cameraRect.xMin + cameraRect.width * (1.0f - stretch) * .5f, cameraRect.yMin, stretch * cameraRect.width, cameraRect.height);
+                }
+                else
+                {
+                    float stretch = rectAspect / previewAspect;
+                    previewRect = new Rect(cameraRect.xMin, cameraRect.yMin + cameraRect.height * (1.0f - stretch) * .5f, cameraRect.width, stretch * cameraRect.height);
+                }
+
+                var previewTexture = GetPreviewTextureWithSizeAndAA((int)previewRect.width, (int)previewRect.height);
                 previewCamera.targetTexture = previewTexture;
-                previewCamera.pixelRect = new Rect(0, 0, cameraRect.width, cameraRect.height);
+                previewCamera.pixelRect = new Rect(0, 0, previewRect.width, previewRect.height);
 
                 Handles.EmitGUIGeometryForCamera(selectedCamera, previewCamera);
 
@@ -216,7 +209,8 @@ public override void OnGUI()
                 }
 
                 previewCamera.Render();
-                Graphics.DrawTexture(cameraRect, previewTexture, new Rect(0, 0, 1, 1), 0, 0, 0, 0, GUI.color, EditorGUIUtility.GUITextureBlit2SRGBMaterial);
+
+                Graphics.DrawTexture(previewRect, previewTexture, new Rect(0, 0, 1, 1), 0, 0, 0, 0, GUI.color, EditorGUIUtility.GUITextureBlit2SRGBMaterial);
             }
         }
     }
diff --git a/Editor/Mono/Inspector/CapsuleCollider2DEditor.cs b/Editor/Mono/Inspector/CapsuleCollider2DEditor.cs
index 8dc5d88cbc..64cdcedc6a 100644
--- a/Editor/Mono/Inspector/CapsuleCollider2DEditor.cs
+++ b/Editor/Mono/Inspector/CapsuleCollider2DEditor.cs
@@ -35,8 +35,6 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(m_Size);
             EditorGUILayout.PropertyField(m_Direction);
 
-            serializedObject.ApplyModifiedProperties();
-
             FinalizeInspectorGUI();
         }
     }
diff --git a/Editor/Mono/Inspector/CircleCollider2DEditor.cs b/Editor/Mono/Inspector/CircleCollider2DEditor.cs
index a7a4579291..c85522f579 100644
--- a/Editor/Mono/Inspector/CircleCollider2DEditor.cs
+++ b/Editor/Mono/Inspector/CircleCollider2DEditor.cs
@@ -31,8 +31,6 @@ public override void OnInspectorGUI()
 
             EditorGUILayout.PropertyField(m_Radius);
 
-            serializedObject.ApplyModifiedProperties();
-
             FinalizeInspectorGUI();
         }
     }
diff --git a/Editor/Mono/Inspector/ClothInspector.cs b/Editor/Mono/Inspector/ClothInspector.cs
index 057cffc3cc..45a93f4bfa 100644
--- a/Editor/Mono/Inspector/ClothInspector.cs
+++ b/Editor/Mono/Inspector/ClothInspector.cs
@@ -1624,6 +1624,9 @@ void OnSceneEditConstraintsGUI()
             if (Selection.gameObjects.Length > 1)
                 return;
 
+            if (!IsMeshValid())
+                return;
+
             s_Inspector = this;
 
             if (Event.current.type == EventType.Repaint)
@@ -1659,6 +1662,9 @@ void OnSceneEditSelfAndInterCollisionParticlesGUI()
             if (Selection.gameObjects.Length > 1)
                 return;
 
+            if (!IsMeshValid())
+                return;
+
             s_Inspector = this;
             Event evt = Event.current;
 
@@ -1949,7 +1955,8 @@ public override bool visible
 
             public override void OnGUI()
             {
-                s_Inspector.ConstraintEditing();
+                if(s_Inspector != null)
+                    s_Inspector.ConstraintEditing();
             }
         }
 
diff --git a/Editor/Mono/Inspector/Collider2DEditorBase.cs b/Editor/Mono/Inspector/Collider2DEditorBase.cs
index 7003e28518..f1e950bb4a 100644
--- a/Editor/Mono/Inspector/Collider2DEditorBase.cs
+++ b/Editor/Mono/Inspector/Collider2DEditorBase.cs
@@ -21,12 +21,14 @@ protected class Styles
 
         private SerializedProperty m_Density;
         private readonly AnimBool m_ShowDensity = new AnimBool();
+        private readonly AnimBool m_ShowLayerOverrides = new AnimBool();
         private readonly AnimBool m_ShowInfo = new AnimBool();
         private readonly AnimBool m_ShowContacts = new AnimBool();
         Vector2 m_ContactScrollPosition;
 
         static ContactPoint2D[] m_Contacts = new ContactPoint2D[100];
 
+        private SavedBool m_ShowLayerOverridesFoldout;
         private SavedBool m_ShowInfoFoldout;
         private bool m_RequiresConstantRepaint;
 
@@ -36,6 +38,11 @@ protected class Styles
         private SerializedProperty m_UsedByComposite;
         private SerializedProperty m_Offset;
         protected SerializedProperty m_AutoTiling;
+        private SerializedProperty m_LayerOverridePriority;
+        private SerializedProperty m_IncludeLayers;
+        private SerializedProperty m_ExcludeLayers;
+        private SerializedProperty m_ForceSendLayers;
+        private SerializedProperty m_ForceReceiveLayers;
 
         private readonly AnimBool m_ShowCompositeRedundants = new AnimBool();
 
@@ -48,8 +55,12 @@ public override void OnEnable()
             m_ShowDensity.value = ShouldShowDensity();
             m_ShowDensity.valueChanged.AddListener(Repaint);
 
+            m_ShowLayerOverrides.valueChanged.AddListener(Repaint);
+            m_ShowLayerOverridesFoldout = new SavedBool($"{target.GetType() }.ShowLayerOverridesFoldout", false);
+            m_ShowLayerOverrides.value = m_ShowLayerOverridesFoldout.value;
+
             m_ShowInfo.valueChanged.AddListener(Repaint);
-            m_ShowInfoFoldout = new SavedBool($"{target.GetType()}.ShowFoldout", false);
+            m_ShowInfoFoldout = new SavedBool($"{target.GetType()}.ShowInfoFoldout", false);
             m_ShowInfo.value = m_ShowInfoFoldout.value;
             m_ShowContacts.valueChanged.AddListener(Repaint);
             m_ContactScrollPosition = Vector2.zero;
@@ -60,6 +71,11 @@ public override void OnEnable()
             m_UsedByComposite = serializedObject.FindProperty("m_UsedByComposite");
             m_Offset = serializedObject.FindProperty("m_Offset");
             m_AutoTiling = serializedObject.FindProperty("m_AutoTiling");
+            m_LayerOverridePriority = serializedObject.FindProperty("m_LayerOverridePriority");
+            m_IncludeLayers = serializedObject.FindProperty("m_IncludeLayers");
+            m_ExcludeLayers = serializedObject.FindProperty("m_ExcludeLayers");
+            m_ForceSendLayers = serializedObject.FindProperty("m_ForceSendLayers");
+            m_ForceReceiveLayers = serializedObject.FindProperty("m_ForceReceiveLayers");
 
             m_ShowCompositeRedundants.value = !m_UsedByComposite.boolValue;
             m_ShowCompositeRedundants.valueChanged.AddListener(Repaint);
@@ -70,6 +86,7 @@ public override void OnEnable()
         public override void OnDisable()
         {
             m_ShowDensity.valueChanged.RemoveListener(Repaint);
+            m_ShowLayerOverrides.valueChanged.RemoveListener(Repaint);
             m_ShowInfo.valueChanged.RemoveListener(Repaint);
             m_ShowContacts.valueChanged.RemoveListener(Repaint);
             m_ShowCompositeRedundants.valueChanged.RemoveListener(Repaint);
@@ -88,7 +105,6 @@ public override void OnInspectorGUI()
                     EditorGUILayout.PropertyField(m_Density);
                 EditorGUILayout.EndFadeGroup();
 
-
                 EditorGUILayout.PropertyField(m_Material);
                 EditorGUILayout.PropertyField(m_IsTrigger);
                 EditorGUILayout.PropertyField(m_UsedByEffector);
@@ -107,6 +123,7 @@ public override void OnInspectorGUI()
 
         public void FinalizeInspectorGUI()
         {
+            ShowLayerOverridesProperties();
             ShowColliderInfoProperties();
 
             // Check for collider error state.
@@ -122,6 +139,31 @@ public void FinalizeInspectorGUI()
 
             // Check for effector warnings.
             Effector2DEditor.CheckEffectorWarnings(target as Collider2D);
+
+            EndColliderInspector();
+        }
+
+        private void ShowLayerOverridesProperties()
+        {
+            // Show Layer Overrides.
+            m_ShowLayerOverridesFoldout.value = m_ShowLayerOverrides.target = EditorGUILayout.Foldout(m_ShowLayerOverrides.target, "Layer Overrides", true);
+            if (EditorGUILayout.BeginFadeGroup(m_ShowLayerOverrides.faded))
+            {
+                EditorGUI.indentLevel++;
+                EditorGUILayout.PropertyField(m_LayerOverridePriority);
+                EditorGUILayout.PropertyField(m_IncludeLayers);
+                EditorGUILayout.PropertyField(m_ExcludeLayers);
+
+                // Only show force send/receive if we're not dealing with triggers.
+                if (targets.Count(x => (x as Collider2D).isTrigger) == 0)
+                {
+                    EditorGUILayout.Space();
+                    EditorGUILayout.PropertyField(m_ForceSendLayers);
+                    EditorGUILayout.PropertyField(m_ForceReceiveLayers);
+                }
+                EditorGUI.indentLevel--;
+            }
+            EditorGUILayout.EndFadeGroup();
         }
 
         private void ShowColliderInfoProperties()
@@ -231,7 +273,7 @@ protected void CheckColliderErrorState()
             }
         }
 
-        protected void BeginColliderInspector()
+        protected void BeginEditColliderInspector()
         {
             serializedObject.Update();
             using (new EditorGUI.DisabledScope(targets.Length > 1))
diff --git a/Editor/Mono/Inspector/CompositeCollider2DEditor.cs b/Editor/Mono/Inspector/CompositeCollider2DEditor.cs
index 857f5de21a..d8e04044b0 100644
--- a/Editor/Mono/Inspector/CompositeCollider2DEditor.cs
+++ b/Editor/Mono/Inspector/CompositeCollider2DEditor.cs
@@ -87,8 +87,6 @@ public override void OnInspectorGUI()
                 (x as CompositeCollider2D).attachedRigidbody.bodyType == RigidbodyType2D.Dynamic) > 0)
                 EditorGUILayout.HelpBox("Outline geometry is composed of edges and will not preserve the original collider's center-of-mass or rotational inertia.  The CompositeCollider2D is attached to a Dynamic Rigidbody2D so you may need to explicitly set these if they are required.", MessageType.Info);
 
-            serializedObject.ApplyModifiedProperties();
-
             FinalizeInspectorGUI();
         }
     }
diff --git a/Editor/Mono/Inspector/ConstrainProportionsTransformScale.cs b/Editor/Mono/Inspector/ConstrainProportionsTransformScale.cs
index b5af711663..5f42d32a89 100644
--- a/Editor/Mono/Inspector/ConstrainProportionsTransformScale.cs
+++ b/Editor/Mono/Inspector/ConstrainProportionsTransformScale.cs
@@ -2,8 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
-using System.Collections.Generic;
+using JetBrains.Annotations;
 using UnityEditor.ShortcutManagement;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -13,13 +12,17 @@ namespace UnityEditor
     internal class ConstrainProportionsTransformScale
     {
         bool m_ConstrainProportionsScale;
+        internal static bool m_IsAnimationPreview;
         Vector3 m_InitialScale;
 
+        static bool s_IsPropertyPaste;
+
         internal bool constrainProportionsScale { get => m_ConstrainProportionsScale; set => m_ConstrainProportionsScale = value; }
 
         internal ConstrainProportionsTransformScale(Vector3 previousScale)
         {
             m_InitialScale = previousScale != Vector3.zero ? previousScale : Vector3.one;
+            s_IsPropertyPaste = false;
         }
 
         internal Vector3 DoGUI(Rect rect, GUIContent scaleContent, Vector3 value,  UnityEngine.Object[] targetObjects, ref int axisModified, SerializedProperty property = null, SerializedProperty constrainProportionsProperty = null)
@@ -33,19 +36,12 @@ internal Vector3 DoGUI(Rect rect, GUIContent scaleContent, Vector3 value,  Unity
             if (previousIsProportionalScale != m_ConstrainProportionsScale)
             {
                 // Every time scale becomes proportional, update initial scale value
-                if (m_ConstrainProportionsScale)
+                if (m_ConstrainProportionsScale && !m_IsAnimationPreview)
                 {
                     m_InitialScale = value != Vector3.zero ? value : Vector3.one;
                 }
 
-                foreach (var obj in targetObjects)
-                {
-                    var tr = obj as Transform;
-                    if (tr == null)
-                        continue;
-                    Undo.RecordObject(tr, "Proportional Scale Toggle Changed");
-                    tr.constrainProportionsScale = m_ConstrainProportionsScale;
-                }
+                SetConstrainProportions(targetObjects, m_ConstrainProportionsScale);
             }
 
             return scale;
@@ -60,16 +56,27 @@ static void ToggleConstrainProportionsScale()
                 return;
 
             bool isProportionalScale = !Selection.DoAllGOsHaveConstrainProportionsEnabled(selected);
-            foreach (var obj in selected)
-            {
-                Undo.RecordObject(obj.transform, "Proportional Scale Toggle Changed");
-                obj.transform.constrainProportionsScale = isProportionalScale;
-            }
+
+            SetConstrainProportions(selected, isProportionalScale);
 
             // To make sure all inspector windows have a proper greyout if initial values are zero, rebuild.
             EditorUtility.ForceRebuildInspectors();
         }
 
+        internal static void SetConstrainProportions([NotNull] Object[] objects, bool value)
+        {
+            foreach (var obj in objects)
+            {
+                Transform t = obj?.GetType() == typeof(GameObject)? (obj as GameObject)?.transform : obj as Transform;
+
+                if (t == null)
+                    continue;
+
+                Undo.RecordObject(t, "Proportional Scale Toggle Changed");
+                t.constrainProportionsScale = value;
+            }
+        }
+
         internal static Vector3 GetVector3WithRatio(Vector3 vector, float ratio)
         {
             //If there are any fields with the same values, use already precalculated values
@@ -86,15 +93,21 @@ internal static Vector3 GetVector3WithRatio(Vector3 vector, float ratio)
         internal static Vector3 DoScaleProportions(Vector3 value, Vector3 previousValue, Vector3 initialScale, ref int axisModified)
         {
             float ratio = 1;
+            bool ratioChanged = false;
+
+            if (!Selection.DoAllGOsHaveConstrainProportionsEnabled(Selection.gameObjects))
+                return value;
 
             if (previousValue != value)
             {
+                if (m_IsAnimationPreview && initialScale == Vector3.zero)
+                    initialScale = Vector3.one;
+
                 // Check which axis was modified and set locked fields and ratio
                 //AxisModified values [-1;2] : [none, x, y, z]
                 // X axis
                 ratio = SetRatio(value.x, previousValue.x, initialScale.x);
                 axisModified = ratio != 1 || !Mathf.Approximately(value.x, previousValue.x) ? 0 : -1;
-
                 // Y axis
                 if (axisModified == -1)
                 {
@@ -102,16 +115,45 @@ internal static Vector3 DoScaleProportions(Vector3 value, Vector3 previousValue,
                     axisModified = ratio != 1 || !Mathf.Approximately(value.y, previousValue.y) ? 1 : -1;
                 }
                 // Z axis
-
                 if (axisModified == -1)
                 {
                     ratio = SetRatio(value.z, previousValue.z, initialScale.z);
                     axisModified = ratio != 1 || !Mathf.Approximately(value.z, previousValue.z) ? 2 : -1;
                 }
 
-                value = GetVector3WithRatio(initialScale, ratio);
+                ratioChanged = true;
+            }
+            // If customer has pasted a scale property via a context menu, we might need to enforce proportions
+            else if (s_IsPropertyPaste)
+            {
+                s_IsPropertyPaste = false;
+                // Catch if any value has changed by checking scale based on X axis
+                if (initialScale * (previousValue.x / initialScale.x) != value)
+                {
+                    Vector3 axisRatios = new Vector3(previousValue.x / initialScale.x, previousValue.y / initialScale.y,
+                        previousValue.z / initialScale.z);
+
+                    if (axisRatios.x != axisRatios.y && axisRatios.x != axisRatios.z && IsValidRatio(axisRatios.x))
+                    {
+                        axisModified = 0;
+                        ratio = axisRatios.x;
+                    }
+                    else if (axisRatios.y != axisRatios.x && axisRatios.y != axisRatios.z && IsValidRatio(axisRatios.y))
+                    {
+                        axisModified = 1;
+                        ratio = axisRatios.y;
+                    }
+                    else if (axisRatios.z != axisRatios.x && axisRatios.z != axisRatios.y && IsValidRatio(axisRatios.z))
+                    {
+                        axisModified = 2;
+                        ratio = axisRatios.z;
+                    }
+
+                    ratioChanged = axisModified != -1;
+                }
             }
-            return value;
+
+            return ratioChanged ? GetVector3WithRatio(initialScale, ratio) : value;
         }
 
         static float SetRatio(float value, float previousValue, float initialValue)
@@ -243,5 +285,30 @@ internal static uint SetBit(uint mask, int index, bool value)
             else
                 return mask & (~bitmask);
         }
+
+        static bool IsValidRatio(float value)
+        {
+            return !float.IsNaN(value) && !float.IsInfinity(value);
+        }
+
+        internal static void NotifyPropertyPasted(string propertyPath)
+        {
+            // If user has pasted a scale property via a context menu, we might need to enforce proportions.
+            s_IsPropertyPaste = propertyPath.StartsWith("m_LocalScale");
+        }
+
+        internal static bool ShouldForceEnablePropertyFields(float[] values)
+        {
+            if (!m_IsAnimationPreview)
+                return false;
+
+                foreach (var value in values)
+                {
+                    if (value != 0)
+                        return false;
+                }
+
+                return true;
+        }
     }
 }
diff --git a/Editor/Mono/Inspector/ConstraintEditorBase.cs b/Editor/Mono/Inspector/ConstraintEditorBase.cs
index 55b54254a4..276c55def1 100644
--- a/Editor/Mono/Inspector/ConstraintEditorBase.cs
+++ b/Editor/Mono/Inspector/ConstraintEditorBase.cs
@@ -69,7 +69,7 @@ internal abstract class ConstraintEditorBase : Editor
 
         public void OnEnable(ConstraintStyleBase style)
         {
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
 
             m_SourceList = new ReorderableList(serializedObject, sources, sources.editable, true, sources.editable, sources.editable);
             m_SourceList.drawElementCallback += DrawElementCallback;
@@ -87,10 +87,10 @@ public void OnEnable(ConstraintStyleBase style)
 
         public void OnDisable()
         {
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
         }
 
-        internal void OnUndoRedoPerformed()
+        internal void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             // must call UserUpdateOffset to allow the offsets to be updated by the Undo system, otherwise the constraint can override them
             foreach (var t in targets)
diff --git a/Editor/Mono/Inspector/CubemapPreview.cs b/Editor/Mono/Inspector/CubemapPreview.cs
index 9ab6e84117..a1d7ebf74d 100644
--- a/Editor/Mono/Inspector/CubemapPreview.cs
+++ b/Editor/Mono/Inspector/CubemapPreview.cs
@@ -14,6 +14,7 @@ internal class CubemapPreview
         static readonly int s_ShaderIntensity = Shader.PropertyToID("_Intensity");
         static readonly int s_ShaderIsNormalMap = Shader.PropertyToID("_IsNormalMap");
         static readonly int s_ShaderExposure = Shader.PropertyToID("_Exposure");
+        static readonly int s_ColorspaceIsGamma = Shader.PropertyToID("_ColorspaceIsGamma");
 
         private enum PreviewType
         {
@@ -181,18 +182,10 @@ private void RenderCubemap(Texture t, Vector2 previewDir, float previewDistance,
             m_Material.SetFloat(s_ShaderIntensity, m_Intensity);
             m_Material.SetFloat(s_ShaderIsNormalMap, TextureInspector.IsNormalMap(t) ? 1.0f : 0.0f);
             m_Material.SetFloat(s_ShaderExposure, exposure);
-
-            if (PlayerSettings.colorSpace == ColorSpace.Linear)
-            {
-                m_Material.SetInt("_ColorspaceIsGamma", 0);
-            }
-            else
-            {
-                m_Material.SetInt("_ColorspaceIsGamma", 1);
-            }
+            m_Material.SetInt(s_ColorspaceIsGamma, PlayerSettings.colorSpace == ColorSpace.Linear ? 0 : 1);
 
             m_PreviewUtility.DrawMesh(m_Mesh, Vector3.zero, rot, m_Material, 0);
-            m_PreviewUtility.Render();
+            m_PreviewUtility.Render(Unsupported.useScriptableRenderPipeline);
         }
     }
 }
diff --git a/Editor/Mono/Inspector/CustomCollider2DEditor.cs b/Editor/Mono/Inspector/CustomCollider2DEditor.cs
index 3bd51e2a8a..8ca134b5eb 100644
--- a/Editor/Mono/Inspector/CustomCollider2DEditor.cs
+++ b/Editor/Mono/Inspector/CustomCollider2DEditor.cs
@@ -27,8 +27,6 @@ public override void OnInspectorGUI()
                 EditorGUI.EndDisabledGroup();
             }
 
-            serializedObject.ApplyModifiedProperties();
-
             FinalizeInspectorGUI();
         }
     }
diff --git a/Editor/Mono/Inspector/EdgeCollider2DEditor.cs b/Editor/Mono/Inspector/EdgeCollider2DEditor.cs
index aa6f98f686..55b371ab0f 100644
--- a/Editor/Mono/Inspector/EdgeCollider2DEditor.cs
+++ b/Editor/Mono/Inspector/EdgeCollider2DEditor.cs
@@ -41,7 +41,7 @@ public override void OnEnable()
 
         public override void OnInspectorGUI()
         {
-            BeginColliderInspector();
+            BeginEditColliderInspector();
             GUILayout.Space(5);
             base.OnInspectorGUI();
 
@@ -72,8 +72,6 @@ public override void OnInspectorGUI()
             }
             EditorGUILayout.EndFadeGroup();
 
-            EndColliderInspector();
-
             FinalizeInspectorGUI();
         }
     }
diff --git a/Editor/Mono/Inspector/EditMode.cs b/Editor/Mono/Inspector/EditMode.cs
index 89b4620786..34f33864c6 100644
--- a/Editor/Mono/Inspector/EditMode.cs
+++ b/Editor/Mono/Inspector/EditMode.cs
@@ -72,14 +72,8 @@ public enum SceneViewEditMode
             GridBox,
             GridSelect,
             GridMove,
-            ParticleSystemCollisionModulePlanesMove,
-            ParticleSystemCollisionModulePlanesRotate,
             LineRendererEdit,
             LineRendererCreate,
-            ParticleSystemShapeModuleGizmo,
-            ParticleSystemShapeModulePosition,
-            ParticleSystemShapeModuleRotation,
-            ParticleSystemShapeModuleScale
         }
 
         public static bool IsOwner(Editor editor)
diff --git a/Editor/Mono/Inspector/EditablePathTool.cs b/Editor/Mono/Inspector/EditablePathTool.cs
index f1b9978fd7..76ab3fcea2 100644
--- a/Editor/Mono/Inspector/EditablePathTool.cs
+++ b/Editor/Mono/Inspector/EditablePathTool.cs
@@ -44,16 +44,21 @@ abstract class EditablePathTool : EditorTool
         void OnEnable()
         {
             CacheColliderData();
-            Undo.undoRedoPerformed += CacheColliderData;
+            Undo.undoRedoEvent += OnUndoRedo;
             Selection.selectionChanged += CacheColliderData;
         }
 
         void OnDisable()
         {
-            Undo.undoRedoPerformed -= CacheColliderData;
+            Undo.undoRedoEvent -= OnUndoRedo;
             Selection.selectionChanged -= CacheColliderData;
         }
 
+        void OnUndoRedo(in UndoRedoInfo info)
+        {
+            CacheColliderData();
+        }
+
         void CacheColliderData()
         {
             m_EditablePaths.Clear();
diff --git a/Editor/Mono/Inspector/Editor.cs b/Editor/Mono/Inspector/Editor.cs
index 7164f7992f..80106b06bf 100644
--- a/Editor/Mono/Inspector/Editor.cs
+++ b/Editor/Mono/Inspector/Editor.cs
@@ -11,6 +11,7 @@
 using UnityEngine;
 using UnityEngine.Internal;
 using UnityEngine.Rendering;
+using UnityEngine.Scripting;
 using UnityEngine.UIElements;
 using Component = UnityEngine.Component;
 using UnityObject = UnityEngine.Object;
@@ -384,7 +385,6 @@ internal InspectorMode inspectorMode
             }
         }
 
-
         internal static float kLineHeight = EditorGUI.kSingleLineHeight;
 
         internal bool hideInspector = false;
@@ -398,6 +398,45 @@ internal InspectorMode inspectorMode
 
         internal static bool m_AllowMultiObjectAccess = true;
 
+        bool m_HasUnsavedChanges = false;
+
+        [UsedByNativeCode]
+        private bool GetHasUnsavedChanges()
+        {
+            return hasUnsavedChanges;
+        }
+
+        public bool hasUnsavedChanges
+        {
+            get
+            {
+                return m_HasUnsavedChanges;
+            }
+            protected set
+            {
+                if (m_HasUnsavedChanges != value)
+                {
+                    m_HasUnsavedChanges = value;
+                    if (propertyViewer != null)
+                    {
+                        propertyViewer.UnsavedChangesStateChanged(this, value);
+                    }
+                }
+            }
+        }
+
+        public string saveChangesMessage { get; protected set; }
+
+        public virtual void SaveChanges()
+        {
+            hasUnsavedChanges = false;
+        }
+
+        public virtual void DiscardChanges()
+        {
+            hasUnsavedChanges = false;
+        }
+
         // used internally to know if this the first editor in the inspector window
         internal bool firstInspectedEditor { get; set; }
 
@@ -674,7 +713,7 @@ internal static void AssignCachedProperties<T>(T self, SerializedProperty root)
             }
         }
 
-        internal virtual void InternalSetTargets(UnityObject[] t) { m_Targets = t; }
+        internal void InternalSetTargets(UnityObject[] t) { m_Targets = t; }
         internal void InternalSetHidden(bool hidden) { hideInspector = hidden; }
         internal void InternalSetContextObject(UnityObject context) { m_Context = context; }
 
@@ -915,15 +954,29 @@ internal virtual void OnHeaderControlsGUI()
 
         internal void ShowOpenButton(UnityObject[] assets, bool enableCondition = true)
         {
-            enableCondition &= (CanOpenMultipleObjects() || assets.Length == 1);
+            int assetCount = assets != null? assets.Length : 0;
+            enableCondition &= (CanOpenMultipleObjects() || assetCount == 1);
             bool previousGUIState = GUI.enabled;
             GUI.enabled = enableCondition;
 
             if (GUILayout.Button(BaseStyles.open, EditorStyles.miniButton))
             {
-                if (!ShouldTryToMakeEditableOnOpen() || AssetDatabase.MakeEditable(
-                    assets.Select(AssetDatabase.GetAssetPath).ToArray(),
-                    "Do you want to check out this file or files?"))
+                bool openAssets = false;
+
+                // 'Check Out and Open' dialog
+                openAssets = AssetDatabase.MakeEditable(assets.Select(AssetDatabase.GetAssetPath).ToArray(),
+                    "Do you want to check out " +
+                    (assetCount > 1 ? String.Format("these {0} files?", assetCount) : "this file?"));
+
+                // 'Open multiple assets' dialog
+                if (openAssets && assetCount > 1)
+                {
+                    openAssets = (EditorUtility.DisplayDialog("Open Selected Assets?",
+                        String.Format("Are you sure you want to open {0} selected assets?", assetCount), "Open",
+                        "Cancel"));
+                }
+
+                if (openAssets)
                 {
                     AssetDatabase.OpenAsset(assets);
                     GUIUtility.ExitGUI();
@@ -1062,6 +1115,11 @@ internal static Rect DrawHeaderGUI(Editor editor, string header, float leftMargi
             else
                 titleRect = new Rect(r.x + kImageSectionWidth, r.y + 6, r.width - kImageSectionWidth, titleHeight);
 
+            if (editor && editor.hasUnsavedChanges && !string.IsNullOrEmpty(header))
+            {
+                header += " *";
+            }
+
             // Title
             if (editor)
                 editor.OnHeaderTitleGUI(titleRect, header);
@@ -1088,7 +1146,7 @@ internal static Rect DrawHeaderGUI(Editor editor, string header, float leftMargi
 
         internal static void CheckForMainObjectNameMismatch(Editor editor)
         {
-            if (editor && editor.target && AssetDatabase.IsNativeAsset(editor.target) && AssetDatabase.IsMainAsset(editor.target))
+            if (editor && editor.target && AssetDatabase.IsNativeAsset(editor.target) && AssetDatabase.IsMainAsset(editor.target) && !Unsupported.GetSerializedAssetInterfaceSingleton(editor.target.name))
             {
                 var mainObjectName = editor.target.name;
                 var fileName = FileUtil.GetLastPathNameComponent(AssetDatabase.GetAssetPath(editor.target));
diff --git a/Editor/Mono/Inspector/EditorDragging.cs b/Editor/Mono/Inspector/EditorDragging.cs
index 5ea1884e13..a8f8d4f572 100644
--- a/Editor/Mono/Inspector/EditorDragging.cs
+++ b/Editor/Mono/Inspector/EditorDragging.cs
@@ -97,7 +97,7 @@ void HandleNativeDragDropInBottomArea(Editor[] editors, Rect rect)
                 return;
             }
 
-            DragAndDrop.visualMode = DragAndDrop.Drop(DragAndDropWindowTarget.inspector, editor.targets, Event.current.type == EventType.DragPerform);
+            DragAndDrop.visualMode = DragAndDrop.DropOnInspectorWindow(editor.targets, Event.current.type == EventType.DragPerform);
 
             if (Event.current.type == EventType.DragPerform)
             {
diff --git a/Editor/Mono/Inspector/EditorElementUpdater.cs b/Editor/Mono/Inspector/EditorElementUpdater.cs
index 10cbd88e3d..488371110c 100644
--- a/Editor/Mono/Inspector/EditorElementUpdater.cs
+++ b/Editor/Mono/Inspector/EditorElementUpdater.cs
@@ -65,8 +65,8 @@ public void CreateMinimumInspectorElementsWithoutLayout(int count)
         /// <param name="count">The number of elements to create.</param>
         public void CreateInspectorElementsWithoutLayout(int count)
         {
-            for (var i = 0; m_Index < m_EditorElements.Count && i < count; i++, m_Index++)
-                m_EditorElements[m_Index].CreateInspectorElement();
+            for (var i = 0; m_Index < m_EditorElements.Count && i < count; i++)
+                m_EditorElements[m_Index++].CreateInspectorElement();
         }
 
         /// <summary>
diff --git a/Editor/Mono/Inspector/EditorSettingsInspector.cs b/Editor/Mono/Inspector/EditorSettingsInspector.cs
index ea4006544c..85e7c1c8bb 100644
--- a/Editor/Mono/Inspector/EditorSettingsInspector.cs
+++ b/Editor/Mono/Inspector/EditorSettingsInspector.cs
@@ -92,6 +92,9 @@ class Content
 
             public static readonly GUIContent numberingScheme = EditorGUIUtility.TrTextContent("Numbering Scheme");
 
+            public static readonly GUIContent inspectorSettings = EditorGUIUtility.TrTextContent("Inspector");
+            public static readonly GUIContent inspectorUseIMGUIDefaultInspector = EditorGUIUtility.TrTextContent("Use IMGUI Default Inspector", "Revert to using IMGUI to generate Default Inspectors where no custom Inspector/Editor was defined.");
+
             public static readonly GUIContent[] numberingSchemeNames =
             {
                 EditorGUIUtility.TrTextContent("Prefab (1)", "Number in parentheses"),
@@ -268,6 +271,7 @@ public PopupElement(string id, string content)
         SerializedProperty m_ProjectGenerationIncludedExtensions;
         SerializedProperty m_ProjectGenerationRootNamespace;
         SerializedProperty m_CacheServerValidationMode;
+        SerializedProperty m_InspectorUseIMGUIDefaultInspector;
 
         bool m_IsGlobalSettings;
 
@@ -361,6 +365,9 @@ public void OnEnable()
 
             m_CacheServerConnectionState = CacheServerConnectionState.Unknown;
 
+            m_InspectorUseIMGUIDefaultInspector = serializedObject.FindProperty("m_InspectorUseIMGUIDefaultInspector");
+            Assert.IsNotNull(m_InspectorUseIMGUIDefaultInspector);
+
             m_IsGlobalSettings = EditorSettings.GetEditorSettings() == target;
         }
 
@@ -570,6 +577,7 @@ public override void OnInspectorGUI()
             DoShaderCompilationSettings();
             DoEnterPlayModeSettings();
             DoNumberingSchemeSettings();
+            DoEnterInspectorSettings();
 
             serializedObject.ApplyModifiedProperties();
             if (compressorsChanged)
@@ -658,7 +666,11 @@ private void DoAssetPipelineSettings()
                     if (parallelImportEnabledOld != parallelImportEnabledNew)
                         EditorSettings.refreshImportMode = parallelImportEnabledNew ? AssetDatabase.RefreshImportMode.OutOfProcessPerQueue : AssetDatabase.RefreshImportMode.InProcess;
                     if (GUILayout.Button(Content.parallelImportLearnMore, EditorStyles.linkLabel))
-                        Application.OpenURL("https://docs.unity3d.com/Manual/ParallelImport.html");
+                    {
+                        // Known issue with Docs redirect - versioned pages might not open offline docs
+                        var help = Help.FindHelpNamed("ParallelImport");
+                        Application.OpenURL(help);
+                    }
                 GUILayout.EndHorizontal();
             }
 
@@ -731,7 +743,9 @@ private void DoCacheServerSettings()
 
             if (GUILayout.Button(Content.cacheServerLearnMore, EditorStyles.linkLabel))
             {
-                Application.OpenURL("https://docs.unity3d.com/Manual/UnityAccelerator.html#UsingWithAssetPipeline");
+                // Known issue with Docs redirect - versioned pages might not open offline docs
+                var help = Help.FindHelpNamed("UnityAccelerator");
+                Application.OpenURL(help);
             }
             GUILayout.EndHorizontal();
 
@@ -952,6 +966,33 @@ private void DoEnterPlayModeSettings()
             EditorGUI.indentLevel--;
         }
 
+        private void DoEnterInspectorSettings()
+        {
+            GUILayout.Space(10);
+            GUILayout.Label(Content.inspectorSettings, EditorStyles.boldLabel);
+
+            EditorGUI.BeginChangeCheck();
+            EditorGUILayout.PropertyField(m_InspectorUseIMGUIDefaultInspector, Content.inspectorUseIMGUIDefaultInspector);
+            if (EditorGUI.EndChangeCheck() && m_IsGlobalSettings)
+            {
+                EditorSettings.inspectorUseIMGUIDefaultInspector = m_InspectorUseIMGUIDefaultInspector.boolValue;
+
+                // Needs to be delayCall because it forces redrawing of UI which messes with the current IMGUI context of the Settings window.
+                EditorApplication.delayCall += ClearEditorsAndRebuildInspectors;
+            }
+        }
+
+        static void ClearEditorsAndRebuildInspectors()
+        {
+            // Cannot use something like EditorUtility.ForceRebuildInspectors() because this only refreshes
+            // the inspector's values and IMGUI state, but otherwise, if the target did not change we
+            // re-use the Editors. We need a special clear function to properly recreate the UI using
+            // the new setting.
+            var propertyEditors = Resources.FindObjectsOfTypeAll<PropertyEditor>();
+            foreach (var propertyEditor in propertyEditors)
+                propertyEditor.ClearEditorsAndRebuild();
+        }
+
         static int GetIndexById(DevDevice[] elements, string id, int defaultIndex)
         {
             for (int i = 0; i < elements.Length; i++)
@@ -1044,6 +1085,13 @@ internal static void DoPopup(Rect popupRect, PopupElement[] elements, int select
         private void SetAssetSerializationMode(object data)
         {
             int popupIndex = (int)data;
+
+            if (m_SerializationMode.intValue == popupIndex) return;
+
+            if (!EditorUtility.DisplayDialog("Change Asset Serialization Mode?",
+                    "Changing the serialization method for assets may force a reimport of some or all assets immediately in the project.\n\nAre you sure you wish to change the asset serialization mode?",
+                    "Yes", "No")) return;
+
             m_SerializationMode.intValue = popupIndex;
             if (m_IsGlobalSettings)
                 EditorSettings.serializationMode = (SerializationMode)popupIndex;
diff --git a/Editor/Mono/Inspector/Effector2DEditor.cs b/Editor/Mono/Inspector/Effector2DEditor.cs
index 47e495d96e..6c1446287b 100644
--- a/Editor/Mono/Inspector/Effector2DEditor.cs
+++ b/Editor/Mono/Inspector/Effector2DEditor.cs
@@ -85,6 +85,12 @@ public static void CheckEffectorWarnings(Collider2D collider)
                     return;
             }
 
+            // If there is an effector (we are using it here) and it's using its collider-mask and we're using overrides then we need to highlight that they are not used here.
+            if (effector != null && effector.useColliderMask && (collider.includeLayers != 0 || collider.excludeLayers != 0))
+            {
+                EditorGUILayout.HelpBox("This collider has Layer Overrides set but these are not used because the '" + effector.GetType().Name + "' component is using its Collider Mask option.", MessageType.Warning);
+            }
+
             // Handle collision/trigger effector preferences.
             if (effector.designedForNonTrigger && collider.isTrigger)
             {
diff --git a/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs b/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs
index 656728fe2c..28b31cd483 100644
--- a/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs
+++ b/Editor/Mono/Inspector/Enlighten/LightmapParameters.cs
@@ -91,7 +91,8 @@ public override void OnInspectorGUI()
             }
 
             EditorGUILayout.PropertyField(m_AntiAliasingSamples, Styles.antiAliasingSamplesContent);
-            EditorGUILayout.Slider(m_Pushoff, 0.0f, 1.0f, Styles.pushoffContent);
+            const float minPushOff = 0.0001f; // Keep in sync with PLM_MIN_PUSHOFF
+            EditorGUILayout.Slider(m_Pushoff, minPushOff, 1.0f, Styles.pushoffContent);
             EditorGUILayout.PropertyField(m_BakedLightmapTag, Styles.bakedLightmapTagContent);
             using (new EditorGUI.DisabledScope(usesEnlightenBackend))
             {
diff --git a/Editor/Mono/Inspector/GameObjectInspector.cs b/Editor/Mono/Inspector/GameObjectInspector.cs
index 2db1c3fcb8..360e979cc9 100644
--- a/Editor/Mono/Inspector/GameObjectInspector.cs
+++ b/Editor/Mono/Inspector/GameObjectInspector.cs
@@ -130,6 +130,9 @@ bool IsPrefabFileTooLargeForInteractivePreview(UnityObject prefabObject)
 
                 var artifactKey = new ArtifactKey(new GUID(guidString));
                 var artifactID = AssetDatabaseExperimental.LookupArtifact(artifactKey);
+                // The artifactID can be invalid if we are in the middle of an AssetDatabase.Refresh.
+                if (!artifactID.isValid)
+                    return false;
                 AssetDatabaseExperimental.GetArtifactPaths(artifactID, out var paths);
                 if (paths.Length != 1)
                 {
diff --git a/Editor/Mono/Inspector/GenericInspector.cs b/Editor/Mono/Inspector/GenericInspector.cs
index 263dd5117e..debe3050f8 100644
--- a/Editor/Mono/Inspector/GenericInspector.cs
+++ b/Editor/Mono/Inspector/GenericInspector.cs
@@ -125,6 +125,12 @@ internal override bool OnOptimizedInspectorGUI(Rect contentRect)
             {
                 while (property.NextVisible(childrenAreExpanded))
                 {
+                    if (GUI.isInsideList && property.depth <= EditorGUI.GetInsideListDepth())
+                        EditorGUI.EndIsInsideList();
+
+                    if (property.isArray)
+                        EditorGUI.BeginIsInsideList(property.depth);
+
                     var handler = ScriptAttributeUtility.GetHandler(property);
                     var hasPropertyDrawer = handler.propertyDrawer != null;
                     childrenAreExpanded = !hasPropertyDrawer && property.isExpanded && EditorGUI.HasVisibleChildFields(property);
diff --git a/Editor/Mono/Inspector/GraphicsSettingsInspector.cs b/Editor/Mono/Inspector/GraphicsSettingsInspector.cs
index 7cb08bb622..8ba091cbc9 100644
--- a/Editor/Mono/Inspector/GraphicsSettingsInspector.cs
+++ b/Editor/Mono/Inspector/GraphicsSettingsInspector.cs
@@ -29,6 +29,17 @@ internal class Styles
             public static readonly GUIContent shaderStrippingSettings = EditorGUIUtility.TrTextContent("Shader Stripping");
             public static readonly GUIContent shaderPreloadSettings = EditorGUIUtility.TrTextContent("Shader Loading");
             public static readonly GUIContent logWhenShaderIsCompiled = EditorGUIUtility.TrTextContent("Log Shader Compilation", "When enabled, the player will print shader information each time a shader is being compiled (development and debug mode only).");
+            public static readonly GUIContent lightProbeOutsideHullStrategy = EditorGUIUtility.TrTextContent("Renderer Light Probe Selection", "Finding the Light Probes closest to a Renderer positioned outside of the tetrahedral Light Probe hull can be very expensive in terms of CPU cycles. Use this option to configure if Unity should spend time searching the hull to find the closest probe, or if it should use the global Ambient Probe instead.");
+            public static readonly int[] lightProbeOutsideHullStrategyValues =
+            {
+                (int)LightProbeOutsideHullStrategy.kLightProbeSearchTetrahedralHull,
+                (int)LightProbeOutsideHullStrategy.kLightProbeUseAmbientProbe
+            };
+            public static readonly GUIContent[] lightProbeOutsideHullStrategyStrings =
+            {
+                EditorGUIUtility.TrTextContent("Find closest Light Probe"),
+                EditorGUIUtility.TrTextContent("Use Ambient Probe"),
+            };
             public static readonly GUIContent cameraSettings = EditorGUIUtility.TrTextContent("Camera Settings");
             public static readonly GUIContent renderPipeSettings = EditorGUIUtility.TrTextContent("Scriptable Render Pipeline Settings", "This defines the default render pipeline, which Unity uses when there is no override for a given quality level.");
             public static readonly GUIContent renderPipeLabel = EditorGUIUtility.TrTextContent("Scriptable Render Pipeline");
@@ -44,6 +55,7 @@ internal class Styles
         SerializedProperty m_TransparencySortAxis;
         SerializedProperty m_ScriptableRenderLoop;
         SerializedProperty m_LogWhenShaderIsCompiled;
+        SerializedProperty m_LightProbeOutsideHullStrategy;
 
         Object graphicsSettings
         {
@@ -86,6 +98,7 @@ public void OnEnable()
             m_TransparencySortAxis = serializedObject.FindProperty("m_TransparencySortAxis");
             m_ScriptableRenderLoop = serializedObject.FindProperty("m_CustomRenderPipeline");
             m_LogWhenShaderIsCompiled = serializedObject.FindProperty("m_LogWhenShaderIsCompiled");
+            m_LightProbeOutsideHullStrategy = serializedObject.FindProperty("m_LightProbeOutsideHullStrategy");
             tierSettingsAnimator = new AnimatedValues.AnimBool(showTierSettingsUI, Repaint);
         }
 
@@ -137,7 +150,7 @@ public override void OnInspectorGUI()
             serializedObject.Update();
 
             GUILayout.Label(Styles.renderPipeSettings, EditorStyles.boldLabel);
-            RenderPipelineAssetSelector.Draw(serializedObject, m_ScriptableRenderLoop);
+            EditorGUI.RenderPipelineAssetField(serializedObject, m_ScriptableRenderLoop);
             EditorGUILayout.Space();
 
             bool usingSRP = GraphicsSettings.currentRenderPipeline != null;
@@ -182,6 +195,8 @@ public override void OnInspectorGUI()
             EditorGUILayout.Space();
             GUILayout.Label(Styles.shaderPreloadSettings, EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(m_LogWhenShaderIsCompiled, Styles.logWhenShaderIsCompiled);
+            EditorGUILayout.IntPopup(m_LightProbeOutsideHullStrategy, Styles.lightProbeOutsideHullStrategyStrings, Styles.lightProbeOutsideHullStrategyValues, Styles.lightProbeOutsideHullStrategy);
+
             shaderPreloadEditor.OnInspectorGUI();
 
             serializedObject.ApplyModifiedProperties();
diff --git a/Editor/Mono/Inspector/InspectorWindow.cs b/Editor/Mono/Inspector/InspectorWindow.cs
index 08ab597219..11511ce87f 100644
--- a/Editor/Mono/Inspector/InspectorWindow.cs
+++ b/Editor/Mono/Inspector/InspectorWindow.cs
@@ -436,12 +436,8 @@ internal static void ApplyChanges()
             {
                 foreach (var editor in inspector.tracker.activeEditors)
                 {
-                    AssetImporterEditor assetImporterEditor = editor as AssetImporterEditor;
-
-                    if (assetImporterEditor != null && assetImporterEditor.HasModified())
-                    {
-                        assetImporterEditor.ApplyAndImport();
-                    }
+                    if(editor.hasUnsavedChanges)
+                        editor.SaveChanges();
                 }
             }
         }
diff --git a/Editor/Mono/Inspector/Joint2DEditor.cs b/Editor/Mono/Inspector/Joint2DEditor.cs
index 891fce133d..6af62b42cc 100644
--- a/Editor/Mono/Inspector/Joint2DEditor.cs
+++ b/Editor/Mono/Inspector/Joint2DEditor.cs
@@ -11,11 +11,13 @@ namespace UnityEditor
     [CanEditMultipleObjects]
     internal class Joint2DEditor : Editor
     {
+        SerializedProperty m_BreakAction;
         SerializedProperty m_BreakForce;
         SerializedProperty m_BreakTorque;
 
         public void OnEnable()
         {
+            m_BreakAction = serializedObject.FindProperty("m_BreakAction");
             m_BreakForce = serializedObject.FindProperty("m_BreakForce");
             m_BreakTorque = serializedObject.FindProperty("m_BreakTorque");
         }
@@ -36,6 +38,7 @@ public override void OnInspectorGUI()
 
             base.OnInspectorGUI();
 
+            EditorGUILayout.PropertyField(m_BreakAction);
             EditorGUILayout.PropertyField(m_BreakForce);
 
             // Distance/Spring/Target joints produce no reaction torque so they're not supported.
diff --git a/Editor/Mono/Inspector/LODGroupEditor.cs b/Editor/Mono/Inspector/LODGroupEditor.cs
index 9ec02df3fd..88700e4f67 100644
--- a/Editor/Mono/Inspector/LODGroupEditor.cs
+++ b/Editor/Mono/Inspector/LODGroupEditor.cs
@@ -62,7 +62,7 @@ void InitAndSetFoldoutLabelTextures()
             }
         }
 
-        void OnUndoRedoPerformed()
+        void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             if (target == null || serializedObject == null)
                 return;
@@ -109,7 +109,7 @@ void OnEnable()
 
             m_TargetTransform = (target as LODGroup)?.gameObject?.transform;
 
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
             Repaint();
         }
 
@@ -175,7 +175,7 @@ protected virtual void AddLODRendererMeshToList(ReorderableList list)
         void OnDisable()
         {
             EditorApplication.update -= Update;
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
 
             m_ShowAnimateCrossFading.valueChanged.RemoveListener(Repaint);
             m_ShowFadeTransitionWidth.valueChanged.RemoveListener(Repaint);
diff --git a/Editor/Mono/Inspector/LightEditor.cs b/Editor/Mono/Inspector/LightEditor.cs
index b7c228362b..a6f8393b8a 100644
--- a/Editor/Mono/Inspector/LightEditor.cs
+++ b/Editor/Mono/Inspector/LightEditor.cs
@@ -487,48 +487,26 @@ public void DrawBounceIntensity()
                 }
             }
 
-            Object TextureValidator(Object[] references, System.Type objType, SerializedProperty property, EditorGUI.ObjectFieldValidatorOptions options)
+            static Object TextureValidator(Object[] references, System.Type objType, SerializedProperty property, EditorGUI.ObjectFieldValidatorOptions options)
             {
-                LightType lightTypeInfo = (LightType)lightType.intValue;
-                Object assetTexture = null;
-                foreach (Object assetObject in references)
+                // Accept RenderTextures of correct dimension
+                Texture validated = (RenderTexture)EditorGUI.ValidateObjectFieldAssignment(references, typeof(RenderTexture), property, options);
+                if (validated != null)
                 {
-                    if (assetObject is Texture texture)
-                    {
-                        if (assetTexture == null)
-                        {
-                            assetTexture = texture;
-                        }
-
-                        switch (lightTypeInfo)
-                        {
-                            case LightType.Spot:
-                            case LightType.Directional:
-                                if (texture is Texture2D)
-                                    return assetObject;
-                                break;
-
-                            case LightType.Point:
-                                if (texture is Cubemap)
-                                    return assetObject;
-                                break;
-
-                            default:
-                                if (texture is Texture)
-                                    return assetObject;
-                                break;
-                        }
-                    }
-                }
-
-                if (assetTexture != null && typeof(RenderTexture).IsAssignableFrom(assetTexture.GetType()))
-                {
-                    return assetTexture;
+                    if (objType == typeof(Texture2D) && validated.dimension != TextureDimension.Tex2D)
+                        validated = null;
+                    else if (objType == typeof(Texture3D) && validated.dimension != TextureDimension.Tex3D)
+                        validated = null;
+                    else if (objType == typeof(Cubemap) && validated.dimension != TextureDimension.Cube)
+                        validated = null;
                 }
-                return null;
+                // Accept regular textures
+                if (validated == null)
+                    validated = (Texture)EditorGUI.ValidateObjectFieldAssignment(references, objType, property, options);
+                return validated;
             }
 
-            void TexturePropertyBody(Rect position, SerializedProperty prop, LightType cookieLightType)
+            static void TexturePropertyBody(Rect position, SerializedProperty prop, LightType cookieLightType)
             {
                 EditorGUI.BeginChangeCheck();
                 int controlID = GUIUtility.GetControlID(12354, FocusType.Keyboard, position);
@@ -538,6 +516,8 @@ void TexturePropertyBody(Rect position, SerializedProperty prop, LightType cooki
                 {
                     case LightType.Spot:
                     case LightType.Directional:
+                    case LightType.Rectangle:
+                    case LightType.Disc:
                         type = typeof(Texture2D);
                         break;
 
diff --git a/Editor/Mono/Inspector/LightProbeGroupInspector.cs b/Editor/Mono/Inspector/LightProbeGroupInspector.cs
index 4668ed30c7..a32bbffc56 100644
--- a/Editor/Mono/Inspector/LightProbeGroupInspector.cs
+++ b/Editor/Mono/Inspector/LightProbeGroupInspector.cs
@@ -36,8 +36,8 @@ internal class LightProbeGroupEditor : IEditablePoint
         public LightProbeGroupEditor(LightProbeGroup group)
         {
             m_Group = group;
-            m_ShouldRecalculateTetrahedra = false;
-            m_SourcePositionsDirty = false;
+            m_ShouldRecalculateTetrahedra = true;
+            m_SourcePositionsDirty = true;
             m_SerializedSelectedProbes = ScriptableObject.CreateInstance<LightProbeGroupSelection>();
             m_SerializedSelectedProbes.hideFlags = HideFlags.HideAndDontSave;
         }
@@ -543,7 +543,7 @@ public void OnEnable()
 
             m_Editor.drawTetrahedra = new SavedBool($"{target.GetType()}.drawTetrahedra", true);
 
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             EditMode.editModeStarted += OnEditModeStarted;
             EditMode.editModeEnded += OnEditModeEnded;
         }
@@ -595,7 +595,7 @@ private void EndEditProbes()
         public void OnDisable()
         {
             EndEditProbes();
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent-= UndoRedoPerformed;
             EditMode.editModeStarted -= OnEditModeStarted;
             EditMode.editModeEnded -= OnEditModeEnded;
 
@@ -606,7 +606,7 @@ public void OnDisable()
             }
         }
 
-        private void UndoRedoPerformed()
+        private void UndoRedoPerformed(in UndoRedoInfo info)
         {
             // Update the cached probe positions from the ones just restored in the LightProbeGroup
             m_Editor.PullProbePositions();
diff --git a/Editor/Mono/Inspector/LightingSettingsEditor.cs b/Editor/Mono/Inspector/LightingSettingsEditor.cs
index 3cf49a5bf7..47a2fce421 100644
--- a/Editor/Mono/Inspector/LightingSettingsEditor.cs
+++ b/Editor/Mono/Inspector/LightingSettingsEditor.cs
@@ -164,13 +164,6 @@ static class Styles
                 EditorGUIUtility.TrTextContent("None")
             };
 
-            public static readonly GUIContent[] helpStringsMixed =
-            {
-                EditorGUIUtility.TrTextContent("Mixed lights provide realtime direct lighting while indirect light is baked into lightmaps and light probes."),
-                EditorGUIUtility.TrTextContent("Mixed lights provide baked direct and indirect lighting for static objects. Dynamic objects receive realtime direct lighting and cast shadows on static objects using the main directional light in the scene."),
-                EditorGUIUtility.TrTextContent("Mixed lights provide realtime direct lighting. Indirect lighting gets baked into lightmaps and light probes. Shadowmasks and light probes occlusion get generated for baked shadows. ")
-            };
-
             public static readonly int[] lightmapCompressionValues =
             {
                 (int)LightmapCompression.None,
@@ -226,7 +219,7 @@ static class Styles
             public static readonly GUIContent finalGather = EditorGUIUtility.TrTextContent("Final Gather", "Specifies whether the final light bounce of the global illumination calculation is calculated at the same resolution as the baked lightmap. When enabled, visual quality is improved at the cost of additional time required to bake the lighting.");
             public static readonly GUIContent finalGatherRayCount = EditorGUIUtility.TrTextContent("Ray Count", "Controls the number of rays emitted for every final gather point.");
             public static readonly GUIContent finalGatherFiltering = EditorGUIUtility.TrTextContent("Denoising", "Controls whether a denoising filter is applied to the final gather output.");
-            public static readonly GUIContent mixedLightMode = EditorGUIUtility.TrTextContent("Lighting Mode", "Specifies which Scene lighting mode will be used for all Mixed lights in the Scene. Options are Baked Indirect, Shadowmask and Subtractive.");
+            public static readonly GUIContent mixedLightMode = EditorGUIUtility.TrTextContent("Lighting Mode", "Specifies the lighting mode of all Mixed lights in the Scene.");
             public static readonly GUIContent useRealtimeGI = EditorGUIUtility.TrTextContent("Realtime Global Illumination", "Precomputed Realtime Global Illumination using Enlighten. Provides diffuse Realtime Global Illumination for static geometry via low resolution lightmaps and via Light Probes for dynamic geometry.");
             public static readonly GUIContent bakedGIDisabledInfo = EditorGUIUtility.TrTextContent("All Baked and Mixed lights in the Scene are currently being overridden to Realtime light modes. Enable Baked Global Illumination to allow the use of Baked and Mixed light modes.");
             public static readonly GUIContent bakeBackend = EditorGUIUtility.TrTextContent("Lightmapper", "Specifies which baking system will be used to generate baked lightmaps.");
@@ -253,6 +246,9 @@ static class Styles
             public static readonly GUIContent environmentImportanceSampling = EditorGUIUtility.TrTextContent("Importance Sampling", "Specifies whether to use importance sampling for sampling environment lighting. In most environments importance sampling facilitates faster convergence while generating lightmaps. In certain low frequency environments, importance sampling can produce noisy results.");
             public static readonly GUIContent environmentSampleCount = EditorGUIUtility.TrTextContent("Environment Samples", "Controls the number of samples the lightmapper will use for environment lighting calculations. Increasing this value may improve the quality of lightmaps but increases the time required for baking to complete.");
             public static readonly GUIContent probeSampleCountMultiplier = EditorGUIUtility.TrTextContent("Light Probe Sample Multiplier", "Controls how many samples are used for Light Probes as a multiplier of the general sample counts above. Higher values improve the quality of Light Probes, but also take longer to bake. Enable the Light Probe sample count multiplier by disabling Project Settings > Editor > Use legacy Light Probe sample counts");
+            public static readonly GUIContent texelsPerUnit = EditorGUIUtility.TrTextContent(" texels per unit");
+            public static readonly GUIContent texels = EditorGUIUtility.TrTextContent(" texels");
+            public static readonly GUIContent sigma = EditorGUIUtility.TrTextContent(" sigma");
 
             public static readonly GUIStyle labelStyle = EditorStyles.wordWrappedMiniLabel;
         }
@@ -415,7 +411,7 @@ void RealtimeLightingGUI(bool compact)
 
                 using (new EditorGUI.DisabledScope((m_BakeBackend.intValue != (int)LightingSettings.Lightmapper.Enlighten) && !enableRealtimeGI))
                 {
-                    DrawResolutionField(m_RealtimeResolution, Styles.indirectResolution);
+                    DrawPropertyFieldWithPostfixLabel(m_RealtimeResolution, Styles.indirectResolution, Styles.texelsPerUnit);
                 }
 
                 EditorGUI.indentLevel -= 2;
@@ -479,20 +475,10 @@ void MixedLightingGUI(bool compact)
                         }
                         EditorGUI.EndProperty();
 
-                        if (mixedGISupported)
+                        if (mixedGISupported && !SupportedRenderingFeatures.IsMixedLightingModeSupported((MixedLightingMode)m_MixedBakeMode.intValue))
                         {
-                            if (!SupportedRenderingFeatures.IsMixedLightingModeSupported((MixedLightingMode)m_MixedBakeMode.intValue))
-                            {
-                                string fallbackMode = Styles.mixedModeStrings[(int)SupportedRenderingFeatures.FallbackMixedLightingMode()].text;
-                                EditorGUILayout.HelpBox(Styles.mixedModeNotSupportedWarning.text + fallbackMode, MessageType.Warning);
-                            }
-                            else if (enableBakedGI)
-                            {
-                                if (m_MixedBakeMode.intValue == (int)MixedLightingMode.Shadowmask)
-                                    EditorGUILayout.HelpBox(Styles.helpStringsMixed[m_MixedBakeMode.intValue].text + EditorGUIUtility.TrTextContent(SupportedRenderingFeatures.active.shadowmaskMessage).text, MessageType.Info);
-                                else
-                                    EditorGUILayout.HelpBox(Styles.helpStringsMixed[m_MixedBakeMode.intValue].text, MessageType.Info);
-                            }
+                            string fallbackMode = Styles.mixedModeStrings[(int)SupportedRenderingFeatures.FallbackMixedLightingMode()].text;
+                            EditorGUILayout.HelpBox(Styles.mixedModeNotSupportedWarning.text + fallbackMode, MessageType.Warning);
                         }
                     }
                 }
@@ -569,18 +555,7 @@ void GeneralLightmapSettingsGUI(bool compact)
                                         EditorGUILayout.PropertyField(m_LightProbeSampleCountMultiplier, Styles.probeSampleCountMultiplier);
                                     }
 
-                                    // Case 1320615: clamping of min bounces can be annoying because it resets when typing in a new max bounce value.
-                                    GUILayout.BeginHorizontal();
-                                    EditorGUILayout.PrefixLabel(Styles.bounces);
-                                    GUILayout.Space(-28);
-                                    int minBouncesValue = EditorGUILayout.DelayedIntField(m_PVRMinBounces.intValue, GUILayout.MaxWidth(80));
-                                    GUILayout.Label("minimum", EditorStyles.miniLabel);
-                                    int maxBouncesValue = EditorGUILayout.DelayedIntField(m_PVRBounces.intValue, GUILayout.MaxWidth(80));
-                                    GUILayout.Label("maximum", EditorStyles.miniLabel);
-                                    GUILayout.EndHorizontal();
-
-                                    m_PVRBounces.intValue = maxBouncesValue;
-                                    m_PVRMinBounces.intValue = minBouncesValue;
+                                    DrawBouncesField(m_PVRMinBounces, m_PVRBounces);
 
                                     // Filtering
                                     EditorGUILayout.PropertyField(m_PVRFilteringMode, Styles.filteringMode);
@@ -676,19 +651,16 @@ void GeneralLightmapSettingsGUI(bool compact)
                     // Show the Indirect Resolution field if the user is using Enlighten baked and the backend is supported.
                     if (bakedGISupported && (m_BakeBackend.intValue == (int)LightingSettings.Lightmapper.Enlighten) && lightmapperSupported)
                     {
-                        DrawResolutionField(m_RealtimeResolution, Styles.indirectResolution);
+                        DrawPropertyFieldWithPostfixLabel(m_RealtimeResolution, Styles.indirectResolution, Styles.texelsPerUnit);
                     }
 
                     if (bakedGISupported)
                     {
                         using (new EditorGUI.DisabledScope(!enableBakedGI))
                         {
-                            DrawResolutionField(m_BakeResolution, Styles.lightmapResolution);
+                            DrawPropertyFieldWithPostfixLabel(m_BakeResolution, Styles.lightmapResolution, Styles.texelsPerUnit);
 
-                            GUILayout.BeginHorizontal();
-                            EditorGUILayout.PropertyField(m_Padding, Styles.padding);
-                            GUILayout.Label(" texels", Styles.labelStyle);
-                            GUILayout.EndHorizontal();
+                            DrawPropertyFieldWithPostfixLabel(m_Padding, Styles.padding, Styles.texels);
 
                             EditorGUILayout.IntPopup(m_LightmapMaxSize, Styles.lightmapMaxSizeStrings, Styles.lightmapMaxSizeValues, Styles.lightmapMaxSize);
 
@@ -792,13 +764,68 @@ static bool PlayerHasSM20Support()
             return hasSM20Api;
         }
 
-        static void DrawResolutionField(SerializedProperty resolution, GUIContent label)
+        static void DrawBouncesField(SerializedProperty minimumProperty, SerializedProperty maximumProperty)
         {
-            GUILayout.BeginHorizontal();
-            EditorGUILayout.PropertyField(resolution, label);
+            Rect bounceLabelRect = GUILayoutUtility.GetRect(
+                EditorGUILayout.kLabelFloatMinW,
+                EditorGUILayout.kLabelFloatMaxW,
+                EditorGUI.kSingleLineHeight,
+                EditorGUI.kSingleLineHeight,
+                EditorStyles.numberField);
+
+            Rect remainingRect = EditorGUI.PrefixLabel(bounceLabelRect, Styles.bounces);
+
+            float subfieldWidth = remainingRect.width * 0.5f;
+
+            Rect inputRect = remainingRect;
+            Rect labelRect = remainingRect;
+
+            const float postfixLabelWidth = 53.0f;
+            const float minimumInputWidth = 30.0f;
+
+            inputRect.width = Mathf.Max(subfieldWidth - postfixLabelWidth, minimumInputWidth);
+            labelRect.x = labelRect.x + inputRect.width;
+
+            int indent = EditorGUI.indentLevel;
+            EditorGUI.indentLevel = 0;
+
+            minimumProperty.intValue = EditorGUI.DelayedIntField(inputRect, minimumProperty.intValue);
+            EditorGUI.LabelField(labelRect, GUIContent.Temp(" minimum"), EditorStyles.miniLabel);
+
+            inputRect.x += inputRect.width + postfixLabelWidth;
+            labelRect.x += inputRect.width + postfixLabelWidth;
+
+            maximumProperty.intValue = EditorGUI.DelayedIntField(inputRect, maximumProperty.intValue);
+            EditorGUI.LabelField(labelRect, GUIContent.Temp(" maximum"), EditorStyles.miniLabel);
 
-            GUILayout.Label(" texels per unit", Styles.labelStyle);
-            GUILayout.EndHorizontal();
+            EditorGUI.indentLevel = indent;
+        }
+
+        static void DrawPropertyFieldWithPostfixLabel(SerializedProperty property, GUIContent label, GUIContent postfixLabel)
+        {
+            const float minimumWidth = 170.0f;
+            const float postfixLabelWidth = 80.0f;
+
+            switch (property.propertyType)
+            {
+                case SerializedPropertyType.Float:
+                    DrawFieldWithPostfixLabel(
+                        (Rect propertyRect) => { property.floatValue = EditorGUI.FloatField(propertyRect, label, property.floatValue); },
+                        postfixLabel,
+                        EditorStyles.numberField,
+                        minimumWidth,
+                        postfixLabelWidth);
+                    break;
+
+                case SerializedPropertyType.Integer:
+                    DrawFieldWithPostfixLabel(
+                        (Rect propertyRect) => { property.intValue = EditorGUI.IntField(propertyRect, label, property.intValue); },
+                        postfixLabel,
+                        EditorStyles.numberField,
+                        minimumWidth,
+                        postfixLabelWidth);
+                    break;
+            }
         }
 
         static void DrawFilterSettingField(SerializedProperty gaussSetting,
@@ -807,23 +834,52 @@ static void DrawFilterSettingField(SerializedProperty gaussSetting,
             GUIContent atrousLabel,
             LightingSettings.FilterType type)
         {
-            if (type == LightingSettings.FilterType.None)
-                return;
+            const float minimumWidth = 230.0f;
+            const float postfixLabelWidth = 40.0f;
 
-            GUILayout.BeginHorizontal();
-
-            if (type == LightingSettings.FilterType.Gaussian)
+            switch(type)
             {
-                EditorGUILayout.IntSlider(gaussSetting, 0, 5, gaussLabel);
-                GUILayout.Label(" texels", Styles.labelStyle);
-            }
-            else if (type == LightingSettings.FilterType.ATrous)
-            {
-                EditorGUILayout.Slider(atrousSetting, 0.0f, 2.0f, atrousLabel);
-                GUILayout.Label(" sigma", Styles.labelStyle);
+                case LightingSettings.FilterType.Gaussian:
+                    DrawFieldWithPostfixLabel(
+                            (Rect propertyRect) => { EditorGUI.IntSlider(propertyRect, gaussSetting, 0, 5, gaussLabel); },
+                            Styles.texels,
+                            EditorStyles.toolbarSlider,
+                            minimumWidth,
+                            postfixLabelWidth);
+                    break;
+
+                case LightingSettings.FilterType.ATrous:
+                    DrawFieldWithPostfixLabel(
+                            (Rect propertyRect) => { EditorGUI.Slider(propertyRect, atrousSetting, 0.0f, 2.0f, atrousLabel); },
+                            Styles.sigma,
+                            EditorStyles.toolbarSlider,
+                            minimumWidth,
+                            postfixLabelWidth);
+                    break;
             }
+        }
+
+        static void DrawFieldWithPostfixLabel(Action<Rect> drawFieldLambda, GUIContent postfixLabel, GUIStyle style, float minWidth, float postfixLabelWidth)
+        {
+            Rect propertyRect = GUILayoutUtility.GetRect(
+                EditorGUILayout.kLabelFloatMinW,
+                EditorGUILayout.kLabelFloatMaxW,
+                EditorGUI.kSingleLineHeight,
+                EditorGUI.kSingleLineHeight,
+                style);
+
+            propertyRect.width = Mathf.Max(propertyRect.width - postfixLabelWidth, minWidth);
+
+            drawFieldLambda(propertyRect);
+
+            int indent = EditorGUI.indentLevel;
+            EditorGUI.indentLevel = 0;
+
+            Rect labelRect = propertyRect;
+            labelRect.x += propertyRect.width;
+            EditorGUI.LabelField(labelRect, postfixLabel, Styles.labelStyle);
 
-            GUILayout.EndHorizontal();
+            EditorGUI.indentLevel = indent;
         }
 
         static bool isBuiltIn(SerializedProperty prop)
diff --git a/Editor/Mono/Inspector/LineRendererCurveEditor.cs b/Editor/Mono/Inspector/LineRendererCurveEditor.cs
index 84a4b50193..203f2e2bc0 100644
--- a/Editor/Mono/Inspector/LineRendererCurveEditor.cs
+++ b/Editor/Mono/Inspector/LineRendererCurveEditor.cs
@@ -55,13 +55,13 @@ public void OnEnable(SerializedObject serializedObject)
             m_Editor.SetShownVRangeInsideMargins(0.0f, 1.0f);
             m_Editor.ignoreScrollWheelUntilClicked = true;
 
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
         }
 
         public void OnDisable()
         {
             m_Editor.OnDisable();
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
         }
 
         private CurveWrapper GetCurveWrapper(AnimationCurve curve)
@@ -93,7 +93,7 @@ public void SetAxisScalars(Vector2 scalars)
             m_Refresh = true;
         }
 
-        private void UndoRedoPerformed()
+        private void UndoRedoPerformed(in UndoRedoInfo info)
         {
             m_Refresh = true;
         }
diff --git a/Editor/Mono/Inspector/LineRendererEditor.cs b/Editor/Mono/Inspector/LineRendererEditor.cs
index 49990d4564..454a101e04 100644
--- a/Editor/Mono/Inspector/LineRendererEditor.cs
+++ b/Editor/Mono/Inspector/LineRendererEditor.cs
@@ -5,10 +5,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor.AnimatedValues;
+using UnityEditor.EditorTools;
 using UnityEditor.IMGUI.Controls;
-using UnityEditorInternal;
 using UnityEngine;
-using UnityEngine.Rendering;
 
 namespace UnityEditor
 {
@@ -36,33 +35,176 @@ class Styles
             public static readonly GUIContent textureMode = EditorGUIUtility.TrTextContent("Texture Mode", "Should the U coordinate be stretched or tiled?");
             public static readonly GUIContent textureScale = EditorGUIUtility.TrTextContent("Texture Scale", "Scale the texture along the UV coordinates using this multiplier.");
             public static readonly GUIContent tolerance = EditorGUIUtility.TrTextContent("Tolerance", "Used to evaluate which points should be removed from the line. A higher value results in a simpler line (fewer points). A value of 0 results in the exact same line with little to no reduction.");
-            public static readonly GUIStyle richTextMiniLabel = new GUIStyle(EditorStyles.miniLabel) { richText = true };
             public static readonly GUIContent shadowBias = EditorGUIUtility.TrTextContent("Shadow Bias", "Apply a shadow bias to prevent self-shadowing artifacts. The specified value is the proportion of the line width at each segment.");
             public static readonly GUIContent generateLightingData = EditorGUIUtility.TrTextContent("Generate Lighting Data", "Toggle generation of normal and tangent data, for use in lit shaders.");
             public static readonly GUIContent sceneTools = EditorGUIUtility.TrTextContent("Scene Tools");
             public static readonly GUIContent applyActiveColorSpace = EditorGUIUtility.TrTextContent("Apply Active Color Space", "When using Linear Rendering, colors will be converted appropriately before being passed to the GPU.");
+        }
+
+        abstract class LineRendererTool : EditorTool
+        {
+            protected LineRendererEditor pointEditor
+            {
+                get
+                {
+                    if (m_PointEditor == null)
+                        m_PointEditor = new LineRendererEditor(target as LineRenderer);
+                    return m_PointEditor;
+                }
+            }
+
+            public override void OnActivated()
+            {
+                pointEditor.Deselect();
+            }
+
+            public override void OnWillBeDeactivated()
+            {
+                pointEditor.Deselect();
+            }
+
+            public void RemoveInvalidSelections()
+            {
+                pointEditor.RemoveInvalidSelections();
+            }
+
+            public List<int> pointSelection
+            {
+                set => pointEditor.m_Selection = value;
+                get => pointEditor.m_Selection;
+            }
+
+            public Bounds selectedPositionsBounds
+            {
+                get => pointEditor.selectedPositionsBounds;
+            }
+
+            public override bool IsAvailable()
+            {
+                return !targets.Skip(1).Any(); // TODO - multi-edit disabled for now. Need to make LineRendererEditor support multiple targets, and fix m_IsGameObjectEditable
+            }
+
+            public abstract void DrawToolbar(SerializedProperty positions);
+            public virtual void OnSceneGUIDelegate(SerializedProperty positions, LineRendererPositionsView positionsView) { }
+
+            private LineRendererEditor m_PointEditor;
+        }
+
+        [EditorTool("Edit Points", typeof(LineRenderer))]
+        class LineRendererEditPointsTool : LineRendererTool
+        {
+            public override GUIContent toolbarIcon
+            {
+                get { return EditorGUIUtility.TrIconContent("EditCollider", "Edit LineRenderer Points in the Scene View."); }
+            }
+
+            public override void OnToolGUI(EditorWindow window)
+            {
+                pointEditor.EditSceneGUI(window);
+            }
+
+            public override void DrawToolbar(SerializedProperty positions)
+            {
+                EditorGUI.BeginChangeCheck();
+                LineRendererEditor.showWireframe = GUILayout.Toggle(LineRendererEditor.showWireframe, Styles.showWireframe);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    SceneView.RepaintAll();
+                }
+
+                bool adjacentPointsSelected = HasAdjacentPointsSelected();
+                using (new EditorGUI.DisabledGroupScope(!adjacentPointsSelected))
+                {
+                    GUILayout.BeginHorizontal();
+                    GUILayout.FlexibleSpace();
+                    if (GUILayout.Button(Styles.subdivide, GUILayout.Width(150)))
+                    {
+                        SubdivideSelected(positions);
+                    }
+                    GUILayout.EndHorizontal();
+                }
+            }
 
-            public static readonly GUIContent[] toolContents =
+            public override void OnSceneGUIDelegate(SerializedProperty positions, LineRendererPositionsView positionsView)
             {
-                EditorGUIUtility.IconContent("EditCollider", "|Edit Points in Scene View"),
-                EditorGUIUtility.IconContent("Toolbar Plus", "|Create Points in Scene View.")
-            };
+                // We need to wait for m_Positions to be updated next frame or we risk calling SetSelection with invalid indexes.
+                if (pointEditor.Count == positions.arraySize)
+                {
+                    if (positions.arraySize != positionsView.GetRows().Count)
+                        positionsView.Reload();
+                    positionsView.SetSelection(pointSelection, TreeViewSelectionOptions.RevealAndFrame);
+                }
+            }
 
-            public static readonly EditMode.SceneViewEditMode[] sceneViewEditModes = new[]
+            private bool HasAdjacentPointsSelected()
             {
-                EditMode.SceneViewEditMode.LineRendererEdit,
-                EditMode.SceneViewEditMode.LineRendererCreate
-            };
+                var selection = pointSelection;
+                selection.Sort();
+                if (selection.Count < 2)
+                    return false;
+
+                for (int i = 0; i < selection.Count - 1; ++i)
+                {
+                    if (selection[i + 1] == selection[i] + 1)
+                        return true;
+                }
+
+                return false;
+            }
 
-            public static readonly string baseSceneEditingToolText = "<color=grey>Line Renderer Scene Editing Mode:</color> ";
-            public static readonly GUIContent[] ToolNames =
+            private void SubdivideSelected(SerializedProperty positions)
             {
-                new GUIContent(L10n.Tr(baseSceneEditingToolText + "Edit Points"), ""),
-                new GUIContent(L10n.Tr(baseSceneEditingToolText + "Create Points"), "")
-            };
+                var selection = pointSelection;
+                if (selection.Count < 2)
+                    return;
+                selection.Sort();
+                var insertedIndexes = new List<int>();
+                int numInserted = 0; // As we insert new nodes, the selected indexes will become offset so we need to keep track of this.
+                for (int i = 0; i < selection.Count - 1; ++i)
+                {
+                    if (selection[i + 1] == selection[i] + 1)
+                    {
+                        int fromIndex = selection[i] + numInserted;
+                        int toIndex = selection[i + 1] + numInserted;
+                        var from = positions.GetArrayElementAtIndex(fromIndex).vector3Value;
+                        var to = positions.GetArrayElementAtIndex(toIndex).vector3Value;
+                        var midPoint = Vector3.Lerp(from, to, 0.5f);
+                        positions.InsertArrayElementAtIndex(toIndex);
+                        positions.GetArrayElementAtIndex(toIndex).vector3Value = midPoint;
+                        insertedIndexes.Add(toIndex);
+                        numInserted++;
+                    }
+                }
+
+                pointSelection = insertedIndexes;
+            }
         }
 
-        private bool m_EditingPositions;
+        [EditorTool("Add Points", typeof(LineRenderer))]
+        class LineRendererAddPointsTool : LineRendererTool
+        {
+            public override GUIContent toolbarIcon
+            {
+                get { return EditorGUIUtility.TrIconContent("Toolbar Plus", "Create LineRenderer Points in the Scene View."); }
+            }
+
+            public override void OnToolGUI(EditorWindow window)
+            {
+                pointEditor.CreateSceneGUI();
+            }
+
+            public override void DrawToolbar(SerializedProperty positions)
+            {
+                LineRendererEditor.inputMode = (LineRendererEditor.InputMode)EditorGUILayout.EnumPopup(Styles.inputMode, LineRendererEditor.inputMode);
+                if (LineRendererEditor.inputMode == LineRendererEditor.InputMode.PhysicsRaycast)
+                {
+                    LineRendererEditor.raycastMask = EditorGUILayout.LayerMaskField(LineRendererEditor.raycastMask, Styles.layerMask);
+                }
+
+                LineRendererEditor.createPointSeparation = EditorGUILayout.FloatField(Styles.pointSeparation, LineRendererEditor.createPointSeparation);
+                LineRendererEditor.creationOffset = EditorGUILayout.FloatField(Styles.normalOffset, LineRendererEditor.creationOffset);
+            }
+        }
 
         public static float simplifyTolerance
         {
@@ -79,7 +221,6 @@ public static bool showSimplifyPreview
         private Vector3[] m_PreviewPoints;
 
         private LineRendererCurveEditor m_CurveEditor = new LineRendererCurveEditor();
-        private LineRendererEditor m_PointEditor;
 
         private SerializedProperty m_Alignment;
         private SerializedProperty m_ColorGradient;
@@ -105,14 +246,9 @@ public static bool showSimplifyPreview
 
         public static readonly float kPositionsViewMinHeight = 30;
 
-        private static bool IsLineRendererEditMode(EditMode.SceneViewEditMode editMode)
+        private LineRendererTool activeSceneViewTool
         {
-            return editMode == EditMode.SceneViewEditMode.LineRendererEdit || editMode == EditMode.SceneViewEditMode.LineRendererCreate;
-        }
-
-        private bool sceneViewEditing
-        {
-            get { return IsLineRendererEditMode(EditMode.editMode) && EditMode.IsOwner(this); }
+            get { return EditorToolManager.activeTool as LineRendererTool; }
         }
 
         private bool canEditInScene
@@ -125,13 +261,9 @@ public override void OnEnable()
             base.OnEnable();
 
             var lineRenderer = target as LineRenderer;
-            m_PointEditor = new LineRendererEditor(lineRenderer, this);
 
-            m_PointEditor.Deselect();
             SceneView.duringSceneGui += OnSceneGUIDelegate;
-            Undo.undoRedoPerformed += UndoRedoPerformed;
-            EditMode.onEditModeStartDelegate += EditModeStarted;
-            EditMode.onEditModeEndDelegate += EditModeEnded;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             m_CurveEditor.OnEnable(serializedObject);
 
             m_Loop = serializedObject.FindProperty("m_Loop");
@@ -188,81 +320,33 @@ void OnPropertyContextMenu(GenericMenu menu, SerializedProperty property)
 
         void PositionsViewSelectionChanged(List<int> selected)
         {
-            m_PointEditor.m_Selection = selected;
+            var sceneTool = activeSceneViewTool;
+            if (sceneTool != null)
+                sceneTool.pointSelection = selected;
+
             SceneView.RepaintAll();
         }
 
         public void OnDisable()
         {
             m_CurveEditor.OnDisable();
-            EndEditPositions();
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
             SceneView.duringSceneGui -= OnSceneGUIDelegate;
             EditorApplication.contextualPropertyMenu -= OnPropertyContextMenu;
         }
 
-        private void UndoRedoPerformed()
+        private void UndoRedoPerformed(in UndoRedoInfo info)
         {
-            m_PointEditor.RemoveInvalidSelections();
             m_PositionsView.Reload();
-            m_PositionsView.SetSelection(m_PointEditor.m_Selection);
-            ResetSimplifyPreview();
-        }
-
-        private void EditModeEnded(Editor editor)
-        {
-            if (editor == this)
-            {
-                EndEditPositions();
-            }
-        }
-
-        private void EditModeStarted(Editor editor, EditMode.SceneViewEditMode mode)
-        {
-            if (editor == this && IsLineRendererEditMode(mode))
-            {
-                StartEditPositions();
-            }
-        }
-
-        private void DrawEditPointTools()
-        {
-            EditorGUI.BeginChangeCheck();
-            LineRendererEditor.showWireframe = GUILayout.Toggle(LineRendererEditor.showWireframe, Styles.showWireframe);
-            if (EditorGUI.EndChangeCheck())
-            {
-                SceneView.RepaintAll();
-            }
-
-            bool adjacentPointsSelected = HasAdjacentPointsSelected();
-            using (new EditorGUI.DisabledGroupScope(!adjacentPointsSelected))
-            {
-                GUILayout.BeginHorizontal();
-                GUILayout.FlexibleSpace();
-                if (GUILayout.Button(Styles.subdivide, GUILayout.Width(150)))
-                {
-                    SubdivideSelected();
-                }
-                GUILayout.EndHorizontal();
-            }
-        }
 
-        private static void CreatePointTools()
-        {
-            LineRendererEditor.inputMode = (LineRendererEditor.InputMode)EditorGUILayout.EnumPopup(Styles.inputMode, LineRendererEditor.inputMode);
-            if (LineRendererEditor.inputMode == LineRendererEditor.InputMode.PhysicsRaycast)
+            var sceneTool = activeSceneViewTool;
+            if (sceneTool != null)
             {
-                LineRendererEditor.raycastMask = EditorGUILayout.LayerMaskField(LineRendererEditor.raycastMask, Styles.layerMask);
+                sceneTool.RemoveInvalidSelections();
+                m_PositionsView.SetSelection(sceneTool.pointSelection);
             }
 
-            LineRendererEditor.createPointSeparation = EditorGUILayout.FloatField(Styles.pointSeparation, LineRendererEditor.createPointSeparation);
-            LineRendererEditor.creationOffset = EditorGUILayout.FloatField(Styles.normalOffset, LineRendererEditor.creationOffset);
-        }
-
-        Bounds GetBounds()
-        {
-            var lineRenderer = (target as LineRenderer);
-            return m_Positions.arraySize > 0 ? lineRenderer.bounds : new Bounds(lineRenderer.useWorldSpace ? lineRenderer.transform.position : Vector3.zero, Vector3.zero);
+            ResetSimplifyPreview();
         }
 
         private void DrawToolbar()
@@ -273,43 +357,17 @@ private void DrawToolbar()
             }
 
             EditorGUILayout.BeginVertical("GroupBox");
-            GUILayout.Label(Styles.sceneTools);
 
             EditorGUI.BeginDisabled(!canEditInScene);
-            EditorGUILayout.Space();
-            GUILayout.BeginHorizontal();
-            GUILayout.FlexibleSpace();
-            EditMode.DoInspectorToolbar(Styles.sceneViewEditModes, Styles.toolContents, GetBounds, this);
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-
-            // Tools box
-            GUILayout.BeginVertical(EditorStyles.helpBox);
-            string helpText = Styles.baseSceneEditingToolText;
-            if (sceneViewEditing)
-            {
-                int index = ArrayUtility.IndexOf(Styles.sceneViewEditModes, EditMode.editMode);
-                if (index >= 0)
-                    helpText = Styles.ToolNames[index].text;
-            }
-
-            GUILayout.Label(helpText, Styles.richTextMiniLabel);
-            GUILayout.EndVertical();
+            EditorGUILayout.EditorToolbarForTarget(Styles.sceneTools, this);
 
             // Editing mode toolbar
-            if (sceneViewEditing)
+            var sceneTools = activeSceneViewTool;
+            if (sceneTools != null)
             {
-                switch (EditMode.editMode)
-                {
-                    case EditMode.SceneViewEditMode.LineRendererEdit:
-                        DrawEditPointTools();
-                        break;
-                    case EditMode.SceneViewEditMode.LineRendererCreate:
-                        CreatePointTools();
-                        break;
-                }
+                sceneTools.DrawToolbar(m_Positions);
             }
-            if (!sceneViewEditing)
+            else
             {
                 EditorGUI.BeginChangeCheck();
                 showSimplifyPreview = EditorGUILayout.Toggle(Styles.simplifyPreview, showSimplifyPreview);
@@ -333,49 +391,6 @@ private void DrawToolbar()
             EditorGUILayout.EndVertical();
         }
 
-        private bool HasAdjacentPointsSelected()
-        {
-            var selection = m_PointEditor.m_Selection;
-            selection.Sort();
-            if (selection.Count < 2)
-                return false;
-
-            for (int i = 0; i < selection.Count - 1; ++i)
-            {
-                if (selection[i + 1] == selection[i] + 1)
-                    return true;
-            }
-
-            return false;
-        }
-
-        private void SubdivideSelected()
-        {
-            var selection = m_PointEditor.m_Selection;
-            if (selection.Count < 2)
-                return;
-            selection.Sort();
-            var insertedIndexes = new List<int>();
-            int numInserted = 0; // As we insert new nodes, the selected indexes will become offset so we need to keep track of this.
-            for (int i = 0; i < selection.Count - 1; ++i)
-            {
-                if (selection[i + 1] == selection[i] + 1)
-                {
-                    int fromIndex = selection[i] + numInserted;
-                    int toIndex = selection[i + 1] + numInserted;
-                    var from = m_Positions.GetArrayElementAtIndex(fromIndex).vector3Value;
-                    var to = m_Positions.GetArrayElementAtIndex(toIndex).vector3Value;
-                    var midPoint = Vector3.Lerp(from, to, 0.5f);
-                    m_Positions.InsertArrayElementAtIndex(toIndex);
-                    m_Positions.GetArrayElementAtIndex(toIndex).vector3Value = midPoint;
-                    insertedIndexes.Add(toIndex);
-                    numInserted++;
-                }
-            }
-
-            m_PointEditor.m_Selection = insertedIndexes;
-        }
-
         private void SimplifyPoints()
         {
             var lineRenderer = target as LineRenderer;
@@ -468,76 +483,37 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
 
-        public void StartEditPositions()
-        {
-            if (m_EditingPositions)
-                return;
-
-            m_EditingPositions = true;
-            Tools.s_Hidden = true;
-            SceneView.RepaintAll();
-        }
-
-        public void EndEditPositions()
-        {
-            if (!m_EditingPositions)
-                return;
-
-            if (m_PointEditor != null)
-                m_PointEditor.Deselect();
-
-            ResetSimplifyPreview();
-            Tools.s_Hidden = false;
-            SceneView.RepaintAll();
-        }
-
-        void InternalOnSceneView()
+        public void OnSceneGUIDelegate(SceneView sceneView)
         {
-            switch (EditMode.editMode)
+            var sceneTool = activeSceneViewTool;
+            if (sceneTool != null)
             {
-                case EditMode.SceneViewEditMode.LineRendererEdit:
-                    m_PointEditor.EditSceneGUI();
-
-                    // We need to wait for m_Positions to be updated next frame or we risk calling SetSelection with invalid indexes.
-                    if (m_PointEditor.Count != m_Positions.arraySize)
-                        break;
-
-                    if (m_Positions.arraySize != m_PositionsView.GetRows().Count)
-                    {
-                        m_PositionsView.Reload();
-                        ResetSimplifyPreview();
-                    }
-                    m_PositionsView.SetSelection(m_PointEditor.m_Selection, TreeViewSelectionOptions.RevealAndFrame);
-                    break;
-                case EditMode.SceneViewEditMode.LineRendererCreate:
-                    m_PointEditor.CreateSceneGUI();
-                    break;
+                sceneTool.OnSceneGUIDelegate(m_Positions, m_PositionsView);
+                ResetSimplifyPreview();
             }
-        }
-
-        public void OnSceneGUIDelegate(SceneView sceneView)
-        {
-            if (m_EditingPositions)
-                InternalOnSceneView();
-
-            if (!sceneViewEditing)
+            else
+            {
                 DrawSimplifyPreview();
+            }
         }
 
         public bool HasFrameBounds()
         {
-            return m_EditingPositions && m_PointEditor.m_Selection.Count > 0;
+            var sceneTool = activeSceneViewTool;
+            return (sceneTool != null) && (sceneTool.pointSelection.Count > 0);
         }
 
         public Bounds OnGetFrameBounds()
         {
-            return m_PointEditor.selectedPositionsBounds;
+            var sceneTool = activeSceneViewTool;
+            return (sceneTool != null) ? sceneTool.selectedPositionsBounds : new Bounds();
         }
 
         internal override Bounds GetWorldBoundsOfTarget(Object targetObject)
         {
-            if (sceneViewEditing)
-                return OnGetFrameBounds();
+            var sceneTool = activeSceneViewTool;
+            if (sceneTool != null)
+                return sceneTool.selectedPositionsBounds;
             return base.GetWorldBoundsOfTarget(targetObject);
         }
     }
diff --git a/Editor/Mono/Inspector/LineRendererToolModes.cs b/Editor/Mono/Inspector/LineRendererToolModes.cs
index 4e8a803b08..72c4051bc1 100644
--- a/Editor/Mono/Inspector/LineRendererToolModes.cs
+++ b/Editor/Mono/Inspector/LineRendererToolModes.cs
@@ -17,7 +17,6 @@ public enum InputMode
         }
 
         private LineRenderer m_LineRenderer;
-        private LineRendererInspector m_Inspector;
         public List<int> m_Selection = new List<int>();
 
         public static float createPointSeparation
@@ -53,10 +52,9 @@ public static bool showWireframe
         private static readonly Color kCloudColor = new Color(200f / 255f, 200f / 255f, 20f / 255f, 0.85f);
         private static readonly Color kSelectedCloudColor = new Color(.3f, .6f, 1, 1);
 
-        public LineRendererEditor(LineRenderer lineRenderer, LineRendererInspector inspector)
+        public LineRendererEditor(LineRenderer lineRenderer)
         {
             m_LineRenderer = lineRenderer;
-            m_Inspector = inspector;
         }
 
         public void Deselect()
@@ -64,7 +62,7 @@ public void Deselect()
             m_Selection.Clear();
         }
 
-        public void HandleEditMenuHotKeyCommands()
+        public void HandleEditMenuHotKeyCommands(EditorWindow window)
         {
             //Handle other events!
             if (Event.current.type == EventType.ValidateCommand
@@ -86,7 +84,7 @@ public void HandleEditMenuHotKeyCommands()
                         break;
                     case "SelectAll":
                         if (execute)
-                            SelectAllPoints();
+                            SelectAllPoints(window);
                         Event.current.Use();
                         break;
                     case "Cut":
@@ -107,12 +105,12 @@ public void RemoveInvalidSelections()
             m_Selection = m_Selection.Where(o => o < points).ToList();
         }
 
-        public void SelectAllPoints()
+        private void SelectAllPoints(EditorWindow window)
         {
             m_Selection.Clear();
             for (int i = 0; i < m_LineRenderer.positionCount; ++i)
                 m_Selection.Add(i);
-            m_Inspector.Repaint();
+            window.Repaint();
         }
 
         public void DestroySelected()
@@ -199,7 +197,7 @@ public void CreateSceneGUI()
             PointCreator.Draw();
         }
 
-        public void EditSceneGUI()
+        public void EditSceneGUI(EditorWindow window)
         {
             Transform transform = m_LineRenderer.useWorldSpace ? null : m_LineRenderer.transform;
 
@@ -212,7 +210,7 @@ public void EditSceneGUI()
             if (showWireframe)
                 DrawWireframe();
 
-            HandleEditMenuHotKeyCommands();
+            HandleEditMenuHotKeyCommands(window);
         }
 
         public int Count { get { return m_LineRenderer.positionCount; } }
diff --git a/Editor/Mono/Inspector/MaskFieldDropdown.cs b/Editor/Mono/Inspector/MaskFieldDropdown.cs
index 46a3f9afc8..0ec71e088f 100644
--- a/Editor/Mono/Inspector/MaskFieldDropdown.cs
+++ b/Editor/Mono/Inspector/MaskFieldDropdown.cs
@@ -234,18 +234,18 @@ public override void OnOpen()
             }
             m_windowSize = Mathf.Clamp(m_windowSize, 100, Screen.currentResolution.width * 0.95f);
 
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
         }
 
         public override void OnClose()
         {
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
             Event.current?.Use();
             MaskFieldGUI.DestroyMaskCallBackInfo();
             base.OnClose();
         }
 
-        void OnUndoRedoPerformed()
+        void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             editorWindow.Close();
         }
@@ -368,16 +368,16 @@ public override void OnOpen()
             }
 
             GetMultiSelectionValues(m_SerializedProperty, out m_SelectionMaskValues, out m_SelectionMatch, m_OptionCount);
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
         }
 
         public override void OnClose()
         {
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
             base.OnClose();
         }
 
-        void OnUndoRedoPerformed()
+        void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             editorWindow.Close();
         }
diff --git a/Editor/Mono/Inspector/MaterialEditor.cs b/Editor/Mono/Inspector/MaterialEditor.cs
index 4d53cd8eee..c489ff4496 100644
--- a/Editor/Mono/Inspector/MaterialEditor.cs
+++ b/Editor/Mono/Inspector/MaterialEditor.cs
@@ -14,6 +14,7 @@
 using UnityEngine.Scripting;
 using VirtualTexturing = UnityEngine.Rendering.VirtualTexturing;
 using StackValidationResult = UnityEngine.Rendering.VirtualTexturing.EditorHelpers.StackValidationResult;
+using System.IO;
 
 namespace UnityEditor
 {
@@ -71,17 +72,36 @@ private static class Styles
 
             public const string undoAssignMaterial = "Assign Material";
             public const string undoAssignSkyboxMaterial = "Assign Skybox Material";
+
+            public static readonly GUIContent parentContent = EditorGUIUtility.TrTextContent("Parent", "Specify the parent of this material.");
+            public static readonly GUIContent hierarchyIcon = EditorGUIUtility.IconContent("UnityEditor.SceneHierarchyWindow", "|Open Material Hierarchy Popup."); // right of | means tooltip
+            public static readonly GUIContent convertIcon = EditorGUIUtility.IconContent("d_RotateTool", "|This material is in a conversion process."); // right of | means tooltip
+
+            public const int kPadding = 3;
+            public const int kHierarchyIconWidth = 44;
+            public const float kSpaceForFoldoutArrow = 10f;
         }
 
         private static readonly List<MaterialEditor> s_MaterialEditors = new List<MaterialEditor>(4);
+        private int m_VariantCountCache = -1, m_HasMixedParentCache = -1;
         private bool m_CheckSetup;
 
         private static int s_ControlHash = "EditorTextField".GetHashCode();
         const float kSpacingUnderTexture = 6f;
         const float kMiniWarningMessageHeight = 27f;
+        private static Color kAmbientLightColor = new Color(0.2f, 0.2f, 0.2f, 0);
 
         private MaterialPropertyBlock m_PropertyBlock;
 
+        internal override string targetTitle
+        {
+            get
+            {
+                var typeName = AllTargetsAreVariants() ? "Material Variant" : "Material";
+                return (!m_AllowMultiObjectAccess || targets.Length == 1) ? target.name + " (" + typeName + ")" : targets.Length + " " + typeName + "s";
+            }
+        }
+
         private enum PreviewType
         {
             Mesh = 0,
@@ -111,8 +131,6 @@ private static bool DoesPreviewAllowRotation(PreviewType type)
         public bool isVisible { get { return firstInspectedEditor || InternalEditorUtility.GetIsInspectorExpanded(target); } }
 
         private Shader m_Shader;
-        private SerializedProperty m_EnableInstancing;
-        private SerializedProperty m_DoubleSidedGI;
 
         private string                      m_InfoMessage;
         private Vector2                     m_PreviewDir = new Vector2(0, -20);
@@ -132,6 +150,9 @@ private static bool DoesPreviewAllowRotation(PreviewType type)
         Renderer[]                          m_RenderersForAnimationMode;
         Component                       m_MeshRendererComp;
 
+        internal enum ConvertAction { None, Flatten, Convert }
+        internal ConvertAction convertState;
+
         private bool ShouldEditorBeHidden()
         {
             //When a MeshRenderer is hidden in the inspector, the MaterialEditor should also be hidden
@@ -340,6 +361,158 @@ private void ShaderPopup(GUIStyle style)
             GUI.enabled = wasEnabled;
         }
 
+        bool HasMixedParent()
+        {
+            if (m_HasMixedParentCache != -1)
+                return m_HasMixedParentCache == 1;
+
+            m_HasMixedParentCache = 0;
+            if (targets.Length != 0)
+            {
+                var parent = ((Material)targets[0]).parent;
+                bool isVariant = ((Material)targets[0]).isVariant;
+                for (int i = 1; i < targets.Length; i++)
+                {
+                    if (((Material)targets[i]).parent != parent || ((Material)targets[i]).isVariant != isVariant)
+                    {
+                        m_HasMixedParentCache = 1;
+                        break;
+                    }
+                }
+            }
+            return m_HasMixedParentCache == 1;
+        }
+
+        int GetVariantCount()
+        {
+            if (m_VariantCountCache == -1)
+                m_VariantCountCache = GetVariantCount(targets);
+
+            return m_VariantCountCache;
+        }
+
+        bool AllTargetsAreVariants()
+        {
+            return GetVariantCount() == targets.Length;
+        }
+
+        // returns true if mat is a child of any element of the targets array
+        private static bool IsChildOfAnyTarget(Material mat, Object[] targets)
+        {
+            foreach (var target in targets)
+            {
+                if (mat == target || mat.IsChildOf(target as Material))
+                    return true;
+            }
+            return false;
+        }
+
+        private static Material HandleParentDragAndDrop(Rect rect, int controlID, EventType eventType, Object[] targets)
+        {
+            Material parent = (targets[0] as Material).parent;
+
+            // We handle drag and drop ourselves because we accept assets containing a material artifact
+            if (eventType == EventType.DragUpdated || eventType == EventType.DragPerform)
+            {
+                if (rect.Contains(Event.current.mousePosition) && GUI.enabled)
+                {
+                    Object[] references = DragAndDrop.objectReferences;
+                    Material validatedObject = EditorGUI.ValidateObjectFieldAssignment(references, typeof(Material), null, EditorGUI.ObjectFieldValidatorOptions.None) as Material;
+                    if (validatedObject == null)
+                    {
+                        foreach (var asset in AssetDatabase.LoadAllAssetsAtPath(AssetDatabase.GetAssetPath(validatedObject)))
+                        {
+                            validatedObject = asset as Material;
+                            if (validatedObject)
+                                break;
+                        }
+                    }
+                    if (validatedObject != null && !IsChildOfAnyTarget(validatedObject, targets))
+                    {
+                        DragAndDrop.visualMode = DragAndDropVisualMode.Generic;
+                        if (eventType == EventType.DragPerform)
+                        {
+                            GUI.changed = true;
+                            DragAndDrop.AcceptDrag();
+                            DragAndDrop.activeControlID = 0;
+                            parent = validatedObject;
+                        }
+                        else
+                            DragAndDrop.activeControlID = controlID;
+                    }
+                    Event.current.Use();
+                }
+            }
+            return parent;
+        }
+
+        private static bool HasMissingParent(Material material)
+        {
+            return material.isVariant && material.parent == null;
+        }
+
+        private static Material DoParentObjectField(Rect rect, Object[] targets)
+        {
+            // This is an augmented object field, preventing cyclic dependencies in the material hierarchy, handling missing parent, and with custom drap and drop rejection
+
+            int controlID = GUIUtility.GetControlID(FocusType.Keyboard, rect);
+            var eventType = Event.current.type;
+
+            Material parent = HandleParentDragAndDrop(rect, controlID, eventType, targets);
+
+            if (eventType == EventType.Repaint && HasMissingParent(targets[0] as Material))
+            {
+                GUIContent content = EditorGUIUtility.TempContent("Missing (Material)");
+
+                var mousePos = Event.current.mousePosition;
+                Rect buttonRect = EditorStyles.objectFieldButton.margin.Remove(new Rect(rect.xMax - 19, rect.y, 19, rect.height));
+
+                EditorGUI.BeginHandleMixedValueContentColor();
+                EditorStyles.objectField.Draw(rect, content, controlID, DragAndDrop.activeControlID == controlID, rect.Contains(mousePos));
+                EditorStyles.objectFieldButton.Draw(buttonRect, GUIContent.none, controlID, DragAndDrop.activeControlID == controlID, buttonRect.Contains(mousePos));
+                EditorGUI.EndHandleMixedValueContentColor();
+                return parent;
+            }
+
+            return EditorGUI.DoObjectField(rect, rect, controlID, parent, null, typeof(Material), null, true) as Material;
+        }
+
+        internal void ParentField(Rect rect, bool showMixedValue = false)
+        {
+            rect = EditorGUI.PrefixLabel(rect, Styles.parentContent);
+
+            EditorGUI.BeginChangeCheck();
+            EditorGUI.showMixedValue = showMixedValue;
+            var parent = DoParentObjectField(rect, targets);
+            EditorGUI.showMixedValue = false;
+            if (EditorGUI.EndChangeCheck())
+            {
+                convertState = ConvertAction.None;
+                Undo.RecordObjects(targets, "Assign parent");
+                foreach (Material target in targets)
+                    target.parent = parent;
+            }
+        }
+
+        private bool DoHierarchyButton()
+        {
+            bool clicked = EditorGUILayout.DropdownButton(GUIContent.none, FocusType.Passive, GUILayout.MaxWidth(Styles.kHierarchyIconWidth));
+
+            Rect rect = GUILayoutUtility.topLevel.GetLast();
+            rect.x += 6;
+            if (convertState == ConvertAction.Convert)
+            {
+                float height = rect.height;
+                rect.height *= 0.8f;
+                rect.y += (height - rect.height) * 0.5f;
+                EditorGUI.LabelField(rect, Styles.convertIcon);
+            }
+            else
+                EditorGUI.LabelField(rect, Styles.hierarchyIcon);
+
+            return clicked;
+        }
+
         private class ShaderSelectionDropdown : AdvancedDropdown
         {
             Action<object> m_OnSelectedShaderPopup;
@@ -782,8 +955,7 @@ protected override void OnHeaderGUI()
             if (ShouldEditorBeHidden())
                 return;
 
-            const float spaceForFoldoutArrow = 10f;
-            Rect titleRect = DrawHeaderGUI(this, targetTitle, firstInspectedEditor ? 0 : spaceForFoldoutArrow);
+            Rect titleRect = DrawHeaderGUI(this, targetTitle, firstInspectedEditor ? 0 : Styles.kSpaceForFoldoutArrow);
             int id = GUIUtility.GetControlID(45678, FocusType.Passive);
 
             if (!firstInspectedEditor)
@@ -801,28 +973,50 @@ protected override void OnHeaderGUI()
 
         internal override void OnHeaderControlsGUI()
         {
+            // Clear cache in case material is modified externally
+            m_VariantCountCache = -1;
+            m_HasMixedParentCache = -1;
+
             if (ShouldEditorBeHidden())
                 return;
 
             serializedObject.Update();
 
             var oldLabelWidth = EditorGUIUtility.labelWidth;
+            EditorGUIUtility.labelWidth = 50;
 
-            using (new EditorGUI.DisabledScope(!IsEnabled()))
-            {
-                EditorGUIUtility.labelWidth = 50;
-
-                // Shader selection dropdown
+            // Shader selection dropdown
+            using (new EditorGUI.DisabledScope(!IsEnabled() || GetVariantCount() != 0))
                 ShaderPopup("MiniPulldown");
 
-                // Edit button for custom shaders
-                if (m_Shader != null && !HasMultipleMixedShaderValues() && (m_Shader.hideFlags & HideFlags.DontSave) == 0)
+            // Edit button for custom shaders
+            if (m_Shader != null && !HasMultipleMixedShaderValues() && (m_Shader.hideFlags & HideFlags.DontSave) == 0)
+            {
+                if (GUILayout.Button("Edit...", EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
+                    AssetDatabase.OpenAsset(m_Shader);
+            }
+
+            using (new EditorGUI.DisabledScope(targets.Length != 1))
+            {
+                if (DoHierarchyButton())
                 {
-                    if (GUILayout.Button("Edit...", EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
-                        AssetDatabase.OpenAsset(m_Shader);
+                    var rect = GUILayoutUtility.topLevel.GetLast();
+                    PopupWindow.Show(rect, new MaterialHierarchyPopup(target as Material, IsEnabled(), this, rect));
+                    GUIUtility.ExitGUI();
                 }
             }
 
+            if (AllTargetsAreVariants() || convertState == ConvertAction.Convert)
+            {
+                // Start a new line for parent
+                EditorGUILayout.EndHorizontal();
+                EditorGUILayout.BeginHorizontal();
+                if (!firstInspectedEditor)
+                    GUILayout.Space(Styles.kSpaceForFoldoutArrow);
+                using (new EditorGUI.DisabledScope(!IsEnabled()))
+                    ParentField(EditorGUILayout.GetControlRect(), HasMixedParent());
+            }
+
             EditorGUIUtility.labelWidth = oldLabelWidth;
         }
 
@@ -958,6 +1152,69 @@ public void SetTextureOffset(string propertyName, Vector2 value, int coord)
             }
         }
 
+        // -------- helper functions to handle material variant overrides
+
+        internal static int GetVariantCount(Object[] targets)
+        {
+            int count = 0;
+            foreach (Material target in targets)
+                count += target.isVariant ? 1 : 0;
+            return count;
+        }
+
+        static bool AllTargetsAreVariants(Object[] targets)
+        {
+            return GetVariantCount(targets) == targets.Length;
+        }
+
+        static MaterialSerializedProperty GetMaterialSerializedProperty(SerializedProperty property)
+        {
+            if (property.propertyPath == "m_LightmapFlags")
+                return MaterialSerializedProperty.LightmapFlags;
+            if (property.propertyPath == "m_EnableInstancingVariants")
+                return MaterialSerializedProperty.EnableInstancingVariants;
+            if (property.propertyPath == "m_DoubleSidedGI")
+                return MaterialSerializedProperty.DoubleSidedGI;
+            if (property.propertyPath == "m_CustomRenderQueue")
+                return MaterialSerializedProperty.CustomRenderQueue;
+            throw new ArgumentException(string.Format("The SerializedProperty '{0}' is not supported by BeginProperty.", property.propertyPath));
+        }
+
+        internal static void BeginProperty(MaterialSerializedProperty property, Object[] targets)
+        {
+            MaterialProperty.BeginProperty(property, targets);
+        }
+
+        internal static void BeginProperty(Rect rect, MaterialSerializedProperty property, Object[] targets)
+        {
+            MaterialProperty.BeginProperty(rect, null, property, targets);
+        }
+
+        public static void BeginProperty(SerializedProperty property)
+        {
+            MaterialProperty.BeginProperty(GetMaterialSerializedProperty(property), property.serializedObject.targetObjects);
+        }
+
+        public static void BeginProperty(Rect rect, SerializedProperty property)
+        {
+            MaterialProperty.BeginProperty(rect, null, GetMaterialSerializedProperty(property), property.serializedObject.targetObjects);
+        }
+
+        public static void BeginProperty(MaterialProperty property)
+        {
+            MaterialProperty.BeginProperty(property, property.targets);
+        }
+
+        public static void BeginProperty(Rect rect, MaterialProperty property)
+        {
+            MaterialProperty.BeginProperty(rect, property, 0, property.targets);
+        }
+
+        public static void EndProperty()
+        {
+            MaterialProperty.EndProperty();
+        }
+
         // -------- helper functions to display common material controls
 
         // The 'Property' methods that accept GUIContent are internal with different name to avoid
@@ -987,8 +1244,9 @@ internal static float RangePropertyInternal(Rect position, MaterialProperty prop
 
         internal static float DoPowerRangeProperty(Rect position, MaterialProperty prop, GUIContent label, float power)
         {
+            BeginProperty(position, prop);
+
             EditorGUI.BeginChangeCheck();
-            EditorGUI.showMixedValue = prop.hasMixedValue;
 
             // For range properties we want to show the slider so we adjust label width to use default width (setting it to 0)
             // See SetDefaultGUIWidths where we set: EditorGUIUtility.labelWidth = GUIClip.visibleRect.width - EditorGUIUtility.fieldWidth - 17;
@@ -1001,20 +1259,22 @@ internal static float DoPowerRangeProperty(Rect position, MaterialProperty prop,
             float value = Mathf.Clamp(prop.floatValue, invert ? prop.rangeLimits.y : prop.rangeLimits.x, invert ? prop.rangeLimits.x : prop.rangeLimits.y);
 
             float newValue = EditorGUI.PowerSlider(position, label, value, prop.rangeLimits.x, prop.rangeLimits.y, power);
-            EditorGUI.showMixedValue = false;
 
             EditorGUIUtility.labelWidth = oldLabelWidth;
 
             if (EditorGUI.EndChangeCheck())
                 prop.floatValue = newValue;
 
+            EndProperty();
+
             return prop.floatValue;
         }
 
         internal static int DoIntRangeProperty(Rect position, MaterialProperty prop, GUIContent label)
         {
+            BeginProperty(position, prop);
+
             EditorGUI.BeginChangeCheck();
-            EditorGUI.showMixedValue = prop.hasMixedValue;
 
             // For range properties we want to show the slider so we adjust label width to use default width (setting it to 0)
             // See SetDefaultGUIWidths where we set: EditorGUIUtility.labelWidth = GUIClip.visibleRect.width - EditorGUIUtility.fieldWidth - 17;
@@ -1022,13 +1282,14 @@ internal static int DoIntRangeProperty(Rect position, MaterialProperty prop, GUI
             EditorGUIUtility.labelWidth = 0f;
 
             int newValue = EditorGUI.IntSlider(position, label, (int)prop.floatValue, (int)prop.rangeLimits.x, (int)prop.rangeLimits.y);
-            EditorGUI.showMixedValue = false;
 
             EditorGUIUtility.labelWidth = oldLabelWidth;
 
             if (EditorGUI.EndChangeCheck())
                 prop.floatValue = (float)newValue;
 
+            EndProperty();
+
             return (int)prop.floatValue;
         }
 
@@ -1050,13 +1311,15 @@ public int IntegerProperty(Rect position, MaterialProperty prop, string label)
 
         internal int IntegerPropertyInternal(Rect position, MaterialProperty prop, GUIContent label)
         {
+            BeginProperty(position, prop);
+
             EditorGUI.BeginChangeCheck();
-            EditorGUI.showMixedValue = prop.hasMixedValue;
             int newValue = EditorGUI.IntField(position, label, prop.intValue);
-            EditorGUI.showMixedValue = false;
             if (EditorGUI.EndChangeCheck())
                 prop.intValue = newValue;
 
+            EndProperty();
+
             return prop.intValue;
         }
 
@@ -1078,13 +1341,15 @@ public float FloatProperty(Rect position, MaterialProperty prop, string label)
 
         internal static float FloatPropertyInternal(Rect position, MaterialProperty prop, GUIContent label)
         {
+            BeginProperty(position, prop);
+
             EditorGUI.BeginChangeCheck();
-            EditorGUI.showMixedValue = prop.hasMixedValue;
             float newValue = EditorGUI.FloatField(position, label, prop.floatValue);
-            EditorGUI.showMixedValue = false;
             if (EditorGUI.EndChangeCheck())
                 prop.floatValue = newValue;
 
+            EndProperty();
+
             return prop.floatValue;
         }
 
@@ -1106,15 +1371,17 @@ public Color ColorProperty(Rect position, MaterialProperty prop, string label)
 
         internal static Color ColorPropertyInternal(Rect position, MaterialProperty prop, GUIContent label)
         {
+            BeginProperty(position, prop);
+
             EditorGUI.BeginChangeCheck();
-            EditorGUI.showMixedValue = prop.hasMixedValue;
             bool isHDR = ((prop.flags & MaterialProperty.PropFlags.HDR) != 0);
             bool showAlpha = true;
             Color newValue = EditorGUI.ColorField(position, label, prop.colorValue, true, showAlpha, isHDR);
-            EditorGUI.showMixedValue = false;
             if (EditorGUI.EndChangeCheck())
                 prop.colorValue = newValue;
 
+            EndProperty();
+
             return prop.colorValue;
         }
 
@@ -1131,8 +1398,9 @@ public Vector4 VectorProperty(Rect position, MaterialProperty prop, string label
 
         internal static Vector4 VectorPropertyInternal(in Rect position, in MaterialProperty prop, in string label)
         {
+            BeginProperty(position, prop);
+
             EditorGUI.BeginChangeCheck();
-            EditorGUI.showMixedValue = prop.hasMixedValue;
 
             // We want to make room for the field in case it's drawn on the same line as the label
             // Set label width to default width (zero) temporarily
@@ -1143,10 +1411,11 @@ internal static Vector4 VectorPropertyInternal(in Rect position, in MaterialProp
 
             EditorGUIUtility.labelWidth = oldLabelWidth;
 
-            EditorGUI.showMixedValue = false;
             if (EditorGUI.EndChangeCheck())
                 prop.vectorValue = newValue;
 
+            EndProperty();
+
             return prop.vectorValue;
         }
 
@@ -1168,6 +1437,8 @@ public float TextureScaleOffsetProperty(Rect position, MaterialProperty property
         {
             BeginAnimatedCheck(position, property);
 
+            BeginProperty(position, property);
+
             EditorGUI.BeginChangeCheck();
             // Mixed value mask is 4 bits for the uv offset & scale (First bit is for the texture itself)
             int mixedValuemask = property.mixedValueMask >> 1;
@@ -1176,6 +1447,8 @@ public float TextureScaleOffsetProperty(Rect position, MaterialProperty property
             if (EditorGUI.EndChangeCheck())
                 property.textureScaleAndOffset = scaleAndOffset;
 
+            EndProperty();
+
             EndAnimatedCheck();
             return 2 * kLineHeight;
         }
@@ -1257,6 +1530,8 @@ public void TextureCompatibilityWarning(MaterialProperty prop)
 
         public Texture TexturePropertyMiniThumbnail(Rect position, MaterialProperty prop, string label, string tooltip)
         {
+            BeginProperty(position, prop);
+
             BeginAnimatedCheck(position, prop);
             Rect thumbRect, labelRect;
             EditorGUI.GetRectsForMiniThumbnailField(position, out thumbRect, out labelRect);
@@ -1271,6 +1546,8 @@ public Texture TexturePropertyMiniThumbnail(Rect position, MaterialProperty prop
 
             TextureCompatibilityWarning(prop);
 
+            EndProperty();
+
             return retValue;
         }
 
@@ -1299,6 +1576,9 @@ public Texture TextureProperty(Rect position, MaterialProperty prop, string labe
 
         public Texture TextureProperty(Rect position, MaterialProperty prop, string label, string tooltip, bool scaleOffset)
         {
+            Rect scopeRect = new Rect(position.x, position.y, position.width, EditorGUI.lineHeight);
+            BeginProperty(scopeRect, prop);
+
             // Label
             EditorGUI.PrefixLabel(position, new GUIContent(label, tooltip));
 
@@ -1308,6 +1588,8 @@ public Texture TextureProperty(Rect position, MaterialProperty prop, string labe
             texPos.xMin = texPos.xMax - EditorGUIUtility.fieldWidth;
             Texture value = TexturePropertyBody(texPos, prop);
 
+            EndProperty();
+
             // UV scale and offset
             if (scaleOffset)
             {
@@ -1568,6 +1850,7 @@ public void LightmapEmissionProperty(Rect position, int labelIndent)
                     isMixed = true;
             }
 
+            BeginProperty(position, MaterialSerializedProperty.LightmapFlags, targets);
             EditorGUI.BeginChangeCheck();
 
             bool realtimeGISupported = SupportedRenderingFeatures.IsLightmapBakeTypeSupported(LightmapBakeType.Realtime);
@@ -1591,6 +1874,7 @@ public void LightmapEmissionProperty(Rect position, int labelIndent)
                 }
             }
 
+            EndProperty();
             EditorGUI.indentLevel -= labelIndent;
         }
 
@@ -1615,6 +1899,8 @@ public bool EmissionEnabledProperty()
                 }
             }
 
+            BeginProperty(MaterialSerializedProperty.LightmapFlags, targets);
+
             // initial checkbox for enabling/disabling emission
             EditorGUI.BeginChangeCheck();
             EditorGUI.showMixedValue = isMixed;
@@ -1622,12 +1908,16 @@ public bool EmissionEnabledProperty()
             EditorGUI.showMixedValue = false;
             if (EditorGUI.EndChangeCheck())
             {
+                RegisterPropertyChangeUndo("Emission Flags");
                 foreach (Material mat in materials)
                 {
                     mat.globalIlluminationFlags = enabled ? defaultEnabled : MaterialGlobalIlluminationFlags.EmissiveIsBlack;
                 }
+                EndProperty();
                 return enabled;
             }
+
+            EndProperty();
             return !isMixed && enabled;
         }
 
@@ -1666,6 +1956,7 @@ public void LightmapEmissionFlagsProperty(int indent, bool enabled, bool ignoreE
                 isMixed = isMixed || (materials[i].globalIlluminationFlags & any_em) != giFlags;
             }
 
+            BeginProperty(MaterialSerializedProperty.LightmapFlags, targets);
             EditorGUI.BeginChangeCheck();
 
             bool realtimeGISupported = SupportedRenderingFeatures.IsLightmapBakeTypeSupported(LightmapBakeType.Realtime);
@@ -1678,6 +1969,7 @@ public void LightmapEmissionFlagsProperty(int indent, bool enabled, bool ignoreE
             EditorGUI.showMixedValue = false;
 
             // Apply flags. But only the part that this tool modifies (RealtimeEmissive, BakedEmissive, None)
+            RegisterPropertyChangeUndo("Emission Flags");
             bool applyFlags = EditorGUI.EndChangeCheck();
             foreach (Material mat in materials)
             {
@@ -1687,6 +1979,8 @@ public void LightmapEmissionFlagsProperty(int indent, bool enabled, bool ignoreE
                     FixupEmissiveFlag(mat);
                 }
             }
+
+            EndProperty();
         }
 
         void ShaderPropertyInternal(Rect position, MaterialProperty prop, GUIContent label)
@@ -1938,6 +2232,16 @@ public void SetDefaultGUIWidths()
             EditorGUIUtility.labelWidth = GUIClip.visibleRect.width - EditorGUIUtility.fieldWidth - 25;
         }
 
+        internal override bool GetOptimizedGUIBlock(bool isDirty, bool isVisible, out float height)
+        {
+            // Shift UI to the right to leave space for locks
+            // Done here because it's the only place between the creation of the vertical group and the call ot OnInspectorGUI
+            // And because OnInspectorGUI might be overriden by a user editor
+            var style = GUILayoutUtility.topLevel.style = new GUIStyle(GUILayoutUtility.topLevel.style);
+            style.padding.left += (int)EditorGUI.kIndentPerLevel;
+            return base.GetOptimizedGUIBlock(isDirty, isVisible, out height);
+        }
+
         private bool IsMaterialEditor(string customEditorName)
         {
             string unityEditorFullName = "UnityEditor." + customEditorName; // for convenience: adding UnityEditor namespace is not needed in the shader
@@ -1975,17 +2279,6 @@ void CreateCustomShaderEditorIfNeeded(Shader shader)
 
         public bool PropertiesGUI()
         {
-            // OnInspectorGUI is wrapped inside a BeginVertical/EndVertical block that adds padding,
-            // which we don't want here so we could have the VC bar span the entire Material Editor width
-            // we stop the vertical block, draw the VC bar, and then start a new vertical block with the same style.
-            var style = GUILayoutUtility.topLevel.style;
-            EditorGUILayout.EndVertical();
-
-            // setting the GUI to enabled where the VC status bar is drawn because it gets disabled by the parent inspector
-            // for non-checked out materials, and we need the version control status bar to be always active
-            bool wasGUIEnabled = GUI.enabled;
-            GUI.enabled = true;
-
             // Material Editor is the first inspected editor when accessed through the Project panel
             // and this is the scenario where we do not want to redraw the VC status bar
             // since InspectorWindow already takes care of that. Otherwise, the Material Editor
@@ -1993,11 +2286,22 @@ public bool PropertiesGUI()
             // thus we draw the VC status bar
             if (!firstInspectedEditor)
             {
+                // OnInspectorGUI is wrapped inside a BeginVertical/EndVertical block that adds padding,
+                // which we don't want here so we could have the VC bar span the entire Material Editor width
+                // we stop the vertical block, draw the VC bar, and then start a new vertical block with the same style.
+                var style = GUILayoutUtility.topLevel.style;
+                EditorGUILayout.EndVertical();
+
+                // setting the GUI to enabled where the VC status bar is drawn because it gets disabled by the parent inspector
+                // for non-checked out materials, and we need the version control status bar to be always active
+                bool wasGUIEnabled = GUI.enabled;
+                GUI.enabled = true;
+
                 PropertyEditor.VersionControlBar(this);
-            }
 
-            GUI.enabled = wasGUIEnabled;
-            EditorGUILayout.BeginVertical(style);
+                GUI.enabled = wasGUIEnabled;
+                EditorGUILayout.BeginVertical(style);
+            }
 
             var eventType = Event.current.type;
             bool isRunningCommand = eventType == EventType.ExecuteCommand || eventType == EventType.ValidateCommand;
@@ -2266,6 +2570,8 @@ public sealed override Texture2D RenderStaticPreview(string assetPath, Object[]
 
             var previewRenderUtility = GetPreviewRendererUtility();
             EditorUtility.SetCameraAnimateMaterials(previewRenderUtility.camera, true);
+            previewRenderUtility.ambientColor = kAmbientLightColor;
+
             previewRenderUtility.BeginStaticPreview(new Rect(0, 0, width, height));
             StreamRenderResources();
             DoRenderPreview(previewRenderUtility, true);
@@ -2375,7 +2681,7 @@ private void DoRenderPreview(PreviewRenderUtility previewRenderUtility, bool ove
                 previewRenderUtility.lights[1].intensity = 1.0f;
             }
 
-            previewRenderUtility.ambientColor = new Color(.2f, .2f, .2f, 0);
+            previewRenderUtility.ambientColor = kAmbientLightColor;
 
             Quaternion rot = Quaternion.identity;
             if (DoesPreviewAllowRotation(viewType))
@@ -2497,11 +2803,8 @@ public virtual void OnEnable()
             m_CustomEditorClassName = "";
             CreateCustomShaderEditorIfNeeded(m_Shader);
 
-            m_EnableInstancing = serializedObject.FindProperty("m_EnableInstancingVariants");
-            m_DoubleSidedGI =  serializedObject.FindProperty("m_DoubleSidedGI");
-
             s_MaterialEditors.Add(this);
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             PropertiesChanged();
 
             m_PropertyBlock = new MaterialPropertyBlock();
@@ -2509,6 +2812,7 @@ public virtual void OnEnable()
             m_ReflectionProbePicker.OnEnable();
         }
 
+        [Obsolete("MaterialEditor.UndoRedoPerformed() has been deprecated. Use MaterialEditor.UndoRedoPerformed(in UndoRedoInfo) instead", false)]
         public virtual void UndoRedoPerformed()
         {
             // Undo could've restored old shader which might lead to change in custom editor class
@@ -2518,6 +2822,15 @@ public virtual void UndoRedoPerformed()
             PropertiesChanged();
         }
 
+        public virtual void UndoRedoPerformed(in UndoRedoInfo info)
+        {
+            // Undo could've restored old shader which might lead to change in custom editor class
+            // therefore we need to rebuild inspector
+            UpdateAllOpenMaterialEditors();
+
+            PropertiesChanged();
+        }
+
         public virtual void OnDisable()
         {
             s_NumberOfEditors--;
@@ -2526,7 +2839,7 @@ public virtual void OnDisable()
 
             m_ReflectionProbePicker.OnDisable();
             s_MaterialEditors.Remove(this);
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
         }
 
         // Handle dragging of material onto renderers
@@ -2688,5 +3001,75 @@ internal override void OnHeaderIconGUI(Rect iconRect)
         {
             OnPreviewGUI(iconRect, Styles.inspectorBigInner);
         }
+
+        [MenuItem("CONTEXT/Material/Flatten Material Variant", true)]
+        static bool FlattenMaterialValidate(MenuCommand command)
+        {
+            Material mat = command.context as Material;
+            return mat.isVariant;
+        }
+
+        [MenuItem("CONTEXT/Material/Flatten Material Variant", false, 502)]
+        static void FlattenMaterial(MenuCommand command)
+        {
+            Material mat = command.context as Material;
+
+            Undo.RecordObject(mat, "Flatten Material Variant");
+            mat.parent = null;
+        }
+
+        // We need to access renderer data in the GenericMenu callback, which is called from a static function
+        // So we backup these variables during header rendering in case context menu is openned
+        static Renderer[] renderersForContextMenu = null;
+        static Material materialForContextMenu = null;
+
+        internal override Rect DrawHeaderHelpAndSettingsGUI(Rect r)
+        {
+            if (!firstInspectedEditor && targets.Length == 1)
+            {
+                renderersForContextMenu = GetAssociatedRenderersFromInspector();
+                materialForContextMenu = target as Material;
+            }
+            return base.DrawHeaderHelpAndSettingsGUI(r);
+        }
+
+        internal static void AddAdditionalMaterialMenuItems(GenericMenu menu)
+        {
+            if (renderersForContextMenu == null || renderersForContextMenu.Length == 0)
+                return;
+
+            // Capture local copies for lambda, and clear static values
+            var renderers = renderersForContextMenu;
+            var material = materialForContextMenu;
+            renderersForContextMenu = null;
+            materialForContextMenu = null;
+
+            menu.AddItem(new GUIContent("Create Variant for Renderer"), false, () => {
+
+                var directory = "Assets/Materials";
+                var assetPath = AssetDatabase.GetAssetPath(material);
+                var assetName = Path.GetFileNameWithoutExtension(assetPath) + " Variant";
+                var package = PackageManager.PackageInfo.FindForAssetPath(assetPath);
+                if (package == null || package.source == PackageManager.PackageSource.Local)
+                    directory = Path.GetDirectoryName(assetPath);
+
+                var path = AssetDatabase.GenerateUniqueAssetPath(Path.Combine(directory, assetName + ".mat"));
+                var variant = new Material(material) { name = assetName, parent = material };
+                Directory.CreateDirectory(directory);
+                AssetDatabase.CreateAsset(variant, path);
+
+                foreach (var renderer in renderers)
+                {
+                    Undo.RegisterCompleteObjectUndo(renderer, "Assign Material");
+                    var materials = renderer.sharedMaterials;
+                    for (int i = 0; i < materials.Length; i++)
+                    {
+                        if (materials[i] == material)
+                            materials[i] = variant;
+                    }
+                    renderer.sharedMaterials = materials;
+                }
+            });
+        }
     }
 } // namespace UnityEditor
diff --git a/Editor/Mono/Inspector/MaterialEditorGUIHelpers.cs b/Editor/Mono/Inspector/MaterialEditorGUIHelpers.cs
index bcd69cb2ee..57b32b5ab0 100644
--- a/Editor/Mono/Inspector/MaterialEditorGUIHelpers.cs
+++ b/Editor/Mono/Inspector/MaterialEditorGUIHelpers.cs
@@ -5,6 +5,7 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 using System;
+using System.Collections.Generic;
 
 namespace UnityEditor
 {
@@ -26,20 +27,6 @@ private bool isPrefabAsset
             }
         }
 
-        // Do currently edited materials have different render queue values?
-        private bool HasMultipleMixedQueueValues()
-        {
-            int queue = (targets[0] as Material).rawRenderQueue;
-            for (int i = 1; i < targets.Length; ++i)
-            {
-                if (queue != (targets[i] as Material).rawRenderQueue)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         // Field for editing render queue value, with an automatically calculated rect
         public void RenderQueueField()
         {
@@ -50,8 +37,7 @@ public void RenderQueueField()
         // Field for editing render queue value, with an explicit rect
         public void RenderQueueField(Rect r)
         {
-            var mixedValue = HasMultipleMixedQueueValues();
-            EditorGUI.showMixedValue = mixedValue;
+            BeginProperty(r, MaterialSerializedProperty.CustomRenderQueue, targets);
 
             var mat = targets[0] as Material;
             int curRawQueue = mat.rawRenderQueue;
@@ -130,7 +116,8 @@ public void RenderQueueField(Rect r)
 
             EditorGUIUtility.labelWidth = oldLabelWidth;
             EditorGUIUtility.fieldWidth = oldFieldWidth;
-            EditorGUI.showMixedValue = false;
+
+            EndProperty();
         }
 
         public bool EnableInstancingField()
@@ -144,19 +131,24 @@ public bool EnableInstancingField()
 
         public void EnableInstancingField(Rect r)
         {
+            BeginProperty(r, MaterialSerializedProperty.EnableInstancingVariants, targets);
+
             using (var scope = new EditorGUI.ChangeCheckScope())
             {
-                var newBoolValue = EditorGUI.Toggle(r, Styles.enableInstancingLabel, m_EnableInstancing.boolValue);
+                bool enableInstancing = EditorGUI.Toggle(r, Styles.enableInstancingLabel, (targets[0] as Material).enableInstancing);
                 if (scope.changed)
-                    m_EnableInstancing.boolValue = newBoolValue;
+                {
+                    foreach (Material material in targets)
+                        material.enableInstancing = enableInstancing;
+                }
             }
 
-            serializedObject.ApplyModifiedProperties();
+            EndProperty();
         }
 
         public bool IsInstancingEnabled()
         {
-            return ShaderUtil.HasInstancing(m_Shader) && m_EnableInstancing.boolValue;
+            return ShaderUtil.HasInstancing(m_Shader) && (targets[0] as Material).enableInstancing;
         }
 
         public bool DoubleSidedGIField()
@@ -166,13 +158,17 @@ public bool DoubleSidedGIField()
             Rect r = GetControlRectForSingleLine();
             if (isPrefabAsset || !isEnlightenLightMapper)
             {
-                using (var scope = new EditorGUI.ChangeCheckScope())
+                BeginProperty(r, MaterialSerializedProperty.DoubleSidedGI, targets);
+
+                EditorGUI.BeginChangeCheck();
+                bool doubleSidedGI = EditorGUI.Toggle(r, Styles.doubleSidedGILabel, (targets[0] as Material).doubleSidedGI);
+                if (EditorGUI.EndChangeCheck())
                 {
-                    var newBoolValue = EditorGUI.Toggle(r, Styles.doubleSidedGILabel, m_DoubleSidedGI.boolValue);
-                    if (scope.changed)
-                        m_DoubleSidedGI.boolValue = newBoolValue;
+                    foreach (Material material in targets)
+                        material.doubleSidedGI = doubleSidedGI;
                 }
-                serializedObject.ApplyModifiedProperties();
+
+                EndProperty();
                 return true;
             }
 
@@ -214,10 +210,16 @@ public Rect TexturePropertySingleLine(GUIContent label, MaterialProperty texture
         public Rect TexturePropertySingleLine(GUIContent label, MaterialProperty textureProp, MaterialProperty extraProperty1, MaterialProperty extraProperty2)
         {
             Rect r = GetControlRectForSingleLine();
+
+            bool hasExtraProp = !(extraProperty1 == null && extraProperty2 == null);
+            if (hasExtraProp) BeginProperty(r, textureProp);
+            if (extraProperty1 != null) BeginProperty(r, extraProperty1);
+            if (extraProperty2 != null) BeginProperty(r, extraProperty2);
+
             TexturePropertyMiniThumbnail(r, textureProp, label.text, label.tooltip);
 
             // No extra properties: early out
-            if (extraProperty1 == null && extraProperty2 == null)
+            if (!hasExtraProp)
                 return r;
 
             // Temporarily reset the indent level as it was already used earlier to compute the positions of the layout items. See issue 946082.
@@ -246,6 +248,10 @@ public Rect TexturePropertySingleLine(GUIContent label, MaterialProperty texture
             }
             // Restore the indent level
             EditorGUI.indentLevel = oldIndentLevel;
+
+            if (extraProperty2 != null) EndProperty();
+            if (extraProperty1 != null) EndProperty();
+            if (hasExtraProp) EndProperty();
             return r;
         }
 
@@ -260,9 +266,17 @@ public Rect TexturePropertyWithHDRColor(
         public Rect TexturePropertyWithHDRColor(GUIContent label, MaterialProperty textureProp, MaterialProperty colorProperty, bool showAlpha)
         {
             Rect r = GetControlRectForSingleLine();
+
+            bool isColorProperty = colorProperty.type == MaterialProperty.PropType.Color;
+            if (isColorProperty)
+            {
+                BeginProperty(r, textureProp);
+                BeginProperty(r, colorProperty);
+            }
+
             TexturePropertyMiniThumbnail(r, textureProp, label.text, label.tooltip);
 
-            if (colorProperty.type != MaterialProperty.PropType.Color)
+            if (!isColorProperty)
             {
                 Debug.LogError("Assuming MaterialProperty.PropType.Color (was " + colorProperty.type + ")");
                 return r;
@@ -286,6 +300,12 @@ public Rect TexturePropertyWithHDRColor(GUIContent label, MaterialProperty textu
             // Restore the indent level
             EditorGUI.indentLevel = oldIndentLevel;
 
+            if (isColorProperty)
+            {
+                EndProperty();
+                EndProperty();
+            }
+
             return r;
         }
 
@@ -299,6 +319,10 @@ public Rect TexturePropertyTwoLines(GUIContent label, MaterialProperty texturePr
             }
 
             Rect r = GetControlRectForSingleLine();
+
+            BeginProperty(r, textureProp);
+            BeginProperty(r, extraProperty1);
+
             TexturePropertyMiniThumbnail(r, textureProp, label.text, label.tooltip);
 
             // Temporarily reset the indent level. See issue 946082.
@@ -311,6 +335,9 @@ public Rect TexturePropertyTwoLines(GUIContent label, MaterialProperty texturePr
                 r1 = GetLeftAlignedFieldRect(r);
             ExtraPropertyAfterTexture(r1, extraProperty1);
 
+            EndProperty();
+            EndProperty();
+
             // New line for extraProperty2
             Rect r2 = GetControlRectForSingleLine();
             ShaderProperty(r2, extraProperty2, label2.text, MaterialEditor.kMiniTextureFieldLabelIndentLevel + 1);
diff --git a/Editor/Mono/Inspector/MaterialPropertyDrawer.cs b/Editor/Mono/Inspector/MaterialPropertyDrawer.cs
index 1e27844de4..e0d336a28e 100644
--- a/Editor/Mono/Inspector/MaterialPropertyDrawer.cs
+++ b/Editor/Mono/Inspector/MaterialPropertyDrawer.cs
@@ -300,6 +300,8 @@ public override void OnGUI(Rect position, MaterialProperty prop, GUIContent labe
                 return;
             }
 
+            MaterialEditor.BeginProperty(position, prop);
+
             if (prop.type != MaterialProperty.PropType.Int)
             {
                 EditorGUI.BeginChangeCheck();
@@ -328,6 +330,8 @@ public override void OnGUI(Rect position, MaterialProperty prop, GUIContent labe
                     SetKeyword(prop, value);
                 }
             }
+
+            MaterialEditor.EndProperty();
         }
 
         public override void Apply(MaterialProperty prop)
@@ -504,6 +508,8 @@ public override void OnGUI(Rect position, MaterialProperty prop, GUIContent labe
                 return;
             }
 
+            MaterialEditor.BeginProperty(position, prop);
+
             if (prop.type != MaterialProperty.PropType.Int)
             {
                 EditorGUI.BeginChangeCheck();
@@ -532,6 +538,8 @@ public override void OnGUI(Rect position, MaterialProperty prop, GUIContent labe
                     SetKeyword(prop, value);
                 }
             }
+
+            MaterialEditor.EndProperty();
         }
 
         public override void Apply(MaterialProperty prop)
@@ -607,6 +615,11 @@ public MaterialEnumDrawer(string[] enumNames, float[] vals)
                 values[i] = (int)vals[i];
         }
 
+        static bool IsPropertyTypeSuitable(MaterialProperty prop)
+        {
+            return prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range || prop.type == MaterialProperty.PropType.Int;
+        }
+
         public override float GetPropertyHeight(MaterialProperty prop, string label, MaterialEditor editor)
         {
             if (prop.type != MaterialProperty.PropType.Float && prop.type != MaterialProperty.PropType.Range && prop.type != MaterialProperty.PropType.Int)
@@ -618,6 +631,16 @@ public override float GetPropertyHeight(MaterialProperty prop, string label, Mat
 
         public override void OnGUI(Rect position, MaterialProperty prop, GUIContent label, MaterialEditor editor)
         {
+            if (!IsPropertyTypeSuitable(prop))
+            {
+                GUIContent c = EditorGUIUtility.TempContent("Enum used on a non-float property: " + prop.name,
+                    EditorGUIUtility.GetHelpIcon(MessageType.Warning));
+                EditorGUI.LabelField(position, c, EditorStyles.helpBox);
+                return;
+            }
+
+            MaterialEditor.BeginProperty(position, prop);
+
             if (prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range)
             {
                 EditorGUI.BeginChangeCheck();
@@ -642,7 +665,7 @@ public override void OnGUI(Rect position, MaterialProperty prop, GUIContent labe
                     prop.floatValue = (float)values[selIndex];
                 }
             }
-            else if (prop.type == MaterialProperty.PropType.Int)
+            else
             {
                 EditorGUI.BeginChangeCheck();
                 EditorGUI.showMixedValue = prop.hasMixedValue;
@@ -666,12 +689,8 @@ public override void OnGUI(Rect position, MaterialProperty prop, GUIContent labe
                     prop.intValue = values[selIndex];
                 }
             }
-            else
-            {
-                GUIContent c = EditorGUIUtility.TempContent("Enum used on a non-float property: " + prop.name,
-                    EditorGUIUtility.GetHelpIcon(MessageType.Warning));
-                EditorGUI.LabelField(position, c, EditorStyles.helpBox);
-            }
+
+            MaterialEditor.EndProperty();
         }
     }
 
diff --git a/Editor/Mono/Inspector/MeshPreview.cs b/Editor/Mono/Inspector/MeshPreview.cs
index c2fc742641..7d16ae62c1 100644
--- a/Editor/Mono/Inspector/MeshPreview.cs
+++ b/Editor/Mono/Inspector/MeshPreview.cs
@@ -25,27 +25,56 @@ internal static class Styles
 
         internal class Settings : IDisposable
         {
-            public DisplayMode displayMode = DisplayMode.Shaded;
-            public int activeUVChannel = 0;
-            public int activeBlendshape = 0;
-            public bool drawWire = true;
-
-            public Vector3 orthoPosition = new Vector3(0.0f, 0.0f, 0.0f);
-            public Vector2 previewDir = new Vector2(0, 0);
-            public Vector2 lightDir = new Vector2(0, 0);
-            public Vector3 pivotPositionOffset = Vector3.zero;
-            public float zoomFactor = 1.0f;
-            public int checkerTextureMultiplier = 10;
-
-            public Material shadedPreviewMaterial;
-            public Material activeMaterial;
-            public Material meshMultiPreviewMaterial;
-            public Material wireMaterial;
-            public Material lineMaterial;
-            public Texture2D checkeredTexture;
-
-            public bool[] availableDisplayModes = Enumerable.Repeat(true, 7).ToArray();
-            public bool[] availableUVChannels = Enumerable.Repeat(true, 8).ToArray();
+            public DisplayMode displayMode { get => m_DisplayMode; set => SetValue(ref m_DisplayMode, value); }
+            DisplayMode m_DisplayMode = DisplayMode.Shaded;
+
+            public int activeUVChannel { get => m_ActiveUVChannel; set => SetValue(ref m_ActiveUVChannel, value); }
+            int m_ActiveUVChannel = 0;
+
+            public int activeBlendshape { get => m_ActiveBlendshape; set => SetValue(ref m_ActiveBlendshape, value); }
+            int m_ActiveBlendshape = 0;
+
+            public bool drawWire { get => m_DrawWire; set => SetValue(ref m_DrawWire, value); }
+            bool m_DrawWire = true;
+
+            public Vector3 orthoPosition { get => m_OrthoPosition; set => SetValue(ref m_OrthoPosition, value); }
+            Vector3 m_OrthoPosition = new Vector3(0.0f, 0.0f, 0.0f);
+
+            public Vector2 previewDir { get => m_PreviewDir; set => SetValue(ref m_PreviewDir, value); }
+            Vector2 m_PreviewDir = new Vector2(0, 0);
+
+            public Vector2 lightDir { get => m_LightDir; set => SetValue(ref m_LightDir, value); }
+            Vector2 m_LightDir = new Vector2(0, 0);
+
+            public Vector3 pivotPositionOffset { get => m_PivotPositionOffset; set => SetValue(ref m_PivotPositionOffset, value); }
+            Vector3 m_PivotPositionOffset = Vector3.zero;
+
+            public float zoomFactor { get => m_ZoomFactor; set => SetValue(ref m_ZoomFactor, value); }
+            float m_ZoomFactor = 1.0f;
+
+            public int checkerTextureMultiplier { get => m_CheckerTextureMultiplier; set => SetValue(ref m_CheckerTextureMultiplier, value); }
+            int m_CheckerTextureMultiplier = 10;
+
+            public Material shadedPreviewMaterial { get => m_ShadedPreviewMaterial; set => SetValue(ref m_ShadedPreviewMaterial, value); }
+            Material m_ShadedPreviewMaterial;
+            public Material activeMaterial { get => m_ActiveMaterial; set => SetValue(ref m_ActiveMaterial, value); }
+            Material m_ActiveMaterial;
+            public Material meshMultiPreviewMaterial { get => m_MeshMultiPreviewMaterial; set => SetValue(ref m_MeshMultiPreviewMaterial, value); }
+            Material m_MeshMultiPreviewMaterial;
+            public Material wireMaterial { get => m_WireMaterial; set => SetValue(ref m_WireMaterial, value); }
+            Material m_WireMaterial;
+            public Material lineMaterial { get => m_LineMaterial; set => SetValue(ref m_LineMaterial, value); }
+            Material m_LineMaterial;
+            public Texture2D checkeredTexture { get => m_CheckeredTexture; set => SetValue(ref m_CheckeredTexture, value); }
+            Texture2D m_CheckeredTexture;
+
+            public bool[] availableDisplayModes { get => m_AvailableDisplayModes; set => SetValue(ref m_AvailableDisplayModes, value); }
+            bool[] m_AvailableDisplayModes = Enumerable.Repeat(true, 7).ToArray();
+
+            public bool[] availableUVChannels { get => m_AvailableUVChannels; set => SetValue(ref m_AvailableUVChannels, value); }
+            bool[] m_AvailableUVChannels = Enumerable.Repeat(true, 8).ToArray();
+
+            public event Action changed;
 
             public Settings()
             {
@@ -73,6 +102,43 @@ public void Dispose()
                 if (lineMaterial != null)
                     UObject.DestroyImmediate(lineMaterial);
             }
+
+            void SetValue<T>(ref T setting, T newValue)
+            {
+                if (setting == null || !setting.Equals(newValue))
+                {
+                    setting = newValue;
+                    changed?.Invoke();
+                }
+            }
+
+            public void Copy(Settings other)
+            {
+                displayMode = other.displayMode;
+                activeUVChannel = other.activeUVChannel;
+                activeBlendshape = other.activeBlendshape;
+                drawWire = other.drawWire;
+
+                orthoPosition = other.orthoPosition;
+                previewDir = other.previewDir;
+                lightDir = other.lightDir;
+                pivotPositionOffset = other.pivotPositionOffset;
+                zoomFactor = other.zoomFactor;
+                checkerTextureMultiplier = other.checkerTextureMultiplier;
+
+                shadedPreviewMaterial = other.shadedPreviewMaterial;
+                activeMaterial = other.activeMaterial;
+                meshMultiPreviewMaterial = other.meshMultiPreviewMaterial;
+                wireMaterial = other.wireMaterial;
+                lineMaterial = other.lineMaterial;
+                checkeredTexture = other.checkeredTexture;
+
+                availableDisplayModes = new bool[other.availableDisplayModes.Length];
+                Array.Copy(other.availableDisplayModes, availableDisplayModes, other.availableDisplayModes.Length);
+
+                availableUVChannels = new bool[other.availableUVChannels.Length];
+                Array.Copy(other.availableUVChannels, availableUVChannels, other.availableUVChannels.Length);
+            }
         }
 
         static string[] m_DisplayModes =
@@ -108,6 +174,8 @@ public Mesh mesh
         PreviewRenderUtility m_PreviewUtility;
         Settings m_Settings;
 
+        internal event Action<MeshPreview> settingsChanged;
+
         Mesh m_BakedSkinnedMesh;
         List<string> m_BlendShapes;
 
@@ -120,6 +188,7 @@ public MeshPreview(Mesh target)
             m_PreviewUtility.camera.transform.position = new Vector3(5, 5, 0);
 
             m_Settings = new Settings();
+            m_Settings.changed += OnSettingsChanged;
             m_BlendShapes = new List<string>();
             CheckAvailableAttributes();
         }
@@ -128,9 +197,16 @@ public void Dispose()
         {
             DestroyBakedSkinnedMesh();
             m_PreviewUtility.Cleanup();
+            m_Settings.changed -= OnSettingsChanged;
             m_Settings.Dispose();
         }
 
+
+        void OnSettingsChanged()
+        {
+            settingsChanged?.Invoke(this);
+        }
+
         static Material CreateWireframeMaterial()
         {
             var shader = Shader.FindBuiltin("Internal-Colored.shader");
@@ -316,6 +392,11 @@ void SetBlendshape(object data)
             BakeSkinnedMesh();
         }
 
+        internal void CopySettings(MeshPreview other)
+        {
+            m_Settings.Copy(other.m_Settings);
+        }
+
         internal static void RenderMeshPreview(
             Mesh mesh,
             PreviewRenderUtility previewUtility,
@@ -707,8 +788,7 @@ void MeshPreviewZoom(Rect rect, Event evt)
             }
             else
             {
-                m_Settings.orthoPosition.x = newCamPos.x;
-                m_Settings.orthoPosition.y = newCamPos.y;
+                m_Settings.orthoPosition = new Vector3(newCamPos.x,  newCamPos.y, m_Settings.orthoPosition.z);
             }
 
             m_Settings.zoomFactor = newZoom;
@@ -734,8 +814,8 @@ void MeshPreviewPan(Rect rect, Event evt)
                 screenPos = cam.WorldToScreenPoint(m_Settings.orthoPosition);
                 screenPos += delta;
                 worldPos = cam.ScreenToWorldPoint(screenPos);
-                m_Settings.orthoPosition.x = worldPos.x;
-                m_Settings.orthoPosition.y = worldPos.y;
+
+                m_Settings.orthoPosition = new Vector3(worldPos.x,  worldPos.y, m_Settings.orthoPosition.z);
             }
             else
             {
diff --git a/Editor/Mono/Inspector/ModelInspector.cs b/Editor/Mono/Inspector/ModelInspector.cs
index a3e0cdf31c..e9a4feddea 100644
--- a/Editor/Mono/Inspector/ModelInspector.cs
+++ b/Editor/Mono/Inspector/ModelInspector.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.Rendering;
@@ -14,26 +15,66 @@ namespace UnityEditor
     [CanEditMultipleObjects]
     class ModelInspector : Editor
     {
-        MeshPreview m_MeshPreview;
+        Dictionary<Object, MeshPreview> m_MeshPreviews = new Dictionary<Object, MeshPreview>();
+        MeshPreview m_DirtyMeshPreview = null;
+
         static Vector2 m_ScrollPos;
 
         void OnEnable()
         {
-            m_MeshPreview = new MeshPreview(targets?.FirstOrDefault(x => x is Mesh) as Mesh);
+            foreach (var previewTarget in targets)
+            {
+                var meshPreview = new MeshPreview(previewTarget as Mesh);
+                meshPreview.settingsChanged += OnPreviewSettingsChanged;
+                m_MeshPreviews.Add(previewTarget, meshPreview);
+            }
         }
 
         void OnDisable()
         {
-            m_MeshPreview.Dispose();
+            foreach (var previewTarget in targets)
+            {
+                var meshPreview = m_MeshPreviews[previewTarget];
+                meshPreview.settingsChanged -= OnPreviewSettingsChanged;
+                meshPreview.Dispose();
+            }
+
+            m_MeshPreviews.Clear();
+        }
+
+        public override void OnPreviewSettings()
+        {
+            if (m_MeshPreviews.TryGetValue(target, out var targetMeshPreview))
+                targetMeshPreview.OnPreviewSettings();
+
+            if (m_DirtyMeshPreview != null)
+            {
+                foreach (var meshPreview in m_MeshPreviews.Values)
+                {
+                    if (meshPreview != m_DirtyMeshPreview)
+                        meshPreview.CopySettings(m_DirtyMeshPreview);
+                }
+
+                m_DirtyMeshPreview = null;
+            }
         }
 
-        public override void OnPreviewSettings() => m_MeshPreview.OnPreviewSettings();
+        void OnPreviewSettingsChanged(MeshPreview preview)
+        {
+            m_DirtyMeshPreview = preview;
+        }
 
         public override Texture2D RenderStaticPreview(
             string assetPath,
             Object[] subAssets,
             int width,
-            int height) => m_MeshPreview.RenderStaticPreview(width, height);
+            int height)
+        {
+            if (m_MeshPreviews.TryGetValue(target, out var meshPreview))
+                return meshPreview.RenderStaticPreview(width, height);
+
+            return null;
+        }
 
         public override bool HasPreviewGUI()
         {
@@ -246,7 +287,11 @@ static void DrawColorRect(Rect rect, Color color)
             EditorGUI.DrawRect(new Rect(rect.x, rect.y + rect.height - 1, rect.width, 1), dimmed);
         }
 
-        public override void OnPreviewGUI(Rect r, GUIStyle background) => m_MeshPreview.OnPreviewGUI(r, background);
+        public override void OnPreviewGUI(Rect r, GUIStyle background)
+        {
+            if (m_MeshPreviews.TryGetValue(target, out var meshPreview))
+                meshPreview.OnPreviewGUI(r, background);
+        }
 
         public override string GetInfoString() => MeshPreview.GetInfoString(target as Mesh);
     }
diff --git a/Editor/Mono/Inspector/MonoScriptInspector.cs b/Editor/Mono/Inspector/MonoScriptInspector.cs
index 094786b1f5..2782ec46a6 100644
--- a/Editor/Mono/Inspector/MonoScriptInspector.cs
+++ b/Editor/Mono/Inspector/MonoScriptInspector.cs
@@ -53,6 +53,12 @@ internal override void OnHeaderIconGUI(Rect iconRect)
                     m_Icon = m_TargetObject.FindProperty("m_Icon");
                 }
 
+                if (m_Icon == null)
+                {
+                    base.OnHeaderIconGUI(iconRect);
+                    return;
+                }
+
                 Rect dropDownRect = iconRect;
 
                 dropDownRect.size = EditorGUI.GetObjectIconDropDownSize(iconRect.width, iconRect.height);
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
index db289c1e49..67df2a6204 100644
--- a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
+++ b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs
@@ -21,6 +21,7 @@
 using GraphicsDeviceType = UnityEngine.Rendering.GraphicsDeviceType;
 using TargetAttributes = UnityEditor.BuildTargetDiscovery.TargetAttributes;
 using UnityEngine.Rendering;
+using UnityEngine.Scripting;
 
 // ************************************* READ BEFORE EDITING **************************************
 //
@@ -49,13 +50,15 @@ static Styles()
 
         class SettingsContent
         {
-            public static readonly GUIContent frameTimingStatsWebGLWarning = EditorGUIUtility.TrTextContent("Frame timing stats are supported in WebGL 2 only. Uncheck 'Automatic Graphics API' if it's set and remove the WebGL 1 API.");
-            public static readonly GUIContent lightmapEncodingWebGLWarning = EditorGUIUtility.TrTextContent("High quality lightmap encoding requires WebGL 2 only. Uncheck 'Automatic Graphics API' if it's set and remove the WebGL 1 API.");
+            public static readonly GUIContent frameTimingStatsWebGLWarning = EditorGUIUtility.TrTextContent("Frame timing stats are supported in WebGL 2 only. Uncheck 'Automatic Graphics API' if it is set and remove the WebGL 1 API.");
+            public static readonly GUIContent lightmapEncodingWebGLWarning = EditorGUIUtility.TrTextContent("High quality lightmap encoding requires WebGL 2. Navigate to 'WebGL Player Settings', uncheck 'Automatic Graphics API' if it is set and remove the WebGL 1 API.");
+            public static readonly GUIContent hdrCubemapEncodingWebGLWarning = EditorGUIUtility.TrTextContent("High quality HDR cubemap encoding requires WebGL 2. Navigate to 'WebGL Player Settings', uncheck 'Automatic Graphics API' if it is set and remove the WebGL 1 API.");
             public static readonly GUIContent colorSpaceAndroidWarning = EditorGUIUtility.TrTextContent("Linear colorspace requires OpenGL ES 3.0 or Vulkan, remove OpenGL ES 2 API from the list. Blit Type for non-SRP projects must be Always Blit or Auto.");
             public static readonly GUIContent colorSpaceWebGLWarning = EditorGUIUtility.TrTextContent("Linear colorspace requires WebGL 2, uncheck 'Automatic Graphics API' to remove WebGL 1 API. WARNING: If DXT sRGB is not supported by the browser, texture will be decompressed");
             public static readonly GUIContent colorSpaceIOSWarning = EditorGUIUtility.TrTextContent("Linear colorspace requires Metal API only. Uncheck 'Automatic Graphics API' and remove OpenGL ES 2/3 APIs.");
             public static readonly GUIContent colorSpaceEmbeddedLinuxWarning = EditorGUIUtility.TrTextContent("Linear colorspace is not supported with OpenGL ES 2.0, uncheck 'Automatic Graphics API' to remove OpenGL ES 2 API");
             public static readonly GUIContent recordingInfo = EditorGUIUtility.TrTextContent("Reordering the list will switch editor to the first available platform");
+            public static readonly GUIContent appleSiliconOpenGLWarning = EditorGUIUtility.TrTextContent("OpenGL is not supported on Apple Silicon chips. Metal will be used on devices with Apple Silicon chips instead.");
             public static readonly GUIContent sharedBetweenPlatformsInfo = EditorGUIUtility.TrTextContent("* Shared setting between multiple platforms.");
 
             public static readonly GUIContent cursorHotspot = EditorGUIUtility.TrTextContent("Cursor Hotspot");
@@ -94,6 +97,10 @@ class SettingsContent
             public static readonly GUIContent strictShaderVariantMatching = EditorGUIUtility.TrTextContent("Strict shader variant matching*", "When enabled, if a shader variant is missing, Unity uses the error shader and displays an error in the Console.");
             public static readonly GUIContent mipStripping = EditorGUIUtility.TrTextContent("Texture MipMap Stripping*", "Remove unused texture levels from package builds, reducing package size on disk. Limits the texture quality settings to the highest mip that was included during the build.");
             public static readonly GUIContent enableFrameTimingStats = EditorGUIUtility.TrTextContent("Frame Timing Stats", "Enable gathering of CPU/GPU frame timing statistics.");
+            public static readonly GUIContent enableOpenGLProfilerGPURecorders = EditorGUIUtility.TrTextContent("OpenGL: Profiler GPU Recorders","Enable Profiler Recorders when rendering with OpenGL. Always enabled with other rendering APIs. Optional on OpenGL due to potential incompatibility with Frame Timing Stats and the GPU Profiler.");
+            public static readonly GUIContent openGLFrameTimingStatsOnGPURecordersOnWarning = EditorGUIUtility.TrTextContent("On OpenGL, Frame Timing Stats may disable Profiler GPU Recorders and the GPU Profiler.");
+            public static readonly GUIContent openGLFrameTimingStatsOnGPURecordersOffInfo = EditorGUIUtility.TrTextContent("On OpenGL, Frame Timing Stats may disable the GPU Profiler.");
+            public static readonly GUIContent openGLFrameTimingStatsOffGPURecordersOnInfo = EditorGUIUtility.TrTextContent("On OpenGL, Profiler GPU Recorders may disable the GPU Profiler.");
             public static readonly GUIContent useOSAutoRotation = EditorGUIUtility.TrTextContent("Use Animated Autorotation", "If set OS native animated autorotation method will be used. Otherwise orientation will be changed immediately.");
             public static readonly GUIContent defaultScreenWidth = EditorGUIUtility.TrTextContent("Default Screen Width");
             public static readonly GUIContent defaultScreenHeight = EditorGUIUtility.TrTextContent("Default Screen Height");
@@ -155,8 +162,6 @@ class SettingsContent
             public static readonly GUIContent appleDeveloperTeamID = EditorGUIUtility.TrTextContent("iOS Developer Team ID", "Developers can retrieve their Team ID by visiting the Apple Developer site under Account > Membership.");
             public static readonly GUIContent useOnDemandResources = EditorGUIUtility.TrTextContent("Use on-demand resources*");
             public static readonly GUIContent gcIncremental = EditorGUIUtility.TrTextContent("Use incremental GC", "With incremental Garbage Collection, the Garbage Collector will try to time-slice the collection task into multiple steps, to avoid long GC times preventing content from running smoothly.");
-            public static readonly GUIContent assemblyVersionValidation = EditorGUIUtility.TrTextContent("Assembly Version Validation", "When Mono Resolves types from a assembly that is Strong Named, versions have to match with the one already loaded.");
-            public static readonly GUIContent assemblyVersionValidationEditorOnly = EditorGUIUtility.TrTextContent("Assembly Version Validation (editor only)", "When Mono Resolves types from a assembly that is Strong Named, versions have to match with the one already loaded.");
             public static readonly GUIContent accelerometerFrequency = EditorGUIUtility.TrTextContent("Accelerometer Frequency*");
             public static readonly GUIContent cameraUsageDescription = EditorGUIUtility.TrTextContent("Camera Usage Description*", "String shown to the user when requesting permission to use the device camera. Written to the NSCameraUsageDescription field in Xcode project's info.plist file");
             public static readonly GUIContent locationUsageDescription = EditorGUIUtility.TrTextContent("Location Usage Description*", "String shown to the user when requesting permission to access the device location. Written to the NSLocationWhenInUseUsageDescription field in Xcode project's info.plist file.");
@@ -194,6 +199,7 @@ class SettingsContent
             public static readonly GUIContent[] il2cppCodeGenerationNames =  new GUIContent[] { EditorGUIUtility.TrTextContent("Faster runtime"), EditorGUIUtility.TrTextContent("Faster (smaller) builds") };
             public static readonly GUIContent scriptingMono2x = EditorGUIUtility.TrTextContent("Mono");
             public static readonly GUIContent scriptingIL2CPP = EditorGUIUtility.TrTextContent("IL2CPP");
+            public static readonly GUIContent scriptingCoreCLR = EditorGUIUtility.TrTextContent("CoreCLR");
             public static readonly GUIContent scriptingDefault = EditorGUIUtility.TrTextContent("Default");
             public static readonly GUIContent strippingDisabled = EditorGUIUtility.TrTextContent("Disabled");
             public static readonly GUIContent strippingMinimal = EditorGUIUtility.TrTextContent("Minimal");
@@ -217,9 +223,12 @@ class SettingsContent
             public static readonly GUIContent[] normalMapEncodingNames = { EditorGUIUtility.TrTextContent("XYZ"), EditorGUIUtility.TrTextContent("DXT5nm-style") };
             public static readonly GUIContent lightmapEncodingLabel = EditorGUIUtility.TrTextContent("Lightmap Encoding", "Affects the encoding scheme and compression format of the lightmaps.");
             public static readonly GUIContent[] lightmapEncodingNames = { EditorGUIUtility.TrTextContent("Low Quality"), EditorGUIUtility.TrTextContent("Normal Quality"), EditorGUIUtility.TrTextContent("High Quality") };
+            public static readonly GUIContent hdrCubemapEncodingLabel = EditorGUIUtility.TrTextContent("HDR Cubemap Encoding", "Determines which encoding scheme Unity uses to encode HDR cubemaps.");
+            public static readonly GUIContent[] hdrCubemapEncodingNames = { EditorGUIUtility.TrTextContent("Low Quality"), EditorGUIUtility.TrTextContent("Normal Quality"), EditorGUIUtility.TrTextContent("High Quality") };
             public static readonly GUIContent lightmapStreamingEnabled = EditorGUIUtility.TrTextContent("Lightmap Streaming", "Only load larger lightmap mipmaps as needed to render the current game cameras. Requires texture streaming to be enabled in quality settings. This value is applied to the light map textures as they are generated.");
             public static readonly GUIContent lightmapStreamingPriority = EditorGUIUtility.TrTextContent("Streaming Priority", "Lightmap mipmap streaming priority when there's contention for resources. Positive numbers represent higher priority. Valid range is -128 to 127. This value is applied to the light map textures as they are generated.");
-            public static readonly GUIContent lightmapQualityAndroidWarning = EditorGUIUtility.TrTextContent("The selected Lightmap Encoding requires OpenGL ES 3.0 or Vulkan. Please remove the OpenGL ES 2 API.");
+            public static readonly GUIContent lightmapQualityAndroidWarning = EditorGUIUtility.TrTextContent("The Lightmap Encoding scheme you have selected requires OpenGL ES 3.0 or Vulkan. Navigate to 'Android Player Settings' > 'Rendering' and disable the OpenGL ES 2 API.");
+            public static readonly GUIContent hdrCubemapQualityAndroidWarning = EditorGUIUtility.TrTextContent("The HDR Cubemap Encoding scheme you have selected requires OpenGL ES 3.0 or Vulkan. Navigate to 'Android Player Settings' > 'Rendering' and disable the OpenGL ES 2 API.");
             public static readonly GUIContent legacyClampBlendShapeWeights = EditorGUIUtility.TrTextContent("Clamp BlendShapes (Deprecated)*", "If set, the range of BlendShape weights in SkinnedMeshRenderers will be clamped.");
             public static readonly GUIContent virtualTexturingSupportEnabled = EditorGUIUtility.TrTextContent("Virtual Texturing*", "Enable support for Virtual Texturing. Changing this value requires an Editor restart.");
             public static readonly GUIContent virtualTexturingUnsupportedPlatformWarning = EditorGUIUtility.TrTextContent("The current target platform does not support Virtual Texturing. To build for this platform, uncheck Enable Virtual Texturing.");
@@ -348,7 +357,6 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_SuppressCommonWarnings;
         SerializedProperty m_AllowUnsafeCode;
         SerializedProperty m_GCIncremental;
-        SerializedProperty m_AssemblyVersionValidation;
 
         SerializedProperty m_OverrideDefaultApplicationIdentifier;
         SerializedProperty m_ApplicationIdentifier;
@@ -393,8 +401,6 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_RunInBackground;
         SerializedProperty m_CaptureSingleScreen;
 
-        SerializedProperty m_SupportedAspectRatios;
-
         SerializedProperty m_SkinOnGPU;
 
         // OpenGL ES 3.1+
@@ -403,6 +409,7 @@ PlayerSettingsIconsEditor iconsEditor
         SerializedProperty m_RequireES32;
 
         SerializedProperty m_LightmapEncodingQuality;
+        SerializedProperty m_HDRCubemapEncodingQuality;
         SerializedProperty m_LightmapStreamingEnabled;
         SerializedProperty m_LightmapStreamingPriority;
 
@@ -494,9 +501,10 @@ public SerializedProperty FindPropertyAssert(string name)
                 Debug.LogError("Failed to find:" + name);
             return property;
         }
-
+        private static List<PlayerSettingsEditor> s_activeEditors = new List<PlayerSettingsEditor>();
         void OnEnable()
         {
+            s_activeEditors.Add(this);
             isPreset = Preset.IsEditorTargetAPreset(target);
             validPlatforms = BuildPlatforms.instance.GetValidPlatforms(true).ToArray();
 
@@ -560,7 +568,6 @@ void OnEnable()
             m_SuppressCommonWarnings        = FindPropertyAssert("suppressCommonWarnings");
             m_AllowUnsafeCode               = FindPropertyAssert("allowUnsafeCode");
             m_GCIncremental                 = FindPropertyAssert("gcIncremental");
-            m_AssemblyVersionValidation = FindPropertyAssert("assemblyVersionValidation");
             m_UseDeterministicCompilation   = FindPropertyAssert("useDeterministicCompilation");
             m_ScriptingBackend              = FindPropertyAssert("scriptingBackend");
             m_EnableRoslynAnalyzers         = FindPropertyAssert("enableRoslynAnalyzers");
@@ -593,7 +600,6 @@ void OnEnable()
             m_DefaultIsNativeResolution     = FindPropertyAssert("defaultIsNativeResolution");
             m_MacRetinaSupport              = FindPropertyAssert("macRetinaSupport");
             m_CaptureSingleScreen           = FindPropertyAssert("captureSingleScreen");
-            m_SupportedAspectRatios         = FindPropertyAssert("m_SupportedAspectRatios");
             m_UsePlayerLog                  = FindPropertyAssert("usePlayerLog");
 
             m_KeepLoadedShadersAlive           = FindPropertyAssert("keepLoadedShadersAlive");
@@ -663,6 +669,25 @@ void OnEnable()
         }
 
         void OnDisable()
+        {
+            s_activeEditors.Remove(this);
+            HandlePendingChangesRequiringRecompilation();
+
+            // Ensure script compilation handling is returned to to EditorOnlyPlayerSettings
+            if (!isPreset)
+                PlayerSettings.isHandlingScriptRecompile = true;
+        }
+
+        [RequiredByNativeCode]
+        private static void HandlePendingChangesBeforeEnterPlaymode()
+        {
+            foreach(var editor in s_activeEditors)
+            {
+                editor.HandlePendingChangesRequiringRecompilation();
+            }
+        }
+
+        private void HandlePendingChangesRequiringRecompilation()
         {
             if (hasScriptingDefinesBeenModified)
             {
@@ -671,6 +696,10 @@ void OnDisable()
                     SetScriptingDefineSymbolsForGroup(lastNamedBuildTarget, scriptingDefinesList.ToArray());
                     SetReason(RecompileReason.scriptingDefineSymbolsModified);
                 }
+                else
+                {
+                    InitReorderableScriptingDefineSymbolsList(lastNamedBuildTarget);
+                }
 
                 hasScriptingDefinesBeenModified = false;
             }
@@ -682,6 +711,10 @@ void OnDisable()
                     SetAdditionalCompilerArgumentsForGroup(lastNamedBuildTarget, additionalCompilerArgumentsList.ToArray());
                     SetReason(RecompileReason.additionalCompilerArgumentsModified);
                 }
+                else
+                {
+                    InitReorderableAdditionalCompilerArgumentsList(lastNamedBuildTarget);
+                }
 
                 hasAdditionalCompilerArgumentsBeenModified = false;
             }
@@ -691,10 +724,6 @@ void OnDisable()
                 serializedObject.ApplyModifiedProperties();
                 RecompileScripts();
             }
-
-            // Ensure script compilation handling is returned to to EditorOnlyPlayerSettings
-            if (!isPreset)
-                PlayerSettings.isHandlingScriptRecompile = true;
         }
 
         public void SetValueChangeListeners(UnityAction action)
@@ -1068,14 +1097,6 @@ public void ResolutionSectionGUI(NamedBuildTarget namedBuildTarget, ISettingEdit
                         EditorGUILayout.PropertyField(m_ForceSingleInstance);
                         EditorGUILayout.PropertyField(m_UseFlipModelSwapchain, SettingsContent.useFlipModelSwapChain);
 
-                        if (isPreset)
-                            EditorGUI.indentLevel++;
-
-                        EditorGUILayout.PropertyField(m_SupportedAspectRatios, true);
-
-                        if (isPreset)
-                            EditorGUI.indentLevel--;
-
                         EditorGUILayout.Space();
                     }
 
@@ -1407,6 +1428,12 @@ void GraphicsAPIsGUIOnePlatform(BuildTargetGroup targetGroup, BuildTarget target
 
                     s_GraphicsDeviceLists.Add(targetPlatform, rlist);
                 }
+
+                if (targetPlatform == BuildTarget.StandaloneOSX && s_GraphicsDeviceLists[BuildTarget.StandaloneOSX].list.Contains(GraphicsDeviceType.OpenGLCore))
+                {
+                    EditorGUILayout.HelpBox(SettingsContent.appleSiliconOpenGLWarning.text, MessageType.Warning, true);
+                }
+
                 s_GraphicsDeviceLists[targetPlatform].DoLayoutList();
 
                 //@TODO: undo
@@ -1821,12 +1848,12 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
 
             bool hdrDisplaySupported = false;
             bool gfxJobModesSupported = false;
-            bool customLightmapEncodingSupported = (platform.namedBuildTarget.ToBuildTargetGroup() == BuildTargetGroup.Standalone || platform.namedBuildTarget == NamedBuildTarget.WebGL);
+            bool hdrEncodingSupportedByPlatform = (platform.namedBuildTarget.ToBuildTargetGroup() == BuildTargetGroup.Standalone || platform.namedBuildTarget == NamedBuildTarget.WebGL);
             if (settingsExtension != null)
             {
                 hdrDisplaySupported = settingsExtension.SupportsHighDynamicRangeDisplays();
                 gfxJobModesSupported = settingsExtension.SupportsGfxJobModes();
-                customLightmapEncodingSupported = customLightmapEncodingSupported || settingsExtension.SupportsCustomLightmapEncoding();
+                hdrEncodingSupportedByPlatform = hdrEncodingSupportedByPlatform || settingsExtension.SupportsCustomLightmapEncoding();
             }
             else
             {
@@ -1967,54 +1994,80 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                 }
             }
 
-            // Show Lightmap Encoding quality option
-            if (customLightmapEncodingSupported && !isPreset)
+            // Show Lightmap Encoding and HDR Cubemap Encoding quality options
+            if (hdrEncodingSupportedByPlatform && !isPreset)
             {
                 using (new EditorGUI.DisabledScope(EditorApplication.isPlaying || Lightmapping.isRunning))
                 {
-                    EditorGUI.BeginChangeCheck();
-                    LightmapEncodingQuality encodingQuality = PlayerSettings.GetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
-                    LightmapEncodingQuality[] lightmapEncodingValues = { LightmapEncodingQuality.Low, LightmapEncodingQuality.Normal, LightmapEncodingQuality.High };
-                    LightmapEncodingQuality newEncodingQuality = BuildEnumPopup(SettingsContent.lightmapEncodingLabel, encodingQuality, lightmapEncodingValues, SettingsContent.lightmapEncodingNames);
-                    if (EditorGUI.EndChangeCheck() && encodingQuality != newEncodingQuality)
                     {
-                        PlayerSettings.SetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup(), newEncodingQuality);
+                        EditorGUI.BeginChangeCheck();
+                        LightmapEncodingQuality encodingQuality = PlayerSettings.GetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
+                        LightmapEncodingQuality[] lightmapEncodingValues = { LightmapEncodingQuality.Low, LightmapEncodingQuality.Normal, LightmapEncodingQuality.High };
+                        LightmapEncodingQuality newEncodingQuality = BuildEnumPopup(SettingsContent.lightmapEncodingLabel, encodingQuality, lightmapEncodingValues, SettingsContent.lightmapEncodingNames);
+                        if (EditorGUI.EndChangeCheck() && encodingQuality != newEncodingQuality)
+                        {
+                            PlayerSettings.SetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup(), newEncodingQuality);
 
-                        Lightmapping.OnUpdateLightmapEncoding(platform.namedBuildTarget.ToBuildTargetGroup());
+                            Lightmapping.OnUpdateLightmapEncoding(platform.namedBuildTarget.ToBuildTargetGroup());
 
-                        serializedObject.ApplyModifiedProperties();
+                            serializedObject.ApplyModifiedProperties();
 
-                        GUIUtility.ExitGUI();
-                    }
+                            GUIUtility.ExitGUI();
+                        }
 
-                    if (encodingQuality == LightmapEncodingQuality.High)
-                    {
-                        if (platform.namedBuildTarget == NamedBuildTarget.WebGL)
+                        if (encodingQuality == LightmapEncodingQuality.High &&
+                            platform.namedBuildTarget == NamedBuildTarget.WebGL &&
+                            PlayerSettings.GetGraphicsAPIs(BuildTarget.WebGL).Contains(GraphicsDeviceType.OpenGLES2))
                         {
-                            var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.WebGL);
-                            if (apis.Contains(GraphicsDeviceType.OpenGLES2))
-                            {
-                                EditorGUILayout.HelpBox(SettingsContent.lightmapEncodingWebGLWarning.text, MessageType.Warning);
-                            }
+                            EditorGUILayout.HelpBox(SettingsContent.lightmapEncodingWebGLWarning.text, MessageType.Warning);
+                        }
+
+                        if (encodingQuality != LightmapEncodingQuality.Low && platform.namedBuildTarget == NamedBuildTarget.Android)
+                        {
+                            var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.Android);
+                            var hasMinAPI = (apis.Contains(GraphicsDeviceType.Vulkan) || apis.Contains(GraphicsDeviceType.OpenGLES3)) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
+                            if (!hasMinAPI)
+                                EditorGUILayout.HelpBox(SettingsContent.lightmapQualityAndroidWarning.text, MessageType.Warning);
                         }
                     }
 
-                    if (encodingQuality != LightmapEncodingQuality.Low)
                     {
-                        if (platform.namedBuildTarget == NamedBuildTarget.Android)
+                        EditorGUI.BeginChangeCheck();
+                        HDRCubemapEncodingQuality encodingQuality = PlayerSettings.GetHDRCubemapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
+                        HDRCubemapEncodingQuality[] hdrCubemapProbeEncodingValues = { HDRCubemapEncodingQuality.Low, HDRCubemapEncodingQuality.Normal, HDRCubemapEncodingQuality.High };
+                        HDRCubemapEncodingQuality newEncodingQuality = BuildEnumPopup(SettingsContent.hdrCubemapEncodingLabel, encodingQuality, hdrCubemapProbeEncodingValues, SettingsContent.hdrCubemapEncodingNames);
+                        if (EditorGUI.EndChangeCheck() && encodingQuality != newEncodingQuality)
+                        {
+                            PlayerSettings.SetHDRCubemapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup(), newEncodingQuality);
+
+                            Lightmapping.OnUpdateHDRCubemapEncoding(platform.namedBuildTarget.ToBuildTargetGroup());
+
+                            serializedObject.ApplyModifiedProperties();
+
+                            GUIUtility.ExitGUI();
+                        }
+
+                        if (encodingQuality == HDRCubemapEncodingQuality.High &&
+                            platform.namedBuildTarget == NamedBuildTarget.WebGL &&
+                            PlayerSettings.GetGraphicsAPIs(BuildTarget.WebGL).Contains(GraphicsDeviceType.OpenGLES2))
+                        {
+                            EditorGUILayout.HelpBox(SettingsContent.hdrCubemapEncodingWebGLWarning.text, MessageType.Warning);
+                        }
+
+                        if (encodingQuality != HDRCubemapEncodingQuality.Low && platform.namedBuildTarget == NamedBuildTarget.Android)
                         {
                             var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.Android);
                             var hasMinAPI = (apis.Contains(GraphicsDeviceType.Vulkan) || apis.Contains(GraphicsDeviceType.OpenGLES3)) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
                             if (!hasMinAPI)
-                                EditorGUILayout.HelpBox(SettingsContent.lightmapQualityAndroidWarning.text, MessageType.Warning);
+                                EditorGUILayout.HelpBox(SettingsContent.hdrCubemapQualityAndroidWarning.text, MessageType.Warning);
                         }
                     }
                 }
             }
 
-            // Light map settings
             if (!isPreset)
             {
+                // Light map settings
                 using (new EditorGUI.DisabledScope(EditorApplication.isPlaying || Lightmapping.isRunning))
                 {
                     bool streamingEnabled = PlayerSettings.GetLightmapStreamingEnabledForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
@@ -2041,6 +2094,7 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                     }
                 }
 
+                // Tickbox for Frame Timing Stats.
                 if (platform.namedBuildTarget.ToBuildTargetGroup() == BuildTargetGroup.Standalone || platform.namedBuildTarget == NamedBuildTarget.WindowsStoreApps || platform.namedBuildTarget == NamedBuildTarget.WebGL || (settingsExtension != null && settingsExtension.SupportsFrameTimingStatistics()))
                 {
                     PlayerSettings.enableFrameTimingStats = EditorGUILayout.Toggle(SettingsContent.enableFrameTimingStats, PlayerSettings.enableFrameTimingStats);
@@ -2052,6 +2106,24 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                             EditorGUILayout.HelpBox(SettingsContent.frameTimingStatsWebGLWarning.text, MessageType.Warning);
                         }
                     }
+                    if(PlayerSettings.enableFrameTimingStats)
+                    {
+                        EditorGUILayout.HelpBox(SettingsContent.openGLFrameTimingStatsOnGPURecordersOffInfo.text, MessageType.Info);
+                    }
+                }
+
+                // Tickbox for OpenGL-only option to toggle Profiler GPU Recorders.
+                if (platform.namedBuildTarget == NamedBuildTarget.Standalone || platform.namedBuildTarget == NamedBuildTarget.Android)
+                {
+                    PlayerSettings.enableOpenGLProfilerGPURecorders = EditorGUILayout.Toggle(SettingsContent.enableOpenGLProfilerGPURecorders, PlayerSettings.enableOpenGLProfilerGPURecorders);
+
+                    // Add different notes/warnings depending on the tickbox combinations.
+                    // These concern Frame Timing Stats as well as Profiler GPU Recorders,
+                    // so are listed below both to (hopefully) highlight that they're linked.
+                    if (PlayerSettings.enableOpenGLProfilerGPURecorders)
+                    {
+                        EditorGUILayout.HelpBox(SettingsContent.openGLFrameTimingStatsOffGPURecordersOnInfo.text, MessageType.Info);
+                    }
                 }
 
                 if (hdrDisplaySupported)
@@ -2201,7 +2273,6 @@ private void OtherSectionIdentificationGUI(BuildPlatform platform, ISettingEdito
                 GUILayout.Label(SettingsContent.macAppStoreTitle, EditorStyles.boldLabel);
 
                 EditorGUILayout.PropertyField(m_OverrideDefaultApplicationIdentifier, EditorGUIUtility.TrTextContent("Override Default Bundle Identifier"));
-                string defaultIdentifier = String.Format("com.{0}.{1}", m_CompanyName.stringValue, m_ProductName.stringValue);
 
                 using (var horizontal = new EditorGUILayout.HorizontalScope())
                 {
@@ -2209,7 +2280,7 @@ private void OtherSectionIdentificationGUI(BuildPlatform platform, ISettingEdito
                     {
                         using (new EditorGUI.IndentLevelScope())
                         {
-                            PlayerSettingsEditor.ShowApplicationIdentifierUI(m_ApplicationIdentifier, BuildTargetGroup.Standalone, m_OverrideDefaultApplicationIdentifier.boolValue, defaultIdentifier, "Bundle Identifier", "'CFBundleIdentifier'");
+                            ShowApplicationIdentifierUI(BuildTargetGroup.Standalone, "Bundle Identifier", "'CFBundleIdentifier'");
                         }
                     }
                 }
@@ -2258,17 +2329,33 @@ internal static GUIContent GetApplicationIdentifierError(BuildTargetGroup target
             return SettingsContent.applicationIdentifierError;
         }
 
-        internal static void ShowApplicationIdentifierUI(SerializedProperty prop, BuildTargetGroup targetGroup, bool overrideDefaultID, string defaultID, string label, string tooltip)
+        internal void ShowApplicationIdentifierUI(BuildTargetGroup targetGroup, string label, string tooltip)
         {
+            var overrideDefaultID = m_OverrideDefaultApplicationIdentifier.boolValue;
+            var defaultIdentifier = String.Format("com.{0}.{1}", m_CompanyName.stringValue, m_ProductName.stringValue);
             var oldIdentifier = "";
-            var currentIdentifier = PlayerSettings.SanitizeApplicationIdentifier(defaultID, targetGroup);
+            var currentIdentifier = PlayerSettings.SanitizeApplicationIdentifier(defaultIdentifier, targetGroup);
             var buildTargetGroup = BuildPipeline.GetBuildTargetGroupName(targetGroup);
             var warningMessage = SettingsContent.applicationIdentifierWarning.text;
             var errorMessage = GetApplicationIdentifierError(targetGroup).text;
 
-            if (!prop.serializedObject.isEditingMultipleObjects)
+            string GetSanitizedApplicationIdentifier()
             {
-                prop.TryGetMapEntry(buildTargetGroup, out var entry);
+                var sanitizedIdentifier = PlayerSettings.SanitizeApplicationIdentifier(currentIdentifier, targetGroup);
+
+                if (currentIdentifier != oldIdentifier) {
+                    if (!overrideDefaultID && !PlayerSettings.IsApplicationIdentifierValid(currentIdentifier, targetGroup))
+                        Debug.LogError(errorMessage);
+                    else if (overrideDefaultID && sanitizedIdentifier != currentIdentifier)
+                        Debug.LogWarning(warningMessage);
+                }
+
+                return sanitizedIdentifier;
+            }
+
+            if (!m_ApplicationIdentifier.serializedObject.isEditingMultipleObjects)
+            {
+                m_ApplicationIdentifier.TryGetMapEntry(buildTargetGroup, out var entry);
 
                 if (entry != null)
                     oldIdentifier = entry.FindPropertyRelative("second").stringValue;
@@ -2278,7 +2365,7 @@ internal static void ShowApplicationIdentifierUI(SerializedProperty prop, BuildT
                     if (overrideDefaultID)
                         currentIdentifier = oldIdentifier;
                     else
-                        prop.SetMapValue(buildTargetGroup, currentIdentifier);
+                        m_ApplicationIdentifier.SetMapValue(buildTargetGroup, currentIdentifier);
                 }
 
                 EditorGUILayout.BeginVertical();
@@ -2286,25 +2373,21 @@ internal static void ShowApplicationIdentifierUI(SerializedProperty prop, BuildT
 
                 using (new EditorGUI.DisabledScope(!overrideDefaultID))
                 {
-                    var sanitizedIdentifier = PlayerSettings.SanitizeApplicationIdentifier(currentIdentifier, targetGroup);
-                    if (currentIdentifier != oldIdentifier && (sanitizedIdentifier != currentIdentifier || currentIdentifier != defaultID))
-                        Debug.LogError(warningMessage);
-                    currentIdentifier = sanitizedIdentifier;
+                    currentIdentifier = GetSanitizedApplicationIdentifier();
                     currentIdentifier = EditorGUILayout.TextField(EditorGUIUtility.TrTextContent(label, tooltip), currentIdentifier);
                 }
 
                 if (EditorGUI.EndChangeCheck())
                 {
-                    var sanitizedIdentifier = PlayerSettings.SanitizeApplicationIdentifier(currentIdentifier, targetGroup);
-                    if (currentIdentifier != oldIdentifier && (sanitizedIdentifier != currentIdentifier || currentIdentifier != defaultID))
-                        Debug.LogError(warningMessage);
-                    currentIdentifier = sanitizedIdentifier;
-                    prop.SetMapValue(buildTargetGroup, currentIdentifier);
+                    currentIdentifier = GetSanitizedApplicationIdentifier();
+                    m_ApplicationIdentifier.SetMapValue(buildTargetGroup, currentIdentifier);
                 }
 
-                if (!PlayerSettings.IsApplicationIdentifierValid(currentIdentifier, targetGroup))
+                if (currentIdentifier == "com.Company.ProductName" || currentIdentifier == "com.unity3d.player")
+                    EditorGUILayout.HelpBox("Don't forget to set the Application Identifier.", MessageType.Warning);
+                else if (!PlayerSettings.IsApplicationIdentifierValid(currentIdentifier, targetGroup))
                     EditorGUILayout.HelpBox(errorMessage, MessageType.Error);
-                else if (!overrideDefaultID && currentIdentifier != defaultID)
+                else if (!overrideDefaultID && currentIdentifier != defaultIdentifier)
                     EditorGUILayout.HelpBox(warningMessage, MessageType.Warning);
 
                 EditorGUILayout.EndVertical();
@@ -2532,9 +2615,6 @@ private void OtherSectionConfigurationGUI(BuildPlatform platform, ISettingEditor
                             m_GCIncremental.boolValue = oldValue;
                     }
                 }
-
-                EditorGUILayout.PropertyField(m_AssemblyVersionValidation,
-                    (PlayerSettings.GetScriptingBackend(platform.namedBuildTarget) != ScriptingImplementation.Mono2x) ? SettingsContent.assemblyVersionValidationEditorOnly : SettingsContent.assemblyVersionValidation);
             }
 
             var insecureHttp = BuildEnumPopup(m_InsecureHttpOption, SettingsContent.insecureHttpOption, new[] { InsecureHttpOption.NotAllowed, InsecureHttpOption.DevelopmentOnly, InsecureHttpOption.AlwaysAllowed }, SettingsContent.insecureHttpOptions);
@@ -3097,6 +3177,9 @@ static GUIContent GetNiceScriptingBackendName(ScriptingImplementation scriptingB
                     return SettingsContent.scriptingMono2x;
                 case ScriptingImplementation.IL2CPP:
                     return SettingsContent.scriptingIL2CPP;
+                #pragma warning disable 618
+                case ScriptingImplementation.CoreCLR:
+                    return SettingsContent.scriptingCoreCLR;
                 default:
                     throw new ArgumentException($"Scripting backend value {scriptingBackend} is not supported.", nameof(scriptingBackend));
             }
diff --git a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
index e56ed05d1f..db95a28427 100644
--- a/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
+++ b/Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsSplashScreenEditor.cs
@@ -48,13 +48,18 @@ internal partial class PlayerSettingsSplashScreenEditor
         static readonly float k_LogoListPropertyLabelWidth = 100;
         static readonly float k_MinPersonalEditionOverlayOpacity = 0.5f;
         static readonly float k_MinProEditionOverlayOpacity = 0.0f;
+        static readonly Color32 k_DarkOnLightBgColor = new Color32(204, 204, 204, 255);// #CCCCCC
+        static readonly Color32 k_LightOnDarkBgColor = new Color32(35, 31, 32, 255);
 
-        static Sprite s_UnityLogo;
+        static Sprite s_UnityLogoLight; // We use this version as a placeholder when the logo is in the list.
+        static Sprite s_UnityLogoDark;
 
         readonly AnimBool m_ShowAnimationControlsAnimator = new AnimBool();
         readonly AnimBool m_ShowBackgroundColorAnimator = new AnimBool();
         readonly AnimBool m_ShowLogoControlsAnimator = new AnimBool();
 
+        Sprite UnityLogo => m_SplashScreenLogoStyle.intValue == (int)PlayerSettings.SplashScreen.UnityLogoStyle.DarkOnLight ? s_UnityLogoDark : s_UnityLogoLight;
+
         // If the user changes an asset(delete, re-import etc) then we should cancel the splash screen to avoid using invalid data. (case 857060)
         class CancelSplashScreenOnAssetChange : AssetPostprocessor
         {
@@ -137,8 +142,10 @@ public void OnEnable()
             m_ShowLogoControlsAnimator.value = m_ShowUnitySplashLogo.boolValue;
             SetValueChangeListeners(m_Owner.Repaint);
 
-            if (s_UnityLogo == null)
-                s_UnityLogo = Resources.GetBuiltinResource<Sprite>("UnitySplash-cube.png");
+            if (s_UnityLogoLight == null)
+                s_UnityLogoLight = AssetDatabase.GetBuiltinExtraResource<Sprite>("SplashScreen/UnitySplash-Light.png");
+            if (s_UnityLogoDark == null)
+                s_UnityLogoDark = AssetDatabase.GetBuiltinExtraResource<Sprite>("SplashScreen/UnitySplash-Dark.png");
         }
 
         internal void SetValueChangeListeners(UnityAction action)
@@ -167,10 +174,7 @@ private void DrawElementUnityLogo(Rect rect, int index, bool isActive, bool isFo
             // Unity logo
             float logoWidth = Mathf.Clamp(rect.width - k_LogoListPropertyMinWidth, k_LogoListUnityLogoMinWidth, k_LogoListUnityLogoMaxWidth);
             var logoRect = new Rect(rect.x, rect.y, logoWidth, rect.height);
-            var oldCol = GUI.color;
-            GUI.color = (m_SplashScreenLogoStyle.intValue == (int)PlayerSettings.SplashScreen.UnityLogoStyle.DarkOnLight ? Color.black : Color.white);
-            GUI.DrawTexture(logoRect, s_UnityLogo.texture, ScaleMode.ScaleToFit);
-            GUI.color = oldCol;
+            GUI.DrawTexture(logoRect, UnityLogo.texture, ScaleMode.ScaleToFit);
 
             // Properties
             var oldLabelWidth = EditorGUIUtility.labelWidth;
@@ -194,7 +198,7 @@ private void DrawLogoListElementCallback(Rect rect, int index, bool isActive, bo
             var element = m_SplashScreenLogos.GetArrayElementAtIndex(index);
             var logo = element.FindPropertyRelative("logo");
 
-            if ((Sprite)logo.objectReferenceValue == s_UnityLogo)
+            if ((Sprite)logo.objectReferenceValue == s_UnityLogoLight)
             {
                 DrawElementUnityLogo(rect, index, isActive, isFocused);
                 return;
@@ -244,11 +248,11 @@ private void OnLogoListAddCallback(ReorderableList list)
         }
 
         // Prevent users removing the unity logo.
-        private static bool OnLogoListCanRemoveCallback(ReorderableList list)
+        private bool OnLogoListCanRemoveCallback(ReorderableList list)
         {
             var element = list.serializedProperty.GetArrayElementAtIndex(list.index);
             var logo = (Sprite)element.FindPropertyRelative("logo").objectReferenceValue;
-            return logo != s_UnityLogo;
+            return logo != s_UnityLogoLight;
         }
 
         private void AddUnityLogoToLogosList()
@@ -258,7 +262,7 @@ private void AddUnityLogoToLogosList()
             {
                 var listElement = m_SplashScreenLogos.GetArrayElementAtIndex(i);
                 var listLogo = listElement.FindPropertyRelative("logo");
-                if ((Sprite)listLogo.objectReferenceValue == s_UnityLogo)
+                if ((Sprite)listLogo.objectReferenceValue == s_UnityLogoLight)
                     return;
             }
 
@@ -266,7 +270,7 @@ private void AddUnityLogoToLogosList()
             var element = m_SplashScreenLogos.GetArrayElementAtIndex(0);
             var logo = element.FindPropertyRelative("logo");
             var duration = element.FindPropertyRelative("duration");
-            logo.objectReferenceValue = s_UnityLogo;
+            logo.objectReferenceValue = s_UnityLogoLight;
             duration.floatValue = k_DefaultLogoTime;
         }
 
@@ -276,7 +280,7 @@ private void RemoveUnityLogoFromLogosList()
             {
                 var element = m_SplashScreenLogos.GetArrayElementAtIndex(i);
                 var logo = element.FindPropertyRelative("logo");
-                if ((Sprite)logo.objectReferenceValue == s_UnityLogo)
+                if ((Sprite)logo.objectReferenceValue == s_UnityLogoLight)
                 {
                     m_SplashScreenLogos.DeleteArrayElementAtIndex(i);
                     --i; // Continue checking in case we have duplicates.
@@ -366,7 +370,15 @@ private void BuiltinCustomSplashScreenGUI(BuildTargetGroup targetGroup, ISetting
                 GameView.RepaintAll();
             }
 
+            EditorGUI.BeginChangeCheck();
             EditorGUILayout.PropertyField(m_SplashScreenLogoStyle, k_Texts.splashStyle);
+            if (EditorGUI.EndChangeCheck())
+            {
+                if (m_SplashScreenLogoStyle.intValue == (int)PlayerSettings.SplashScreen.UnityLogoStyle.DarkOnLight)
+                    m_SplashScreenBackgroundColor.colorValue = k_DarkOnLightBgColor;
+                else
+                    m_SplashScreenBackgroundColor.colorValue = k_LightOnDarkBgColor;
+            }
 
             // Animation
             EditorGUILayout.PropertyField(m_SplashScreenAnimation, k_Texts.animate);
diff --git a/Editor/Mono/Inspector/PolygonCollider2DEditor.cs b/Editor/Mono/Inspector/PolygonCollider2DEditor.cs
index 7dfd57e3ab..30c0050919 100644
--- a/Editor/Mono/Inspector/PolygonCollider2DEditor.cs
+++ b/Editor/Mono/Inspector/PolygonCollider2DEditor.cs
@@ -36,7 +36,7 @@ public override void OnInspectorGUI()
             }
             else
             {
-                BeginColliderInspector();
+                BeginEditColliderInspector();
             }
 
             // Grab this as the offset to the top of the drag target.
@@ -52,8 +52,6 @@ public override void OnInspectorGUI()
                 EditorGUI.EndDisabledGroup();
             }
 
-            EndColliderInspector();
-
             FinalizeInspectorGUI();
 
             HandleDragAndDrop(GUILayoutUtility.GetLastRect());
diff --git a/Editor/Mono/Inspector/PolygonEditorUtility.cs b/Editor/Mono/Inspector/PolygonEditorUtility.cs
index 9fe0573ef1..581d1d4dca 100644
--- a/Editor/Mono/Inspector/PolygonEditorUtility.cs
+++ b/Editor/Mono/Inspector/PolygonEditorUtility.cs
@@ -44,7 +44,7 @@ public void Reset()
             m_HandleEdge = false;
         }
 
-        private void UndoRedoPerformed()
+        private void UndoRedoPerformed(in UndoRedoInfo info)
         {
             if (m_ActiveCollider != null)
             {
@@ -56,7 +56,7 @@ private void UndoRedoPerformed()
 
         public void StartEditing(Collider2D collider)
         {
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
 
             Reset();
 
@@ -88,7 +88,7 @@ public void StopEditing()
             PolygonEditor.StopEditing();
             m_ActiveCollider = null;
 
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
         }
 
         public void OnSceneGUI()
diff --git a/Editor/Mono/Inspector/PreviewRenderUtility.cs b/Editor/Mono/Inspector/PreviewRenderUtility.cs
index 260924c6ac..29aa496442 100644
--- a/Editor/Mono/Inspector/PreviewRenderUtility.cs
+++ b/Editor/Mono/Inspector/PreviewRenderUtility.cs
@@ -280,17 +280,14 @@ public void BeginStaticPreview(Rect r)
             Graphics.DrawTexture(new Rect(0, 0, m_RenderTexture.width, m_RenderTexture.height), darkGreyBackground);
             Object.DestroyImmediate(darkGreyBackground);
 
-            if (!EditorApplication.isUpdating)
+            if (!EditorApplication.isUpdating && Unsupported.SetOverrideLightingSettings(previewScene.scene))
             {
-                var oldProbe = RenderSettings.ambientProbe;
-                Texture defaultEnvTexture = ReflectionProbe.defaultTexture;
-                if (Unsupported.SetOverrideLightingSettings(previewScene.scene))
-                {
-                    // Most preview windows just want the light probe from the main scene so by default we copy it here. It can then be overridden if user wants.
-                    RenderSettings.ambientProbe = oldProbe;
-                    RenderSettings.defaultReflectionMode = UnityEngine.Rendering.DefaultReflectionMode.Custom;
-                    RenderSettings.customReflectionTexture = defaultEnvTexture;
-                }
+                // User can set an ambientColor if they want to override the default black color
+                // Cannot grab the main scene light probe/color instead as this is sometimes run on a worker without access to the original probe/color.
+                RenderSettings.ambientMode = AmbientMode.Flat;
+                RenderSettings.ambientLight = ambientColor;
+                // Reflection mode should be set to the default (skybox) to stay consistent with the worker thread settings when the preview is created while saving
+                RenderSettings.defaultReflectionMode = UnityEngine.Rendering.DefaultReflectionMode.Skybox;
             }
         }
 
diff --git a/Editor/Mono/Inspector/PropertyEditor.cs b/Editor/Mono/Inspector/PropertyEditor.cs
index 1573176c17..cb377c319e 100644
--- a/Editor/Mono/Inspector/PropertyEditor.cs
+++ b/Editor/Mono/Inspector/PropertyEditor.cs
@@ -6,9 +6,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using UnityEditor.AddComponent;
 using UnityEditor.VersionControl;
 using UnityEngine;
+using UnityEngine.Scripting;
 using UnityEditorInternal;
 using UnityEditorInternal.VersionControl;
 using UnityEditor.StyleSheets;
@@ -20,6 +22,7 @@
 using AssetImporterEditor = UnityEditor.AssetImporters.AssetImporterEditor;
 using JetBrains.Annotations;
 using Unity.Profiling;
+using UnityEditor.UIElements;
 
 namespace UnityEditor
 {
@@ -27,7 +30,6 @@ interface IPropertyView
     {
         ActiveEditorTracker tracker { get; }
         InspectorMode inspectorMode { get; }
-        bool useUIElementsDefaultInspector { get; }
         HashSet<int> editorsWithImportedObjectLabel { get; }
         Editor lastInteractedEditor { get; set; }
         GUIView parent { get; }
@@ -37,6 +39,7 @@ interface IPropertyView
         bool WasEditorVisible(Editor[] editors, int editorIndex, Object target);
         bool ShouldCullEditor(Editor[] editors, int editorIndex);
         void Repaint();
+        void UnsavedChangesStateChanged(Editor editor, bool value);
     }
 
     interface IPropertySourceOpener
@@ -92,6 +95,11 @@ class PropertyEditor : EditorWindow, IPropertyView, IHasCustomMenu
         protected Component[] m_ComponentsInPrefabSource;
         protected HashSet<Component> m_RemovedComponents;
         protected HashSet<Component> m_SuppressedComponents;
+        // Map that maps from editorIndex to list of removed asset components
+        // This is later used to determine if removed components visual elements need to be added to some editor at some index
+        protected Dictionary<int, List<Component>> m_RemovedComponentDict;
+        // List of removed components at the end of the editor list that needs to have visual elements append to the editor list
+        protected List<Component> m_AdditionalRemovedComponents;
         protected bool m_ResetKeyboardControl;
         internal bool m_OpenAddComponentMenu = false;
         protected ActiveEditorTracker m_Tracker;
@@ -121,7 +129,6 @@ class PropertyEditor : EditorWindow, IPropertyView, IHasCustomMenu
         public GUIView parent => m_Parent;
         public HashSet<int> editorsWithImportedObjectLabel { get; } = new HashSet<int>();
         public EditorDragging editorDragging { get; }
-        public bool useUIElementsDefaultInspector { get; internal set; } = false;
         internal int inspectorElementModeOverride { get; set; } = 0;
         public Editor lastInteractedEditor { get; set; }
         internal static PropertyEditor HoveredPropertyEditor { get; private set; }
@@ -319,7 +326,7 @@ protected virtual void OnEnable()
             CreateTracker();
 
             EditorApplication.focusChanged += OnFocusChanged;
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
             PrefabUtility.prefabInstanceUnpacked += OnPrefabInstanceUnpacked;
             ObjectChangeEvents.changesPublished += OnObjectChanged;
 
@@ -341,7 +348,7 @@ protected virtual void OnDisable()
             m_LastVerticalScrollValue = m_ScrollView?.verticalScroller.value ?? 0;
 
             EditorApplication.focusChanged -= OnFocusChanged;
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
             PrefabUtility.prefabInstanceUnpacked -= OnPrefabInstanceUnpacked;
             ObjectChangeEvents.changesPublished -= OnObjectChanged;
 
@@ -369,12 +376,6 @@ protected virtual void OnLostFocus()
 
         protected virtual bool CloseIfEmpty()
         {
-            // It should never close if its tracker is not locked.
-            if (!tracker.isLocked)
-            {
-                return false;
-            }
-
             // We can rely on the tracker to always keep valid Objects
             // even after an assemblyreload or assetdatabase refresh.
             List<Object> locked = new List<Object>();
@@ -394,6 +395,7 @@ protected virtual void OnInspectorUpdate()
 
             // Check if scripts have changed without calling set dirty
             tracker.VerifyModifiedMonoBehaviours();
+            InspectorUtility.DirtyLivePropertyChanges(tracker);
 
             if (!tracker.isDirty || !ReadyToRepaint())
                 return;
@@ -531,9 +533,8 @@ private void OnGeometryChanged(GeometryChangedEvent e)
             RestoreVerticalScrollIfNeeded();
         }
 
-        private void SetUseUIEDefaultInspector()
+        internal void ClearEditorsAndRebuild()
         {
-            useUIElementsDefaultInspector = !useUIElementsDefaultInspector;
             // Clear the editors Element so that a real rebuild is done
             editorsElement.Clear();
             m_EditorElementUpdater.Clear();
@@ -563,7 +564,6 @@ public virtual void AddDebugItemsToMenu(GenericMenu menu)
             if (Unsupported.IsDeveloperMode())
             {
                 menu.AddItem(EditorGUIUtility.TrTextContent("Debug-Internal"), m_InspectorMode == InspectorMode.DebugInternal, SetDebugInternal);
-                menu.AddItem(EditorGUIUtility.TrTextContent("Use UI Toolkit Default Inspector"), useUIElementsDefaultInspector, SetUseUIEDefaultInspector);
             }
         }
 
@@ -723,7 +723,7 @@ protected virtual void UpdateWindowObjectNameTitle()
             Repaint();
         }
 
-        private void OnUndoRedoPerformed()
+        private void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             // Early out if we have no removed or suppressed components.
             // It's only a change from suppressed to removed or vice versa that needs to be handled specially on undo/redo.
@@ -735,11 +735,87 @@ private void OnUndoRedoPerformed()
             RebuildContentsContainers();
         }
 
+        private void DetermineInsertionPointOfVisualElementForRemovedComponent(int targetGameObjectIndex, Editor[] editors)
+        {
+            // Calculate which editor should have the removed component visual element added, if any.
+            // The visual element for removed components is added to the top of the chosen editor.
+            // It is assumed the asset components comes in the same order in the editors list, but there can be additional added
+            // components in the editors list, i.e. the editors for assets components can't be moved by the user
+            // Added components can appear anywhere in the editors list
+            if (m_RemovedComponentDict == null)
+                m_RemovedComponentDict = new Dictionary<int, List<Component>>();
+            if (m_AdditionalRemovedComponents == null)
+                m_AdditionalRemovedComponents = new List<Component>();
+
+            m_RemovedComponentDict.Clear();
+            m_AdditionalRemovedComponents.Clear();
+
+            int editorIndex = targetGameObjectIndex + 1;
+
+            foreach(var sourceComponent in m_ComponentsInPrefabSource)
+            {
+                // editorCounter is used to look forward in the list of editor, this is because added components might have be inserted between prefab components
+                // it starts at editorIndex because there is no need to look at the previous editors, based on the assumption that asset components and instance components
+                // always comes in the same order
+                int editorCounter = editorIndex;
+
+                // Move forwards through the list of editors to find one that matches the asset component
+                while (editorCounter < editors.Length)
+                {
+                    Object editorTarget = editors[editorCounter].target;
+
+                    // Skip added Components
+                    if (editorTarget is Component && PrefabUtility.GetPrefabInstanceHandle(editorTarget) == null)
+                    {
+                        // If editorIndex and editorCounter are identical we also increment the editor index because we don't
+                        // want to add the removed component visual element to added components editors
+                        // For consistency the visual element for removed components are never added to added components, so if the current
+                        // editor is an added component we skip the current editor
+                        if (editorIndex == editorCounter)
+                            ++editorIndex;
+                        ++editorCounter;
+                        continue;
+                    }
+
+                    Object correspondingSource = PrefabUtility.GetCorrespondingObjectFromSource(editorTarget);
+                    if (correspondingSource == sourceComponent)
+                    {
+                        // When we found an editor that matches the asset component, we move the start index because we don't have to test
+                        // this editor again
+                        editorIndex = editorCounter + 1;
+                        break;
+                    }
+
+                    ++editorCounter;
+                }
+
+                // If the forward looking counter has reached the end of the editors list, the component must have been removed from the instance
+                if (editorCounter >= editors.Length)
+                {
+                    // If the editorIndex has also reached the end we have removed components at the end of the list and those need to have their
+                    // visual element added separately
+                    if (editorIndex >= editors.Length)
+                    {
+                        m_AdditionalRemovedComponents.Add(sourceComponent);
+                    }
+                    else
+                    {
+                        if (!m_RemovedComponentDict.ContainsKey(editorIndex))
+                            m_RemovedComponentDict.Add(editorIndex, new List<Component>());
+
+                        m_RemovedComponentDict[editorIndex].Add(sourceComponent);
+                    }
+                }
+            }
+        }
+
         private void ExtractPrefabComponents()
         {
             m_LastInitialEditorInstanceID = m_Tracker.activeEditors.Length == 0 ? 0 : m_Tracker.activeEditors[0].GetInstanceID();
 
             m_ComponentsInPrefabSource = null;
+            m_RemovedComponentDict = null;
+            m_AdditionalRemovedComponents = null;
             if (m_RemovedComponents == null)
             {
                 m_RemovedComponents = new HashSet<Component>();
@@ -895,6 +971,13 @@ internal virtual void RebuildContentsContainers()
             {
                 m_RemovedPrefabComponentsElement.RemoveFromHierarchy();
                 m_RemovedPrefabComponentsElement = null;
+
+            }
+
+            if (m_RemovedComponentDict != null)
+            {
+                m_RemovedComponentDict = null;
+                m_AdditionalRemovedComponents = null;
             }
 
             BeginRebuildContentContainers();
@@ -965,7 +1048,7 @@ internal virtual void RebuildContentsContainers()
 
             k_CreateInspectorElements.Begin();
             // Only trigger the fixed count and viewport creation if this is the first build. Otherwise let the update method handle it.
-            if (m_EditorElementUpdater.Position == 0)
+            if (m_EditorElementUpdater.Position == 0 && editors.Any())
             {
                 // Force create a certain number of inspector elements without invoking a layout pass.
                 // We always want a minimum number of elements to be added.
@@ -1124,7 +1207,7 @@ protected IPreviewable[] GetEditorsWithPreviews(Editor[] editors)
             foreach (Editor e in editors)
             {
                 ++i;
-                if (e.target == null)
+                if (!e || e.target == null)
                     continue;
 
                 // If target is an asset, but not the same asset as the asset
@@ -1176,14 +1259,15 @@ private void ResetKeyboardControl()
             }
         }
 
-        private static bool HasLabel(Object target)
+        private static bool IsOpenForEdit(Object target)
         {
-            return HasLabel(target, AssetDatabase.GetAssetPath(target));
-        }
+            if (EditorUtility.IsPersistent(target))
+            {
+                var assetPath = AssetDatabase.GetAssetPath(target);
+                return Provider.PathHasMetaFile(assetPath) && AssetDatabase.IsMetaFileOpenForEdit(target);
+            }
 
-        private static bool HasLabel(Object target, string assetPath)
-        {
-            return EditorUtility.IsPersistent(target) && assetPath.StartsWith("assets", StringComparison.OrdinalIgnoreCase);
+            return false;
         }
 
         private Object[] GetInspectedAssets()
@@ -1193,13 +1277,13 @@ private Object[] GetInspectedAssets()
             if (assetEditor != null && assetEditor.targets.Length == 1)
             {
                 string assetPath = AssetDatabase.GetAssetPath(assetEditor.target);
-                if (HasLabel(assetEditor.target, assetPath) && !Directory.Exists(assetPath))
+                if (IsOpenForEdit(assetEditor.target) && !Directory.Exists(assetPath))
                     return assetEditor.targets;
             }
 
             // This is used if more than one asset is selected
             // Ideally the tracker should be refactored to track not just editors but also the selection that caused them, so we wouldn't need this
-            return Selection.objects.Where(HasLabel).ToArray();
+            return Selection.objects.Where(IsOpenForEdit).ToArray();
         }
 
         protected virtual bool BeginDrawPreviewAndLabels() { return true; }
@@ -1712,7 +1796,6 @@ private void DrawEditors(Editor[] editors)
             if (m_RemovedComponents == null)
                 ExtractPrefabComponents(); // needed after assembly reload (due to HashSet not being serializable)
 
-            int prefabComponentIndex = -1;
             int targetGameObjectIndex = -1;
             GameObject targetGameObject = null;
             if (m_ComponentsInPrefabSource != null)
@@ -1721,30 +1804,23 @@ private void DrawEditors(Editor[] editors)
                 targetGameObject = (GameObject)editors[targetGameObjectIndex].target;
             }
 
+            if (m_ComponentsInPrefabSource != null && m_RemovedComponents.Count > 0 && m_RemovedComponentDict == null)
+                DetermineInsertionPointOfVisualElementForRemovedComponent(targetGameObjectIndex, editors);
+
             for (int editorIndex = 0; editorIndex < editors.Length; editorIndex++)
             {
+                if (!editors[editorIndex])
+                    continue;
                 editors[editorIndex].propertyViewer = this;
+
                 VisualElement prefabsComponentElement = new VisualElement() { name = "PrefabComponentElement" };
-                if (m_ComponentsInPrefabSource != null && editorIndex > targetGameObjectIndex)
-                {
-                    if (prefabComponentIndex == -1)
-                        prefabComponentIndex = 0;
-                    while (prefabComponentIndex < m_ComponentsInPrefabSource.Length)
-                    {
-                        Object target = editors[editorIndex].target;
-                        // This is possible if there's a component with a missing script.
-                        if (target != null)
-                        {
-                            Object correspondingSource = PrefabUtility.GetCorrespondingObjectFromSource(target);
-                            Component nextInSource = m_ComponentsInPrefabSource[prefabComponentIndex];
+                Object target = editors[editorIndex].target;
 
-                            if (correspondingSource == nextInSource)
-                                break;
-                            AddRemovedPrefabComponentElement(targetGameObject, nextInSource, prefabsComponentElement);
-                        }
-                        prefabComponentIndex++;
-                    }
-                    prefabComponentIndex++;
+                if (m_RemovedComponentDict != null && m_RemovedComponentDict.ContainsKey(editorIndex))
+                {
+                    var objectList = m_RemovedComponentDict[editorIndex];
+                    foreach (var sourceComponent in objectList)
+                        AddRemovedPrefabComponentElement(targetGameObject, sourceComponent, prefabsComponentElement);
                 }
 
                 try
@@ -1766,10 +1842,10 @@ private void DrawEditors(Editor[] editors)
                                 ? "Nothing Selected"
                                 : ObjectNames.GetInspectorTitle(editorTarget);
                             culledEditorContainer =
-                                EditorUIService.instance.CreateCulledEditorElement(editorIndex, this, editorTitle);
+                                new UIElements.EditorElement(editorIndex, this, true) { name = editorTitle };
                             editorsElement.Add(culledEditorContainer as VisualElement);
 
-                            if (!EditorUIService.disableInspectorElementThrottling)
+                            if (!InspectorElement.disabledThrottling)
                                 m_EditorElementUpdater.Add(culledEditorContainer);
                         }
 
@@ -1781,10 +1857,9 @@ private void DrawEditors(Editor[] editors)
                         string editorTitle = editorTarget == null ?
                             "Nothing Selected" :
                             $"{editor.GetType().Name}_{editorTarget.GetType().Name}_{editorTarget.GetInstanceID()}";
-                        editorContainer = EditorUIService.instance.CreateEditorElement(editorIndex, this, editorTitle);
+                        editorContainer = new UIElements.EditorElement(editorIndex, this) { name = editorTitle };
                         editorsElement.Add(editorContainer as VisualElement);
-
-                        if (!EditorUIService.disableInspectorElementThrottling)
+                        if (!InspectorElement.disabledThrottling)
                             m_EditorElementUpdater.Add(editorContainer);
                     }
 
@@ -1810,16 +1885,11 @@ private void DrawEditors(Editor[] editors)
             }
 
             // Make sure to display any remaining removed components that come after the last component on the GameObject.
-            if (m_ComponentsInPrefabSource != null)
+            if (m_AdditionalRemovedComponents != null && m_AdditionalRemovedComponents.Count() > 0)
             {
                 VisualElement prefabsComponentElement = new VisualElement() { name = "RemainingPrefabComponentElement" };
-                while (prefabComponentIndex > -1 && prefabComponentIndex < m_ComponentsInPrefabSource.Length)
-                {
-                    Component nextInSource = m_ComponentsInPrefabSource[prefabComponentIndex];
-                    AddRemovedPrefabComponentElement(targetGameObject, nextInSource, prefabsComponentElement);
-
-                    prefabComponentIndex++;
-                }
+                foreach(var sourceComponent in m_AdditionalRemovedComponents)
+                    AddRemovedPrefabComponentElement(targetGameObject, sourceComponent, prefabsComponentElement);
 
                 if (prefabsComponentElement.childCount > 0)
                 {
@@ -1839,7 +1909,7 @@ private void RestoreVerticalScrollIfNeeded()
             m_LastInspectedObjectInstanceID = -1; // reset to make sure the restore occurs once
         }
 
-        void OnPrefabInstanceUnpacked(GameObject unpackedPrefabInstance)
+        void OnPrefabInstanceUnpacked(GameObject unpackedPrefabInstance, PrefabUnpackMode unpackMode)
         {
             if (m_RemovedComponents == null)
                 return;
@@ -1984,6 +2054,60 @@ public bool ShouldCullEditor(Editor[] editors, int editorIndex)
             return false;
         }
 
+        public override void SaveChanges()
+        {
+            base.SaveChanges();
+            foreach (var editor in tracker.activeEditors)
+            {
+                editor.SaveChanges();
+            }
+        }
+
+        public override void DiscardChanges()
+        {
+            base.DiscardChanges();
+            foreach (var editor in tracker.activeEditors)
+            {
+                editor.DiscardChanges();
+            }
+        }
+
+        public void UnsavedChangesStateChanged(Editor editor, bool value)
+        {
+            tracker.UnsavedChangesStateChanged(editor, value);
+            hasUnsavedChanges = tracker.hasUnsavedChanges;
+            if (hasUnsavedChanges)
+            {
+                StringBuilder str = new StringBuilder();
+                foreach (var activeEditor in tracker.activeEditors)
+                {
+                    if (activeEditor.hasUnsavedChanges)
+                    {
+                        str.AppendLine(activeEditor.saveChangesMessage);
+                    }
+                }
+                saveChangesMessage = str.ToString();
+            }
+            else
+            {
+                saveChangesMessage = string.Empty;
+            }
+        }
+
+        [RequiredByNativeCode]
+        private static bool PrivateRequestRebuild(ActiveEditorTracker tracker)
+        {
+            foreach (var inspector in Resources.FindObjectsOfTypeAll<PropertyEditor>())
+            {
+                if (inspector.tracker.Equals(tracker))
+                {
+                    return ContainerWindow.PrivateRequestClose(new List<EditorWindow>() {inspector});
+                }
+            }
+
+            return true;
+        }
+
         private void DrawSelectionPickerList()
         {
             if (m_TypeSelectionList == null)
@@ -2032,8 +2156,12 @@ private void AddComponentButton(Editor[] editors)
                 return;
 
             Editor editor = InspectorWindowUtils.GetFirstNonImportInspectorEditor(editors);
+
             if (editor != null && editor.target != null && editor.target is GameObject && editor.IsEnabled())
             {
+                if (ModeService.HasExecuteHandler("inspector_read_only") && ModeService.Execute("inspector_read_only", editor.target))
+                    return;
+
                 EditorGUILayout.BeginHorizontal(GUIContent.none, GUIStyle.none, GUILayout.Height(kAddComponentButtonHeight));
                 {
                     GUILayout.FlexibleSpace();
diff --git a/Editor/Mono/Inspector/QualitySettingsEditor.cs b/Editor/Mono/Inspector/QualitySettingsEditor.cs
index 33c8c1b9af..0b3fd40d6c 100644
--- a/Editor/Mono/Inspector/QualitySettingsEditor.cs
+++ b/Editor/Mono/Inspector/QualitySettingsEditor.cs
@@ -31,6 +31,7 @@ private class Content
             public static readonly GUIContent kVSyncCountLabel = EditorGUIUtility.TrTextContent("VSync Count", "Specifies how Unity synchronizes rendering with the refresh rate of the display device.");
             public static readonly GUIContent kLODBiasLabel = EditorGUIUtility.TrTextContent("LOD Bias", "The bias Unity uses to determine which model to render when a GameObject’s on-screen size is between two LOD levels. Values between 0 and 1 favor the less detailed model. Values greater than 1 favor the more detailed model.");
             public static readonly GUIContent kMaximumLODLevelLabel = EditorGUIUtility.TrTextContent("Maximum LOD Level", "The highest LOD to use in the application.");
+            public static readonly GUIContent kEnableLODCrossFadeLabel = EditorGUIUtility.TrTextContent("LOD Cross Fade", "Enables or disables LOD Cross Fade.");
             public static readonly GUIContent kMipStrippingHint = EditorGUIUtility.TrTextContent("Where the maximum possible texture mip resolution for a platform is less than full, enabling Texture MipMap Stripping in Player Settings can reduce the package size.");
 
             public static readonly GUIContent kAsyncUploadTimeSlice = EditorGUIUtility.TrTextContent("Time Slice", "The amount of time (in milliseconds) Unity spends uploading Texture and Mesh data to the GPU per frame.");
@@ -411,7 +412,7 @@ void SoftParticlesHintGUI()
                 return;
 
             RenderingPath renderPath = mainCamera.actualRenderingPath;
-            if (renderPath == RenderingPath.DeferredLighting || renderPath == RenderingPath.DeferredShading)
+            if (renderPath == RenderingPath.DeferredShading)
                 return; // using deferred, all is good
 
             if ((mainCamera.depthTextureMode & DepthTextureMode.Depth) != 0)
@@ -522,6 +523,7 @@ public override void OnInspectorGUI()
             var vSyncCountProperty = currentSettings.FindPropertyRelative("vSyncCount");
             var lodBiasProperty = currentSettings.FindPropertyRelative("lodBias");
             var maximumLODLevelProperty = currentSettings.FindPropertyRelative("maximumLODLevel");
+            var enableLODCrossFadeProperty = currentSettings.FindPropertyRelative("enableLODCrossFade");
             var particleRaycastBudgetProperty = currentSettings.FindPropertyRelative("particleRaycastBudget");
             var asyncUploadTimeSliceProperty = currentSettings.FindPropertyRelative("asyncUploadTimeSlice");
             var asyncUploadBufferSizeProperty = currentSettings.FindPropertyRelative("asyncUploadBufferSize");
@@ -545,7 +547,10 @@ public override void OnInspectorGUI()
 
             GUILayout.Label(EditorGUIUtility.TempContent("Rendering"), EditorStyles.boldLabel);
 
-            RenderPipelineAssetSelector.Draw(Content.kRenderPipelineObject, m_QualitySettings, customRenderPipeline);
+            EditorGUI.RenderPipelineAssetField(Content.kRenderPipelineObject, m_QualitySettings, customRenderPipeline);
+            if (!usingSRP && customRenderPipeline.objectReferenceValue != null)
+                EditorGUILayout.HelpBox("Missing a Scriptable Render Pipeline in Graphics: \"Scriptable Render Pipeline Settings\" to use Scriptable Render Pipeline from Quality: \"Custom Render Pipeline\".", MessageType.Warning);
+
             if (!usingSRP)
                 EditorGUILayout.PropertyField(pixelLightCountProperty);
 
@@ -661,6 +666,8 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(lodBiasProperty, Content.kLODBiasLabel);
             if (!SupportedRenderingFeatures.active.overridesMaximumLODLevel)
                 EditorGUILayout.PropertyField(maximumLODLevelProperty, Content.kMaximumLODLevelLabel);
+            if (!SupportedRenderingFeatures.active.overridesEnableLODCrossFade)
+                EditorGUILayout.PropertyField(enableLODCrossFadeProperty, Content.kEnableLODCrossFadeLabel);
 
             GUILayout.Space(10);
             GUILayout.Label(EditorGUIUtility.TempContent("Meshes"), EditorStyles.boldLabel);
diff --git a/Editor/Mono/Inspector/RenderPipelineAssetSelector.cs b/Editor/Mono/Inspector/RenderPipelineAssetSelector.cs
index 7e7c3aa382..daa12c7af6 100644
--- a/Editor/Mono/Inspector/RenderPipelineAssetSelector.cs
+++ b/Editor/Mono/Inspector/RenderPipelineAssetSelector.cs
@@ -11,9 +11,9 @@ namespace UnityEditor
     /// <summary>
     /// Provides a display for a <see cref="EditorGUI.ObjectField"/> and prompts the user to confirm the change.
     /// </summary>
-    internal static class RenderPipelineAssetSelector
+    public sealed partial class EditorGUI
     {
-        static class Styles
+        static class RenderPipelineAssetSelectorStyles
         {
             public static readonly GUIContent renderPipeLabel = EditorGUIUtility.TrTextContent("Scriptable Render Pipeline");
 
@@ -23,35 +23,16 @@ static class Styles
             public static string cancelLabel => LocalizationDatabase.GetLocalizedString("Cancel");
         }
 
-        static void AskRenderPipelineChangeConfirmation(SerializedObject serializedObject, SerializedProperty serializedProperty, Object selectedRenderPipelineAsset)
+        static void PromptConfirmation(SerializedObject serializedObject, SerializedProperty serializedProperty, Object selectedRenderPipelineAsset)
         {
             if (selectedRenderPipelineAsset == serializedProperty.objectReferenceValue)
                 return;
 
-            if (EditorUtility.DisplayDialog(Styles.renderPipeChangedTitleBox, Styles.renderPipeChangedWarning, Styles.renderPipeChangedConfirmation, Styles.cancelLabel))
+            if (EditorUtility.DisplayDialog(RenderPipelineAssetSelectorStyles.renderPipeChangedTitleBox, RenderPipelineAssetSelectorStyles.renderPipeChangedWarning, RenderPipelineAssetSelectorStyles.renderPipeChangedConfirmation, RenderPipelineAssetSelectorStyles.cancelLabel))
             {
                 serializedProperty.objectReferenceValue = selectedRenderPipelineAsset;
                 serializedObject.ApplyModifiedProperties();
             }
-
-            GUIUtility.ExitGUI();
-        }
-
-        static void ApplyChangeIfNeeded(SerializedObject serializedObject, SerializedProperty serializedProperty, Object selectedRenderPipelineAsset)
-        {
-            if (!ObjectSelector.isVisible)
-            {
-                AskRenderPipelineChangeConfirmation(serializedObject, serializedProperty, selectedRenderPipelineAsset);
-                return;
-            }
-
-            if (Event.current.type == EventType.ExecuteCommand &&
-                Event.current.commandName == ObjectSelector.ObjectSelectorClosedCommand)
-            {
-                AskRenderPipelineChangeConfirmation(serializedObject, serializedProperty, ObjectSelector.GetCurrentObject());
-                Event.current.Use();
-                GUIUtility.ExitGUI();
-            }
         }
 
         /// <summary>
@@ -60,25 +41,50 @@ static void ApplyChangeIfNeeded(SerializedObject serializedObject, SerializedPro
         /// <param name="content">The label.</param>
         /// <param name="serializedObject">The <see cref="SerializedObject"/> that holds the <see cref="SerializedProperty"/> with the new render pipeline asset.</param>
         /// <param name="serializedProperty">The <see cref="SerializedProperty"/> to modify with the new render pipeline asset.</param>
-        public static void Draw(GUIContent content, SerializedObject serializedObject, SerializedProperty serializedProperty)
+        internal static void RenderPipelineAssetField(GUIContent content, SerializedObject serializedObject, SerializedProperty serializedProperty)
         {
-            var selectedRenderPipelineAsset = EditorGUILayout.ObjectField(content, serializedProperty.objectReferenceValue, typeof(RenderPipelineAsset), false);
-            ApplyChangeIfNeeded(serializedObject, serializedProperty, selectedRenderPipelineAsset);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                EditorGUILayout.PrefixLabel(content);
+                RenderPipelineAssetField(serializedObject, serializedProperty);
+            }
         }
 
         /// <summary>
         /// Draws the object field and, if the user attempts to change the value, asks the user for confirmation.
         /// </summary>
-        /// <param name="serializedObject">TThe <see cref="SerializedObject"/> that holds the <see cref="SerializedProperty"/> with the new render pipeline asset.</param>
+        /// <param name="serializedObject">The <see cref="SerializedObject"/> that holds the <see cref="SerializedProperty"/> with the new render pipeline asset.</param>
         /// <param name="serializedProperty">The <see cref="SerializedProperty"/> to modify with the new render pipeline asset.</param>
-        public static void Draw(SerializedObject serializedObject, SerializedProperty serializedProperty)
+        internal static void RenderPipelineAssetField(SerializedObject serializedObject, SerializedProperty serializedProperty)
         {
             Rect renderLoopRect = EditorGUILayout.GetControlRect(true, EditorGUI.GetPropertyHeight(serializedProperty));
 
-            EditorGUI.BeginProperty(renderLoopRect, Styles.renderPipeLabel, serializedProperty);
+            EditorGUI.BeginProperty(renderLoopRect, RenderPipelineAssetSelectorStyles.renderPipeLabel, serializedProperty);
+
+            int id = GUIUtility.GetControlID(s_ObjectFieldHash, FocusType.Keyboard, renderLoopRect);
 
-            var selectedRenderPipelineAsset = EditorGUI.ObjectField(renderLoopRect, serializedProperty.objectReferenceValue, typeof(RenderPipelineAsset), false);
-            ApplyChangeIfNeeded(serializedObject, serializedProperty, selectedRenderPipelineAsset);
+            var selectedRenderPipelineAsset = DoObjectField(
+                position: IndentedRect(renderLoopRect),
+                dropRect: IndentedRect(renderLoopRect),
+                id: id,
+                obj: serializedProperty.objectReferenceValue,
+                objBeingEdited: null,
+                objType: typeof(RenderPipelineAsset),
+                additionalType: null,
+                property: null,
+                validator: null,
+                allowSceneObjects: false,
+                style: EditorStyles.objectField,
+                onObjectSelectorClosed: obj =>
+                {
+                    if (!ObjectSelector.SelectionCanceled())
+                        PromptConfirmation(serializedObject, serializedProperty, obj);
+                });
+
+            if (!ObjectSelector.isVisible)
+            {
+                PromptConfirmation(serializedObject, serializedProperty, selectedRenderPipelineAsset);
+            }
 
             EditorGUI.EndProperty();
         }
diff --git a/Editor/Mono/Inspector/RenderTextureEditor.cs b/Editor/Mono/Inspector/RenderTextureEditor.cs
index 68d9dd4a2b..db07e6b22d 100644
--- a/Editor/Mono/Inspector/RenderTextureEditor.cs
+++ b/Editor/Mono/Inspector/RenderTextureEditor.cs
@@ -86,6 +86,24 @@ protected override void OnEnable()
             m_sRGB = serializedObject.FindProperty("m_SRGB");
             m_UseDynamicScale = serializedObject.FindProperty("m_UseDynamicScale");
             m_ShadowSamplingMode = serializedObject.FindProperty("m_ShadowSamplingMode");
+
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
+        }
+
+        protected override void OnDisable()
+        {
+            base.OnDisable();
+
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
+        }
+
+        private void OnUndoRedoPerformed(in UndoRedoInfo info)
+        {
+            var rt = target as RenderTexture;
+            if (rt != null)
+            {
+                rt.Release();
+            }
         }
 
         protected void OnRenderTextureGUI(GUIElements guiElements)
diff --git a/Editor/Mono/Inspector/ReorderableListWrapper.cs b/Editor/Mono/Inspector/ReorderableListWrapper.cs
index cdbe537458..95afc9c45b 100644
--- a/Editor/Mono/Inspector/ReorderableListWrapper.cs
+++ b/Editor/Mono/Inspector/ReorderableListWrapper.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Linq;
 using UnityEditor;
 using UnityEditor.SceneManagement;
@@ -40,6 +41,7 @@ internal SerializedProperty Property
             set
             {
                 m_OriginalProperty = value;
+                if (!m_OriginalProperty.isValid) return;
                 m_ArraySize = m_OriginalProperty.FindPropertyRelative("Array.size");
 
                 if (m_ReorderableList != null)
@@ -50,7 +52,7 @@ internal SerializedProperty Property
 
                     if (versionChanged || m_ArraySize != null && m_LastArraySize != m_ArraySize.intValue)
                     {
-                        m_ReorderableList.ClearCacheRecursive();
+                        m_ReorderableList.InvalidateCacheRecursive();
                         ReorderableList.InvalidateParentCaches(m_ReorderableList.serializedProperty.propertyPath);
 
                         if (m_ArraySize != null) m_LastArraySize = m_ArraySize.intValue;
@@ -61,7 +63,15 @@ internal SerializedProperty Property
 
         public static string GetPropertyIdentifier(SerializedProperty serializedProperty)
         {
-            return serializedProperty.propertyPath + (GUIView.current?.nativeHandle.ToInt32() ?? -1);
+            // Property may be disposed
+            try
+            {
+                return serializedProperty?.propertyPath + serializedProperty.serializedObject.targetObject.GetInstanceID() + (GUIView.current?.nativeHandle.ToInt32() ?? -1);
+            }
+            catch (NullReferenceException)
+            {
+                return string.Empty;
+            }
         }
 
         ReorderableListWrapper() {}
@@ -97,10 +107,7 @@ void Init(bool reorderable)
             };
         }
 
-        internal void ClearCache()
-        {
-            m_ReorderableList.ClearCache();
-        }
+        internal void InvalidateCache() => m_ReorderableList.InvalidateCache();
 
         public float GetHeight()
         {
@@ -155,7 +162,7 @@ public void Draw(GUIContent label, Rect r, Rect visibleArea, string tooltip, boo
                     EditorGUI.SetExpandedRecurse(Property, Property.isExpanded);
                 }
 
-                m_ReorderableList.ClearCacheRecursive();
+                m_ReorderableList.InvalidateCacheRecursive();
             }
 
             DrawChildren(r, headerRect, sizeRect, visibleArea, prevType);
@@ -165,8 +172,10 @@ void DrawChildren(Rect listRect, Rect headerRect, Rect sizeRect, Rect visibleRec
         {
             if (Event.current.type == EventType.Used && sizeRect.Contains(Event.current.mousePosition)) Event.current.type = previousEvent;
 
+            EditorGUI.BeginChangeCheck();
             EditorGUI.DefaultPropertyField(sizeRect, m_ArraySize, GUIContent.none);
             EditorGUI.LabelField(sizeRect, new GUIContent("", "Array Size"));
+            if (EditorGUI.EndChangeCheck()) m_ReorderableList.InvalidateCache();
 
             if (headerRect.Contains(Event.current.mousePosition))
             {
diff --git a/Editor/Mono/Inspector/Rigidbody2DEditor.cs b/Editor/Mono/Inspector/Rigidbody2DEditor.cs
index af7e7fd6b2..a4ad7d3f0b 100644
--- a/Editor/Mono/Inspector/Rigidbody2DEditor.cs
+++ b/Editor/Mono/Inspector/Rigidbody2DEditor.cs
@@ -28,10 +28,13 @@ internal class Rigidbody2DEditor : Editor
         SerializedProperty m_SleepingMode;
         SerializedProperty m_CollisionDetection;
         SerializedProperty m_Constraints;
+        SerializedProperty m_IncludeLayers;
+        SerializedProperty m_ExcludeLayers;
 
         readonly AnimBool m_ShowIsStatic = new AnimBool();
         readonly AnimBool m_ShowIsKinematic = new AnimBool();
 
+        readonly AnimBool m_ShowLayerOverrides = new AnimBool();
         readonly AnimBool m_ShowInfo = new AnimBool();
         readonly AnimBool m_ShowContacts = new AnimBool();
         Vector2 m_ContactScrollPosition;
@@ -41,6 +44,7 @@ internal class Rigidbody2DEditor : Editor
 
         static List<ContactPoint2D> m_Contacts = new List<ContactPoint2D>(64);
 
+        private SavedBool m_ShowLayerOverridesFoldout;
         private SavedBool m_ShowInfoFoldout;
         private bool m_RequiresConstantRepaint;
 
@@ -63,6 +67,8 @@ public void OnEnable()
             m_SleepingMode = serializedObject.FindProperty("m_SleepingMode");
             m_CollisionDetection = serializedObject.FindProperty("m_CollisionDetection");
             m_Constraints = serializedObject.FindProperty("m_Constraints");
+            m_IncludeLayers = serializedObject.FindProperty("m_IncludeLayers");
+            m_ExcludeLayers = serializedObject.FindProperty("m_ExcludeLayers");
 
             m_ShowIsStatic.value = body.bodyType != RigidbodyType2D.Static;
             m_ShowIsStatic.valueChanged.AddListener(Repaint);
@@ -70,8 +76,11 @@ public void OnEnable()
             m_ShowIsKinematic.value = body.bodyType != RigidbodyType2D.Kinematic;
             m_ShowIsKinematic.valueChanged.AddListener(Repaint);
 
+            m_ShowLayerOverrides.valueChanged.AddListener(Repaint);
+            m_ShowLayerOverridesFoldout = new SavedBool($"{target.GetType() }.ShowLayerOverridesFoldout", false);
+            m_ShowLayerOverrides.value = m_ShowLayerOverridesFoldout.value;
             m_ShowInfo.valueChanged.AddListener(Repaint);
-            m_ShowInfoFoldout = new SavedBool($"{target.GetType()}.ShowFoldout", false);
+            m_ShowInfoFoldout = new SavedBool($"{target.GetType()}.ShowInfoFoldout", false);
             m_ShowInfo.value = m_ShowInfoFoldout.value;
             m_ShowContacts.valueChanged.AddListener(Repaint);
             m_ContactScrollPosition = Vector2.zero;
@@ -83,6 +92,7 @@ public void OnDisable()
         {
             m_ShowIsStatic.valueChanged.RemoveListener(Repaint);
             m_ShowIsKinematic.valueChanged.RemoveListener(Repaint);
+            m_ShowLayerOverrides.valueChanged.RemoveListener(Repaint);
             m_ShowInfo.valueChanged.RemoveListener(Repaint);
             m_ShowContacts.valueChanged.RemoveListener(Repaint);
         }
@@ -174,9 +184,24 @@ public override void OnInspectorGUI()
                 EditorGUILayout.EndFadeGroup();
             }
 
+            ShowLayerOverridesProperties();
+            ShowBodyInfoProperties();
+
             serializedObject.ApplyModifiedProperties();
+        }
 
-            ShowBodyInfoProperties();
+        private void ShowLayerOverridesProperties()
+        {
+            // Show Layer Overrides.
+            m_ShowLayerOverridesFoldout.value = m_ShowLayerOverrides.target = EditorGUILayout.Foldout(m_ShowLayerOverrides.target, "Layer Overrides", true);
+            if (EditorGUILayout.BeginFadeGroup(m_ShowLayerOverrides.faded))
+            {
+                EditorGUI.indentLevel++;
+                EditorGUILayout.PropertyField(m_IncludeLayers);
+                EditorGUILayout.PropertyField(m_ExcludeLayers);
+                EditorGUI.indentLevel--;
+            }
+            EditorGUILayout.EndFadeGroup();
         }
 
         private void ShowBodyInfoProperties()
diff --git a/Editor/Mono/Inspector/ShaderInspector.cs b/Editor/Mono/Inspector/ShaderInspector.cs
index 32d252e711..3a96f2c07f 100644
--- a/Editor/Mono/Inspector/ShaderInspector.cs
+++ b/Editor/Mono/Inspector/ShaderInspector.cs
@@ -503,6 +503,9 @@ private class Styles
 
         private readonly Shader m_Shader;
 
+        private ulong totalVariants;
+        private ulong variantsWithUsage;
+
 
         public static int currentMode
         {
@@ -560,6 +563,8 @@ public ShaderInspectorPlatformsPopup(Shader shader)
         {
             m_Shader = shader;
             InitializeShaderPlatforms();
+            totalVariants = 0;
+            variantsWithUsage = 0;
         }
 
         static void InitializeShaderPlatforms()
@@ -679,7 +684,7 @@ static string FormatCount(ulong count)
             if (count > 1000 * 1000)
                 return ((double)count / 1000000.0).ToString("f2", CultureInfo.InvariantCulture.NumberFormat) + "M";
             if (count > 1000)
-                return ((double)count / 1000.0).ToString("f2", CultureInfo.InvariantCulture.NumberFormat) + "k";
+                return ((double)count / 1000.0).ToString("f2", CultureInfo.InvariantCulture.NumberFormat) + "K";
             return count.ToString();
         }
 
@@ -694,7 +699,19 @@ void DoShaderVariants(EditorWindow caller, ref Rect drawPos)
 
             // display included variant count, and a button to show list of them
             drawPos.y += kSeparatorHeight;
-            ulong variantCount = ShaderUtil.GetVariantCount(m_Shader, strip);
+            ulong variantCount = 0;
+            if (strip)
+            {
+                if (variantsWithUsage == 0)
+                    variantsWithUsage = ShaderUtil.GetVariantCount(m_Shader, true);
+                variantCount = variantsWithUsage;
+            }
+            else
+            {
+                if (totalVariants == 0)
+                    totalVariants = ShaderUtil.GetVariantCount(m_Shader, false);
+                variantCount = totalVariants;
+            }
             var variantText = FormatCount(variantCount) +
                 (strip ?
                     " variants included" :
diff --git a/Editor/Mono/Inspector/SpriteFrameInspector.cs b/Editor/Mono/Inspector/SpriteFrameInspector.cs
index 92d63aa511..b27603b0a9 100644
--- a/Editor/Mono/Inspector/SpriteFrameInspector.cs
+++ b/Editor/Mono/Inspector/SpriteFrameInspector.cs
@@ -92,25 +92,37 @@ public override void OnInspectorGUI()
                 EditorGUILayout.LabelField(Styles.borderLabel, Styles.multiValueText);
         }
 
-        public static Texture2D BuildPreviewTexture(Sprite sprite, Material spriteRendererMaterial, bool isPolygon)
+
+        public static Texture2D BuildPreviewTexture(Sprite sprite, Material spriteRendererMaterial, bool isPolygon, int width, int height)
+        {
+            return BuildPreviewTexture(sprite, spriteRendererMaterial, isPolygon, width, height, Color.white, Matrix4x4.identity);
+        }
+
+        public static Texture2D BuildPreviewTexture(Sprite sprite, Material spriteRendererMaterial, bool isPolygon, int width, int height, Color color, Matrix4x4 transform)
         {
-            if (!ShaderUtil.hardwareSupportsRectRenderTexture)
+            if (!ShaderUtil.hardwareSupportsRectRenderTexture || sprite == null)
             {
                 return null;
             }
 
-            float spriteWidth = sprite.rect.width;
-            float spriteHeight = sprite.rect.height;
+            var spriteWidth = sprite.rect.width;
+            var spriteHeight = sprite.rect.height;
 
-            int width = (int)spriteWidth;
-            int height = (int)spriteHeight;
             Texture2D texture = UnityEditor.Sprites.SpriteUtility.GetSpriteTexture(sprite, false);
 
             // only adjust the preview texture size if the sprite is not in polygon mode.
             // In polygon mode, we are looking at a 4x4 texture will detailed mesh. It's better to maximize the display of it.
             if (!isPolygon)
             {
-                PreviewHelpers.AdjustWidthAndHeightForStaticPreview((int)spriteWidth, (int)spriteHeight, ref width, ref height);
+                // Try to have a minimum of 64 pixels for width and height, unless requested width and height is smaller
+                var minWidth = Mathf.Min(64, width);
+                var minHeight = Mathf.Min(64, height);
+
+                PreviewHelpers.AdjustWidthAndHeightForStaticPreview((int) spriteWidth, (int) spriteHeight, ref width, ref height);
+
+                // Set minimum size for width and height to prevent small previews for small sprites
+                width = Mathf.Max(minWidth, width);
+                height = Mathf.Max(minHeight, height);
             }
 
             SavedRenderTargetState savedRTState = new SavedRenderTargetState();
@@ -182,22 +194,20 @@ public static Texture2D BuildPreviewTexture(Sprite sprite, Material spriteRender
 
             GL.PushMatrix();
             GL.LoadOrtho();
-            GL.Color(new Color(1, 1, 1, 1));
             GL.Begin(GL.TRIANGLES);
             for (int i = 0; i < triangles.Length; ++i)
             {
                 ushort index = triangles[i];
-                Vector2 vertex = vertices[index];
+                Vector3 vertex = vertices[index];
+                vertex = transform.MultiplyPoint(vertex);
                 Vector2 uv = uvs[index];
+                GL.Color(colors != null ? colors.Value[index] * color : color);
                 GL.TexCoord(new Vector3(uv.x, uv.y, 0));
-                if (colors != null)
-                    GL.Color(colors.Value[index]);
                 GL.Vertex3((vertex.x * pixelsToUnits + pivot.x) / spriteWidth, (vertex.y * pixelsToUnits + pivot.y) / spriteHeight, 0);
             }
             GL.End();
             GL.PopMatrix();
 
-
             if (spriteRendererMaterial != null)
             {
                 if (_matHasTexture)
@@ -239,7 +249,7 @@ public override Texture2D RenderStaticPreview(string assetPath, Object[] subAsse
                 isPolygonSpriteAsset = textureImporter.spriteImportMode == SpriteImportMode.Polygon;
             }
 
-            return BuildPreviewTexture(sprite, null, isPolygonSpriteAsset);
+            return BuildPreviewTexture(sprite, null, isPolygonSpriteAsset, width, height);
         }
 
         public override bool HasPreviewGUI()
@@ -276,7 +286,7 @@ public static void DrawPreview(Rect r, Sprite frame, Material spriteRendererMate
             Rect wantedRect = new Rect(r.x, r.y, frame.rect.width * zoomLevel, frame.rect.height * zoomLevel);
             wantedRect.center = r.center;
 
-            Texture2D previewTexture = BuildPreviewTexture(frame, spriteRendererMaterial, isPolygon);
+            Texture2D previewTexture = BuildPreviewTexture(frame, spriteRendererMaterial, isPolygon, (int) wantedRect.width, (int) wantedRect.height);
             EditorGUI.DrawTextureTransparent(wantedRect, previewTexture, ScaleMode.ScaleToFit);
 
             var border = frame.border;
diff --git a/Editor/Mono/Inspector/SpriteRendererEditor.cs b/Editor/Mono/Inspector/SpriteRendererEditor.cs
index 9f2f9a9504..d0e6c680cb 100644
--- a/Editor/Mono/Inspector/SpriteRendererEditor.cs
+++ b/Editor/Mono/Inspector/SpriteRendererEditor.cs
@@ -39,6 +39,7 @@ class Styles
             public static readonly GUIContent maskInteractionLabel = EditorGUIUtility.TrTextContent("Mask Interaction", "SpriteRenderer's interaction with a Sprite Mask");
             public static readonly GUIContent spriteSortPointLabel = EditorGUIUtility.TrTextContent("Sprite Sort Point", "Determines which position of the Sprite which is used for sorting");
             public static readonly Texture2D warningIcon = EditorGUIUtility.LoadIcon("console.warnicon");
+            public static readonly GUIContent drawModeChange = EditorGUIUtility.TrTextContent("Draw mode Change");
         }
 
         private SerializedProperty m_FlipX;
@@ -89,7 +90,14 @@ public override void OnInspectorGUI()
 
             using (new EditorGUI.DisabledGroupScope(IsTextureless()))
             {
-                EditorGUILayout.PropertyField(m_DrawMode, Styles.drawModeLabel);
+                var showMixedValue = EditorGUI.showMixedValue;
+                if (m_DrawMode.hasMultipleDifferentValues)
+                    EditorGUI.showMixedValue = true;
+                SpriteDrawMode drawMode = (SpriteDrawMode)m_DrawMode.intValue;
+                drawMode = (SpriteDrawMode)EditorGUILayout.EnumPopup(Styles.drawModeLabel, drawMode);
+                SetDrawMode(drawMode);
+                EditorGUI.showMixedValue = showMixedValue;
+
                 m_ShowDrawMode.target = ShouldShowDrawMode();
                 if (EditorGUILayout.BeginFadeGroup(m_ShowDrawMode.faded))
                 {
@@ -139,6 +147,26 @@ public override void OnInspectorGUI()
             serializedObject.ApplyModifiedProperties();
         }
 
+        internal void SetDrawMode(SpriteDrawMode drawMode)
+        {
+            if (drawMode != (SpriteDrawMode)m_DrawMode.intValue)
+            {
+                foreach (var target in serializedObject.targetObjects)
+                {
+                    var sr = (SpriteRenderer)target;
+                    var t = sr.transform;
+                    Undo.RecordObjects(new UnityEngine.Object[] {sr, t}, Styles.drawModeChange.text);
+                    sr.drawMode = drawMode;
+                    foreach (var editor in ActiveEditorTracker.sharedTracker.activeEditors)
+                    {
+                        if(editor.target == t)
+                            editor.serializedObject.SetIsDifferentCacheDirty();
+                    }
+                }
+                serializedObject.SetIsDifferentCacheDirty();
+            }
+        }
+
         void FloatFieldLabelAbove(GUIContent contentLabel, SerializedProperty sp)
         {
             EditorGUILayout.BeginVertical();
@@ -217,7 +245,6 @@ void FlipToggle(Rect r, GUIContent label, SerializedProperty property)
             EditorGUI.indentLevel = oldIndent;
             if (EditorGUI.EndChangeCheck())
             {
-                Undo.RecordObjects(targets, "Edit Constraints");
                 property.boolValue = toggle;
             }
 
@@ -241,20 +268,6 @@ private void ShowMaterialError()
 
         private bool IsMaterialTextureAtlasConflict()
         {
-            Material material = (target as SpriteRenderer).sharedMaterial;
-            if (material == null)
-                return false;
-            string tag = material.GetTag("CanUseSpriteAtlas", false);
-            if (tag.ToLower() == "false")
-            {
-                Sprite frame = m_Sprite.objectReferenceValue as Sprite;
-                TextureImporter ti = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(frame)) as TextureImporter;
-                if (ti != null && ti.spritePackingTag != null && ti.spritePackingTag.Length > 0)
-                {
-                    return true;
-                }
-            }
-
             return false;
         }
 
diff --git a/Editor/Mono/Inspector/StandardShaderGUI.cs b/Editor/Mono/Inspector/StandardShaderGUI.cs
index 0a44867c6f..3779b6cc5f 100644
--- a/Editor/Mono/Inspector/StandardShaderGUI.cs
+++ b/Editor/Mono/Inspector/StandardShaderGUI.cs
@@ -4,7 +4,6 @@
 
 using System;
 using UnityEngine;
-using TargetAttributes = UnityEditor.BuildTargetDiscovery.TargetAttributes;
 
 namespace UnityEditor
 {
@@ -90,6 +89,11 @@ private static class Styles
         MaterialEditor m_MaterialEditor;
         WorkflowMode m_WorkflowMode = WorkflowMode.Specular;
 
+        static int _SpecGlossMap = Shader.PropertyToID("_SpecGlossMap");
+        static int _SpecColor = Shader.PropertyToID("_SpecColor");
+        static int _MetallicGlossMap = Shader.PropertyToID("_MetallicGlossMap");
+        static int _Metallic = Shader.PropertyToID("_Metallic");
+
         public void FindProperties(MaterialProperty[] props)
         {
             blendMode = FindProperty("_Mode", props);
@@ -191,11 +195,22 @@ public void ShaderPropertiesGUI(Material material)
             m_MaterialEditor.DoubleSidedGIField();
         }
 
+        bool ShaderHasProperty(Shader shader, int nameId)
+        {
+            for (int i = 0, count = shader.GetPropertyCount(); i < count; i++)
+            {
+                if (shader.GetPropertyNameId(i) == nameId)
+                    return true;
+            }
+            return false;
+        }
+
         internal void DetermineWorkflow(Material material)
         {
-            if (material.HasProperty("_SpecGlossMap") && material.HasProperty("_SpecColor"))
+            var shader = material.shader;
+            if (ShaderHasProperty(shader, _SpecGlossMap) && ShaderHasProperty(shader, _SpecColor))
                 m_WorkflowMode = WorkflowMode.Specular;
-            if (material.HasProperty("_MetallicGlossMap") && material.HasProperty("_Metallic"))
+            else if (ShaderHasProperty(shader, _MetallicGlossMap) && ShaderHasProperty(shader, _Metallic))
                 m_WorkflowMode = WorkflowMode.Metallic;
             else
                 m_WorkflowMode = WorkflowMode.Dielectric;
@@ -236,7 +251,7 @@ public override void AssignNewShaderToMaterial(Material material, Shader oldShad
 
         bool BlendModePopup()
         {
-            EditorGUI.showMixedValue = blendMode.hasMixedValue;
+            MaterialEditor.BeginProperty(blendMode);
             var mode = (BlendMode)blendMode.floatValue;
 
             EditorGUI.BeginChangeCheck();
@@ -248,7 +263,7 @@ bool BlendModePopup()
                 blendMode.floatValue = (float)mode;
             }
 
-            EditorGUI.showMixedValue = false;
+            MaterialEditor.EndProperty();
 
             return result;
         }
@@ -257,7 +272,7 @@ void DoNormalArea()
         {
             m_MaterialEditor.TexturePropertySingleLine(Styles.normalMapText, bumpMap, bumpMap.textureValue != null ? bumpScale : null);
             if (bumpScale.floatValue != 1
-                && BuildTargetDiscovery.PlatformHasFlag(EditorUserBuildSettings.activeBuildTarget, TargetAttributes.HasIntegratedGPU))
+                && UnityEditorInternal.InternalEditorUtility.IsMobilePlatform(EditorUserBuildSettings.activeBuildTarget))
                 if (m_MaterialEditor.HelpBoxWithButton(
                     EditorGUIUtility.TrTextContent("Bump scale is not supported on mobile platforms"),
                     EditorGUIUtility.TrTextContent("Fix Now")))
@@ -285,6 +300,13 @@ void DoEmissionArea(Material material)
                 // Texture and HDR color controls
                 m_MaterialEditor.TexturePropertyWithHDRColor(Styles.emissionText, emissionMap, emissionColorForRendering, false);
 
+                if (material.globalIlluminationFlags.HasFlag(MaterialGlobalIlluminationFlags.EmissiveIsBlack))
+                {
+                    material.GetPropertyState(MaterialSerializedProperty.LightmapFlags, out _, out _, out bool lockedByAncestor);
+                    if (lockedByAncestor)
+                        EditorGUILayout.HelpBox("Emissive lighting is locked to black by a parent Material. Changing the emissive color will have no effect.", MessageType.Warning);
+                }
+
                 // If texture was assigned and color was black set color to white
                 float brightness = emissionColorForRendering.colorValue.maxColorComponent;
                 if (emissionMap.textureValue != null && !hadEmissionTexture && brightness <= 0f)
diff --git a/Editor/Mono/Inspector/TagManagerInspector.cs b/Editor/Mono/Inspector/TagManagerInspector.cs
index ddfa324787..1ac0eb1f36 100644
--- a/Editor/Mono/Inspector/TagManagerInspector.cs
+++ b/Editor/Mono/Inspector/TagManagerInspector.cs
@@ -244,6 +244,7 @@ void AddToSortLayerList(ReorderableList list)
 
         public void ReorderSortLayerList(ReorderableList list)
         {
+            serializedObject.ApplyModifiedProperties();
             tagManager.UpdateSortingLayersOrder();
         }
 
diff --git a/Editor/Mono/Inspector/Texture3DPreview.cs b/Editor/Mono/Inspector/Texture3DPreview.cs
index 187b5ed714..bf7057e6a6 100644
--- a/Editor/Mono/Inspector/Texture3DPreview.cs
+++ b/Editor/Mono/Inspector/Texture3DPreview.cs
@@ -10,7 +10,7 @@
 
 namespace UnityEditor
 {
-    internal class Texture3DPreview : Editor
+    internal class Texture3DPreview : ScriptableObject
     {
         enum Preview3DMode
         {
@@ -181,7 +181,7 @@ static Texture2D TurboColorRamp
         float m_StepScale = 1;
         float m_SurfaceOffset = 0;
 
-        public override string GetInfoString()
+        public string GetInfoString()
         {
             if (Texture == null) return "";
 
@@ -438,7 +438,7 @@ void DrawPreview()
             m_PreviewUtility.Render();
         }
 
-        public override void OnPreviewGUI(Rect r, GUIStyle background)
+        public void OnPreviewGUI(Rect r, GUIStyle background)
         {
             if (!ShaderUtil.hardwareSupportsRectRenderTexture || !SystemInfo.supports3DTextures)
             {
diff --git a/Editor/Mono/Inspector/TextureInspector.cs b/Editor/Mono/Inspector/TextureInspector.cs
index 27a604368d..e62bd25ad6 100644
--- a/Editor/Mono/Inspector/TextureInspector.cs
+++ b/Editor/Mono/Inspector/TextureInspector.cs
@@ -172,8 +172,11 @@ protected virtual void OnEnable()
 
             SetMipLevelDefaultForVT();
 
-            if (m_Texture3DPreview == null) m_Texture3DPreview = CreateInstance<Texture3DPreview>();
-            m_Texture3DPreview.Texture = target as Texture;
+            m_Texture3DPreview = CreateInstance<Texture3DPreview>();
+            if (IsTexture3D())
+            {
+                m_Texture3DPreview.Texture = target as Texture;
+            }
             m_Texture3DPreview.OnEnable();
         }
 
@@ -231,7 +234,7 @@ protected virtual void OnDisable()
             RestoreLastTextureMipLevels();
 
             m_CubemapPreview.OnDisable();
-            m_Texture3DPreview.OnDisable();
+            DestroyImmediate(m_Texture3DPreview);
         }
 
         public override bool RequiresConstantRepaint()
@@ -809,7 +812,7 @@ public override void OnPreviewGUI(Rect r, GUIStyle background)
             {
                 string path = AssetDatabase.GetAssetPath(t);
                 TextureImporter textureImporter = AssetImporter.GetAtPath(path) as TextureImporter;
-                SpriteMetaData[] spritesheet = textureImporter != null ? textureImporter.spritesheet : null;
+                SpriteMetaData[] spritesheet = textureImporter != null ? textureImporter.GetSpriteMetaDatas() : null;
 
                 if (spritesheet != null && textureImporter.spriteImportMode == SpriteImportMode.Multiple)
                 {
@@ -895,7 +898,7 @@ public override Texture2D RenderStaticPreview(string assetPath, Object[] subAsse
                 {
                     Sprite sprite = subAssets[0] as Sprite;
                     if (sprite)
-                        return SpriteInspector.BuildPreviewTexture(sprite, null, true);
+                        return SpriteInspector.BuildPreviewTexture(sprite, null, true, width, height);
                 }
                 else
                     return null;
diff --git a/Editor/Mono/Inspector/TrailRendererEditor.cs b/Editor/Mono/Inspector/TrailRendererEditor.cs
index 46aff439e5..ff3d7b5ffc 100644
--- a/Editor/Mono/Inspector/TrailRendererEditor.cs
+++ b/Editor/Mono/Inspector/TrailRendererEditor.cs
@@ -3,8 +3,12 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System.Collections.Generic;
+using System.Linq;
+using UnityEditor.EditorTools;
+using UnityEditor.IMGUI.Controls;
+using UnityEditor.Overlays;
+using UnityEditor.ShortcutManagement;
 using UnityEngine;
-using UnityEngine.Rendering;
 
 namespace UnityEditor
 {
@@ -23,8 +27,59 @@ private class Styles
             public static readonly GUIContent shadowBias = EditorGUIUtility.TrTextContent("Shadow Bias", "Apply a shadow bias to prevent self-shadowing artifacts. The specified value is the proportion of the trail width at each segment.");
             public static readonly GUIContent generateLightingData = EditorGUIUtility.TrTextContent("Generate Lighting Data", "Toggle generation of normal and tangent data, for use in lit shaders.");
             public static readonly GUIContent applyActiveColorSpace = EditorGUIUtility.TrTextContent("Apply Active Color Space", "When using Linear Rendering, colors will be converted appropriately before being passed to the GPU.");
+
+            public static readonly GUIContent play = EditorGUIUtility.TrTextContent("Play");
+            public static readonly GUIContent playDisabled = EditorGUIUtility.TrTextContent("Play", "Play is disabled, because the Time Scale in the Time Manager is set to 0.0.");
+            public static readonly GUIContent stop = EditorGUIUtility.TrTextContent("Stop");
+            public static readonly GUIContent pause = EditorGUIUtility.TrTextContent("Pause");
+            public static readonly GUIContent restart = EditorGUIUtility.TrTextContent("Restart");
+            public static readonly GUIContent movementSpeed = EditorGUIUtility.TrTextContent("Movement Speed", "Speed is also affected by the Time Scale setting in the Time Manager.");
+            public static readonly GUIContent movementSpeedDisabled = EditorGUIUtility.TrTextContent("Movement Speed", "Speed is locked to 0.0, because the Time Scale in the Time Manager is set to 0.0.");
+            public static readonly GUIContent timeScale = EditorGUIUtility.TrTextContent("Time Scale", "Speed up or slow down the preview of the trail.");
+            public static readonly GUIContent timeScaleDisabled = EditorGUIUtility.TrTextContent("Time Scale", "Time Scale is locked to 0.0, because the Time Scale in the Time Manager is set to 0.0.");
+            public static readonly GUIContent showBounds = EditorGUIUtility.TrTextContent("Show Bounds", "Show world space bounding boxes.");
+            public static readonly GUIContent previewShape = EditorGUIUtility.TrTextContent("Shape", "The trail preview will follow the selected shape.");
+            public static readonly GUIContent previewShapeSize = EditorGUIUtility.TrTextContent("Shape Size", "The size of the shape.");
+
+            public static readonly GUIContent toolIcon = EditorGUIUtility.IconContent("ParticleShapeTool", "Shape gizmo editing mode.");
+
+            public static readonly string secondsFloatFieldFormatString = "f2";
+        }
+
+        private enum PreviewShape
+        {
+            Circle,
+            Square,
+            Line,
+            SineWave,
+            Spring
         }
 
+        private const string k_PreviewMovementSpeed = "TrailPreviewMovementSpeed";
+        private const string k_PreviewTimeScale = "TrailPreviewTimeScale";
+        private const string k_PreviewShape = "TrailPreviewShape";
+        private const string k_PreviewShapeSize = "TrailPreviewShapeSize";
+
+        private static LinkedList<TrailRendererInspector> s_Inspectors = new LinkedList<TrailRendererInspector>();
+        private static bool s_PreviewIsPlaying;
+        private static bool s_PreviewIsPaused;
+        private static float s_PreviewMovementSpeed;
+        private static float s_PreviewTimeScale;
+        private static bool s_PreviewShowBounds;
+        private static PreviewShape s_PreviewShape;
+        private static float s_PreviewShapeSize;
+        private Vector3? m_PreviewBackupPosition;
+        private bool m_PreviewIsFirstMove;
+        private float m_PreviewTimePercentage;
+
+        private static readonly Matrix4x4 s_ArcHandleOffsetMatrix = Matrix4x4.TRS(Vector3.zero, Quaternion.AngleAxis(90f, Vector3.right) * Quaternion.AngleAxis(90f, Vector3.up), Vector3.one);
+        private const float k_SineWaveRepeat = 2.0f;
+        private const float k_SineWaveHeightMultiplier = 0.5f;
+        private const float k_SpringRotations = 5.0f;
+        private const float k_PreviewMinSize = 0.1f;
+        private const float k_SceneViewOverlayLabelWidth = 110.0f;
+        private ArcHandle m_PreviewArcHandle = new ArcHandle();
+
         private LineRendererCurveEditor m_CurveEditor = new LineRendererCurveEditor();
         private SerializedProperty m_Time;
         private SerializedProperty m_MinVertexDistance;
@@ -41,11 +96,90 @@ private class Styles
         private SerializedProperty m_GenerateLightingData;
         private SerializedProperty m_MaskInteraction;
 
+        public class ShortcutContext : IShortcutToolContext
+        {
+            public bool active { get; set; }
+        }
+
+        private ShortcutContext m_ShortcutContext = new ShortcutContext { active = true };
+
+        private static Event CreateCommandEvent(string commandName)
+        {
+            return new Event { type = EventType.ExecuteCommand, commandName = "TrailRenderer/" + commandName };
+        }
+
+        private static Event s_PlayEvent;
+        private static Event s_StopEvent;
+        private static Event s_RestartEvent;
+        private static Event s_ShowBoundsEvent;
+
+        private static PrefColor s_BoundsColor = new PrefColor("Trail Renderer/Bounds", 1.0f, 235.0f / 255.0f, 4.0f / 255.0f, 1.0f);
+        private static PrefColor s_GizmoColor = new PrefColor("Trail Renderer/Shape Gizmos", 148f / 255f, 229f / 255f, 1f, 0.9f);
+
+        private static void DispatchShortcutEvent(Event evt)
+        {
+            var sceneView = SceneView.lastActiveSceneView;
+            if (sceneView != null)
+            {
+                if (sceneView.SendEvent(evt))
+                    return;
+            }
+
+            var inspectors = Resources.FindObjectsOfTypeAll<TrailRendererInspector>();
+            foreach (var inspector in inspectors)
+            {
+                if (inspector != null)
+                {
+                    if (inspector.HandleShortcutEvent(evt))
+                        return;
+                }
+            }
+        }
+
+        [Shortcut("TrailRenderer/Play", typeof(ShortcutContext), KeyCode.Comma)]
+        private static void PlayPauseShortcut(ShortcutArguments args)
+        {
+            DispatchShortcutEvent(s_PlayEvent);
+        }
+
+        [Shortcut("TrailRenderer/Stop", typeof(ShortcutContext), KeyCode.Period)]
+        private static void StopShortcut(ShortcutArguments args)
+        {
+            DispatchShortcutEvent(s_StopEvent);
+        }
+
+        [Shortcut("TrailRenderer/Restart", typeof(ShortcutContext), KeyCode.Slash)]
+        private static void RestartShortcut(ShortcutArguments args)
+        {
+            DispatchShortcutEvent(s_RestartEvent);
+        }
+
+        [Shortcut("TrailRenderer/ShowBounds", typeof(ShortcutContext))]
+        private static void ShowBoundsShortcut(ShortcutArguments args)
+        {
+            DispatchShortcutEvent(s_ShowBoundsEvent);
+        }
+
         public override void OnEnable()
         {
             base.OnEnable();
 
+            s_PreviewMovementSpeed = SessionState.GetFloat(k_PreviewMovementSpeed, 0.2f);
+            s_PreviewTimeScale = SessionState.GetFloat(k_PreviewTimeScale, 1.0f);
+            s_PreviewShape = (PreviewShape)SessionState.GetInt(k_PreviewShape, 0);
+            s_PreviewShapeSize = SessionState.GetFloat(k_PreviewShapeSize, 5.0f);
+
             m_CurveEditor.OnEnable(serializedObject);
+            s_Inspectors.AddLast(this);
+            SceneView.duringSceneGui += OnSceneViewGUI;
+            EditorApplication.update += RepaintSceneView;
+            ShortcutIntegration.instance.contextManager.RegisterToolContext(m_ShortcutContext);
+
+            s_PlayEvent = CreateCommandEvent("Play");
+            s_StopEvent = CreateCommandEvent("Stop");
+            s_RestartEvent = CreateCommandEvent("Restart");
+            s_ShowBoundsEvent = CreateCommandEvent("ShowBounds");
+
             m_Time = serializedObject.FindProperty("m_Time");
             m_MinVertexDistance = serializedObject.FindProperty("m_MinVertexDistance");
             m_Autodestruct = serializedObject.FindProperty("m_Autodestruct");
@@ -64,7 +198,76 @@ public override void OnEnable()
 
         public void OnDisable()
         {
+            Stop();
+
             m_CurveEditor.OnDisable();
+            s_Inspectors.Remove(this);
+            SceneView.duringSceneGui -= OnSceneViewGUI;
+            EditorApplication.update -= RepaintSceneView;
+            ShortcutIntegration.instance.contextManager.DeregisterToolContext(m_ShortcutContext);
+
+            SessionState.SetFloat(k_PreviewMovementSpeed, s_PreviewMovementSpeed);
+            SessionState.SetFloat(k_PreviewTimeScale, s_PreviewTimeScale);
+            SessionState.SetInt(k_PreviewShape, (int)s_PreviewShape);
+            SessionState.SetFloat(k_PreviewShapeSize, s_PreviewShapeSize);
+        }
+
+        private static float ClampPreviewSize(TrailRenderer tr, float size)
+        {
+            float minSize = Mathf.Max(k_PreviewMinSize, tr.widthMultiplier * 0.5f);
+            return Mathf.Max(size, minSize);
+        }
+
+        private void SavePositionForPreview()
+        {
+            if (!m_PreviewBackupPosition.HasValue)
+            {
+                if (target is TrailRenderer tr)
+                {
+                    m_PreviewBackupPosition = tr.transform.localPosition;
+                    m_PreviewIsFirstMove = true;
+
+                    s_PreviewShapeSize = ClampPreviewSize(tr, s_PreviewShapeSize);
+
+                    DrivenPropertyManager.TryRegisterProperty(this, tr.transform, "m_LocalPosition");
+                    DrivenPropertyManager.TryRegisterProperty(this, tr, "s_PreviewTimeScale");
+                    EditorGUIUtility.beginProperty += BeginDrivenPropertyCheck;
+                }
+
+                m_PreviewTimePercentage = 0.0f;
+                Tools.hidden = true;
+            }
+        }
+
+        private void RestorePositionAfterPreview()
+        {
+            DrivenPropertyManager.UnregisterProperties(this);
+            EditorGUIUtility.beginProperty -= BeginDrivenPropertyCheck;
+
+            if (m_PreviewBackupPosition.HasValue)
+            {
+                if (target is TrailRenderer tr)
+                    tr.Clear();
+                m_PreviewBackupPosition = null;
+            }
+
+            Tools.hidden = false;
+        }
+
+        private void BeginDrivenPropertyCheck(Rect rect, SerializedProperty property)
+        {
+            if (EditorApplication.isPlayingOrWillChangePlaymode)
+                return;
+
+            if (DrivenPropertyManagerInternal.IsDriving(this, property.serializedObject.targetObject, property.propertyPath))
+            {
+                // Properties driven by a UnityEvent are disabled as changes to them would be ignored.
+                GUI.enabled = false;
+
+                Color animatedColor = AnimationMode.animatedPropertyColor;
+                animatedColor.a *= GUI.backgroundColor.a;
+                GUI.backgroundColor = AnimationMode.animatedPropertyColor;
+            }
         }
 
         public override void OnInspectorGUI()
@@ -95,5 +298,508 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
         }
+
+        private void OnSceneViewGUI(SceneView sceneView)
+        {
+            // Bounds
+            if (s_PreviewShowBounds)
+            {
+                var oldCol = Handles.color;
+                Handles.color = s_BoundsColor;
+
+                foreach (var obj in targets)
+                {
+                    if (obj is TrailRenderer tr)
+                    {
+                        var worldBounds = tr.bounds;
+                        Handles.DrawWireCube(worldBounds.center, worldBounds.size);
+                    }
+                }
+
+                Handles.color = oldCol;
+            }
+
+            // Move trail using shape
+            if (m_PreviewBackupPosition.HasValue)
+            {
+                if (target is TrailRenderer tr)
+                {
+                    if (s_PreviewIsPlaying && !s_PreviewIsPaused)
+                    {
+                        Tools.hidden = !(EditorToolManager.activeTool is ShapeGizmoTool);
+
+                        float previousPreviewTimePercentage = m_PreviewTimePercentage;
+                        float timeStep = Mathf.Min(Time.deltaTime, 0.1f);
+
+                        float moveSpeed = s_PreviewMovementSpeed;
+                        if (s_PreviewShape == PreviewShape.Spring)
+                            moveSpeed *= 0.5f;
+
+                        m_PreviewTimePercentage += (timeStep * moveSpeed * s_PreviewTimeScale);
+                        m_PreviewTimePercentage %= 1.0f;
+
+                        tr.previewTimeScale = s_PreviewTimeScale;
+
+                        var transform = tr.transform;
+                        Matrix4x4 localTransform = Matrix4x4.TRS(Vector3.zero, transform.localRotation, transform.localScale);
+
+                        switch (s_PreviewShape)
+                        {
+                            case PreviewShape.Circle:
+                                transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(Mathf.Sin(m_PreviewTimePercentage * Mathf.PI * 2.0f), Mathf.Cos(m_PreviewTimePercentage * Mathf.PI * 2.0f), 0.0f) * s_PreviewShapeSize);
+                                break;
+                            case PreviewShape.Square:
+                                if (m_PreviewTimePercentage < 0.25f)
+                                    transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(Mathf.Lerp(-1.0f, 1.0f, m_PreviewTimePercentage * 4.0f), -1.0f, 0.0f) * s_PreviewShapeSize);
+                                else if (m_PreviewTimePercentage < 0.5f)
+                                    transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(1.0f, Mathf.Lerp(-1.0f, 1.0f, (m_PreviewTimePercentage - 0.25f) * 4.0f), 0.0f) * s_PreviewShapeSize);
+                                else if (m_PreviewTimePercentage < 0.75f)
+                                    transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(Mathf.Lerp(1.0f, -1.0f, (m_PreviewTimePercentage - 0.5f) * 4.0f), 1.0f, 0.0f) * s_PreviewShapeSize);
+                                else
+                                    transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(-1.0f, Mathf.Lerp(1.0f, -1.0f, (m_PreviewTimePercentage - 0.75f) * 4.0f), 0.0f) * s_PreviewShapeSize);
+                                break;
+                            case PreviewShape.Line:
+                                transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(Mathf.Lerp(-1.0f, 1.0f, m_PreviewTimePercentage), 0.0f, 0.0f) * s_PreviewShapeSize);
+                                break;
+                            case PreviewShape.SineWave:
+                                transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(Mathf.Lerp(-1.0f, 1.0f, m_PreviewTimePercentage), Mathf.Sin(m_PreviewTimePercentage * Mathf.PI * 2.0f * k_SineWaveRepeat) * k_SineWaveHeightMultiplier, 0.0f) * s_PreviewShapeSize);
+                                break;
+                            case PreviewShape.Spring:
+                                transform.localPosition = m_PreviewBackupPosition.Value + localTransform.MultiplyPoint(new Vector3(Mathf.Sin(m_PreviewTimePercentage * Mathf.PI * 2.0f * k_SpringRotations), Mathf.Cos(m_PreviewTimePercentage * Mathf.PI * 2.0f * k_SpringRotations), Mathf.Lerp(-0.5f, 0.5f, m_PreviewTimePercentage) * k_SpringRotations) * s_PreviewShapeSize);
+                                break;
+                        }
+
+                        // Clear non-looping shapes when they repeat
+                        if (previousPreviewTimePercentage > m_PreviewTimePercentage)
+                        {
+                            if (s_PreviewShape == PreviewShape.Line || s_PreviewShape == PreviewShape.SineWave || s_PreviewShape == PreviewShape.Spring)
+                                tr.Clear();
+                        }
+
+                        // Clear the trail when a preview starts
+                        if (m_PreviewIsFirstMove)
+                        {
+                            tr.Clear();
+                            m_PreviewIsFirstMove = false;
+                        }
+                    }
+                    else if (s_PreviewIsPaused)
+                    {
+                        tr.previewTimeScale = 0.0f;
+                    }
+                }
+            }
+        }
+
+        private void RepaintSceneView()
+        {
+            if (s_PreviewIsPlaying && !s_PreviewIsPaused)
+                SceneView.RepaintAll();
+        }
+
+        private void Play()
+        {
+            if (!s_PreviewIsPlaying && !s_PreviewIsPaused)
+                SavePositionForPreview();
+
+            s_PreviewIsPlaying = true;
+            s_PreviewIsPaused = false;
+        }
+
+        private void Pause()
+        {
+            s_PreviewIsPlaying = false;
+            s_PreviewIsPaused = true;
+            Tools.hidden = false;
+        }
+
+        private void Stop()
+        {
+            s_PreviewIsPlaying = false;
+            s_PreviewIsPaused = false;
+            RestorePositionAfterPreview();
+        }
+
+        private void PlayStopGUI()
+        {
+            bool disablePlayButton = (Time.timeScale == 0.0f);
+            GUIContent playText = disablePlayButton ? Styles.playDisabled : Styles.play;
+
+            // Play/Stop buttons
+            GUILayout.BeginHorizontal(GUILayout.Width(220.0f));
+            {
+                using (new EditorGUI.DisabledScope(disablePlayButton))
+                {
+                    bool isPlaying = s_PreviewIsPlaying && !s_PreviewIsPaused && !disablePlayButton;
+                    if (GUILayout.Button(isPlaying ? Styles.pause : playText, "ButtonLeft"))
+                    {
+                        if (isPlaying)
+                            Pause();
+                        else
+                            Play();
+                    }
+                }
+
+                if (GUILayout.Button(Styles.restart, "ButtonMid"))
+                {
+                    Stop();
+                    Play();
+                }
+
+                if (GUILayout.Button(Styles.stop, "ButtonRight"))
+                {
+                    Stop();
+                }
+            }
+            GUILayout.EndHorizontal();
+
+            // Playback info
+            PlayBackInfoGUI();
+
+            // Handle shortcut keys last so we do not activate them if inputfield has used the event
+            HandleKeyboardShortcuts();
+        }
+
+        private void PlayBackInfoGUI()
+        {
+            EventType oldEventType = Event.current.type;
+            int oldHotControl = GUIUtility.hotControl;
+            string oldFormat = EditorGUI.kFloatFieldFormatString;
+
+            EditorGUIUtility.labelWidth = k_SceneViewOverlayLabelWidth;
+
+            EditorGUI.kFloatFieldFormatString = Styles.secondsFloatFieldFormatString;
+            if (Time.timeScale == 0.0f)
+            {
+                using (new EditorGUI.DisabledScope(true))
+                {
+                    EditorGUILayout.FloatField(Styles.movementSpeedDisabled, 0.0f);
+                    EditorGUILayout.FloatField(Styles.timeScaleDisabled, 0.0f);
+                }
+            }
+            else
+            {
+                EditorGUI.BeginChangeCheck();
+                s_PreviewMovementSpeed = Mathf.Clamp(EditorGUILayout.FloatField(Styles.movementSpeed, s_PreviewMovementSpeed), 0.0f, 2.0f);
+                s_PreviewTimeScale = Mathf.Clamp(EditorGUILayout.FloatField(Styles.timeScale, s_PreviewTimeScale), 0.1f, 1.0f);
+                if (EditorGUI.EndChangeCheck())
+                    m_PreviewIsFirstMove = true;
+            }
+
+            EditorGUI.BeginChangeCheck();
+            s_PreviewShape = (PreviewShape)EditorGUILayout.EnumPopup(Styles.previewShape, s_PreviewShape);
+            if (EditorGUI.EndChangeCheck())
+                m_PreviewIsFirstMove = true;
+
+            EditorGUI.BeginChangeCheck();
+            s_PreviewShapeSize = EditorGUILayout.FloatField(Styles.previewShapeSize, s_PreviewShapeSize);
+            if (EditorGUI.EndChangeCheck())
+            {
+                s_PreviewShapeSize = ClampPreviewSize(target as TrailRenderer, s_PreviewShapeSize);
+                m_PreviewIsFirstMove = true;
+            }
+
+            EditorGUI.kFloatFieldFormatString = oldFormat;
+
+            s_PreviewShowBounds = GUILayout.Toggle(s_PreviewShowBounds, Styles.showBounds, EditorStyles.toggle);
+
+            EditorGUIUtility.labelWidth = 0.0f;
+        }
+
+        private void HandleKeyboardShortcuts()
+        {
+            var evt = Event.current;
+
+            if (evt.type == EventType.ExecuteCommand)
+            {
+                if (HandleShortcutEvent(evt))
+                    evt.Use();
+            }
+        }
+
+        private bool HandleShortcutEvent(Event evt)
+        {
+            if (EditorApplication.isPlaying)
+                return false;
+
+            if (evt.commandName == s_PlayEvent.commandName)
+            {
+                if (!s_PreviewIsPlaying)
+                    Play();
+                else
+                    Pause();
+
+                return true;
+            }
+            else if (evt.commandName == s_StopEvent.commandName)
+            {
+                Stop();
+                return true;
+            }
+            else if (evt.commandName == s_RestartEvent.commandName)
+            {
+                Stop();
+                Play();
+                return true;
+            }
+            else if (evt.commandName == s_ShowBoundsEvent.commandName)
+            {
+                s_PreviewShowBounds = !s_PreviewShowBounds;
+                return true;
+            }
+
+            return false;
+        }
+
+        private static Matrix4x4 GetPreviewMatrix(Vector3? backupPosition, Transform transform)
+        {
+            Matrix4x4 parentMatrix = Matrix4x4.identity;
+            if (transform.parent)
+                parentMatrix = transform.parent.localToWorldMatrix;
+
+            Vector3 localPosition = backupPosition.HasValue ? backupPosition.Value : transform.localPosition;
+            Matrix4x4 localMatrix = Matrix4x4.TRS(localPosition, transform.localRotation, transform.localScale);
+            return parentMatrix * localMatrix;
+        }
+
+        [Overlay(typeof(SceneView), k_OverlayId, k_DisplayName)]
+        class SceneViewTrailRendererOverlay : TransientSceneViewOverlay
+        {
+            const string k_OverlayId = "Scene View/TrailRenderer";
+            const string k_DisplayName = "Trail Renderer";
+
+            public override bool visible
+            {
+                get { return s_Inspectors != null && s_Inspectors.Count > 0 && !EditorApplication.isPlaying && (s_Inspectors.Last().targets.Length == 1); }
+            }
+
+            public override void OnGUI()
+            {
+                if (!visible)
+                    return;
+                s_Inspectors.Last().PlayStopGUI();
+            }
+        }
+
+        [EditorTool("Shape", typeof(TrailRenderer))]
+        class ShapeGizmoTool : EditorTool, IDrawSelectedHandles
+        {
+            public override GUIContent toolbarIcon
+            {
+                get { return Styles.toolIcon; }
+            }
+
+            public override bool IsAvailable()
+            {
+                // Check for count != 1
+                if (targets.Skip(1).Any())
+                    return false;
+                if (s_Inspectors == null || s_Inspectors.Count == 0)
+                    return false;
+
+                return !EditorApplication.isPlaying;
+            }
+
+            public override void OnToolGUI(EditorWindow window)
+            {
+                if (s_Inspectors == null || !s_Inspectors.Any())
+                    return;
+
+                DrawHandles(s_Inspectors.Last(), true);
+            }
+
+            public void OnDrawHandles()
+            {
+                if (!s_PreviewIsPlaying)
+                    DrawHandles(s_Inspectors.Last(), false);
+            }
+
+            private void DrawHandles(TrailRendererInspector inspector, bool allowGizmoEditing)
+            {
+                Color gizmoEditingColor = new Color(1.0f, 1.0f, 1.0f, allowGizmoEditing && !Event.current.alt ? 1.0f : 0.0f);
+
+                Color origCol = Handles.color;
+                Handles.color = s_GizmoColor;
+
+                Matrix4x4 orgMatrix = Handles.matrix;
+
+                foreach (var tr in targets.OfType<TrailRenderer>())
+                {
+                    Handles.matrix = GetPreviewMatrix(inspector.m_PreviewBackupPosition, tr.transform);
+
+                    switch (s_PreviewShape)
+                    {
+                        case PreviewShape.Circle:
+                            {
+                                EditorGUI.BeginChangeCheck();
+
+                                inspector.m_PreviewArcHandle.angle = 360.0f;
+                                inspector.m_PreviewArcHandle.radius = s_PreviewShapeSize;
+                                inspector.m_PreviewArcHandle.SetColorWithRadiusHandle(Color.white, 0f);
+                                inspector.m_PreviewArcHandle.radiusHandleColor *= gizmoEditingColor;
+                                inspector.m_PreviewArcHandle.angleHandleColor = Color.clear;
+
+                                using (new Handles.DrawingScope(Handles.matrix * s_ArcHandleOffsetMatrix))
+                                    inspector.m_PreviewArcHandle.DrawHandle();
+
+                                if (EditorGUI.EndChangeCheck())
+                                    s_PreviewShapeSize = ClampPreviewSize(tr, inspector.m_PreviewArcHandle.radius);
+                            }
+                            break;
+                        case PreviewShape.Square:
+                            {
+                                EditorGUI.BeginChangeCheck();
+                                float size = DoSimpleSquareHandle(s_PreviewShapeSize, allowGizmoEditing);
+                                if (EditorGUI.EndChangeCheck())
+                                    s_PreviewShapeSize = ClampPreviewSize(tr, size);
+                            }
+                            break;
+                        case PreviewShape.Line:
+                            {
+                                EditorGUI.BeginChangeCheck();
+                                float radius = Handles.DoSimpleEdgeHandle(Quaternion.identity, Vector3.zero, s_PreviewShapeSize, allowGizmoEditing);
+                                if (EditorGUI.EndChangeCheck())
+                                    s_PreviewShapeSize = ClampPreviewSize(tr, radius);
+                            }
+                            break;
+                        case PreviewShape.SineWave:
+                            {
+                                EditorGUI.BeginChangeCheck();
+                                float radius = DoSimpleSineWaveHandle(s_PreviewShapeSize, allowGizmoEditing, k_SineWaveHeightMultiplier, k_SineWaveRepeat);
+                                if (EditorGUI.EndChangeCheck())
+                                    s_PreviewShapeSize = ClampPreviewSize(tr, radius);
+                            }
+                            break;
+                        case PreviewShape.Spring:
+                            {
+                                EditorGUI.BeginChangeCheck();
+                                float radius = DoSimpleSpringHandle(s_PreviewShapeSize, allowGizmoEditing, k_SpringRotations);
+                                if (EditorGUI.EndChangeCheck())
+                                    s_PreviewShapeSize = ClampPreviewSize(tr, radius);
+                            }
+                            break;
+                    }
+                }
+
+                Handles.color = origCol;
+                Handles.matrix = orgMatrix;
+            }
+
+            private static float DoSimpleSquareHandle(float size, bool editable)
+            {
+                if (Event.current.alt)
+                    editable = false;
+
+                Vector3 right = Vector3.right;
+                Vector3 up = Vector3.up;
+
+                if (editable)
+                {
+                    // Size handles at edges
+                    EditorGUI.BeginChangeCheck();
+                    size = Handles.SizeSlider(Vector3.zero, up, size);
+                    size = Handles.SizeSlider(Vector3.zero, -up, size);
+                    size = Handles.SizeSlider(Vector3.zero, right, size);
+                    size = Handles.SizeSlider(Vector3.zero, -right, size);
+                    if (EditorGUI.EndChangeCheck())
+                        size = Mathf.Max(0.0f, size);
+                }
+
+                // Draw gizmo
+                if (size > 0)
+                {
+                    Vector3[] points = new Vector3[5];
+
+                    points[0] = up * size + right * size;
+                    points[1] = -up * size + right * size;
+                    points[2] = -up * size - right * size;
+                    points[3] = up * size - right * size;
+                    points[4] = points[0];
+
+                    Handles.DrawPolyLine(points);
+                }
+
+                return size;
+            }
+
+            private static float DoSimpleSineWaveHandle(float radius, bool editable, float heightMultiplier, float repeatCount)
+            {
+                if (Event.current.alt)
+                    editable = false;
+
+                Vector3 right = Vector3.right;
+                Vector3 up = Vector3.up;
+
+                if (editable)
+                {
+                    // Radius handles at ends
+                    EditorGUI.BeginChangeCheck();
+                    radius = Handles.SizeSlider(Vector3.zero, right, radius);
+                    radius = Handles.SizeSlider(Vector3.zero, -right, radius);
+                    if (EditorGUI.EndChangeCheck())
+                        radius = Mathf.Max(0.0f, radius);
+                }
+
+                // Draw gizmo
+                if (radius > 0)
+                {
+                    Vector3 start = -right * radius;
+
+                    Vector3[] points = new Vector3[128];
+                    for (int i = 0; i < points.Length; i++)
+                    {
+                        float percent = ((float)i / (points.Length - 1));
+                        Vector3 sine = start + right * (radius * percent) * 2.0f;
+                        sine += up * Mathf.Sin(percent * Mathf.PI * 2.0f * repeatCount) * radius * heightMultiplier;
+                        points[i] = sine;
+                    }
+
+                    Handles.DrawPolyLine(points);
+                }
+
+                return radius;
+            }
+
+            private static float DoSimpleSpringHandle(float radius, bool editable, float rotationCount)
+            {
+                if (Event.current.alt)
+                    editable = false;
+
+                Vector3 right = Vector3.right;
+                Vector3 up = Vector3.up;
+
+                if (editable)
+                {
+                    // Radius handles at ends
+                    EditorGUI.BeginChangeCheck();
+
+                    Vector3 start = new Vector3(0.0f, 0.0f, -0.5f * rotationCount) * radius;
+                    radius = Handles.SizeSlider(start, up, radius);
+
+                    Vector3 end = new Vector3(0.0f, 0.0f, 0.5f * rotationCount) * radius;
+                    radius = Handles.SizeSlider(end, up, radius);
+
+                    if (EditorGUI.EndChangeCheck())
+                        radius = Mathf.Max(0.0f, radius);
+                }
+
+                // Draw gizmo
+                if (radius > 0)
+                {
+                    Vector3[] points = new Vector3[128];
+                    for (int i = 0; i < points.Length; i++)
+                    {
+                        float percent = ((float)i / (points.Length - 1));
+                        float theta = percent * Mathf.PI * 2.0f * rotationCount;
+                        Vector3 sine = new Vector3(Mathf.Sin(theta), Mathf.Cos(theta), Mathf.Lerp(-0.5f, 0.5f, percent) * rotationCount);
+                        points[i] = sine * radius;
+                    }
+
+                    Handles.DrawPolyLine(points);
+                }
+
+                return radius;
+            }
+        }
     }
 }
diff --git a/Editor/Mono/Inspector/TransformRotationGUI.cs b/Editor/Mono/Inspector/TransformRotationGUI.cs
index fbd9afd381..18bd2d534b 100644
--- a/Editor/Mono/Inspector/TransformRotationGUI.cs
+++ b/Editor/Mono/Inspector/TransformRotationGUI.cs
@@ -96,6 +96,22 @@ public void RotationField(bool disabled)
                     EditorGUI.FloatField(nr, s_XYZLabels[i], ref m_EulerFloats[i]);
                     if (EditorGUI.EndChangeCheck() && m_EulerFloats[i].hasResult)
                         eulerChangedMask |= 1 << i;
+
+                    if (Event.current.type == EventType.ContextClick && nr.Contains(Event.current.mousePosition))
+                    {
+                        var childProperty = m_Rotation.Copy();
+                        childProperty.Next(true);
+                        int childPropertyIndex = i;
+                        while (childPropertyIndex > 0)
+                        {
+                            childProperty.Next(false);
+                            childPropertyIndex--;
+                        }
+
+                        EditorGUI.DoPropertyContextMenu(childProperty);
+                        Event.current.Use();
+                    }
+
                     nr.x += w + EditorGUI.kSpacingSubLabel;
                 }
                 EditorGUIUtility.labelWidth = prevWidth;
diff --git a/Editor/Mono/Inspector/TransformUtils.cs b/Editor/Mono/Inspector/TransformUtils.cs
index 6238ea9153..a7af1fe1f4 100644
--- a/Editor/Mono/Inspector/TransformUtils.cs
+++ b/Editor/Mono/Inspector/TransformUtils.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using UnityEngine;
 using UnityEditor;
 
@@ -18,5 +19,31 @@ public static void SetInspectorRotation(Transform t, Vector3 r)
         {
             t.SetLocalEulerAngles(r, t.rotationOrder);
         }
+
+        public static bool GetConstrainProportions(Transform transform)
+        {
+            return GetConstrainProportions(new []{transform});
+        }
+
+        public static bool GetConstrainProportions(Transform[] transforms)
+        {
+            return Selection.DoAllGOsHaveConstrainProportionsEnabled(transforms);
+        }
+
+        public static void SetConstrainProportions(Transform transform, bool enabled)
+        {
+            SetConstrainProportions(new[] { transform }, enabled);
+        }
+
+        public static void SetConstrainProportions(Transform[] transforms, bool enabled)
+        {
+            foreach (var t in transforms)
+            {
+                if (t == null)
+                    throw new ArgumentNullException("transform", "One or more transforms are null");
+            }
+
+            ConstrainProportionsTransformScale.SetConstrainProportions(transforms, enabled);
+        }
     }
 }
diff --git a/Editor/Mono/Inspector/UnityEventDrawer.cs b/Editor/Mono/Inspector/UnityEventDrawer.cs
index dca303a963..690bcfb341 100644
--- a/Editor/Mono/Inspector/UnityEventDrawer.cs
+++ b/Editor/Mono/Inspector/UnityEventDrawer.cs
@@ -9,6 +9,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEditor;
+using UnityEditor.UIElements;
 using UnityEngine.Events;
 using Object = UnityEngine.Object;
 using UnityEngine.Pool;
@@ -155,22 +156,21 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
 
         private ListView CreateListView(SerializedProperty property)
         {
-            var listView = EditorUIService.instance.CreateListViewBinding(property.serializedObject);
-            listView.showAddRemoveFooter = true;
-            listView.reorderMode = ListViewReorderMode.Animated;
-            listView.showBorder = true;
-            listView.showFoldoutHeader = false;
-            listView.showBoundCollectionSize = false;
-            listView.showAlternatingRowBackgrounds = AlternatingRowBackground.None;
-            listView.fixedItemHeight = GetElementHeight();
+            var listView = new ListView
+            {
+                showAddRemoveFooter = true,
+                reorderMode = ListViewReorderMode.Animated,
+                showBorder = true,
+                showFoldoutHeader = false,
+                showBoundCollectionSize = false,
+                showAlternatingRowBackgrounds = AlternatingRowBackground.None,
+                fixedItemHeight = GetElementHeight()
+            };
 
             var propertyRelative = property.FindPropertyRelative(kCallsPath);
             listView.bindingPath = propertyRelative.propertyPath;
 
-            listView.makeItem += () =>
-            {
-                return EditorUIService.instance.CreateUnityEventItem();
-            };
+            listView.makeItem += () => new UnityEventItem();
 
             listView.bindItem += (VisualElement element, int i) =>
             {
@@ -208,7 +208,8 @@ private ListView CreateListView(SerializedProperty property)
                     return GetArgument(pListener);
                 };
 
-                EditorUIService.instance.BindUnityEventItem(element, propertyData, createMenuCallback, formatSelectedValueCallback, getArgumentCallback);
+                var eventItem = element as UnityEventItem;
+                eventItem.BindFields(propertyData, createMenuCallback, formatSelectedValueCallback, getArgumentCallback);
             };
 
             return listView;
@@ -663,6 +664,9 @@ internal static GenericMenu BuildPopupList(Object target, UnityEventBase dummyEv
                 // Collect all the names and record how many times the same name is used.
                 foreach (Component comp in comps)
                 {
+                    if (comp == null)
+                        continue;
+
                     var duplicateIndex = 0;
                     if (duplicateNames.TryGetValue(comp.GetType().Name, out duplicateIndex))
                         duplicateIndex++;
diff --git a/Editor/Mono/Inspector/VisualElements/MinMaxGradientField.cs b/Editor/Mono/Inspector/VisualElements/MinMaxGradientField.cs
index ea530d83e4..fc3961be32 100644
--- a/Editor/Mono/Inspector/VisualElements/MinMaxGradientField.cs
+++ b/Editor/Mono/Inspector/VisualElements/MinMaxGradientField.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Linq;
 using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -11,6 +12,8 @@ namespace UnityEditor.UIElements
 {
     internal class MinMaxGradientField : BaseField<ParticleSystem.MinMaxGradient>
     {
+        public new class UxmlFactory : UxmlFactory<MinMaxGradientField> { }
+
         public new static readonly string ussClassName = "unity-min-max-gradient-field";
         public static readonly string visualInputUssClass = ussClassName + "__visual-input";
         public static readonly string dropdownFieldUssClass = ussClassName + "__dropdown-field";
@@ -28,56 +31,86 @@ internal class MinMaxGradientField : BaseField<ParticleSystem.MinMaxGradient>
             L10n.Tr("Random Color")
         };
 
-        VisualElement m_ColorMin;
-        VisualElement m_ColorMax;
-        VisualElement m_GradientMin;
-        VisualElement m_GradientMax;
-        VisualElement m_ModeDropdown;
+        PropertyField m_ColorMin;
+        PropertyField m_ColorMax;
+        PropertyField m_GradientMin;
+        PropertyField m_GradientMax;
+        DropdownField m_ModeDropdown;
         VisualElement m_GradientsContainer;
-        VisualElement m_MixedValueTypeLabel;
+        Label m_MixedValueTypeLabel;
 
         public MinMaxGradientField()
             : this(null, null) { }
 
         public MinMaxGradientField(MinMaxGradientPropertyDrawer.PropertyData propertyData, string label) : base(label, null)
         {
-            m_ColorMin = EditorUIService.instance.CreatePropertyField(propertyData.colorMin, "");
-            m_ColorMin.AddToClassList(colorFieldUssClass);
-            m_ColorMax = EditorUIService.instance.CreatePropertyField(propertyData.colorMax, "");
-            m_ColorMax.AddToClassList(colorFieldUssClass);
-            m_GradientMin = EditorUIService.instance.CreatePropertyField(propertyData.gradientMin, "");
-            m_GradientMax = EditorUIService.instance.CreatePropertyField(propertyData.gradientMax, "");
-            m_ModeDropdown = EditorUIService.instance.CreateDropdownField(stringModes, () => propertyData.mode.intValue);
-            m_ModeDropdown.AddToClassList(dropdownFieldUssClass);
-            m_MixedValueTypeLabel = new Label("\u2014");
-            m_MixedValueTypeLabel.AddToClassList(multipleValuesLabelUssClass);
-
-            var dropdownInput = m_ModeDropdown.Q<VisualElement>(null, "unity-popup-field__input");
-            dropdownInput.AddToClassList(dropdownInputUssClass);
-
-            m_GradientsContainer = new VisualElement();
-            m_GradientsContainer.AddToClassList(gradientContainerUssClass);
-            m_GradientsContainer.Add(m_GradientMin);
-            m_GradientsContainer.Add(m_GradientMax);
-
-            visualInput.AddToClassList(visualInputUssClass);
-            visualInput.Add(m_ColorMin);
-            visualInput.Add(m_ColorMax);
-            visualInput.Add(m_GradientsContainer);
-            visualInput.Add(m_MixedValueTypeLabel);
-            visualInput.Add(m_ModeDropdown);
-
-            m_ModeDropdown.RegisterCallback<ChangeEvent<string>>(e =>
+            if (propertyData != null)
             {
-                var index = Array.IndexOf(stringModes, e.newValue);
-                var mode = (MinMaxGradientState)index;
+                m_ColorMin = new PropertyField(propertyData.colorMin, "");
+                m_ColorMin.AddToClassList(colorFieldUssClass);
+                m_ColorMax = new PropertyField(propertyData.colorMax, "");
+                m_ColorMax.AddToClassList(colorFieldUssClass);
+                m_GradientMin = new PropertyField(propertyData.gradientMin, "");
+                m_GradientMax = new PropertyField(propertyData.gradientMax, "");
+                m_ModeDropdown = new DropdownField
+                {
+                    choices = stringModes.ToList()
+                };
+                m_ModeDropdown.createMenuCallback = () =>
+                {
+                    var osMenu = new GenericOSMenu();
+
+                    for (int i = 0; i < stringModes.Length; i++)
+                    {
+                        var option = stringModes[i];
+                        var isValueSelected = propertyData.mode.intValue == i;
+
+                        osMenu.AddItem(option, isValueSelected, () =>
+                        {
+                            m_ModeDropdown.value = option;
+                        });
+                    }
+
+                    return osMenu;
+                };
+                m_ModeDropdown.formatSelectedValueCallback = (value) =>
+                {
+                    // Don't show label for this dropdown
+                    return "";
+                };
+
+                m_ModeDropdown.index = propertyData.mode.intValue;
+                m_ModeDropdown.AddToClassList(dropdownFieldUssClass);
+                m_MixedValueTypeLabel = new Label("\u2014");
+                m_MixedValueTypeLabel.AddToClassList(multipleValuesLabelUssClass);
+
+                var dropdownInput = m_ModeDropdown.Q<VisualElement>(null, "unity-popup-field__input");
+                dropdownInput.AddToClassList(dropdownInputUssClass);
+
+                m_GradientsContainer = new VisualElement();
+                m_GradientsContainer.AddToClassList(gradientContainerUssClass);
+                m_GradientsContainer.Add(m_GradientMin);
+                m_GradientsContainer.Add(m_GradientMax);
+
+                visualInput.AddToClassList(visualInputUssClass);
+                visualInput.Add(m_ColorMin);
+                visualInput.Add(m_ColorMax);
+                visualInput.Add(m_GradientsContainer);
+                visualInput.Add(m_MixedValueTypeLabel);
+                visualInput.Add(m_ModeDropdown);
+
+                m_ModeDropdown.RegisterCallback<ChangeEvent<string>>(e =>
+                {
+                    var index = Array.IndexOf(stringModes, e.newValue);
+                    var mode = (MinMaxGradientState)index;
+
+                    propertyData.mode.intValue = index;
+                    propertyData.mode.serializedObject.ApplyModifiedProperties();
+                    UpdateFieldsDisplay(propertyData.mode);
+                });
 
-                propertyData.mode.intValue = index;
-                propertyData.mode.serializedObject.ApplyModifiedProperties();
                 UpdateFieldsDisplay(propertyData.mode);
-            });
-
-            UpdateFieldsDisplay(propertyData.mode);
+            }
         }
 
         private void UpdateFieldsDisplay(SerializedProperty mode)
diff --git a/Editor/Mono/InspectorUtility.cs b/Editor/Mono/InspectorUtility.cs
new file mode 100644
index 0000000000..aa8cff31f2
--- /dev/null
+++ b/Editor/Mono/InspectorUtility.cs
@@ -0,0 +1,161 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine.Bindings;
+using System;
+using Object = UnityEngine.Object;
+using System.Collections.Generic;
+using UnityEngine.Scripting;
+
+namespace UnityEditor
+{
+    internal class InspectorUtility
+    {
+        internal delegate void LivePropertyOverrideCallback(SerializedObject serializedObject, bool isLiveUpdate);
+        internal delegate bool LivePropertyChangedCallback(Object[] unityObject);
+
+        internal static Dictionary<Type, LivePropertyOverrideCallback> s_LivePropertyOverrideCallbacks = new Dictionary<Type, LivePropertyOverrideCallback>();
+        internal static Dictionary<Type, LivePropertyChangedCallback> s_LivePropertyChangedCallbacks = new Dictionary<Type, LivePropertyChangedCallback>();
+
+        static SerializedObject s_CachedSerializedObject = new SerializedObject(IntPtr.Zero);
+
+        internal static void SetLivePropertyOverride(Type type, LivePropertyOverrideCallback callback)
+        {
+            if (s_LivePropertyOverrideCallbacks.TryGetValue(type, out var del))
+            {
+                del += callback;
+            }
+            else
+            {
+                s_LivePropertyOverrideCallbacks[type] = callback;
+            }
+        }
+
+        internal static void RemoveLivePropertyOverride(Type type, LivePropertyOverrideCallback callback)
+        {
+            s_LivePropertyOverrideCallbacks[type] -= callback;
+            if (s_LivePropertyOverrideCallbacks[type] == null)
+                s_LivePropertyOverrideCallbacks.Remove(type);
+        }
+
+        internal static void SetLivePropertyChanged(Type type, LivePropertyChangedCallback callback)
+        {
+            if (s_LivePropertyChangedCallbacks.TryGetValue(type, out var del))
+            {
+                del += callback;
+            }
+            else
+            {
+                s_LivePropertyChangedCallbacks[type] = callback;
+            }
+        }
+
+        internal static void RemoveLivePropertyChanged(Type type, LivePropertyChangedCallback callback)
+        {
+            s_LivePropertyChangedCallbacks[type] -= callback;
+            if (s_LivePropertyChangedCallbacks[type] == null)
+                s_LivePropertyChangedCallbacks.Remove(type);
+        }
+
+        static bool IsLivePropertyChanged(Editor editor)
+        {
+            var target = editor.target;
+            if (target == null)
+                return false;
+
+            var targetType = target.GetType();
+
+            if (s_LivePropertyChangedCallbacks.TryGetValue(targetType, out var cb))
+            {
+                if (cb.Invoke(editor.targets))
+                    return true;
+            }
+
+            return false;
+        }
+
+        internal static void DirtyLivePropertyChanges(ActiveEditorTracker tracker)
+        {
+            if (!EditorApplication.isPlaying || s_LivePropertyOverrideCallbacks.Count <= 0)
+                return;
+
+            var editors = tracker.activeEditors;
+            for (var i = 0; i != editors.Length;i++)
+            {
+                if (tracker.GetVisible(i) == 0)
+                    continue;
+
+                // Callback
+                var editor = editors[i];
+                if (IsLivePropertyChanged(editor))
+                    editor.isInspectorDirty = true;
+            }
+        }
+
+        // Check if current serialized object contains any live properties.
+        // If so, enable live property feature.
+        [RequiredByNativeCode]
+        internal static bool Internal_HasLiveProperties(IntPtr nativeObjectPtr)
+        {
+            if (!EditorApplication.isPlaying || s_LivePropertyOverrideCallbacks.Count <= 0)
+                return false;
+
+            if (s_CachedSerializedObject.m_NativeObjectPtr != IntPtr.Zero)
+                throw new ArgumentException("Recursive EnableLivePropertyFeature are not allowed.");
+
+            var livePropertyFeatureEnabled = false;
+
+            try
+            {
+                s_CachedSerializedObject.m_NativeObjectPtr = nativeObjectPtr;
+                var target = s_CachedSerializedObject.targetObject;
+                if (target == null)
+                    return false;
+
+                var targetType = target.GetType();
+
+                if (s_LivePropertyOverrideCallbacks.ContainsKey(targetType))
+                {
+                    livePropertyFeatureEnabled = true;
+                }
+            }
+            finally
+            {
+                // This serialized object is just a temp reference to pass around, it doesn't own the pointer
+                s_CachedSerializedObject.m_NativeObjectPtr = IntPtr.Zero;
+            }
+
+            return livePropertyFeatureEnabled;
+        }
+
+        // Invoke override callback for live property.
+        [RequiredByNativeCode]
+        internal static void Internal_CallPropertyOverrideCallback(IntPtr nativeObjectPtr, bool isLiveUpdate)
+        {
+            if (s_CachedSerializedObject.m_NativeObjectPtr != IntPtr.Zero && s_CachedSerializedObject.m_NativeObjectPtr != nativeObjectPtr)
+                throw new ArgumentException("Recursive SetLivePropertyOverrides are not allowed.");
+
+            try
+            {
+                if (s_CachedSerializedObject.m_NativeObjectPtr == IntPtr.Zero)
+                {
+                    s_CachedSerializedObject.m_NativeObjectPtr = nativeObjectPtr;
+                    if (s_CachedSerializedObject.targetObject == null)
+                        return;
+                }
+
+                var targetType = s_CachedSerializedObject.targetObject.GetType();
+                if (s_LivePropertyOverrideCallbacks.TryGetValue(targetType, out var cb))
+                {
+                    cb.Invoke(s_CachedSerializedObject, isLiveUpdate);
+                }
+            }
+            finally
+            {
+                // This serialized object is just a temp reference to pass around, it doesn't own the pointer
+                s_CachedSerializedObject.m_NativeObjectPtr = IntPtr.Zero;
+            }
+        }
+    }
+}
diff --git a/Editor/Mono/InteractionContext.bindings.cs b/Editor/Mono/InteractionContext.bindings.cs
new file mode 100644
index 0000000000..3777ca822b
--- /dev/null
+++ b/Editor/Mono/InteractionContext.bindings.cs
@@ -0,0 +1,90 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine.Bindings;
+using UnityEngine.Assertions;
+
+namespace UnityEditor
+{
+    [NativeType(Header = "Editor/Src/InteractionContext.h")]
+    internal partial class InteractionContext
+    {
+        [Flags]
+        public enum Flags
+        {
+            DisableNone = 0,
+            DisableUndo = 1,
+            DisableDialogs = 2,
+
+            DisableUndoAndDialogs = DisableUndo | DisableDialogs,
+        }
+
+        internal IntPtr m_NativePtr;
+
+        public InteractionContext(Flags flags)
+        {
+            m_NativePtr = Internal_Create((int)flags);
+        }
+
+        ~InteractionContext()
+        {
+            Internal_Destroy(m_NativePtr);
+        }
+
+        public extern bool IsUndoEnabled();
+        public extern bool WasAnyUndoOperationRegisteredSinceCreation();
+
+        public extern bool AreDialogsEnabled();
+        public extern bool HasUnusedDialogResponses();
+        public extern bool IsCurrentDialogResponse(string dialogTitle);
+        public extern string GetCurrentDialogResponse();
+        public extern string GetCurrentDialogResponseAndAvance();
+        public extern void AppendDialogResponse(string dialogTitle, string dialogResponse);
+
+        public extern string GetErrors();
+
+        [FreeFunction("CreateInteractionContext", IsThreadSafe = false)]
+        private static extern IntPtr Internal_Create(int flags);
+        [FreeFunction("DestroyInteractionContext")]
+        private static extern void Internal_Destroy(IntPtr m_NativePtr);
+
+        public static InteractionContext UserAction = new InteractionContext(Flags.DisableNone);
+    }
+
+    internal class GlobalInteractionContext : InteractionContext, IDisposable
+    {
+        public GlobalInteractionContext(InteractionContext.Flags flags)
+            : base(flags)
+        {
+            Assert.IsNull(GetGlobalInteractionContext());
+            SetGlobalInteractionContext(this);
+        }
+
+        public void Dispose()
+        {
+            try
+            {
+                Assert.IsFalse(HasUnusedDialogResponses());
+                if (!IsUndoEnabled())
+                {
+                    Assert.IsFalse(WasAnyUndoOperationRegisteredSinceCreation());
+                }
+            }
+            finally
+            {
+                ClearGlobalInteractionContext();
+            }
+        }
+
+        [FreeFunction("SetGlobalInteractionContext")]
+        private static extern void SetGlobalInteractionContext(InteractionContext interactionContext);
+
+        [FreeFunction("GetGlobalInteractionContext")]
+        private static extern InteractionContext GetGlobalInteractionContext();
+
+        [FreeFunction("ClearGlobalInteractionContext")]
+        private static extern void ClearGlobalInteractionContext();
+    }
+}
diff --git a/Editor/Mono/Internal/MonoScripts.cs b/Editor/Mono/Internal/MonoScripts.cs
index bde203fa3d..697ad65d47 100644
--- a/Editor/Mono/Internal/MonoScripts.cs
+++ b/Editor/Mono/Internal/MonoScripts.cs
@@ -15,7 +15,11 @@ public static class MonoScripts
         public static MonoScript CreateMonoScript(string scriptContents, string className, string nameSpace, string assemblyName, bool isEditorScript)
         {
             var script = new MonoScript();
-            script.Init(scriptContents, className, nameSpace, assemblyName, isEditorScript);
+            if (!string.IsNullOrEmpty(scriptContents))
+            {
+                Debug.LogWarning($"MonoScript {className} was initialized with a non-empty script. This has never worked and should not be attempted. The script contents will be ignored");
+            }
+            script.Init(className, nameSpace, assemblyName, isEditorScript);
             return script;
         }
     }
diff --git a/Editor/Mono/InternalEditorUtility.bindings.cs b/Editor/Mono/InternalEditorUtility.bindings.cs
index c52fcafe82..3830ed411e 100644
--- a/Editor/Mono/InternalEditorUtility.bindings.cs
+++ b/Editor/Mono/InternalEditorUtility.bindings.cs
@@ -507,6 +507,7 @@ public static Version GetUnityVersion()
         [FreeFunction("InternalEditorUtilityBindings::GetLicenseInfoText")]
         extern public static string GetLicenseInfo();
 
+        [Obsolete("GetLicenseFlags is no longer supported", error: true)]
         [FreeFunction("InternalEditorUtilityBindings::GetLicenseFlags")]
         extern public static int[] GetLicenseFlags();
 
@@ -836,10 +837,6 @@ internal static bool RunningUnderWindows8(bool orHigher = true)
         [FreeFunction("ScriptingManager::GetClasslibsProfile")]
         extern internal static string GetEditorProfile();
 
-        [StaticAccessor("UnityExtensions::Get()", StaticAccessorType.Dot)]
-        [NativeMethod("IsInitialized")]
-        extern internal static bool IsUnityExtensionsInitialized();
-
         [FreeFunction("UnityExtensions::IsValidExtensionPath")]
         extern internal static bool IsValidUnityExtensionPath(string path);
 
@@ -891,9 +888,6 @@ internal static PrecompiledAssembly[] GetUnityAssemblies(bool buildingForEditor,
         [FreeFunction("GetUnityAssembliesManaged")]
         extern private static PrecompiledAssembly[] GetUnityAssembliesInternal(bool buildingForEditor, BuildTarget target);
 
-        [FreeFunction("GetPrecompiledAssembliesManaged")]
-        extern internal static PrecompiledAssembly[] GetPrecompiledAssemblies(bool buildingForEditor, BuildTargetGroup buildTargetGroup, BuildTarget target, string[] extraScriptingDefines = null);
-
         [FreeFunction("GetPrecompiledAssemblyPathsManaged")]
         extern internal static string[] GetPrecompiledAssemblyPaths();
 
diff --git a/Editor/Mono/InternalEditorUtility.cs b/Editor/Mono/InternalEditorUtility.cs
index 5cedce2850..9748ad749f 100644
--- a/Editor/Mono/InternalEditorUtility.cs
+++ b/Editor/Mono/InternalEditorUtility.cs
@@ -13,6 +13,7 @@
 using UnityEditor.Scripting.ScriptCompilation;
 using UnityEngine.UIElements;
 using UnityEngine.Video;
+using UnityEditor.Build;
 
 namespace UnityEditorInternal
 {
@@ -619,7 +620,6 @@ internal static bool IsScriptOrAssembly(string filename)
             switch (System.IO.Path.GetExtension(filename).ToLower())
             {
                 case ".cs":
-                case ".js":
                 case ".boo":
                     return true;
                 case ".dll":
@@ -647,7 +647,7 @@ internal static string GetMonolithicEngineAssemblyPath()
 
         internal static string[] GetCompilationDefines(EditorScriptCompilationOptions options, BuildTargetGroup targetGroup, BuildTarget target)
         {
-            return GetCompilationDefines(options, targetGroup, target, PlayerSettings.GetApiCompatibilityLevel(targetGroup));
+            return GetCompilationDefines(options, targetGroup, target, PlayerSettings.GetApiCompatibilityLevel(NamedBuildTarget.FromActiveSettings(target)));
         }
 
         public static void SetShowGizmos(bool value)
@@ -662,5 +662,26 @@ public static void SetShowGizmos(bool value)
 
             view.SetShowGizmos(value);
         }
+
+        private static Material blitSceneViewCaptureMat;
+        public static bool CaptureSceneView(SceneView sv, RenderTexture rt)
+        {
+            if (!sv.hasFocus)
+                return false;
+
+            if (blitSceneViewCaptureMat == null)
+                blitSceneViewCaptureMat = (Material)EditorGUIUtility.LoadRequired("SceneView/BlitSceneViewCapture.mat");
+
+            // Grab SceneView framebuffer into a temporary RT.
+            RenderTexture tmp = RenderTexture.GetTemporary(rt.descriptor);
+            Rect rect = new Rect(0, 0, sv.position.width, sv.position.height);
+            sv.m_Parent.GrabPixels(tmp, rect);
+
+            // Blit it into the target RT, it will be flipped by the shader if necessary.
+            Graphics.Blit(tmp, rt, blitSceneViewCaptureMat);
+            RenderTexture.ReleaseTemporary(tmp);
+
+            return true;
+        }
     }
 }
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/MainToolbarImguiContainer.cs b/Editor/Mono/MainToolbarImguiContainer.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/MainToolbarImguiContainer.cs
rename to Editor/Mono/MainToolbarImguiContainer.cs
diff --git a/Editor/Mono/MaterialProperty.cs b/Editor/Mono/MaterialProperty.cs
index baa88178d4..69995c776c 100644
--- a/Editor/Mono/MaterialProperty.cs
+++ b/Editor/Mono/MaterialProperty.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -213,5 +214,588 @@ private void ApplyProperty(object previousValue, int changedPropertyMask)
             if (!didApply)
                 ShaderUtil.ApplyProperty(this, changedPropertyMask, "Modify " + displayName + " of " + targetTitle);
         }
+
+        // -------- helper functions to handle material variant overrides
+        // It displays the override bar on the left, the lock icon, and the bold font
+        // It also creates the context menu when left clicking a property
+
+        private static class Styles
+        {
+            public static string revertMultiText = L10n.Tr("Revert on {0} Material(s)");
+            public static string applyToMaterialText = L10n.Tr("Apply to Material '{0}'");
+            public static string applyToVariantText = L10n.Tr("Apply as Override in Variant '{0}'");
+
+            static Color overrideLineColor_l = new Color32(0x09, 0x09, 0x09, 0xFF);
+            static Color overrideLineColor_d = new Color32(0xC4, 0xC4, 0xC4, 0xFF);
+            public static Color overrideLineColor { get { return EditorGUIUtility.isProSkin ? overrideLineColor_d : overrideLineColor_l; } }
+
+            public static readonly GUIContent revertContent = EditorGUIUtility.TrTextContent("Revert");
+            public static readonly GUIContent revertAllContent = EditorGUIUtility.TrTextContent("Revert all Overrides");
+            public static readonly GUIContent lockContent = EditorGUIUtility.TrTextContent("Lock in children");
+            public static readonly GUIContent lockOriginContent = EditorGUIUtility.TrTextContent("See lock origin");
+
+            public static readonly GUIContent resetContent = EditorGUIUtility.TrTextContent("Reset");
+            public static readonly GUIContent copyContent = EditorGUIUtility.TrTextContent("Copy");
+            public static readonly GUIContent pasteContent = EditorGUIUtility.TrTextContent("Paste");
+
+            static readonly Texture lockInChildrenIcon = EditorGUIUtility.IconContent("HierarchyLock").image;
+            public static readonly GUIContent lockInChildrenContent = EditorGUIUtility.TrTextContent(string.Empty, "Locked properties cannot be overriden by a child.", lockInChildrenIcon);
+
+            static readonly Texture lockedByAncestorIcon = EditorGUIUtility.IconContent("IN LockButton on").image;
+            public static readonly GUIContent lockedByAncestorContent = EditorGUIUtility.TrTextContent(string.Empty, "This property is set and locked by an ancestor.", lockedByAncestorIcon);
+
+            public static readonly GUIStyle centered = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleLeft };
+        }
+
+        struct PropertyData
+        {
+            public MaterialProperty property;
+            public MaterialSerializedProperty serializedProperty;
+            public Object[] targets;
+
+            public bool wasBoldDefaultFont;
+            public bool isLockedInChildren, isLockedByAncestor, isOverriden;
+
+            public float startY;
+            public Rect position;
+
+            private static List<MaterialProperty> capturedProperties = new List<MaterialProperty>();
+            private static List<MaterialSerializedProperty> capturedSerializedProperties = new List<MaterialSerializedProperty>();
+
+            private bool HasMixedValues<T>(Func<Material, T> getter)
+            {
+                T value = getter(targets[0] as Material);
+                for (int i = 1; i < targets.Length; ++i)
+                {
+                    if (!EqualityComparer<T>.Default.Equals(value, getter(targets[i] as Material)))
+                        return true;
+                }
+                return false;
+            }
+
+            public bool hasMixedValue
+            {
+                get
+                {
+                    if (property != null)
+                        return property.hasMixedValue;
+
+                    if (serializedProperty == MaterialSerializedProperty.EnableInstancingVariants)
+                        return HasMixedValues((mat) => mat.enableInstancing);
+                    else if (serializedProperty == MaterialSerializedProperty.LightmapFlags)
+                        return HasMixedValues((mat) => mat.globalIlluminationFlags);
+                    else if (serializedProperty == MaterialSerializedProperty.DoubleSidedGI)
+                        return HasMixedValues((mat) => mat.doubleSidedGI);
+                    else if (serializedProperty == MaterialSerializedProperty.CustomRenderQueue)
+                        return HasMixedValues((mat) => mat.rawRenderQueue);
+                    return false;
+                }
+            }
+
+            public void Init()
+            {
+                isLockedInChildren = false;
+                isLockedByAncestor = false;
+                isOverriden = true;
+                int nameId = property != null ? Shader.PropertyToID(property.name) : -1;
+                foreach (Material target in targets)
+                {
+                    bool l, b, o;
+                    if (property != null)
+                        target.GetPropertyState(nameId, out o, out l, out b);
+                    else
+                        target.GetPropertyState(serializedProperty, out o, out l, out b);
+                    // When multi editing:
+                    // 1. Show property as locked if any target is locked, to prevent bypassing the lock
+                    // 2. Show property as overriden if all targets override it, to not show overrides on materials
+                    isLockedInChildren |= l;
+                    isLockedByAncestor |= b;
+                    isOverriden &= o;
+                }
+            }
+
+            static void MergeStack(out bool lockedInChildren, out bool lockedByAncestor, out bool overriden)
+            {
+                // We have to copy the property stack, because access from the Menu callbacks is delayed
+                capturedProperties.Clear();
+                capturedSerializedProperties.Clear();
+
+                lockedInChildren = false;
+                lockedByAncestor = false;
+                overriden = false;
+                for (int i = 0; i < s_PropertyStack.Count; i++)
+                {
+                    // When multiple properties are displayed on the same line, we *or* everything otherwise it gets confusing.
+                    if (s_PropertyStack[i].targets == null) continue;
+                    lockedInChildren |= s_PropertyStack[i].isLockedInChildren;
+                    lockedByAncestor |= s_PropertyStack[i].isLockedByAncestor;
+                    overriden        |= s_PropertyStack[i].isOverriden;
+
+                    if (s_PropertyStack[i].property != null)
+                        capturedProperties.Add(s_PropertyStack[i].property);
+                    else
+                        capturedSerializedProperties.Add(s_PropertyStack[i].serializedProperty);
+                }
+            }
+
+            static string GetMultiEditingDisplayName(string multiEditSuffix)
+            {
+                int nonEmptyCount = capturedProperties.Count + capturedSerializedProperties.Count;
+                if (nonEmptyCount != 1)
+                    return nonEmptyCount + " " + multiEditSuffix;
+                else if (capturedProperties.Count != 0)
+                    return capturedProperties[0].displayName;
+                else
+                    return capturedSerializedProperties[0].ToString();
+            }
+
+            public static void DoPropertyContextMenu(bool lockMenusOnly, Object[] targets)
+            {
+                MergeStack(out bool lockedInChildren, out bool lockedByAncestor, out bool overriden);
+
+                GenericMenu menu = new GenericMenu();
+
+                if (lockedByAncestor)
+                {
+                    if (targets.Length != 1)
+                        return;
+
+                    menu.AddItem(Styles.lockOriginContent, false, () => GotoLockOriginAction(targets));
+                }
+                else if (GUI.enabled)
+                {
+                    if (!lockMenusOnly)
+                        DoRegularMenu(menu, overriden, targets);
+                    DoLockPropertiesMenu(menu, !lockedInChildren, targets);
+                }
+
+                if (Event.current.shift && capturedProperties.Count == 1)
+                {
+                    if (menu.GetItemCount() != 0)
+                        menu.AddSeparator("");
+                    menu.AddItem(EditorGUIUtility.TrTextContent("Copy Property Name"), false, () => EditorGUIUtility.systemCopyBuffer = capturedProperties[0].name);
+                }
+
+                if (menu.GetItemCount() == 0)
+                    return;
+
+                Event.current.Use();
+                menu.ShowAsContext();
+            }
+
+            enum DisplayMode { Material, Variant, Mixed };
+            static DisplayMode GetDisplayMode(Object[] targets)
+            {
+                int variantCount = MaterialEditor.GetVariantCount(targets);
+                if (variantCount == 0)
+                    return DisplayMode.Material;
+                if (variantCount == targets.Length)
+                    return DisplayMode.Variant;
+                return DisplayMode.Mixed;
+            }
+
+            static void ResetMaterialProperties()
+            {
+                foreach (var property in capturedProperties)
+                {
+                    // fetch default value from shader
+                    var shader = (property.targets[0] as Material).shader;
+                    int nameId = shader.FindPropertyIndex(property.name);
+                    switch (property.type)
+                    {
+                        case PropType.Float:
+                        case PropType.Range:
+                            property.floatValue = shader.GetPropertyDefaultFloatValue(nameId);
+                            break;
+                        case PropType.Vector:
+                            property.vectorValue = shader.GetPropertyDefaultVectorValue(nameId);
+                            break;
+                        case PropType.Color:
+                            property.colorValue = shader.GetPropertyDefaultVectorValue(nameId);
+                            break;
+                        case PropType.Int:
+                            property.intValue = shader.GetPropertyDefaultIntValue(nameId);
+                            break;
+                        case PropType.Texture:
+                            Texture texture = null;
+                            var importer = AssetImporter.GetAtPath(AssetDatabase.GetAssetPath(shader)) as ShaderImporter;
+                            if (importer != null)
+                                texture = importer.GetDefaultTexture(property.name);
+                            if (texture == null)
+                                texture = EditorMaterialUtility.GetShaderDefaultTexture(shader, property.name);
+                            property.textureValue = texture;
+                            property.textureScaleAndOffset = new Vector4(1, 1, 0, 0);
+                            break;
+                    }
+                }
+            }
+
+            static void HandleApplyRevert(GenericMenu menu, bool singleEditing, Object[] targets)
+            {
+                // Apply
+                if (singleEditing)
+                {
+                    Material source = (Material)targets[0];
+                    Material destination = (Material)targets[0];
+                    while (destination = destination.parent as Material)
+                    {
+                        if (AssetDatabase.IsForeignAsset(destination))
+                            continue;
+
+                        var text = destination.isVariant ? Styles.applyToVariantText : Styles.applyToMaterialText;
+                        var applyContent = new GUIContent(string.Format(text, destination.name));
+
+                        menu.AddItem(applyContent, false, (object dest) => {
+                            foreach (var prop in capturedProperties)
+                                source.ApplyPropertyOverride((Material)dest, prop.name);
+                            foreach (var prop in capturedSerializedProperties)
+                                source.ApplyPropertyOverride((Material)dest, prop);
+                        }, destination);
+                    }
+                }
+
+                // Revert
+                var content = singleEditing ? Styles.revertContent :
+                    EditorGUIUtility.TempContent(string.Format(Styles.revertMultiText, targets.Length));
+                menu.AddItem(content, false, () => {
+                    string displayName = GetMultiEditingDisplayName("overrides");
+                    string targetName = singleEditing ? targets[0].name : targets.Length + " Materials";
+                    Undo.RecordObjects(targets, "Revert " + displayName + " of " + targetName);
+
+                    foreach (Material target in targets)
+                    {
+                        foreach (var prop in capturedProperties)
+                            target.RevertPropertyOverride(prop.name);
+                        foreach (var prop in capturedSerializedProperties)
+                            target.RevertPropertyOverride(prop);
+                    }
+                });
+            }
+
+            static void HandleCopyPaste(GenericMenu menu)
+            {
+                GetCopyPasteAction(capturedProperties[0], out var copyAction, out var pasteAction);
+
+                if (menu.GetItemCount() != 0)
+                    menu.AddSeparator("");
+
+                if (copyAction != null)
+                    menu.AddItem(Styles.copyContent, false, copyAction);
+                else
+                    menu.AddDisabledItem(Styles.copyContent);
+                if (pasteAction != null)
+                    menu.AddItem(Styles.pasteContent, false, pasteAction);
+                else
+                    menu.AddDisabledItem(Styles.pasteContent);
+            }
+
+            static void HandleRevertAll(GenericMenu menu, bool singleEditing, Object[] targets)
+            {
+                foreach (Material target in targets)
+                {
+                    if (target.overrideCount != 0)
+                    {
+                        if (menu.GetItemCount() != 0)
+                            menu.AddSeparator("");
+
+                        menu.AddItem(Styles.revertAllContent, false, () => {
+                                string targetName = singleEditing ? targets[0].name : targets.Length + " Materials";
+                                Undo.RecordObjects(targets, "Revert all overrides of " + targetName);
+
+                                foreach (Material target in targets)
+                                target.RevertAllPropertyOverrides();
+                                });
+                        break;
+                    }
+                }
+            }
+
+            static void DoRegularMenu(GenericMenu menu, bool isOverriden, Object[] targets)
+            {
+                var singleEditing = targets.Length == 1;
+
+                if (isOverriden)
+                    HandleApplyRevert(menu, singleEditing, targets);
+
+                if (singleEditing && capturedProperties.Count == 1)
+                    HandleCopyPaste(menu);
+
+                DisplayMode displayMode = GetDisplayMode(targets);
+                if (displayMode == DisplayMode.Material)
+                {
+                    if (menu.GetItemCount() != 0)
+                        menu.AddSeparator("");
+
+                    menu.AddItem(Styles.resetContent, false, ResetMaterialProperties);
+                }
+                else if (displayMode == DisplayMode.Variant)
+                    HandleRevertAll(menu, singleEditing, targets);
+            }
+
+            static void GetCopyPasteAction(MaterialProperty prop, out GenericMenu.MenuFunction copyAction, out GenericMenu.MenuFunction pasteAction)
+            {
+                bool canCopy = !capturedProperties[0].hasMixedValue;
+                bool canPaste = GUI.enabled;
+
+                copyAction = null;
+                pasteAction = null;
+                switch (prop.type)
+                {
+                    case PropType.Float:
+                    case PropType.Range:
+                        if (canCopy) copyAction = () => Clipboard.floatValue = prop.floatValue;
+                        if (canPaste && Clipboard.hasFloat) pasteAction = () => prop.floatValue = Clipboard.floatValue;
+                        break;
+                    case PropType.Int:
+                        if (canCopy) copyAction = () => Clipboard.integerValue = prop.intValue;
+                        if (canPaste && Clipboard.hasInteger) pasteAction = () => prop.intValue = Clipboard.integerValue;
+                        break;
+                    case PropType.Color:
+                        if (canCopy) copyAction = () => Clipboard.colorValue = prop.colorValue;
+                        if (canPaste && Clipboard.hasColor) pasteAction = () => prop.colorValue = Clipboard.colorValue;
+                        break;
+                    case PropType.Vector:
+                        if (canCopy) copyAction = () => Clipboard.vector4Value = prop.vectorValue;
+                        if (canPaste && Clipboard.hasVector4) pasteAction = () => prop.vectorValue = Clipboard.vector4Value;
+                        break;
+                    case PropType.Texture:
+                        if (canCopy) copyAction = () => Clipboard.guidValue = AssetDatabase.GUIDFromAssetPath(AssetDatabase.GetAssetPath(prop.textureValue));
+                        if (canPaste && Clipboard.hasGuid) pasteAction = () => prop.textureValue = AssetDatabase.LoadMainAssetAtPath(AssetDatabase.GUIDToAssetPath(Clipboard.guidValue)) as Texture;
+                        break;
+                }
+            }
+
+            static void DoLockPropertiesMenu(GenericMenu menu, bool lockValue, Object[] targets)
+            {
+                if (menu.GetItemCount() != 0)
+                    menu.AddSeparator("");
+
+                // Lock
+                menu.AddItem(Styles.lockContent, !lockValue, () => {
+                    LockProperties(lockValue, targets);
+                });
+            }
+
+            static void LockProperties(bool lockValue, Object[] targets)
+            {
+                string actionName = lockValue ? "locking" : "unlocking";
+                string displayName = GetMultiEditingDisplayName("properties");
+                string targetName = targets.Length == 1 ? targets[0].name : targets.Length + " Materials";
+                Undo.RecordObjects(targets, string.Format("{0} {1} of {2}", actionName, displayName, targetName));
+
+                foreach (Material target in targets)
+                {
+                    foreach (var prop in capturedProperties)
+                        target.SetPropertyLock(prop.name, lockValue);
+                    foreach (var prop in capturedSerializedProperties)
+                        target.SetPropertyLock(prop, lockValue);
+                }
+            }
+
+            static public void DoLockAction(Object[] targets)
+            {
+                MergeStack(out bool lockedInChildren, out bool lockedByAncestor, out bool _);
+
+                if (lockedByAncestor)
+                    GotoLockOriginAction(targets);
+                else
+                    LockProperties(!lockedInChildren, targets);
+
+                Event.current.Use();
+            }
+
+            static void GotoLockOriginAction(Object[] targets)
+            {
+                // Find lock origin
+                Material origin = targets[0] as Material;
+                while ((origin = origin.parent))
+                {
+                    bool isLocked = false;
+                    foreach (var prop in capturedProperties)
+                    {
+                        origin.GetPropertyState(Shader.PropertyToID(prop.name), out _, out isLocked, out _);
+                        if (isLocked) break;
+                    }
+                    if (isLocked) break;
+
+                    foreach (var prop in capturedSerializedProperties)
+                    {
+                        origin.GetPropertyState(prop, out _, out isLocked, out _);
+                        if (isLocked) break;
+                    }
+                    if (isLocked) break;
+                }
+
+                if (origin)
+                {
+                    int clickCount = 1;
+                    if (Event.current != null)
+                    {
+                        clickCount = Event.current.clickCount;
+                        Event.current.Use();
+                    }
+                    if (clickCount == 1)
+                        EditorGUIUtility.PingObject(origin);
+                    else
+                    {
+                        Selection.SetActiveObjectWithContext(origin, null);
+                        GUIUtility.ExitGUI();
+                    }
+                }
+            }
+        }
+        static List<PropertyData> s_PropertyStack = new List<PropertyData>();
+        internal static void ClearStack() => s_PropertyStack.Clear();
+
+        internal static void BeginProperty(MaterialProperty prop, Object[] targets)
+        {
+            // Get the current Y coordinate before drawing the property
+            // We define a new empty rect in order to grab the current height even if there was nothing drawn in the block
+            // (GetLastRect cause issue if it was first element of block)
+            MaterialProperty.BeginProperty(Rect.zero, prop, 0, targets, GUILayoutUtility.GetRect(0, 0).yMax);
+        }
+
+        internal static void BeginProperty(MaterialSerializedProperty prop, Object[] targets)
+        {
+            // Get the current Y coordinate before drawing the property
+            // We define a new empty rect in order to grab the current height even if there was nothing drawn in the block
+            // (GetLastRect cause issue if it was first element of block)
+            MaterialProperty.BeginProperty(Rect.zero, null, prop, targets, GUILayoutUtility.GetRect(0, 0).yMax);
+        }
+
+        internal static void BeginProperty(Rect totalRect, MaterialProperty prop, MaterialSerializedProperty serializedProp, Object[] targets, float startY = -1)
+        {
+            if (targets == null || IsRegistered(prop, serializedProp))
+            {
+                s_PropertyStack.Add(new PropertyData() { targets = null });
+                return;
+            }
+
+            PropertyData data = new PropertyData()
+            {
+                property = prop,
+                serializedProperty = serializedProp,
+                targets = targets,
+
+                startY = startY,
+                position = totalRect,
+                wasBoldDefaultFont = EditorGUIUtility.GetBoldDefaultFont()
+            };
+            data.Init();
+            s_PropertyStack.Add(data);
+
+            if (data.isOverriden)
+                EditorGUIUtility.SetBoldDefaultFont(true);
+
+            if (data.isLockedByAncestor)
+                EditorGUI.BeginDisabledGroup(true);
+
+            EditorGUI.showMixedValue = data.hasMixedValue;
+        }
+
+        internal static void EndProperty()
+        {
+            if (s_PropertyStack.Count == 0)
+            {
+                Debug.LogError("MaterialProperty stack is empty");
+                return;
+            }
+            var data = s_PropertyStack[s_PropertyStack.Count - 1];
+            if (data.targets == null)
+            {
+                s_PropertyStack.RemoveAt(s_PropertyStack.Count - 1);
+                return;
+            }
+
+            Rect position = data.position;
+            if (data.startY != -1)
+            {
+                position = GUILayoutUtility.GetLastRect();
+                position.yMin = data.startY;
+                position.x = 1;
+                position.width = EditorGUIUtility.labelWidth;
+            }
+
+            bool mouseOnLock = false;
+            if (position != Rect.zero)
+            {
+                // Display override rect
+                if (data.isOverriden)
+                    EditorGUI.DrawMarginLineForRect(position, Styles.overrideLineColor);
+
+                Rect lockRegion = position;
+                lockRegion.width = 14;
+                lockRegion.height = 14;
+                lockRegion.x = 11;
+                lockRegion.y += (position.height - lockRegion.height) * 0.5f;
+                mouseOnLock = lockRegion.Contains(Event.current.mousePosition);
+
+                // Display lock icon
+                Rect lockRect = position;
+                lockRect.width = 32;
+                lockRect.height = Mathf.Max(lockRect.height, 20.0f);
+                lockRect.x = 8;
+                lockRect.y += (position.height - lockRect.height) * 0.5f;
+
+                if (data.isLockedByAncestor)
+                {
+                    // Make sure we draw the lock only once
+                    bool isLastLockInStack = true;
+                    for (int i = 0; i < s_PropertyStack.Count - 1; i++)
+                    {
+                        if (s_PropertyStack[i].isLockedByAncestor)
+                        {
+                            isLastLockInStack = false;
+                            break;
+                        }
+                    }
+
+                    if (isLastLockInStack)
+                        GUI.Label(lockRect, Styles.lockedByAncestorContent, Styles.centered);
+                }
+                else if (data.isLockedInChildren)
+                    GUI.Label(lockRect, Styles.lockInChildrenContent, Styles.centered);
+                else if (GUI.enabled)
+                {
+                    GUIView.current?.MarkHotRegion(GUIClip.UnclipToWindow(lockRegion));
+                    if (mouseOnLock)
+                    {
+                        EditorGUI.BeginDisabledGroup(true);
+                        GUI.Label(lockRect, Styles.lockInChildrenContent, Styles.centered);
+                        EditorGUI.EndDisabledGroup();
+                    }
+                }
+            }
+
+            // Restore state
+            EditorGUI.showMixedValue = false;
+
+            EditorGUIUtility.SetBoldDefaultFont(data.wasBoldDefaultFont);
+
+            if (data.isLockedByAncestor)
+                EditorGUI.EndDisabledGroup();
+
+            // Context menu
+            if (Event.current.rawType == EventType.ContextClick && (position.Contains(Event.current.mousePosition) || mouseOnLock))
+                PropertyData.DoPropertyContextMenu(mouseOnLock, data.targets);
+            else if (Event.current.type == EventType.MouseUp && Event.current.button == 0 && mouseOnLock)
+                PropertyData.DoLockAction(data.targets);
+
+            s_PropertyStack.RemoveAt(s_PropertyStack.Count - 1);
+        }
+
+        static bool IsRegistered(MaterialProperty prop, MaterialSerializedProperty serializedProp)
+        {
+            // [PerRendererData] material properties are read-only as they are meant to be set in code on a per-renderer basis.
+            // Don't show override UI for them
+            if (prop != null && (prop.flags & PropFlags.PerRendererData) != 0)
+                return true;
+            for (int i = 0; i < s_PropertyStack.Count; i++)
+            {
+                if (s_PropertyStack[i].property == prop && s_PropertyStack[i].serializedProperty == serializedProp)
+                    return true;
+            }
+            return false;
+        }
     }
 } // namespace UnityEngine.Rendering
diff --git a/Editor/Mono/Media/Bindings/MediaEncoder.bindings.cs b/Editor/Mono/Media/Bindings/MediaEncoder.bindings.cs
index 37c373658d..988acc0d9c 100644
--- a/Editor/Mono/Media/Bindings/MediaEncoder.bindings.cs
+++ b/Editor/Mono/Media/Bindings/MediaEncoder.bindings.cs
@@ -44,7 +44,7 @@ public void Set(int numerator, int denominator = 1)
 
         public static explicit operator double(MediaRational r)
         {
-            return (r.denominator == 0) ? 0.0 : (r.numerator / r.denominator);
+            return (r.denominator == 0) ? 0.0 : ((double)r.numerator / r.denominator);
         }
 
         public MediaRational inverse
diff --git a/Editor/Mono/MeshUtility.bindings.cs b/Editor/Mono/MeshUtility.bindings.cs
index 0aa6958109..67cffc6fb6 100644
--- a/Editor/Mono/MeshUtility.bindings.cs
+++ b/Editor/Mono/MeshUtility.bindings.cs
@@ -24,13 +24,16 @@ public static void Optimize(Mesh mesh)
             OptimizeReorderVertexBuffer(mesh);
         }
 
-        extern public static void SetMeshCompression(Mesh mesh, ModelImporterMeshCompression compression);
-        extern public static ModelImporterMeshCompression GetMeshCompression(Mesh mesh);
+        extern public static void SetMeshCompression([NotNull] Mesh mesh, ModelImporterMeshCompression compression);
+        extern public static ModelImporterMeshCompression GetMeshCompression([NotNull] Mesh mesh);
 
         [NativeName("SetPerTriangleUV2")]
         static extern bool SetPerTriangleUV2NoCheck(Mesh src, Vector2[] triUV);
         public static bool SetPerTriangleUV2(Mesh src, Vector2[] triUV)
         {
+            if (src == null)
+                throw new ArgumentNullException("src");
+
             if (triUV == null)
                 throw new ArgumentNullException("triUV");
 
diff --git a/Editor/Mono/Modules/BeeBuildPostprocessor.cs b/Editor/Mono/Modules/BeeBuildPostprocessor.cs
index a0db0aae5b..64648bd98a 100644
--- a/Editor/Mono/Modules/BeeBuildPostprocessor.cs
+++ b/Editor/Mono/Modules/BeeBuildPostprocessor.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using Bee.BeeDriver;
@@ -119,8 +120,8 @@ private IEnumerable<Plugin> GetPluginsFor(BuildTarget target)
 
         LinkerConfig LinkerConfigFor(BuildPostProcessArgs args)
         {
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(args.target);
-            var strippingLevel = PlayerSettings.GetManagedStrippingLevel(buildTargetGroup);
+            var namedBuildTarget = GetNamedBuildTarget(args);
+            var strippingLevel = PlayerSettings.GetManagedStrippingLevel(namedBuildTarget);
 
             // IL2CPP does not support a managed stripping level of disabled. If the player settings
             // do try this (which should not be possible from the editor), use Low instead.
@@ -162,7 +163,7 @@ LinkerConfig LinkerConfigFor(BuildPostProcessArgs args)
                         .ToArray(),
                     Runtime = GetUseIl2Cpp(args) ? "il2cpp" : "mono",
                     Profile = IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(
-                        PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup), args.target),
+                        PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget), args.target),
                     Ruleset = strippingLevel switch
                     {
                         ManagedStrippingLevel.Minimal => "Minimal",
@@ -173,7 +174,7 @@ LinkerConfig LinkerConfigFor(BuildPostProcessArgs args)
                     },
                     AdditionalArgs = additionalArgs.ToArray(),
                     ModulesAssetPath = $"{BuildPipeline.GetPlaybackEngineDirectory(args.target, 0)}/modules.asset",
-                    AllowDebugging = (args.report.summary.options & BuildOptions.AllowDebugging) == BuildOptions.AllowDebugging,
+                    AllowDebugging = GetAllowDebugging(args),
                     PerformEngineStripping = PlayerSettings.stripEngineCode,
                 };
             }
@@ -185,8 +186,7 @@ LinkerConfig LinkerConfigFor(BuildPostProcessArgs args)
 
         protected virtual string Il2CppBuildConfigurationNameFor(BuildPostProcessArgs args)
         {
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(args.target);
-            return Il2CppNativeCodeBuilderUtils.GetConfigurationName(PlayerSettings.GetIl2CppCompilerConfiguration(buildTargetGroup));
+            return Il2CppNativeCodeBuilderUtils.GetConfigurationName(PlayerSettings.GetIl2CppCompilerConfiguration(GetNamedBuildTarget(args)));
         }
 
         protected virtual IEnumerable<string> AdditionalIl2CppArgsFor(BuildPostProcessArgs args)
@@ -194,6 +194,46 @@ protected virtual IEnumerable<string> AdditionalIl2CppArgsFor(BuildPostProcessAr
             yield break;
         }
 
+        IEnumerable<string> SplitArgs(string args)
+        {
+            int startIndex = 0;
+            bool inQuotes = false;
+            int i = 0;
+            for (; i < args.Length; i++)
+            {
+                if (args[i] == '"')
+                    inQuotes = !inQuotes;
+                if (args[i] == ' ' && !inQuotes)
+                {
+                    if (i - startIndex > 0)
+                        yield return args.Substring(startIndex, i - startIndex);
+                    startIndex = i + 1;
+                }
+            }
+            if (i - startIndex > 0)
+                yield return args.Substring(startIndex, i - startIndex);
+        }
+
+        protected virtual string Il2CppSysrootPathFor(BuildPostProcessArgs args)
+        {
+            return null;
+        }
+
+        protected virtual string Il2CppToolchainPathFor(BuildPostProcessArgs args)
+        {
+            return null;
+        }
+
+        protected virtual string Il2CppCompilerFlagsFor(BuildPostProcessArgs args)
+        {
+            return null;
+        }
+
+        protected virtual string Il2CppLinkerFlagsFor(BuildPostProcessArgs args)
+        {
+            return null;
+        }
+
         Il2CppConfig Il2CppConfigFor(BuildPostProcessArgs args)
         {
             if (!GetUseIl2Cpp(args))
@@ -203,27 +243,34 @@ Il2CppConfig Il2CppConfigFor(BuildPostProcessArgs args)
 
             var diagArgs = Debug.GetDiagnosticSwitch("VMIl2CppAdditionalArgs").value as string;
             if (!string.IsNullOrEmpty(diagArgs))
-                additionalArgs.Add(diagArgs.Trim('\''));
+                additionalArgs.AddRange(SplitArgs(diagArgs.Trim('\'')));
 
             var playerSettingsArgs = PlayerSettings.GetAdditionalIl2CppArgs();
             if (!string.IsNullOrEmpty(playerSettingsArgs))
-                additionalArgs.Add(playerSettingsArgs);
+                additionalArgs.AddRange(SplitArgs(playerSettingsArgs));
+
+            var sysrootPath = Il2CppSysrootPathFor(args);
+            var toolchainPath = Il2CppToolchainPathFor(args);
+            var compilerFlags = Il2CppCompilerFlagsFor(args);
+            var linkerFlags = Il2CppLinkerFlagsFor(args);
 
             if (CrashReportingSettings.enabled)
                 additionalArgs.Add("--emit-source-mapping");
 
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(args.target);
-            var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup);
-            var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
+            var namedBuildTarget = GetNamedBuildTarget(args);
+            var apiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget);
             var il2cppCodeGeneration = PlayerSettings.GetIl2CppCodeGeneration(namedBuildTarget);
             var platformHasIncrementalGC = BuildPipeline.IsFeatureSupported("ENABLE_SCRIPTING_GC_WBARRIERS", args.target);
+            var allowDebugging = GetAllowDebugging(args);
+
             return new Il2CppConfig
             {
                 EnableDeepProfilingSupport = GetDevelopment(args) &&
                     IsBuildOptionSet(args.report.summary.options,
                     BuildOptions.EnableDeepProfilingSupport),
                 EnableFullGenericSharing = il2cppCodeGeneration == Il2CppCodeGeneration.OptimizeSize,
-                Profile = IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup), args.target),
+                Profile = IL2CPPUtils.ApiCompatibilityLevelToDotNetProfileArgument(PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget), args.target),
+                Defines = string.Join(";", IL2CPPUtils.GetBuilderDefinedDefines(args.target, apiCompatibilityLevel, allowDebugging)),
                 ConfigurationName = Il2CppBuildConfigurationNameFor(args),
                 GcWBarrierValidation = platformHasIncrementalGC && PlayerSettings.gcWBarrierValidation,
                 GcIncremental = platformHasIncrementalGC && PlayerSettings.gcIncremental &&
@@ -237,7 +284,11 @@ Il2CppConfig Il2CppConfigFor(BuildPostProcessArgs args)
                     .Select(imp => imp.assetPath)
                     .ToArray(),
                 AdditionalArgs = additionalArgs.ToArray(),
-                AllowDebugging = (args.report.summary.options & BuildOptions.AllowDebugging) == BuildOptions.AllowDebugging,
+                AllowDebugging = allowDebugging,
+                CompilerFlags = compilerFlags,
+                LinkerFlags = linkerFlags,
+                SysRootPath = sysrootPath,
+                ToolChainPath = toolchainPath,
             };
         }
 
@@ -258,7 +309,7 @@ static bool IsNewInputSystemEnabled()
             CompanyName = args.companyName,
             ProductName = Paths.MakeValidFileName(args.productName),
             PlayerPackage = args.playerPackage,
-            ApplicationIdentifier = PlayerSettings.GetApplicationIdentifier(BuildPipeline.GetBuildTargetGroup(args.target)),
+            ApplicationIdentifier = PlayerSettings.GetApplicationIdentifier(GetNamedBuildTarget(args)),
             InstallIntoBuildsFolder = GetInstallingIntoBuildsFolder(args),
             GenerateIdeProject = GetCreateSolution(args),
             Development = (args.report.summary.options & BuildOptions.Development) == BuildOptions.Development,
@@ -307,12 +358,22 @@ protected string GetDataFolderFor(BuildPostProcessArgs args)
         private SystemProcessRunnableProgram MakePlayerBuildProgram(BuildPostProcessArgs args)
         {
             var buildProgramAssembly = new NPath($"{args.playerPackage}/{GetPlatformNameForBuildProgram(args)}PlayerBuildProgram.exe");
+            NPath buildPipelineFolder = $"{EditorApplication.applicationContentsPath}/Tools/BuildPipeline";
+            NPath beePlatformFolder = $"{args.playerPackage}/Bee";
+            var searchPaths = $"{beePlatformFolder}{Path.PathSeparator}";
+            if (IL2CPPUtils.UsingDevelopmentBuild())
+            {
+                NPath il2cppPath = IL2CPPUtils.GetExePath("il2cpp").ToNPath().Parent;
+                searchPaths = $"{il2cppPath}{Path.PathSeparator}";
+            }
+
             return new SystemProcessRunnableProgram(NetCoreRunProgram.NetCoreRunPath,
                 new[]
                 {
                     buildProgramAssembly.InQuotes(SlashMode.Native),
-                    $"\"{EditorApplication.applicationContentsPath}/Tools/BuildPipeline\""
-                });
+                    $"\"{searchPaths}{buildPipelineFolder}\""
+                },
+                new () {{ "DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1" }});
         }
 
         class PlayerBuildProgressAPI : ProgressAPI
@@ -371,11 +432,11 @@ protected virtual RunnableProgram BeeBackendProgram(BuildPostProcessArgs args)
             return null;
         }
 
-        void SetupBeeDriver(BuildPostProcessArgs args)
+        void SetupBeeDriver(BuildPostProcessArgs args, ILPostProcessingProgram ilpp)
         {
             RunnableProgram buildProgram = MakePlayerBuildProgram(args);
             progressAPI = new PlayerBuildProgressAPI($"Building {args.productName}");
-            Driver = UnityBeeDriver.Make(buildProgram, DagName(args), DagDirectory.ToString(), false, "", progressAPI, BeeBackendProgram(args));
+            Driver = UnityBeeDriver.Make(buildProgram, DagName(args), DagDirectory.ToString(), false, "", ilpp, UnityBeeDriver.StdOutModeForPlayerBuilds, progressAPI, BeeBackendProgram(args));
 
             foreach (var o in GetDataForBuildProgramFor(args))
             {
@@ -473,13 +534,29 @@ public override string PrepareForBuild(BuildOptions options, BuildTarget target)
             if ((options & BuildOptions.CleanBuildCache) == BuildOptions.CleanBuildCache)
                 EditorCompilation.CleanCache();
 
+            if (Unsupported.IsDeveloperBuild())
+            {
+                NPath editorGitRevisionFile = $"{EditorApplication.applicationContentsPath}/Tools/BuildPipeline/gitrevision.txt";
+                NPath playerGitRevisionFile = $"{BuildPipeline.GetPlaybackEngineDirectory(target, options)}/Bee/gitrevision.txt";
+                if (editorGitRevisionFile.Exists() && playerGitRevisionFile.Exists())
+                {
+                    string editorGitRevision = editorGitRevisionFile.ReadAllText();
+                    string playerGitRevision = playerGitRevisionFile.ReadAllText();
+                    if (editorGitRevision != playerGitRevision)
+                        return $"The Bee libraries used in the editor come from a different revision, than the ones used for the player. Please rebuild both editor and player when making changes to Bee player build libraries. (editor: '{editorGitRevision}', player: '{playerGitRevision}')";
+                }
+            }
+
             return base.PrepareForBuild(options, target);
         }
 
         protected virtual void CleanBuildOutput(BuildPostProcessArgs args)
         {
-            new NPath(args.installPath).DeleteIfExists(DeleteMode.Soft);
-            new NPath(GetIl2CppDataBackupFolderName(args)).DeleteIfExists(DeleteMode.Soft);
+            if (!GetInstallingIntoBuildsFolder(args))
+            {
+                new NPath(args.installPath).DeleteIfExists(DeleteMode.Soft);
+                new NPath(GetIl2CppDataBackupFolderName(args)).DeleteIfExists(DeleteMode.Soft);
+            }
         }
 
         public override void PostProcess(BuildPostProcessArgs args)
@@ -491,7 +568,7 @@ public override void PostProcess(BuildPostProcessArgs args)
 
                 var buildStep = args.report.BeginBuildStep("Setup incremental player build");
 
-                SetupBeeDriver(args);
+                SetupBeeDriver(args, new ILPostProcessingProgram());
                 args.report.EndBuildStep(buildStep);
 
                 // Remove any previous file entries in the build report.
@@ -552,7 +629,7 @@ public override void PostProcessCompletedBuild(BuildPostProcessArgs args)
         {
             base.PostProcessCompletedBuild(args);
 
-            if (PlayerSettings.GetManagedStrippingLevel(BuildPipeline.GetBuildTargetGroup(args.target)) == ManagedStrippingLevel.Disabled)
+            if (PlayerSettings.GetManagedStrippingLevel(GetNamedBuildTarget(args)) == ManagedStrippingLevel.Disabled)
                 return;
 
             var strippingInfo = GetStrippingInfoFromBuild(args);
@@ -576,6 +653,19 @@ protected virtual bool IsPluginCompatibleWithCurrentBuild(BuildTarget buildTarge
             return !string.Equals(cpu, "None", StringComparison.OrdinalIgnoreCase);
         }
 
+        protected NamedBuildTarget GetNamedBuildTarget(BuildPostProcessArgs args)
+        {
+            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(args.target);
+
+            if (buildTargetGroup == BuildTargetGroup.Standalone)
+            {
+                return (StandaloneBuildSubtarget)args.subtarget == StandaloneBuildSubtarget.Server
+                    ? NamedBuildTarget.Server : NamedBuildTarget.Standalone;
+            }
+
+            return NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup);
+        }
+
         protected bool GetDevelopment(BuildPostProcessArgs args) =>
             IsBuildOptionSet(args.options, BuildOptions.Development);
 
@@ -586,6 +676,13 @@ protected bool ShouldAppendBuild(BuildPostProcessArgs args) =>
             IsBuildOptionSet(args.options, BuildOptions.AcceptExternalModificationsToPlayer);
 
         protected virtual bool GetUseIl2Cpp(BuildPostProcessArgs args) =>
-            PlayerSettings.GetScriptingBackend(BuildPipeline.GetBuildTargetGroup(args.target)) == ScriptingImplementation.IL2CPP;
+            PlayerSettings.GetScriptingBackend(GetNamedBuildTarget(args)) == ScriptingImplementation.IL2CPP;
+
+        protected virtual bool GetAllowDebugging(BuildPostProcessArgs args) => (args.report.summary.options & BuildOptions.AllowDebugging) == BuildOptions.AllowDebugging;
+
+        #pragma warning disable 618
+        protected virtual bool GetUseCoreCLR(BuildPostProcessArgs args) =>
+            PlayerSettings.GetScriptingBackend(GetNamedBuildTarget(args)) == ScriptingImplementation.CoreCLR;
+
     }
 }
diff --git a/Editor/Mono/Modules/DefaultBuildPostprocessor.cs b/Editor/Mono/Modules/DefaultBuildPostprocessor.cs
index c943cb27d9..e0ff8a0768 100644
--- a/Editor/Mono/Modules/DefaultBuildPostprocessor.cs
+++ b/Editor/Mono/Modules/DefaultBuildPostprocessor.cs
@@ -73,14 +73,8 @@ public virtual void UpdateBootConfig(BuildTarget target, BootConfigData config,
             config.Set("wait-for-native-debugger", "0");
             if (config.Get("player-connection-debug") == "1")
             {
-                if (EditorUserBuildSettings.waitForManagedDebugger)
-                {
-                    config.Set("wait-for-managed-debugger", "1");
-                }
-                else
-                {
-                    config.Set("wait-for-managed-debugger", "0");
-                }
+                config.Set("wait-for-managed-debugger", EditorUserBuildSettings.waitForManagedDebugger ? "1" : "0");
+                config.Set("managed-debugger-fixed-port", EditorUserBuildSettings.managedDebuggerFixedPort.ToString());
             }
 
             config.Set("hdr-display-enabled", PlayerSettings.useHDRDisplay ? "1" : "0");
diff --git a/Editor/Mono/Modules/DefaultBuildWindowExtension.cs b/Editor/Mono/Modules/DefaultBuildWindowExtension.cs
index f967f28d62..b0a917144b 100644
--- a/Editor/Mono/Modules/DefaultBuildWindowExtension.cs
+++ b/Editor/Mono/Modules/DefaultBuildWindowExtension.cs
@@ -52,6 +52,7 @@ public virtual bool AskForBuildLocation()
         public virtual bool ShouldDrawExplicitArrayBoundsCheckbox() { return false; }
         public virtual bool ShouldDrawForceOptimizeScriptsCheckbox() { return false; }
         public virtual bool ShouldDrawWaitForManagedDebugger() { return false; }
+        public virtual bool ShouldDrawManagedDebuggerFixedPort() { return false; }
         public virtual bool ShouldDisableManagedDebuggerCheckboxes() { return false; }
 
         public virtual void DoScriptsOnlyGUI()
diff --git a/Editor/Mono/Modules/DefaultPluginImporterExtension.cs b/Editor/Mono/Modules/DefaultPluginImporterExtension.cs
index e80811c52a..700c1893f9 100644
--- a/Editor/Mono/Modules/DefaultPluginImporterExtension.cs
+++ b/Editor/Mono/Modules/DefaultPluginImporterExtension.cs
@@ -9,6 +9,8 @@
 using System.Linq;
 using System.Text;
 using UnityEditor.Compilation;
+using UnityEditor.Scripting.ScriptCompilation;
+using UnityEditorInternal;
 using UnityEngine;
 
 namespace UnityEditor.Modules
@@ -151,38 +153,43 @@ public virtual string CalculateFinalPluginPath(string platformName, PluginImport
             return Path.GetFileName(imp.assetPath);
         }
 
-        protected Dictionary<string, List<PluginImporter>> GetCompatiblePlugins(string buildTargetName)
+        private static bool IsPluginCompatible(PluginImporter pluginImporter, string buildTargetName, string[] defines)
         {
-            var assemblies = CompilationPipeline.GetAssemblies();
-            var assemblyDefines = new Dictionary<string, string[]>(assemblies.Length);
-            foreach (var assembly in assemblies)
-            {
-                assemblyDefines.Add(assembly.name, assembly.defines);
-            }
+            var defineConstraints = pluginImporter.DefineConstraints;
+            var isCompatibleWithPlatform = pluginImporter.GetCompatibleWithPlatformOrAnyPlatformBuildTarget(buildTargetName);
+            return isCompatibleWithPlatform
+                && DefineConstraintsHelper.IsDefineConstraintsCompatible(defines, defineConstraints);
+        }
 
-            IEnumerable<PluginImporter> plugins = PluginImporter.GetAllImporters().Where(imp => imp.GetCompatibleWithPlatformOrAnyPlatformBuildTarget(buildTargetName) && imp.IsCompatibleWithDefines(assemblyDefines.ContainsKey(imp.name) ? assemblyDefines[imp.name] : null));
-            Dictionary<string, List<PluginImporter>> matchingPlugins = new Dictionary<string, List<PluginImporter>>();
+        protected Dictionary<string, List<PluginImporter>> GetCompatiblePlugins(string buildTargetName, string[] defines)
+        {
+            var pluginImporters = PluginImporter.GetAllImporters();
+            var plugins = pluginImporters
+                .Where(pluginImporter => IsPluginCompatible(pluginImporter, buildTargetName, defines));
+
+            plugins = PluginImporter.FilterAssembliesByAssemblyVersion(plugins);
 
+            var matchingPlugins = new Dictionary<string, List<PluginImporter>>();
             foreach (var plugin in plugins)
             {
                 string finalPluginPath = CalculateFinalPluginPath(buildTargetName, plugin);
                 if (string.IsNullOrEmpty(finalPluginPath))
                     continue;
 
-                List<PluginImporter> temp = null;
-                if (matchingPlugins.TryGetValue(finalPluginPath, out temp) == false)
+                if (!matchingPlugins.TryGetValue(finalPluginPath, out var pluginsList))
                 {
-                    temp = new List<PluginImporter>();
-                    matchingPlugins[finalPluginPath] = temp;
+                    pluginsList = new List<PluginImporter>();
+                    matchingPlugins[finalPluginPath] = pluginsList;
                 }
-                temp.Add(plugin);
+                pluginsList.Add(plugin);
             }
+
             return matchingPlugins;
         }
 
-        public virtual bool CheckFileCollisions(string buildTargetName)
+        public virtual bool CheckFileCollisions(string buildTargetName, string[] defineConstraints)
         {
-            Dictionary<string, List<PluginImporter>> matchingPlugins = GetCompatiblePlugins(buildTargetName);
+            Dictionary<string, List<PluginImporter>> matchingPlugins = GetCompatiblePlugins(buildTargetName, defineConstraints);
 
             bool foundCollisions = false;
 
diff --git a/Editor/Mono/Modules/ModuleManager.cs b/Editor/Mono/Modules/ModuleManager.cs
index eff6836d2e..0937538dec 100644
--- a/Editor/Mono/Modules/ModuleManager.cs
+++ b/Editor/Mono/Modules/ModuleManager.cs
@@ -485,8 +485,13 @@ internal static bool ShouldShowMultiDisplayOption()
         {
             GUIContent[] platformDisplayNames = Modules.ModuleManager.GetDisplayNames(EditorUserBuildSettings.activeBuildTarget.ToString());
             BuildTargetGroup curPlatform = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
-            return curPlatform == BuildTargetGroup.Standalone || curPlatform == BuildTargetGroup.WSA || curPlatform == BuildTargetGroup.iOS || curPlatform == BuildTargetGroup.Android
-                || platformDisplayNames != null;
+            return curPlatform == BuildTargetGroup.Standalone
+                || curPlatform == BuildTargetGroup.WSA
+                || curPlatform == BuildTargetGroup.iOS
+                || curPlatform == BuildTargetGroup.Android
+                || curPlatform == BuildTargetGroup.EmbeddedLinux
+                || platformDisplayNames != null
+                ;
         }
 
         internal static GUIContent[] GetDisplayNames(string target)
diff --git a/Editor/Mono/Modules/PlatformSupportModule.cs b/Editor/Mono/Modules/PlatformSupportModule.cs
index 3c2c10d722..0868a1ca10 100644
--- a/Editor/Mono/Modules/PlatformSupportModule.cs
+++ b/Editor/Mono/Modules/PlatformSupportModule.cs
@@ -171,12 +171,26 @@ internal class DefaultScriptingImplementations : IScriptingImplementations
     {
         public virtual ScriptingImplementation[] Supported()
         {
-            return new[] { ScriptingImplementation.Mono2x, ScriptingImplementation.IL2CPP };
+            if (Unsupported.IsSourceBuild())
+            {
+                return new[]
+                {
+                    ScriptingImplementation.Mono2x,
+                    ScriptingImplementation.IL2CPP,
+                    #pragma warning disable 618
+                    ScriptingImplementation.CoreCLR
+                };
+            }
+            return new[]
+            {
+                ScriptingImplementation.Mono2x,
+                ScriptingImplementation.IL2CPP,
+            };
         }
 
         public virtual ScriptingImplementation[] Enabled()
         {
-            return new[] { ScriptingImplementation.Mono2x, ScriptingImplementation.IL2CPP };
+            return Supported();
         }
 
         public virtual bool AllowIL2CPPCompilerConfigurationSelection()
@@ -303,6 +317,8 @@ internal interface IBuildWindowExtension
         // Enables a dialog "Wait For Managed debugger", which halts program execution until managed debugger is connected
         bool ShouldDrawWaitForManagedDebugger();
 
+        bool ShouldDrawManagedDebuggerFixedPort();
+
         // Grays out managed debugger options
         bool ShouldDisableManagedDebuggerCheckboxes();
 
@@ -367,7 +383,7 @@ internal interface IPluginImporterExtension
 
         // Called before building the player, checks if plugins don't overwrite each other
         string CalculateFinalPluginPath(string buildTargetName, PluginImporter imp);
-        bool CheckFileCollisions(string buildTargetName);
+        bool CheckFileCollisions(string buildTargetName, string[] buildDefineConstraints);
     }
 
     internal struct BuildLaunchPlayerArgs
diff --git a/Editor/Mono/MonoScript.bindings.cs b/Editor/Mono/MonoScript.bindings.cs
index 24fd0f7836..2d3b3ec9cd 100644
--- a/Editor/Mono/MonoScript.bindings.cs
+++ b/Editor/Mono/MonoScript.bindings.cs
@@ -50,9 +50,9 @@ public MonoScript() : base(TextAsset.CreateOptions.None, null)
             Init_Internal(this);
         }
 
-        internal void Init(string scriptContents, string className, string nameSpace, string assemblyName, bool isEditorScript)
+        internal void Init(string className, string nameSpace, string assemblyName, bool isEditorScript)
         {
-            Init(this, scriptContents, className, nameSpace, assemblyName, isEditorScript);
+            Init(this, className, nameSpace, assemblyName, isEditorScript);
         }
 
         [FreeFunction("MonoScript_Init_Internal")]
@@ -60,7 +60,7 @@ internal void Init(string scriptContents, string className, string nameSpace, st
 
         // *undocumented*
         [FreeFunction("MonoScript_Init")]
-        private static extern void Init([NotNull("NullExceptionObject")] MonoScript self, string scriptContents, string className, string nameSpace, string assemblyName, bool isEditorScript);
+        private static extern void Init([NotNull("NullExceptionObject")] MonoScript self, string className, string nameSpace, string assemblyName, bool isEditorScript);
 
         // *undocumented*
         [NativeName("GetAssemblyName")]
diff --git a/Editor/Mono/ObjectListArea.cs b/Editor/Mono/ObjectListArea.cs
index 960f17ed59..bc50f31383 100644
--- a/Editor/Mono/ObjectListArea.cs
+++ b/Editor/Mono/ObjectListArea.cs
@@ -247,7 +247,8 @@ internal void InitForSearch(Rect rect, HierarchyType hierarchyType, SearchFilter
                         requiredTypeNames = searchFilter.classNames,
                         requiredTypes = searchFilter.classNames.Select(name =>
                             TypeCache.GetTypesDerivedFrom<Object>()
-                                .FirstOrDefault(t => name == t.FullName || name == t.Name))
+                                .FirstOrDefault(t => name == t.FullName || name == t.Name)),
+                        searchFilter = searchFilter
                     };
                 }, searchSessionOptions);
                 m_SearchSessionHandler.BeginSearch(searchQuery);
@@ -341,7 +342,7 @@ internal float GetVisibleWidth()
         public float m_RightMargin = 10f;
         public float m_LeftMargin = 10f;
 
-        public virtual void OnGUI(Rect position, int keyboardControlID)
+        public void OnGUI(Rect position, int keyboardControlID)
         {
             s_VCEnabled = VersionControlUtils.isVersionControlConnected;
 
@@ -643,7 +644,7 @@ public void SelectAll()
             SetSelection(instanceIDs.ToArray(), false);
         }
 
-        protected void SetSelection(int[] selectedInstanceIDs, bool doubleClicked)
+        void SetSelection(int[] selectedInstanceIDs, bool doubleClicked)
         {
             InitSelection(selectedInstanceIDs);
 
diff --git a/Editor/Mono/ObjectListLocalGroup.cs b/Editor/Mono/ObjectListLocalGroup.cs
index c28d3d2cfb..3b8c3468ba 100644
--- a/Editor/Mono/ObjectListLocalGroup.cs
+++ b/Editor/Mono/ObjectListLocalGroup.cs
@@ -662,12 +662,6 @@ void DrawSubAssetBackground(int beginIndex, int endIndex, float yOffset)
                 }
             }
 
-            internal void DrawItem(Rect itemRect, ExtraItem extraItem)
-            {
-                GUI.Label(itemRect, GUIContent.none, Styles.iconAreaBg);
-                DrawItem(itemRect, null, extraItem, false);
-            }
-
             void DrawItem(Rect position, FilteredHierarchy.FilterResult filterItem, BuiltinResource builtinResource, bool isFolderBrowsing)
             {
                 System.Diagnostics.Debug.Assert((filterItem != null && builtinResource == null) ||
@@ -1426,7 +1420,7 @@ public virtual void StartDrag(int draggedInstanceID, List<int> selectedInstanceI
 
             public DragAndDropVisualMode DoDrag(int dragToInstanceID, bool perform)
             {
-                return DragAndDrop.Drop(DragAndDropWindowTarget.projectBrowser, dragToInstanceID, AssetDatabase.GetAssetPath(dragToInstanceID), perform);
+                return DragAndDrop.DropOnProjectBrowserWindow(dragToInstanceID, AssetDatabase.GetAssetPath(dragToInstanceID), perform);
             }
 
             static internal int GetControlIDFromInstanceID(int instanceID)
diff --git a/Editor/Mono/ObjectSelector.cs b/Editor/Mono/ObjectSelector.cs
index ed3a210d12..d87b386539 100644
--- a/Editor/Mono/ObjectSelector.cs
+++ b/Editor/Mono/ObjectSelector.cs
@@ -79,6 +79,7 @@ static class Styles
         UnityObject m_ObjectBeingEdited;
         SerializedProperty m_EditedProperty;
 
+        bool m_SelectionCancelled;
         int m_LastSelectedInstanceId = 0;
         readonly SearchService.ObjectSelectorSearchSessionHandler m_SearchSessionHandler = new SearchService.ObjectSelectorSearchSessionHandler();
         readonly SearchSessionOptions m_LegacySearchSessionOptions = new SearchSessionOptions { legacyOnly = true };
@@ -428,6 +429,7 @@ internal void Show(UnityObject obj, Type[] requiredTypes, UnityObject objectBein
             m_AllowedIDs = allowedInstanceIDs;
             m_ObjectBeingEdited = objectBeingEdited;
             m_LastSelectedInstanceId = obj?.GetInstanceID() ?? 0;
+            m_SelectionCancelled = false;
 
             m_OnObjectSelectorClosed = onObjectSelectorClosed;
             m_OnObjectSelectorUpdated = onObjectSelectedUpdated;
@@ -502,6 +504,7 @@ internal void Show(UnityObject obj, Type[] requiredTypes, UnityObject objectBein
                         // Undo changes we have done in the ObjectSelector
                         Undo.RevertAllDownToGroup(m_ModalUndoGroup);
                         m_LastSelectedInstanceId = 0;
+                        m_SelectionCancelled = true;
                     }
                     else
                     {
@@ -515,6 +518,8 @@ internal void Show(UnityObject obj, Type[] requiredTypes, UnityObject objectBein
 
                 if (m_SearchSessionHandler.SelectObject(onSelectorClosed, onSelectionChanged))
                     return;
+                else
+                    m_SearchSessionHandler.EndSession();
             }
 
             // Freeze to prevent flicker on OSX.
@@ -522,6 +527,7 @@ internal void Show(UnityObject obj, Type[] requiredTypes, UnityObject objectBein
             // SetFreezeDisplay(false) further down.
             ContainerWindow.SetFreezeDisplay(true);
 
+            var shouldRepositionWindow = m_Parent != null;
             ShowWithMode(ShowMode.AuxWindow);
             string text = "Select " + (requiredTypes[0] == null ? m_RequiredTypes[0] : requiredTypes[0].Name);
             for (int i = 1; i < requiredTypes.Length; i++)
@@ -529,6 +535,11 @@ internal void Show(UnityObject obj, Type[] requiredTypes, UnityObject objectBein
             titleContent = EditorGUIUtility.TrTextContent(text);
 
             // Deal with window size
+            if (shouldRepositionWindow)
+            {
+                m_Parent.window.LoadInCurrentMousePosition();
+                m_Parent.window.FitWindowToScreen(true);
+            }
             Rect p = m_Parent == null ? new Rect(0, 0, 1, 1) : m_Parent.window.position;
             p.width = EditorPrefs.GetFloat("ObjectSelectorWidth", 200);
             p.height = EditorPrefs.GetFloat("ObjectSelectorHeight", 390);
@@ -616,6 +627,11 @@ void InitIfNeeded()
             }
         }
 
+        public static bool SelectionCanceled()
+        {
+            return ObjectSelector.get.m_SelectionCancelled;
+        }
+
         public static UnityObject GetCurrentObject()
         {
             return EditorUtility.InstanceIDToObject(ObjectSelector.get.GetSelectedInstanceID());
@@ -945,6 +961,7 @@ void Cancel()
             m_ListArea?.InitSelection(new int[0]);
             m_ObjectTreeWithSearch.Clear();
             m_LastSelectedInstanceId = 0;
+            m_SelectionCancelled = true;
             m_EditedProperty = null;
 
             SendEvent(ObjectSelectorCanceledCommand, false);
diff --git a/Editor/Mono/OrderedCallbackCollection.cs b/Editor/Mono/OrderedCallbackCollection.cs
new file mode 100644
index 0000000000..39660d2e5d
--- /dev/null
+++ b/Editor/Mono/OrderedCallbackCollection.cs
@@ -0,0 +1,378 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using UnityEngine;
+using UnityEngine.Pool;
+
+namespace UnityEditor.Callbacks
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    public class RunAfterClassAttribute : Attribute
+    {
+        public Type classType { get; }
+
+        public RunAfterClassAttribute(Type type) => classType = type;
+
+        public RunAfterClassAttribute(string assemblyQualifiedName) => classType = Type.GetType(assemblyQualifiedName, false);
+    }
+
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    public class RunBeforeClassAttribute : Attribute
+    {
+        public Type classType { get; }
+
+        public RunBeforeClassAttribute(Type type) => classType = type;
+
+        public RunBeforeClassAttribute(string assemblyQualifiedName) => classType = Type.GetType(assemblyQualifiedName, false);
+    }
+
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    public class RunAfterAssemblyAttribute : Attribute
+    {
+        public string assemblyName { get; }
+
+        public RunAfterAssemblyAttribute(string assemblyName) => this.assemblyName = assemblyName;
+    }
+
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    public class RunBeforeAssemblyAttribute : Attribute
+    {
+        public string assemblyName { get; }
+
+        public RunBeforeAssemblyAttribute(string assemblyName) => this.assemblyName = assemblyName;
+    }
+
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    public class RunAfterPackageAttribute : Attribute
+    {
+        public string packageName { get; }
+
+        public RunAfterPackageAttribute(string packageName) => this.packageName = packageName;
+    }
+
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+    public class RunBeforePackageAttribute : Attribute
+    {
+        public string packageName { get; }
+
+        public RunBeforePackageAttribute(string packageName) => this.packageName = packageName;
+    }
+
+    abstract class OrderedCallbackCollection
+    {
+        public abstract class Callback : IComparable
+        {
+            string m_PackageName;
+
+            public abstract Type classType { get; }
+
+            public abstract string name { get; }
+
+            public string packageName
+            {
+                get
+                {
+                    if (m_PackageName == null)
+                    {
+                        var pkg = PackageManager.PackageInfo.FindForAssembly(classType.Assembly);
+                        m_PackageName = pkg != null ? pkg.name : string.Empty;
+                    }
+                    return m_PackageName;
+                }
+            }
+
+            public HashSet<Callback> outgoing { get; } = new HashSet<Callback>();
+            public HashSet<Callback> incoming { get; } = new HashSet<Callback>();
+
+            public abstract IEnumerable<T> GetCustomAttributes<T>() where T : Attribute;
+
+            public void AddIncomingConnection(Callback method)
+            {
+                incoming.Add(method);
+                method.outgoing.Add(this);
+            }
+
+            public void AddIncomingConnections(IList<Callback> methods)
+            {
+                foreach(var m in methods)
+                {
+                    AddIncomingConnection(m);
+                }
+            }
+
+            public void AddOutgoingConnection(Callback method)
+            {
+                outgoing.Add(method);
+                method.incoming.Add(this);
+            }
+
+            public void AddOutgoingConnections(IList<Callback> methods)
+            {
+                foreach (var m in methods)
+                {
+                    AddOutgoingConnection(m);
+                }
+            }
+
+            public int CompareTo(object obj)
+            {
+                if (obj is Callback other)
+                    return classType.FullName.CompareTo(other.classType.FullName);
+                return 0;
+            }
+        }
+
+        List<Callback> m_SortedCallbacks;
+
+        public abstract string name { get; }
+
+        public List<Callback> sortedCallbacks
+        {
+            get
+            {
+                if (m_SortedCallbacks == null)
+                    m_SortedCallbacks = GenerateSortedCallbacks();
+                return m_SortedCallbacks;
+            }
+        }
+
+        public abstract List<Callback> GetCallbacks();
+
+        public List<Callback> GenerateDependencyGraph()
+        {
+            var callbacks = GetCallbacks();
+            var packageLookup = DictionaryPool<string, List<Callback>>.Get();
+            var assemblyLookup = DictionaryPool<string, List<Callback>>.Get();
+            var classLookup = DictionaryPool<Type, Callback>.Get();
+
+            // First generate our lookups for class, assembly and package.
+            foreach (var cb in callbacks)
+            {
+                classLookup[cb.classType] = cb;
+
+                var assemblyName = cb.classType.Assembly.GetName().Name;
+                if (!assemblyLookup.TryGetValue(assemblyName, out var assemblies))
+                {
+                    assemblies = new List<Callback>();
+                    assemblyLookup[assemblyName] = assemblies;
+                }
+                assemblies.Add(cb);
+
+                var package = cb.packageName;
+                if(package != null)
+                {
+                    if (!packageLookup.TryGetValue(package, out var packages))
+                    {
+                        packages = new List<Callback>();
+                        packageLookup[package] = packages;
+                    }
+                    packages.Add(cb);
+                }
+            }
+
+            // Sort the methods so that the output order is deterministic.
+            callbacks.Sort();
+
+            // Now connect the dependency graph nodes
+            foreach (var dependency in callbacks)
+            {
+                // Dependency by class
+                foreach (var runAfter in dependency.GetCustomAttributes<RunAfterClassAttribute>())
+                {
+                    // Ignore classes that may not exist in the project
+                    if (runAfter.classType == null)
+                        continue;
+
+                    if (classLookup.TryGetValue(runAfter.classType, out var runAfterMethodInfo))
+                    {
+                        dependency.AddIncomingConnection(runAfterMethodInfo);
+                    }
+                }
+                foreach (var runBefore in dependency.GetCustomAttributes<RunBeforeClassAttribute>())
+                {
+                    // Ignore classes that may not exist in the project
+                    if (runBefore.classType == null)
+                        continue;
+
+                    if (classLookup.TryGetValue(runBefore.classType, out var runBeforeMethodInfo))
+                    {
+                        dependency.AddOutgoingConnection(runBeforeMethodInfo);
+                    }
+                }
+
+                // Dependency by package
+                foreach (var runAfter in dependency.GetCustomAttributes<RunAfterPackageAttribute>())
+                {
+                    if (packageLookup.TryGetValue(runAfter.packageName, out var runAfterMethodInfos))
+                    {
+                        dependency.AddIncomingConnections(runAfterMethodInfos);
+                    }
+                }
+                foreach (var runBefore in dependency.GetCustomAttributes<RunBeforePackageAttribute>())
+                {
+                    if (packageLookup.TryGetValue(runBefore.packageName, out var runBeforeMethodInfos))
+                    {
+                        dependency.AddOutgoingConnections(runBeforeMethodInfos);
+                    }
+                }
+
+                // Dependency by Assembly
+                foreach (var runAfter in dependency.GetCustomAttributes<RunAfterAssemblyAttribute>())
+                {
+                    if (assemblyLookup.TryGetValue(runAfter.assemblyName, out var runAfterMethodInfos))
+                    {
+                        dependency.AddIncomingConnections(runAfterMethodInfos);
+                    }
+                }
+                foreach (var runBefore in dependency.GetCustomAttributes<RunBeforeAssemblyAttribute>())
+                {
+                    if (assemblyLookup.TryGetValue(runBefore.assemblyName, out var runBeforeMethodInfos))
+                    {
+                        dependency.AddOutgoingConnections(runBeforeMethodInfos);
+                    }
+                }
+            }
+
+            DictionaryPool<string, List<Callback>>.Release(packageLookup);
+            DictionaryPool<string, List<Callback>>.Release(assemblyLookup);
+            DictionaryPool<Type, Callback>.Release(classLookup);
+
+            return callbacks;
+        }
+
+        public List<Callback> GenerateSortedCallbacks() => PerformTopologicalSortingKahnAlgorithm(GenerateDependencyGraph());
+
+        List<Callback> PerformTopologicalSortingKahnAlgorithm(List<Callback> dependencyGraph, HashSet<string> cyclicNodes = null)
+        {
+            int n = dependencyGraph.Count;
+            var ordered = new List<Callback>(n);
+            var q = new Queue<Callback>();
+
+            // Find nodes which do not need to run after anything(no incoming)
+            foreach (var node in dependencyGraph)
+            {
+                if (node.incoming.Count == 0)
+                    q.Enqueue(node);
+            }
+
+            while (q.Count != 0)
+            {
+                var at = q.Dequeue();
+                ordered.Add(at);
+
+                foreach (var o in at.outgoing)
+                {
+                    o.incoming.Remove(at);
+                    if (o.incoming.Count == 0)
+                        q.Enqueue(o);
+                }
+                at.outgoing.Clear();
+            }
+
+            // Graph contains a cycle
+            if (ordered.Count != dependencyGraph.Count)
+            {
+                var sb = new StringBuilder();
+                sb.Append($"Found cycles in callback dependency graph for {name}.\nThe following nodes could not be added:\n");
+
+                var visited = cyclicNodes ?? new HashSet<string>();
+                foreach (var node in dependencyGraph)
+                {
+                    if (node.incoming.Count == 0)
+                        continue;
+
+                    PrintChildren(node, sb, visited, 0);
+                }
+                Debug.LogError(sb.ToString());
+            }
+
+            return ordered;
+        }
+
+        static void PrintChildren(Callback callback, StringBuilder stringBuilder, HashSet<string> visited, int depth)
+        {
+            if (visited.Contains(callback.name))
+            {
+                if (depth != 0)
+                {
+                    // We have a cycle. Abort here
+                    stringBuilder.Append(new string('-', depth));
+                    stringBuilder.AppendLine($"<color=red>{callback.name}</color>");
+                }
+
+                return;
+            }
+
+            visited.Add(callback.name);
+
+            if (depth != 0)
+            {
+                stringBuilder.Append(new string('-', depth));
+            }
+
+            stringBuilder.AppendLine(callback.name);
+
+            foreach (var node in callback.outgoing)
+            {
+                PrintChildren(node, stringBuilder, visited, depth + 1);
+            }
+        }
+
+        /// <summary>
+        /// This can aid with debugging and understanding the dependencies.
+        /// It will generate a Graphviz dot diagram to show the dependencies, cyclic issues and generated callback order.
+        /// </summary>
+        /// <param name="path">Where to save the generated dot diagram.</param>
+        public void GenerateDependencyDiagram(string path = "DependenciesDiagram.dot")
+        {
+            var dependencyGraph = GenerateDependencyGraph();
+            var cyclicNodes = new HashSet<string>();
+            var sortedCallbacks = PerformTopologicalSortingKahnAlgorithm(GenerateDependencyGraph(), cyclicNodes);
+
+            var graphvizDiagram = new StringBuilder();
+            graphvizDiagram.AppendLine("digraph DependenciesDiagram {");
+            graphvizDiagram.AppendLine("\tnode [style=\"filled, rounded\", shape=box, fillcolor=\"#FCE5EC\" color=\"#EB417A\"]");
+            foreach(var node in cyclicNodes)
+            {
+                graphvizDiagram.AppendLine($"\t<{node}>");
+            }
+
+            graphvizDiagram.AppendLine();
+            graphvizDiagram.AppendLine("\tnode [style=\"filled, rounded\", shape=box, fillcolor=\"#DAEDFD\" color=\"#2196F3\"]");
+            graphvizDiagram.AppendLine("\tedge [penwidth=1.5, color=\"#2196F3\"]");
+            foreach (var node in dependencyGraph)
+            {
+                if (node.outgoing.Count > 0)
+                {
+                    graphvizDiagram.Append($"\t<{node.name}> -> ");
+
+                    var enumerator = node.outgoing.GetEnumerator();
+                    enumerator.MoveNext();
+                    graphvizDiagram.Append($"<{enumerator.Current.name}>");
+                    while (enumerator.MoveNext())
+                    {
+                        graphvizDiagram.Append($", <{enumerator.Current.name}>");
+                    }
+                    graphvizDiagram.AppendLine();
+                }
+            }
+            graphvizDiagram.AppendLine();
+
+            // Sorted results
+            graphvizDiagram.AppendLine("\tedge [penwidth=1.5, color=\"#67BC6B\"]");
+            for (var i = 0; i < sortedCallbacks.Count - 1; ++i)
+            {
+                graphvizDiagram.AppendLine($"\t<{sortedCallbacks[i].name}> -> <{sortedCallbacks[i + 1].name}>");
+            }
+            graphvizDiagram.AppendLine("}");
+
+            File.WriteAllText(path, graphvizDiagram.ToString());
+            EditorUtility.OpenWithDefaultApp(path);
+        }
+    }
+}
diff --git a/Editor/Mono/Overlays/IMGUIOverlay.cs b/Editor/Mono/Overlays/IMGUIOverlay.cs
index 6fc79aa42d..9daf39149d 100644
--- a/Editor/Mono/Overlays/IMGUIOverlay.cs
+++ b/Editor/Mono/Overlays/IMGUIOverlay.cs
@@ -28,24 +28,25 @@ abstract class TransientSceneViewOverlay : IMGUIOverlay, ITransientOverlay
 
     public abstract class IMGUIOverlay : Overlay
     {
-        internal IMGUIContainer drawingContainer { get; private set; }
+        internal IMGUIContainer imguiContainer { get; private set; }
 
         public sealed override VisualElement CreatePanelContent()
         {
             rootVisualElement.pickingMode = PickingMode.Position;
-            var imgui = new IMGUIContainer();
-            imgui.onGUIHandler = () => OnPanelGUIHandler(imgui);
-            return imgui;
+            imguiContainer = new IMGUIContainer();
+            imguiContainer.onGUIHandler = OnPanelGUIHandler;
+            OnContentRebuild();
+            return imguiContainer;
         }
 
-        void OnPanelGUIHandler(IMGUIContainer container)
+        internal virtual void OnContentRebuild() { }
+
+        void OnPanelGUIHandler()
         {
             if (!displayed)
                 return;
 
-            drawingContainer = container;
             OnGUI();
-            drawingContainer = null;
 
             if (Event.current.isMouse)
                 Event.current.Use();
diff --git a/Editor/Mono/Overlays/Overlay.cs b/Editor/Mono/Overlays/Overlay.cs
index 929fba01fc..4248911aaf 100644
--- a/Editor/Mono/Overlays/Overlay.cs
+++ b/Editor/Mono/Overlays/Overlay.cs
@@ -48,6 +48,13 @@ public abstract partial class Overlay
         Vector2 m_FloatingSnapOffset;
         internal Vector2 m_SnapOffsetDelta = Vector2.zero;
 
+        //Min and Max being 0 means the resizing is disabled for that axis without enforcing an actual size
+        //Resizing is disabled by default
+        Vector2 m_MinSize = Vector2.zero;
+        Vector2 m_MaxSize = Vector2.zero;
+        Vector2 m_Size;
+        bool m_SizeOverridden;
+
         // Temporary Variables
         bool m_LockAnchor = false;
         bool m_ContentsChanged = true;
@@ -62,6 +69,8 @@ public abstract partial class Overlay
         VisualElement m_CollapsedContent;
         OverlayPopup m_ModalPopup; // collapsed popup root
         VisualElement m_RootVisualElement;
+        VisualElement m_ResizeTarget;
+        internal VisualElement resizeTarget => m_ResizeTarget;
 
         OverlayDropZone m_BeforeDropZone;
         OverlayDropZone m_AfterDropZone;
@@ -70,6 +79,11 @@ public abstract partial class Overlay
         public event Action<Layout> layoutChanged;
         public event Action<bool> collapsedChanged;
         public event Action<bool> displayedChanged;
+        internal event Action<OverlayContainer> containerChanged;
+        internal event Action minSizeChanged;
+        internal event Action maxSizeChanged;
+        internal event Action sizeOverridenChanged;
+
         // Invoked in partial class OverlayPlacement.cs
 #pragma warning disable 67
         public event Action<bool> floatingChanged;
@@ -121,6 +135,7 @@ internal set
             {
                 if (m_Layout == value)
                     return;
+
                 m_Layout = value;
                 RebuildContent();
             }
@@ -164,12 +179,19 @@ public string displayName
         internal OverlayContainer container
         {
             get => m_Container;
-            set => m_Container = value;
+            set
+            {
+                if (m_Container == value)
+                    return;
+
+                m_Container = value;
+                containerChanged?.Invoke(m_Container);
+            }
         }
 
         internal DockZone dockZone => floating ? DockZone.Floating : OverlayCanvas.GetDockZone(container);
 
-        internal DockPosition dockPosition => container?.GetDockPosition(this) ?? DockPosition.Bottom;
+        internal DockPosition dockPosition => container.GetSection(OverlayContainerSection.BeforeSpacer).Contains(this) ? DockPosition.Top : DockPosition.Bottom;
 
         internal static VisualTreeAsset treeAsset
         {
@@ -181,11 +203,6 @@ internal static VisualTreeAsset treeAsset
             }
         }
 
-        internal void SetDisplayedNoCallback(bool value)
-        {
-            rootVisualElement.style.display = value ? DisplayStyle.Flex : DisplayStyle.None;
-        }
-
         public bool displayed
         {
             get => rootVisualElement.style.display == DisplayStyle.Flex;
@@ -249,6 +266,10 @@ internal VisualElement rootVisualElement
                 m_RootVisualElement.Add(m_AfterDropZone = new OverlayDropZone(this, OverlayDropZone.Placement.After));
                 m_RootVisualElement.tooltip = L10n.Tr(displayName);
 
+                m_ResizeTarget = m_RootVisualElement.Q("unity-overlay");
+                m_ResizeTarget.style.overflow = Overflow.Hidden;
+                m_ResizeTarget.Add(new OverlayResizerGroup(this));
+
                 return m_RootVisualElement;
             }
         }
@@ -266,7 +287,80 @@ internal VisualElement contentRoot
             }
         }
 
-        public bool isInToolbar => !floating && container is ToolbarOverlayContainer;
+        public bool isInToolbar => container is ToolbarOverlayContainer;
+        internal bool sizeOverridden
+        {
+            get => m_SizeOverridden;
+            private set
+            {
+                if (m_SizeOverridden == value)
+                    return;
+
+                m_SizeOverridden = value;
+                sizeOverridenChanged?.Invoke();
+            }
+        }
+
+        internal Vector2 sizeToSave => m_Size;
+
+        public Vector2 size
+        {
+            get
+            {
+                if (!ShouldUseSizeValue())
+                    return m_ResizeTarget.layout.size;
+
+                return new Vector2(
+                    IsSizeAuto(m_MinSize.x, m_MaxSize.x) ? m_ResizeTarget.layout.width : m_Size.x,
+                    IsSizeAuto(m_MinSize.y, m_MaxSize.y) ? m_ResizeTarget.layout.height : m_Size.y);
+            }
+            set
+            {
+                if (m_Size == value && sizeOverridden)
+                    return;
+
+                m_Size = value;
+                sizeOverridden = true;
+                UpdateSize();
+            }
+        }
+
+        public Vector2 minSize
+        {
+            get => m_MinSize;
+            set
+            {
+                if (m_MinSize == value)
+                    return;
+
+                m_MinSize = value;
+                minSizeChanged?.Invoke();
+                UpdateSize();
+            }
+        }
+
+        public Vector2 maxSize
+        {
+            get => m_MaxSize;
+            set
+            {
+                if (m_MaxSize == value)
+                    return;
+
+                m_MaxSize = value;
+                maxSizeChanged?.Invoke();
+                UpdateSize();
+            }
+        }
+
+        internal void ResetSize()
+        {
+            if (!sizeOverridden)
+                return;
+
+            sizeOverridden = false;
+            UpdateSize();
+        }
 
         bool CanCreateRequestedLayout(Layout requested)
         {
@@ -302,7 +396,7 @@ internal void RebuildContent()
 
             // We need to invoke a callback if the collapsed state changes (either from user request or invalid layout)
             bool wasCollapsed = collapsedContent.parent == contentRoot;
-            var prevLayout = layout;
+            var prevLayout = m_ActiveLayout;
             m_ActiveLayout = GetBestLayoutForState();
 
             // Clear any existing contents.
@@ -315,8 +409,8 @@ internal void RebuildContent()
 
             // An Overlay can collapsed by request, or by necessity. If collapsed due to invalid layout/container match,
             // the collapsed property is not modified. The next time a content rebuild is requested we'll try again to
-            // create the contents with the st  ored state.
-            bool isCollapsed = m_Collapsed || m_ActiveLayout == 0;
+            // create the contents with the stored state.
+            bool isCollapsed = m_Collapsed || activeLayout == 0;
 
             if (isCollapsed)
             {
@@ -357,7 +451,7 @@ internal void RebuildContent()
             m_BeforeDropZone.style.display = dropZonesDisplay;
             m_AfterDropZone.style.display = dropZonesDisplay;
 
-            container?.UpdateIsVisibleInContainer(this);
+            UpdateSize();
 
             // Invoke callbacks after content is created and styling has been applied
             if(wasCollapsed != isCollapsed)
@@ -367,6 +461,40 @@ internal void RebuildContent()
                 layoutChanged?.Invoke(m_ActiveLayout);
         }
 
+        bool ShouldUseSizeValue()
+        {
+            return sizeOverridden && layout == Layout.Panel && !collapsed && !(container is ToolbarOverlayContainer);
+        }
+
+        bool IsSizeAuto(float min, float max)
+        {
+            return Mathf.Approximately(min, 0) && Mathf.Approximately(max, 0);
+        }
+
+        void UpdateSize()
+        {
+            m_Size.x = Mathf.Clamp(m_Size.x, m_MinSize.x, m_MaxSize.x);
+            m_Size.y = Mathf.Clamp(m_Size.y, m_MinSize.y, m_MaxSize.y);
+
+            if (m_ResizeTarget == null)
+                return;
+
+            if (!ShouldUseSizeValue())
+            {
+                m_ResizeTarget.style.width = new StyleLength(StyleKeyword.Auto);
+                m_ResizeTarget.style.height = new StyleLength(StyleKeyword.Auto);
+            }
+            else
+            {
+                //If both min-max for one axis are 0, disable resizing for that axis
+                m_ResizeTarget.style.width = IsSizeAuto(m_MinSize.x, m_MaxSize.x) ? new StyleLength(StyleKeyword.Auto) : m_Size.x;
+                m_ResizeTarget.style.height = IsSizeAuto(m_MinSize.y, m_MaxSize.y) ? new StyleLength(StyleKeyword.Auto) : m_Size.y;
+            }
+
+            var position = canvas.ClampToOverlayWindow(new Rect(floatingPosition, m_Size)).position;
+            UpdateSnapping(position);
+        }
+
         // CreateContent always returns a new VisualElement tree with the Overlay contents. It does not modify the
         // m_CurrentContent or m_ContentRoot properties. Use RebuildContent() to update an Overlay contents.
         // CreateContent will try to return content in the requested layout, regardless of whether the container
@@ -450,7 +578,7 @@ void ToggleCollapsedPopup()
 
             m_ModalPopup.RegisterCallback<FocusOutEvent>(evt =>
             {
-                if (evt.relatedTarget is VisualElement target && m_ModalPopup.Contains(target))
+                if (evt.relatedTarget is VisualElement target && (m_ModalPopup == target || m_ModalPopup.Contains(target)))
                     return;
 
                 // When the new focus is an embedded IMGUIContainer or popup window, give focus back to the modal
@@ -494,6 +622,8 @@ void BuildContextMenu(ContextualMenuPopulateEvent evt)
 
             if (!isInToolbar)
             {
+                menu.AppendAction(L10n.Tr("Reset Size"), action => ResetSize());
+
                 menu.AppendSeparator();
                 var layouts = supportedLayouts;
 
@@ -531,6 +661,8 @@ internal void ApplySaveData(SaveData data)
             m_Layout = data.layout;
             m_FloatingSnapOffset = data.snapOffset;
             m_SnapOffsetDelta = data.snapOffsetDelta;
+            m_SizeOverridden = data.sizeOverriden;
+            m_Size = data.size;
         }
     }
 }
diff --git a/Editor/Mono/Overlays/OverlayAttribute.cs b/Editor/Mono/Overlays/OverlayAttribute.cs
index 69768cbfea..3803de4130 100644
--- a/Editor/Mono/Overlays/OverlayAttribute.cs
+++ b/Editor/Mono/Overlays/OverlayAttribute.cs
@@ -87,7 +87,7 @@ public OverlayAttribute()
             if (string.IsNullOrEmpty(m_UssName)) m_UssName = m_Id;
         }
 
-        public OverlayAttribute(Type editorWindowType, string id, string displayName, string ussName, bool defaultDisplay = false)
+        public OverlayAttribute(Type editorWindowType, string id, string displayName, string ussName, bool defaultDisplay = false):this()
         {
             this.editorWindowType = editorWindowType;
             this.displayName = displayName;
diff --git a/Editor/Mono/Overlays/OverlayCanvas.cs b/Editor/Mono/Overlays/OverlayCanvas.cs
index 35a588c83e..9ed79d551c 100644
--- a/Editor/Mono/Overlays/OverlayCanvas.cs
+++ b/Editor/Mono/Overlays/OverlayCanvas.cs
@@ -28,6 +28,8 @@ class SaveData : IEquatable<SaveData>
         public string id;
         public int index = k_InvalidIndex;
         public Layout layout = Layout.Panel;
+        public Vector2 size;
+        public bool sizeOverriden;
 
         public SaveData() { }
 
@@ -44,12 +46,14 @@ public SaveData(SaveData other)
             id = other.id;
             index = other.index;
             layout = other.layout;
+            size = other.size;
+            sizeOverriden = other.sizeOverriden;
         }
 
         public SaveData(Overlay overlay, int indexInContainer = k_InvalidIndex)
         {
             var container = overlay.container != null ? overlay.container.name : "";
-            var dock = overlay.container != null && overlay.container.topOverlays.Contains(overlay)
+            var dock = overlay.container != null && overlay.container.ContainsOverlay(overlay, OverlayContainerSection.BeforeSpacer)
                 ? DockPosition.Top
                 : DockPosition.Bottom;
 
@@ -181,7 +185,7 @@ public sealed class OverlayCanvas : ISerializationCallbackReceiver
             "overlay-toolbar__bottom",
             "overlay-container--left",
             "overlay-container--right",
-            k_DefaultContainer
+            "Floating"
         };
 
         internal static DockZone GetDockZone(OverlayContainer container)
@@ -214,20 +218,22 @@ internal OverlayContainer GetDockZoneContainer(DockZone zone)
 
         VisualElement m_RootVisualElement;
         internal EditorWindow containerWindow { get; set; }
-        internal VisualElement floatingContainer { get; set; }
+
+        internal FloatingOverlayContainer floatingContainer => m_FloatingOverlayContainer ??= new FloatingOverlayContainer {canvas = this};
+
+        FloatingOverlayContainer m_FloatingOverlayContainer;
         Overlay m_HoveredOverlay;
 
         OverlayMenu menu => m_Menu ??= new OverlayMenu(this);
         internal VisualElement rootVisualElement => m_RootVisualElement ??= CreateRoot();
 
-        Vector2 localMousePosition { get; set; }
+        internal Vector2 localMousePosition { get; set; }
         internal Overlay hoveredOverlay => m_HoveredOverlay;
         OverlayContainer hoveredOverlayContainer { get; set; }
         OverlayContainer defaultContainer { get; set; }
         OverlayContainer defaultToolbarContainer { get; set; }
 
-        List<OverlayContainer> containers;
-        List<VisualElement> toolbarZones { get; set; }
+        List<OverlayContainer> containers { get; set; }
 
         readonly Dictionary<VisualElement, Overlay> m_OverlaysByVE = new Dictionary<VisualElement, Overlay>();
 
@@ -253,9 +259,6 @@ internal void SetOverlaysEnabled(bool visible)
 
             foreach (var container in containers)
                 container.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
-            foreach (var toolbar in toolbarZones)
-                toolbar.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
-            floatingContainer.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
 
             overlaysEnabledChanged?.Invoke(visible);
         }
@@ -286,22 +289,13 @@ VisualElement CreateRoot()
             if (s_DropZoneTreeAsset == null)
                 s_DropZoneTreeAsset = EditorGUIUtility.Load(k_UxmlPathDropZone) as VisualTreeAsset;
 
-            var toolbarZonesContainer = ve.Q("overlay-drop-zones__toolbars");
-
-            if (s_DropZoneTreeAsset != null)
-            {
-                s_DropZoneTreeAsset.CloneTree(toolbarZonesContainer);
-
-                toolbarZones = toolbarZonesContainer.Query(null, k_ToolbarZone).ToList();
-
-                foreach (var visualElement in toolbarZones)
-                {
-                    visualElement.style.position = Position.Absolute;
-                }
-            }
-
             ve.name = ussClassName;
             ve.style.flexGrow = 1;
+
+            ve.Add(floatingContainer);
+            floatingContainer.AddToClassList(k_FloatingContainer);
+            floatingContainer.name = "Floating";
+
             containers = ve.Query<OverlayContainer>().ToList();
 
             foreach (var container in containers)
@@ -316,19 +310,12 @@ VisualElement CreateRoot()
                 }
             }
 
-            floatingContainer = ve.Q(k_FloatingContainer);
-            floatingContainer.style.position = Position.Absolute;
-            floatingContainer.style.top = 0;
-            floatingContainer.style.left = 0;
-            floatingContainer.style.right = 0;
-            floatingContainer.style.bottom = 0;
-
             m_OriginGhost = new VisualElement { name = "origin-ghost"};
             m_OriginGhost.AddToClassList(k_GhostClassName);
             m_OriginGhost.AddToClassList(k_DropTargetClassName);
 
             destinationMarker = new OverlayDestinationMarker { name = "dest-marker"};
-            ve.Q("overlay-drop-zones").Add(destinationMarker);
+            ve.Add(destinationMarker);
 
             SetPickingMode(ve, PickingMode.Ignore);
 
@@ -517,7 +504,9 @@ internal void UpdateGhostHover(bool hovered)
         void WriteOrReplaceSaveData(Overlay overlay, int containerIndex = -1)
         {
             if (containerIndex < 0)
-                containerIndex = overlay.container?.FindIndex(overlay) ?? SaveData.k_InvalidIndex;
+                if (overlay.container == null || !overlay.container.GetOverlayIndex(overlay, out _, out containerIndex))
+                    containerIndex = SaveData.k_InvalidIndex;
+
             var saveData = new SaveData(overlay, containerIndex);
             int existing = m_SaveData.FindIndex(x => x.id == overlay.id);
 
@@ -536,19 +525,19 @@ public void OnBeforeSerialize()
             {
                 if (container != null)
                 {
-                    var top = container.topOverlays;
-                    var bot = container.bottomOverlays;
+                    var before = container.GetSection(OverlayContainerSection.BeforeSpacer);
+                    var after = container.GetSection(OverlayContainerSection.AfterSpacer);
 
-                    for (int i = 0, c = top.Count; i < c; ++i)
+                    for (int i = 0, c = before.Count; i < c; ++i)
                     {
-                        if (!top[i].dontSaveInLayout)
-                            WriteOrReplaceSaveData(top[i], i);
+                        if (!before[i].dontSaveInLayout)
+                            WriteOrReplaceSaveData(before[i], i);
                     }
 
-                    for (int i = 0, c = bot.Count; i < c; ++i)
+                    for (int i = 0, c = after.Count; i < c; ++i)
                     {
-                        if (!bot[i].dontSaveInLayout)
-                            WriteOrReplaceSaveData(bot[i], i);
+                        if (!after[i].dontSaveInLayout)
+                            WriteOrReplaceSaveData(after[i], i);
                     }
                 }
             }
@@ -587,11 +576,16 @@ internal void ApplySaveData(SaveData[] saveData)
         internal void Move(Overlay overlay, DockZone zone, DockPosition position = DockPosition.Bottom)
         {
             var container = GetDockZoneContainer(zone);
-            if(position == DockPosition.Bottom)
-                container.AddToBottom(overlay);
+            if (position == DockPosition.Bottom)
+                overlay.DockAt(container, OverlayContainerSection.AfterSpacer);
             else
-                container.AddToTop(overlay);
-            overlay.RebuildContent();
+                overlay.DockAt(container, OverlayContainerSection.BeforeSpacer);
+        }
+
+        internal void Rebuild()
+        {
+            OnBeforeSerialize();
+            RestoreOverlays();
         }
 
         public void Add(Overlay overlay, bool show = true)
@@ -680,6 +674,7 @@ SaveData FindSaveData(Overlay overlay)
                     data.dockPosition = attrib.defaultDockPosition;
                     data.floating = attrib.defaultDockZone == DockZone.Floating;
                     data.layout = attrib.defaultLayout;
+                    data.displayed = attrib.defaultDisplay;
                 }
             }
 
@@ -704,18 +699,21 @@ void RestoreOverlay(Overlay overlay, SaveData data = null)
 
             // Overlays are sorted by their index in containers so we can directly add them to top or bottom without
             // thinking of order
-            if(data.dockPosition == DockPosition.Top)
-                container.AddToTop(overlay);
+            if (data.dockPosition == DockPosition.Top)
+                overlay.DockAt(container, OverlayContainerSection.BeforeSpacer, container.GetSectionCount(OverlayContainerSection.BeforeSpacer));
             else if (data.dockPosition == DockPosition.Bottom)
-                container.AddToBottom(overlay);
+                overlay.DockAt(container, OverlayContainerSection.AfterSpacer, container.GetSectionCount(OverlayContainerSection.AfterSpacer));
             else
                 throw new Exception("data.dockPosition is not Top or Bottom, did someone add a new one?");
 
             if(overlay.floating)
                 floatingContainer.Add(overlay.rootVisualElement);
 
-            overlay.SetDisplayedNoCallback(data.displayed);
-            overlay.RebuildContent();
+            if(overlay.displayed != data.displayed)
+                overlay.displayed = data.displayed;
+            else
+                overlay.RebuildContent();
+
             overlay.UpdateAbsolutePosition();
         }
 
diff --git a/Editor/Mono/Overlays/OverlayContainer.cs b/Editor/Mono/Overlays/OverlayContainer.cs
index 5e197727a9..a31d7c8b43 100644
--- a/Editor/Mono/Overlays/OverlayContainer.cs
+++ b/Editor/Mono/Overlays/OverlayContainer.cs
@@ -2,107 +2,37 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.Overlays
 {
-    class ToolbarOverlayContainer : OverlayContainer
+    enum OverlayContainerSection
     {
-        public new class UxmlFactory : UxmlFactory<ToolbarOverlayContainer, UxmlTraits> {}
-        public new class UxmlTraits : OverlayContainer.UxmlTraits {}
-
-        const string k_ToolbarClassName = "overlay-toolbar-area";
-
-        readonly OverlayDropZoneBase m_NoElementDropZone;
-
-        public ToolbarOverlayContainer()
-        {
-            AddToClassList(k_ToolbarClassName);
-            m_NoElementDropZone = new HiddenToolbarDropZone(this) {name = "NoElementToolbarDropZone"};
-            Add(m_NoElementDropZone);
-        }
-
-        protected override bool InitSpacer()
-        {
-            if (base.InitSpacer())
-            {
-                m_NoElementDropZone.style.display = DisplayStyle.Flex;
-                beforeSpacerDropZone.style.display = DisplayStyle.None;
-                afterSpacerDropZone.style.display = DisplayStyle.None;
-                return true;
-            }
-
-            return false;
-        }
-
-        protected override void OnStateUnlocked()
-        {
-            base.OnStateUnlocked();
-            UpdateDropZones();
-        }
-
-        protected override void OnOverlayBecomeVisibleInContainer(Overlay overlay)
-        {
-            InitSpacer();
-            base.OnOverlayBecomeVisibleInContainer(overlay);
-
-            UpdateDropZones();
-        }
-
-        protected override void OnOverlayBecomeInvisibleInContainer(Overlay overlay)
-        {
-            InitSpacer();
-            base.OnOverlayBecomeInvisibleInContainer(overlay);
-
-            UpdateDropZones();
-        }
-
-        void UpdateDropZones()
-        {
-            if (stateLocked)
-                return;
-
-            if (visibleOverlayCount >= 1)
-            {
-                m_NoElementDropZone.style.display = DisplayStyle.None;
-                beforeSpacerDropZone.style.display = DisplayStyle.Flex;
-                afterSpacerDropZone.style.display = DisplayStyle.Flex;
-            }
-            else
-            {
-                m_NoElementDropZone.style.display = DisplayStyle.Flex;
-                beforeSpacerDropZone.style.display = DisplayStyle.None;
-                afterSpacerDropZone.style.display = DisplayStyle.None;
-            }
-        }
-
-        public override Layout preferredLayout => isHorizontal ? Layout.HorizontalToolbar : Layout.VerticalToolbar;
-
-        public override bool IsOverlayLayoutSupported(Layout requested)
-        {
-            if (isHorizontal)
-                return (requested & Layout.HorizontalToolbar) > 0;
-            return (requested & Layout.VerticalToolbar) > 0;
-        }
+        BeforeSpacer,
+        AfterSpacer
     }
 
     class OverlayContainer : VisualElement
     {
-        public new class UxmlFactory : UxmlFactory<OverlayContainer, UxmlTraits> {}
+        public new class UxmlFactory : UxmlFactory<OverlayContainer, UxmlTraits> { }
 
         public new class UxmlTraits : VisualElement.UxmlTraits
         {
-            readonly UxmlBoolAttributeDescription m_IsHorizontal = new UxmlBoolAttributeDescription { name = "horizontal", defaultValue = false };
-            readonly UxmlStringAttributeDescription m_SupportedLayout = new UxmlStringAttributeDescription {name = "supported-overlay-layout", defaultValue = ""};
+            readonly UxmlBoolAttributeDescription m_IsHorizontal = new UxmlBoolAttributeDescription
+                {name = "horizontal", defaultValue = false};
+
+            readonly UxmlStringAttributeDescription m_SupportedLayout = new UxmlStringAttributeDescription
+                {name = "supported-overlay-layout", defaultValue = ""};
 
             public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext cc)
             {
                 base.Init(ve, bag, cc);
 
-                var container = ((OverlayContainer)ve);
+                var container = ((OverlayContainer) ve);
                 container.isHorizontal = m_IsHorizontal.GetValueFromBag(bag, cc);
 
                 container.m_SupportedOverlayLayouts = Layout.Panel;
@@ -122,14 +52,24 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
             }
         }
 
-        List<Overlay> m_TopOverlays = new List<Overlay>();
-        List<Overlay> m_BottomOverlaysOverlays = new List<Overlay>();
-        public List<Overlay> topOverlays => m_TopOverlays;
-        public List<Overlay> bottomOverlays => m_BottomOverlaysOverlays;
+        public const string className = "unity-overlay-container";
+        public const string spacerClassName = "overlay-container__spacer";
+        const string k_HorizontalClassName = className + "-horizontal";
+        const string k_VerticalClassName = className + "-vertical";
+        public static readonly Overlay spacerMarker = null;
+
+        readonly List<Overlay> m_BeforeOverlays = new List<Overlay>();
+        readonly List<Overlay> m_AfterOverlays = new List<Overlay>();
+        readonly VisualElement m_Spacer;
+
+        // This is set by querying the stylesheet for 'vertical' and 'horizontal'
+        Layout m_SupportedOverlayLayouts = 0; //Used as a flag in this case
+        bool m_IsHorizontal;
+
+        public OverlayCanvas canvas { get; internal set; }
 
-        public int visibleOverlayCount => m_VisibleInContainer.Count;
-        protected OverlayDropZoneBase beforeSpacerDropZone { get; private set; }
-        protected OverlayDropZoneBase afterSpacerDropZone { get; private set; }
+        public int overlayCount => m_BeforeOverlays.Count + m_AfterOverlays.Count;
+        public virtual Layout preferredLayout => Layout.Panel;
 
         public bool isHorizontal
         {
@@ -147,261 +87,241 @@ public bool isHorizontal
             }
         }
 
-        // This is set by querying the stylesheet for 'vertical' and 'horizontal'
-        Layout m_SupportedOverlayLayouts = 0;
-
-        public const string className = "unity-overlay-container";
-        public const string spacerClassName = "overlay-container__spacer";
-        const string k_HorizontalClassName = className + "-horizontal";
-        const string k_VerticalClassName = className + "-vertical";
-
-        bool m_IsHorizontal;
-        VisualElement m_Spacer;
-        VisualElement m_Canvas;
-        bool m_StateLocked;
-        readonly HashSet<Overlay> m_VisibleInContainer = new HashSet<Overlay>();
+        protected VisualElement spacer => m_Spacer;
+        public bool isSpacerVisible => !Mathf.Approximately(spacer.rect.width, 0) && !Mathf.Approximately(spacer.rect.height, 0);
 
         public OverlayContainer()
         {
             AddToClassList(className);
             name = className;
 
-            RegisterCallback<AttachToPanelEvent>(OnAttachedToPanel);
+            Add(m_Spacer = new VisualElement());
+            m_Spacer.AddToClassList(spacerClassName);
+
+            m_Spacer.Add(new OverlayContainerDropZone(this, OverlayContainerDropZone.Placement.Start));
+            var dropZoneSpacer = new VisualElement { name = "DropZonesSpacer" };
+            m_Spacer.Add(dropZoneSpacer);
+            m_Spacer.Add(new OverlayContainerDropZone(this, OverlayContainerDropZone.Placement.End));
+
             SetVertical();
         }
 
-        void SetHorizontal()
+        protected virtual void SetHorizontal()
         {
             EnableInClassList(k_HorizontalClassName, true);
             EnableInClassList(k_VerticalClassName, false);
         }
 
-        void SetVertical()
+        protected virtual void SetVertical()
         {
             EnableInClassList(k_HorizontalClassName, false);
             EnableInClassList(k_VerticalClassName, true);
         }
 
-        public virtual Layout preferredLayout => Layout.Panel;
-
-        public virtual bool IsOverlayLayoutSupported(Layout requested)
+        public bool ContainsOverlay(Overlay overlay, OverlayContainerSection section)
         {
-            return (m_SupportedOverlayLayouts & requested) > 0;
+            return GetSectionInternal(section).Contains(overlay);
         }
 
-        void OnAttachedToPanel(AttachToPanelEvent evt)
+        public bool ContainsOverlay(Overlay overlay)
         {
-            m_Canvas = parent;
-            while (m_Canvas != null && !m_Canvas.ClassListContains(OverlayCanvas.ussClassName))
-            {
-                m_Canvas = m_Canvas.parent;
-            }
-
-            InitSpacer();
+            return ContainsOverlay(overlay, OverlayContainerSection.BeforeSpacer)
+                   || ContainsOverlay(overlay, OverlayContainerSection.AfterSpacer);
         }
 
-        public VisualElement spacer
+        public void InsertOverlay(Overlay overlay, OverlayContainerSection section, int index)
         {
-            get
-            {
-                InitSpacer();
-                return m_Spacer;
-            }
-        }
+            if (overlay == null)
+                return;
 
-        public bool stateLocked
-        {
-            get => m_StateLocked;
-            set
+            var list = GetSectionInternal(section);
+
+            int realIndex = -1;
+
+            //Insert relative to another element in case other visual elements are added to hierarchy
+            if (index < list.Count)
             {
-                if (m_StateLocked == value)
-                    return;
+                realIndex = IndexOf(list[index].rootVisualElement);
+
+                // Section after spacer is listed from bottom to spacer instead of spacer to bottom.
+                // So before an overlay after the spacer is actually after the overlay element in the container hierarchy.
+                if (section == OverlayContainerSection.AfterSpacer)
+                    ++realIndex;
 
-                m_StateLocked = value;
-                if (m_StateLocked)
-                    OnStateLocked();
-                else
-                    OnStateUnlocked();
             }
-        }
 
-        protected virtual bool InitSpacer()
-        {
-            if (m_Spacer == null)
+            if (realIndex < 0)
             {
-                m_Spacer = this.Q(null, spacerClassName);
-                if (m_Spacer == null)
-                    return false;
-
-                m_Spacer.Add(beforeSpacerDropZone = new OverlayContainerDropZone(this, OverlayContainerDropZone.Placement.Start));
-                var dropZoneSpacer = new VisualElement { name = "DropZonesSpacer" };
-                m_Spacer.Add(dropZoneSpacer);
-                m_Spacer.Add(afterSpacerDropZone = new OverlayContainerDropZone(this, OverlayContainerDropZone.Placement.End));
-                return true;
+                switch (section)
+                {
+                    case OverlayContainerSection.BeforeSpacer: realIndex = IndexOf(m_Spacer); break;
+                    case OverlayContainerSection.AfterSpacer: realIndex = IndexOf(m_Spacer) + 1; break;
+                }
             }
 
-            return false;
-        }
-
-        public void RemoveOverlay(Overlay overlay)
-        {
-            if (!topOverlays.Remove(overlay) && !bottomOverlays.Remove(overlay))
-                return;
 
-            overlay.rootVisualElement.RemoveFromHierarchy();
-            OnOverlayRemoved(overlay);
+            Insert(realIndex, overlay.rootVisualElement);
+            list.Insert(index, overlay);
         }
 
-        public void InsertBefore(Overlay overlay, Overlay targetOverlay)
+        public bool RemoveOverlay(Overlay overlay)
         {
-            var index = topOverlays.IndexOf(targetOverlay);
-            if (index >= 0)
-            {
-                if (topOverlays.Contains(overlay)) return;
-                topOverlays.Insert(index, overlay);
-                Insert(IndexOf(targetOverlay.rootVisualElement), overlay.rootVisualElement);
-                OnOverlayAdded(overlay);
-                return;
-            }
+            if (overlay == spacerMarker)
+                return false;
 
-            index = bottomOverlays.IndexOf(targetOverlay);
-            if (index >= 0)
-            {
-                if (bottomOverlays.Contains(overlay)) return;
-                bottomOverlays.Insert(index, overlay);
-                Insert(IndexOf(targetOverlay.rootVisualElement), overlay.rootVisualElement);
-                OnOverlayAdded(overlay);
-            }
+            bool found = m_BeforeOverlays.Remove(overlay);
+            found |= m_AfterOverlays.Remove(overlay);
+            if (found)
+               overlay.rootVisualElement.RemoveFromHierarchy();
+
+            return found;
         }
 
-        public void AddAfter(Overlay overlay, Overlay targetOverlay)
+        public bool GetOverlayIndex(Overlay overlay, out OverlayContainerSection section, out int index)
         {
-            var index = topOverlays.IndexOf(targetOverlay);
+            index = m_BeforeOverlays.IndexOf(overlay);
             if (index >= 0)
             {
-                if (topOverlays.Contains(overlay)) return;
-                topOverlays.Insert(index + 1, overlay);
-                Insert(IndexOf(targetOverlay.rootVisualElement) + 1, overlay.rootVisualElement);
-                OnOverlayAdded(overlay);
-                return;
+                section = OverlayContainerSection.BeforeSpacer;
+                return true;
             }
 
-            index = bottomOverlays.IndexOf(targetOverlay);
+            index = m_AfterOverlays.IndexOf(overlay);
             if (index >= 0)
             {
-                if (bottomOverlays.Contains(overlay)) return;
-                bottomOverlays.Insert(index + 1, overlay);
-                Insert(IndexOf(targetOverlay.rootVisualElement) + 1, overlay.rootVisualElement);
-                OnOverlayAdded(overlay);
+                section = OverlayContainerSection.AfterSpacer;
+                return true;
             }
-        }
-
-        public void AddToTop(Overlay overlay)
-        {
-            if (topOverlays.Contains(overlay)) return;
-            topOverlays.Add(overlay);
-            Insert(IndexOf(spacer), overlay.rootVisualElement);
-            OnOverlayAdded(overlay);
-        }
 
-        public void AddToBottom(Overlay overlay)
-        {
-            if (bottomOverlays.Contains(overlay)) return;
-            bottomOverlays.Add(overlay);
-            Add(overlay.rootVisualElement);
-            OnOverlayAdded(overlay);
+            section = (OverlayContainerSection)(-1);
+            index = -1;
+            return false;
         }
 
-        void OnOverlayAdded(Overlay overlay)
+        public bool HasVisibleOverlays()
         {
-            overlay.container = this;
-            UpdateIsVisibleInContainer(overlay);
-        }
+            if (GetFirstVisible(OverlayContainerSection.BeforeSpacer) != null)
+                return true;
 
-        protected void OnOverlayRemoved(Overlay overlay)
-        {
-            overlay.container = null;
-            if (m_VisibleInContainer.Remove(overlay))
-                OnOverlayBecomeInvisibleInContainer(overlay);
-        }
+            if (GetFirstVisible(OverlayContainerSection.AfterSpacer) != null)
+                return true;
 
-        internal Overlay FirstTopOverlay()
-        {
-            return FirstValidOverlay(topOverlays);
+            return false;
         }
 
-        internal Overlay LastTopOverlay()
+        public int GetSectionCount(OverlayContainerSection section)
         {
-            return LastValidOverlay(topOverlays);
+            return GetSectionInternal(section).Count;
         }
 
-        internal Overlay FirstBottomOverlay()
+        public ReadOnlyCollection<Overlay> GetSection(OverlayContainerSection section)
         {
-            return FirstValidOverlay(bottomOverlays);
+            return GetSectionInternal(section).AsReadOnly();
         }
 
-        internal Overlay LastBottomOverlay()
+        List<Overlay> GetSectionInternal(OverlayContainerSection section)
         {
-            return LastValidOverlay(bottomOverlays);
+            switch (section)
+            {
+                case OverlayContainerSection.BeforeSpacer: return m_BeforeOverlays;
+                case OverlayContainerSection.AfterSpacer: return m_AfterOverlays;
+                default:
+                    throw new InvalidEnumArgumentException();
+            }
         }
 
-        Overlay FirstValidOverlay(List<Overlay> overlays)
+        public Overlay GetFirstVisible(OverlayContainerSection section)
         {
-            for (int i = 0; i < overlays.Count; ++i)
+            List<Overlay> overlays = GetSectionInternal(section);
+            foreach (var overlay in overlays)
             {
-                if (IsOverlayVisibleInContainer(overlays[i]))
-                    return overlays[i];
+                if (overlay != null && overlay.displayed)
+                    return overlay;
             }
+
             return null;
         }
 
-        Overlay LastValidOverlay(List<Overlay> overlays)
+        public Overlay GetLastVisible(OverlayContainerSection section)
         {
+            List<Overlay> overlays = GetSectionInternal(section);
             for (int i = overlays.Count - 1; i >= 0; --i)
             {
-                if (IsOverlayVisibleInContainer(overlays[i]))
-                    return overlays[i];
+                var overlay = overlays[i];
+                if (overlay != null && overlay.displayed)
+                    return overlay;
             }
+
             return null;
         }
 
-        internal bool IsOverlayVisibleInContainer(Overlay overlay)
+        public virtual bool IsOverlayLayoutSupported(Layout requested)
         {
-            return !overlay.floating && overlay.displayed;
+            return (m_SupportedOverlayLayouts & requested) > 0;
         }
+    }
 
-        protected virtual void OnOverlayBecomeVisibleInContainer(Overlay overlay) {}
-        protected virtual void OnOverlayBecomeInvisibleInContainer(Overlay overlay) {}
-        protected virtual void OnStateLocked() {}
-        protected virtual void OnStateUnlocked() {}
+    class FloatingOverlayContainer : OverlayContainer
+    {
+        public FloatingOverlayContainer()
+        {
+            this.StretchToParentSize();
+        }
 
-        internal void UpdateIsVisibleInContainer(Overlay overlay)
+        public override bool IsOverlayLayoutSupported(Layout requested)
         {
-            if (overlay.displayed && !overlay.floating)
-            {
-                if (m_VisibleInContainer.Add(overlay))
-                    OnOverlayBecomeVisibleInContainer(overlay);
-            }
-            else
-            {
-                if (m_VisibleInContainer.Remove(overlay))
-                    OnOverlayBecomeInvisibleInContainer(overlay);
-            }
+            return true;
+        }
+    }
+
+    class ToolbarOverlayContainer : OverlayContainer
+    {
+        public new class UxmlFactory : UxmlFactory<ToolbarOverlayContainer, UxmlTraits> { }
+        public new class UxmlTraits : OverlayContainer.UxmlTraits { }
+
+        const string k_ToolbarClassName = "overlay-toolbar-area";
+
+        readonly OverlayDropZoneBase m_NoElementDropZone;
+        readonly VisualElement m_ContentContainer;
+
+        public override VisualElement contentContainer => m_ContentContainer ?? base.contentContainer;
+
+        public override Layout preferredLayout => isHorizontal ? Layout.HorizontalToolbar : Layout.VerticalToolbar;
+
+        public ToolbarOverlayContainer()
+        {
+            AddToClassList(k_ToolbarClassName);
+            m_NoElementDropZone = new HiddenToolbarDropZone(this) { name = "NoElementToolbarDropZone" };
+            hierarchy.Add(m_NoElementDropZone);
+
+            hierarchy.Add(m_ContentContainer = new VisualElement());
+            m_ContentContainer.style.flexGrow = 1;
+            m_ContentContainer.style.flexDirection = isHorizontal ? FlexDirection.Row : FlexDirection.Column;
+            m_ContentContainer.pickingMode = PickingMode.Ignore;
+            m_ContentContainer.Add(spacer);
+        }
+
+        protected override void SetHorizontal()
+        {
+            base.SetHorizontal();
+
+            if (contentContainer != null)
+                contentContainer.style.flexDirection = FlexDirection.Row;
         }
 
-        internal int FindIndex(Overlay overlay)
+        protected override void SetVertical()
         {
-            var top = topOverlays.IndexOf(overlay);
-            if (top >= 0)
-                return top;
-            return bottomOverlays.IndexOf(overlay);
+            base.SetVertical();
+
+            if (contentContainer != null)
+                contentContainer.style.flexDirection = FlexDirection.Column;
         }
 
-        internal DockPosition GetDockPosition(Overlay overlay)
+        public override bool IsOverlayLayoutSupported(Layout requested)
         {
-            if (topOverlays.Contains(overlay))
-                return DockPosition.Top;
-            return DockPosition.Bottom;
+            if (isHorizontal)
+                return (requested & Layout.HorizontalToolbar) > 0;
+            return (requested & Layout.VerticalToolbar) > 0;
         }
     }
 }
diff --git a/Editor/Mono/Overlays/OverlayDragger.cs b/Editor/Mono/Overlays/OverlayDragger.cs
index e5c7c17d90..fbfde935fa 100644
--- a/Editor/Mono/Overlays/OverlayDragger.cs
+++ b/Editor/Mono/Overlays/OverlayDragger.cs
@@ -11,8 +11,6 @@ namespace UnityEditor.Overlays
 {
     sealed class OverlayDragger : MouseManipulator
     {
-        internal const string k_DragAreaHovered = "unity-overlay-drag-area-hovered";
-
         public static event Action<Overlay> dragStarted;
         public static event Action<Overlay> dragEnded;
 
@@ -27,9 +25,10 @@ sealed class OverlayDragger : MouseManipulator
         Vector2 m_StartMousePosition;
         readonly Overlay m_Overlay;
         int m_InitialIndex;
+        OverlayContainerSection m_InitialSection;
 
         OverlayCanvas canvas => m_Overlay.canvas;
-        VisualElement floatingContainer => canvas.floatingContainer;
+        FloatingOverlayContainer floatingContainer => canvas.floatingContainer;
         VisualElement canvasRoot => canvas.rootVisualElement;
 
         public OverlayDragger(Overlay overlay)
@@ -43,10 +42,9 @@ public OverlayDragger(Overlay overlay)
         protected override void RegisterCallbacksOnTarget()
         {
             target.RegisterCallback<MouseDownEvent>(OnMouseDown);
-            target.RegisterCallback<MouseMoveEvent>(OnMouseMove, TrickleDown.TrickleDown);
             target.RegisterCallback<MouseUpEvent>(OnMouseUp);
             target.RegisterCallback<KeyDownEvent>(OnKeyDown);
-            target.RegisterCallback<MouseLeaveEvent>(OnMouseLeave);
+            target.RegisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOut);
         }
 
         protected override void UnregisterCallbacksFromTarget()
@@ -55,7 +53,7 @@ protected override void UnregisterCallbacksFromTarget()
             target.UnregisterCallback<MouseMoveEvent>(OnMouseMove);
             target.UnregisterCallback<MouseUpEvent>(OnMouseUp);
             target.UnregisterCallback<KeyDownEvent>(OnKeyDown);
-            target.UnregisterCallback<MouseLeaveEvent>(OnMouseLeave);
+            target.UnregisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOut);
         }
 
         OverlayDropZoneBase GetOverlayDropZone(Vector2 mousePosition, Overlay ignoreTarget)
@@ -109,34 +107,31 @@ void OnMouseDown(MouseDownEvent e)
 
             m_InitialLayoutPosition = floatingContainer.WorldToLocal(m_Overlay.rootVisualElement.worldBound.position);
 
+            dragStarted?.Invoke(m_Overlay);
+
             //if docked, convert to floating
             if (!m_Overlay.floating)
             {
-                m_Overlay.container.stateLocked = true;
-                m_InitialIndex = m_Overlay.container.IndexOf(m_Overlay.rootVisualElement);
+                m_Overlay.container.GetOverlayIndex(m_Overlay, out m_InitialSection, out m_InitialIndex);
 
                 canvas.ShowOriginGhost(m_Overlay);
-                m_Overlay.floatingPosition = m_InitialLayoutPosition;
                 m_Overlay.Undock();
-            }
-            else
-            {
-                //make sure overlay is on top
-                m_Overlay.rootVisualElement.BringToFront();
+                m_Overlay.floatingPosition = m_InitialLayoutPosition;
+                m_Overlay.UpdateAbsolutePosition();
             }
 
+            m_Overlay.BringToFront();
+
             m_Active = true;
+            target.RegisterCallback<MouseMoveEvent>(OnMouseMove, TrickleDown.TrickleDown);
             target.CaptureMouse();
             e.StopPropagation();
-            UpdateHovered(e.mousePosition);
 
             dragStarted?.Invoke(m_Overlay);
         }
 
         void OnMouseMove(MouseMoveEvent e)
         {
-            UpdateHovered(e.mousePosition);
-
             if (!m_Active)
                 return;
 
@@ -182,20 +177,11 @@ void OnMouseUp(MouseUpEvent e)
             OnDragEnd(e.mousePosition);
         }
 
-        void OnMouseLeave(MouseLeaveEvent evt)
-        {
-            //No need to consider the event position in case of a mouse leave event
-            UpdateHovered(false);
-        }
-
-        void UpdateHovered(Vector2 mousePosition)
-        {
-            UpdateHovered(m_Active || IsInDraggableArea(mousePosition));
-        }
-
-        void UpdateHovered(bool hoverStatus)
+        void OnPointerCaptureOut(PointerCaptureOutEvent evt)
         {
-            m_Overlay.rootVisualElement.EnableInClassList(k_DragAreaHovered, hoverStatus);
+            if (!m_Active)
+                return;
+            CancelDrag(evt.originalMousePosition);
         }
 
         void OnKeyDown(KeyDownEvent evt)
@@ -222,8 +208,7 @@ void CancelDrag(Vector2 mousePosition)
             }
             else
             {
-                m_Overlay.floating = false;
-                m_Overlay.container.Insert(m_InitialIndex, m_Overlay.rootVisualElement);
+                m_Overlay.DockAt(m_StartContainer, m_InitialSection, m_InitialIndex);
             }
 
             OnDragEnd(mousePosition);
@@ -236,8 +221,7 @@ void OnDragEnd(Vector2 mousePosition)
 
             canvas.HideOriginGhost();
             canvas.destinationMarker.SetTarget(null);
-            m_StartContainer.stateLocked = false;
-            UpdateHovered(mousePosition);
+            target.UnregisterCallback<MouseMoveEvent>(OnMouseMove);
 
             dragEnded?.Invoke(m_Overlay);
         }
diff --git a/Editor/Mono/Overlays/OverlayDropZone.cs b/Editor/Mono/Overlays/OverlayDropZone.cs
index 661b87de3d..87f5db1458 100644
--- a/Editor/Mono/Overlays/OverlayDropZone.cs
+++ b/Editor/Mono/Overlays/OverlayDropZone.cs
@@ -94,92 +94,56 @@ protected override void OnDropZoneActivated(Overlay draggedOverlay)
             base.OnDropZoneActivated(draggedOverlay);
 
             //Disable if the drop zone is linked to the overlay being dragged currently
-            if (m_Placement == Placement.Start && m_Container.LastTopOverlay() == draggedOverlay
-                || m_Placement == Placement.End && m_Container.FirstBottomOverlay() == draggedOverlay)
+            if (m_Placement == Placement.Start && m_Container.GetLastVisible(OverlayContainerSection.BeforeSpacer) == draggedOverlay
+                || m_Placement == Placement.End && m_Container.GetLastVisible(OverlayContainerSection.AfterSpacer) == draggedOverlay)
             {
                 SetVisualMode(VisualMode.Disabled);
                 return;
             }
 
-            if (m_Container is ToolbarOverlayContainer)
+            if (m_Container is FloatingOverlayContainer)
             {
-                //Disable if drop zone is reduced to 0 size. Toolbar have container drop zone with flex-grow = 1
-                if (Mathf.Approximately(rect.width, 0) || Mathf.Approximately(rect.height, 0))
+                SetVisualMode(VisualMode.Disabled);
+            }
+            else
+            {
+                if (m_Container is ToolbarOverlayContainer && !m_Container.HasVisibleOverlays())
                 {
                     SetVisualMode(VisualMode.Disabled);
-                    return;
                 }
-
-                switch (m_Placement)
+                else if (!m_Container.isSpacerVisible)
                 {
-                    case Placement.Start:
-                        SetVisualMode(VisualMode.AddToStart);
-                        break;
-                    case Placement.End:
-                        SetVisualMode(VisualMode.AddToEnd);
-                        break;
-                    default:
-                        SetVisualMode(VisualMode.Disabled);
-                        break;
+                    SetVisualMode(VisualMode.Insert);
                 }
-            }
-            else
-            {
-                switch (m_Placement)
+                else
                 {
-                    case Placement.Start:
-                        SetVisualMode(OverlayVisibleInContainerCount(m_Container, m_Container.topOverlays) == 0
-                            ? VisualMode.AddToStart
-                            : VisualMode.Insert);
-                        break;
-                    case Placement.End:
-                        SetVisualMode(OverlayVisibleInContainerCount(m_Container, m_Container.bottomOverlays) == 0
-                            ? VisualMode.AddToEnd
-                            : VisualMode.Insert);
-                        break;
-                    default:
-                        SetVisualMode(VisualMode.Insert);
-                        break;
+                    switch (m_Placement)
+                    {
+                        case Placement.Start:
+                            SetVisualMode(VisualMode.AddToStart);
+                            break;
+                        case Placement.End:
+                            SetVisualMode(VisualMode.AddToEnd);
+                            break;
+                        default:
+                            SetVisualMode(VisualMode.Disabled);
+                            break;
+                    }
                 }
             }
         }
 
-        static int OverlayVisibleInContainerCount(OverlayContainer container, List<Overlay> overlays)
-        {
-            int count = 0;
-            foreach (var overlay in overlays)
-            {
-                if (container.IsOverlayVisibleInContainer(overlay))
-                    ++count;
-            }
-            return count;
-        }
-
         public override void DropOverlay(Overlay overlay)
         {
             switch (m_Placement)
             {
                 case Placement.Start:
-                {
-                    var target = m_Container.LastTopOverlay();
-                    if (target != null)
-                        m_Container.AddAfter(overlay, target);
-                    else
-                        m_Container.AddToTop(overlay);
-
+                    overlay.DockAt(m_Container, OverlayContainerSection.BeforeSpacer, m_Container.GetSectionCount(OverlayContainerSection.BeforeSpacer));
                     break;
-                }
 
                 case Placement.End:
-                {
-                    var target = m_Container.FirstBottomOverlay();
-                    if (target != null)
-                        m_Container.InsertBefore(overlay, target);
-                    else
-                        m_Container.AddToBottom(overlay);
-
+                    overlay.DockAt(m_Container, OverlayContainerSection.AfterSpacer, m_Container.GetSectionCount(OverlayContainerSection.AfterSpacer));
                     break;
-                }
             }
 
             overlay.floating = false;
@@ -217,8 +181,13 @@ protected override void OnDropZoneActivated(Overlay draggedOverlay)
         {
             base.OnDropZoneActivated(draggedOverlay);
 
+            var container = m_TargetOverlay.container;
+
+            //If floating, current overlay or this dropzone is next to a spacer
             if (m_TargetOverlay.floating
-                || m_TargetOverlay == draggedOverlay)
+                || m_TargetOverlay == draggedOverlay
+                || m_Placement == Placement.After && container.GetLastVisible(OverlayContainerSection.BeforeSpacer) == m_TargetOverlay
+                || m_Placement == Placement.Before && container.GetLastVisible(OverlayContainerSection.AfterSpacer) == m_TargetOverlay)
             {
                 SetVisualMode(VisualMode.Disabled);
             }
@@ -227,14 +196,14 @@ protected override void OnDropZoneActivated(Overlay draggedOverlay)
                 switch (m_Placement)
                 {
                     case Placement.Before:
-                        if (m_TargetOverlay.container.FirstTopOverlay() != m_TargetOverlay)
+                        if (container.GetFirstVisible(OverlayContainerSection.BeforeSpacer) != m_TargetOverlay)
                             goto default;
 
                         SetVisualMode(VisualMode.AddToStart);
                         break;
 
                     case Placement.After:
-                        if (m_TargetOverlay.container.LastBottomOverlay() != m_TargetOverlay)
+                        if (container.GetFirstVisible(OverlayContainerSection.AfterSpacer) != m_TargetOverlay)
                             goto default;
 
                         SetVisualMode(VisualMode.AddToEnd);
@@ -254,17 +223,17 @@ public override bool CanAcceptTarget(Overlay overlay)
 
         public override void DropOverlay(Overlay overlay)
         {
-            var container = m_TargetOverlay.container;
-
-            switch (m_Placement)
+            // The drop zone before the element should place after the next overlay when after the spacer.
+            // Overlay after the spacer are listed from bottom to spacer instead of spacer to bottom.
+            m_TargetOverlay.container.GetOverlayIndex(m_TargetOverlay, out var section, out _);
+            if (section == OverlayContainerSection.BeforeSpacer && m_Placement == Placement.After
+                || section == OverlayContainerSection.AfterSpacer && m_Placement == Placement.Before)
             {
-                case Placement.Before:
-                    container.InsertBefore(overlay, m_TargetOverlay);
-                    break;
-
-                case Placement.After:
-                    container.AddAfter(overlay, m_TargetOverlay);
-                    break;
+                overlay.DockAfter(m_TargetOverlay);
+            }
+            else
+            {
+                overlay.DockBefore(m_TargetOverlay);
             }
 
             overlay.floating = false;
@@ -283,11 +252,13 @@ sealed class HiddenToolbarDropZone : OverlayContainerDropZone
     {
         const string k_NoElementClassName = className + "-no-element";
         const string k_DestinationClassName = OverlayDestinationMarker.className + "--no-element";
+        OverlayContainer m_OverlayContainer;
 
         public HiddenToolbarDropZone(OverlayContainer container) : base(container, Placement.Start)
         {
             AddToClassList(k_NoElementClassName);
-
+            m_OverlayContainer = container;
+            SetVisualMode(VisualMode.Disabled);
             priority = 1;
         }
 
@@ -297,6 +268,18 @@ public override void PopulateDestMarkerClassList(IList<string> classes)
 
             classes.Add(k_DestinationClassName);
         }
+
+        protected override void OnDropZoneActivated(Overlay draggedOverlay)
+        {
+            base.OnDropZoneActivated(draggedOverlay);
+
+            SetVisualMode(m_OverlayContainer.HasVisibleOverlays() ? VisualMode.Disabled : VisualMode.Custom);
+        }
+
+        protected override void OnDropZoneDeactivated(Overlay draggedOverlay)
+        {
+            SetVisualMode(VisualMode.Disabled);
+        }
     }
 
     abstract class OverlayDropZoneBase : VisualElement
diff --git a/Editor/Mono/Overlays/OverlayMenu.cs b/Editor/Mono/Overlays/OverlayMenu.cs
index 0777ed68ab..41c842fe78 100644
--- a/Editor/Mono/Overlays/OverlayMenu.cs
+++ b/Editor/Mono/Overlays/OverlayMenu.cs
@@ -137,14 +137,19 @@ public void Show(IEnumerable<Overlay> overlays, Rect bounds, Vector2 mousePositi
             size.x = Mathf.Min(parentBounds.width, size.x);
             size.y = Mathf.Min(parentBounds.height, size.y);
 
-            if (menuRect.xMax > parentBounds.width)
+            //Show has been triggered by a menu entry and not by a shortcut key
+            //Place the menu at the center of the parent Bounds
+            if(mousePosition.Equals(Vector2.negativeInfinity))
+                menuRect = new Rect(parentBounds.center - size / 2f, size);
+
+            if(menuRect.xMax > parentBounds.width)
                 menuRect.x -= menuRect.xMax - parentBounds.width;
-            if (menuRect.xMin < 0)
+            if(menuRect.xMin < 0)
                 menuRect.x = 0;
 
-            if (menuRect.yMax > parentBounds.height)
+            if(menuRect.yMax > parentBounds.height)
                 menuRect.y -= menuRect.yMax - parentBounds.height;
-            if (menuRect.yMin < 0)
+            if(menuRect.yMin < 0)
                 menuRect.y = 0;
 
             style.top = menuRect.y;
diff --git a/Editor/Mono/Overlays/OverlayPlacement.cs b/Editor/Mono/Overlays/OverlayPlacement.cs
index 228eaba800..182f78018f 100644
--- a/Editor/Mono/Overlays/OverlayPlacement.cs
+++ b/Editor/Mono/Overlays/OverlayPlacement.cs
@@ -68,21 +68,84 @@ internal set
 
         void OnFloatingChanged(bool floating)
         {
-            RebuildContent();
-
             if (floating)
                 UpdateAbsolutePosition();
 
-            container?.UpdateIsVisibleInContainer(this);
             floatingChanged?.Invoke(floating);
         }
 
+        internal bool DockAt(OverlayContainer container, OverlayContainerSection section)
+        {
+            return DockAt(container, section, container.GetSectionCount(section));
+        }
+
+        internal bool DockAt(OverlayContainer container, OverlayContainerSection section, int index)
+        {
+            //If the overlay is staying in the same container
+            if (container.GetOverlayIndex(this, out var originSection, out var originIndex))
+            {
+                if (originSection == section && originIndex == index)
+                    return true;
+
+                //If the overlay was before the index, removing it will change the size of the container
+                if (originSection == section && originIndex < index)
+                    --index;
+            }
+
+            this.container?.RemoveOverlay(this);
+
+            this.container = container;
+            this.container.InsertOverlay(this, section, index);
+
+            floating = container is FloatingOverlayContainer;
+
+            RebuildContent();
+
+            return true;
+        }
+
+        internal bool DockBefore(Overlay target)
+        {
+            if (target.container == null)
+                throw new ArgumentException("Target overlay has an invalid container", nameof(target));
+
+            var container = target.container;
+            container.GetOverlayIndex(target, out var section, out var index);
+            return DockAt(container, section, index);
+        }
+
+        internal bool DockAfter(Overlay target)
+        {
+            if (target.container == null)
+                throw new ArgumentException("Target overlay has an invalid container", nameof(target));
+
+            var container = target.container;
+            container.GetOverlayIndex(target, out var section, out var index);
+            return DockAt(container, section, index + 1);
+        }
+
         public void Undock()
         {
             if (floating)
                 return;
-            canvas.floatingContainer.Add(rootVisualElement);
-            floating = true;
+
+            DockAt(canvas.floatingContainer, OverlayContainerSection.BeforeSpacer, canvas.floatingContainer.GetSectionCount(OverlayContainerSection.BeforeSpacer));
+        }
+
+        internal void BringToFront()
+        {
+            if (!(container is FloatingOverlayContainer))
+                return;
+
+            DockAt(container, OverlayContainerSection.BeforeSpacer, container.GetSectionCount(OverlayContainerSection.BeforeSpacer));
+        }
+
+        internal void SetSnappingOffset(Vector2 snapOffset, Vector2 snapOffsetDelta)
+        {
+            m_FloatingSnapOffset = snapOffset;
+            m_SnapOffsetDelta = snapOffsetDelta;
+            UpdateAbsolutePosition();
+            floatingPositionChanged?.Invoke(floatingPosition);
         }
 
         Vector2 SnapToFloatingPosition(SnapCorner corner, Vector2 snapPosition)
@@ -186,6 +249,10 @@ internal void OnGeometryChanged(GeometryChangedEvent evt)
 
         void UpdateSnapping(Vector2 position)
         {
+            //Protect against an update to the position while the canvas hasn't had its first geometry pass
+            if (float.IsNaN(position.x) || float.IsNaN(position.y))
+                return;
+
             if (m_LockAnchor)
             {
                 //Anchor and position are locked, we only update the offsetDelta
diff --git a/Editor/Mono/Overlays/OverlayResizer.cs b/Editor/Mono/Overlays/OverlayResizer.cs
new file mode 100644
index 0000000000..9bb742c3a2
--- /dev/null
+++ b/Editor/Mono/Overlays/OverlayResizer.cs
@@ -0,0 +1,280 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine;
+using UnityEngine.UIElements;
+using Cursor = UnityEngine.UIElements.Cursor;
+
+namespace UnityEditor.Overlays
+{
+    class OverlayResizerGroup : VisualElement
+    {
+        const float k_CornerSize = 8;
+        const float k_SideSize = 6;
+
+        [Flags]
+        enum Direction
+        {
+            Left = 1 << 0,
+            Bottom = 1 << 1,
+            Top = 1 << 2,
+            Right = 1 << 3,
+
+            TopLeft = Top | Left,
+            TopRight = Top | Right,
+            BottomLeft = Bottom | Left,
+            BottomRight = Bottom | Right,
+        }
+
+        class OverlayResizer : VisualElement
+        {
+            readonly Direction m_Direction;
+            readonly Overlay m_Overlay;
+            readonly bool m_ModifyPosition;
+
+            Vector2 m_OriginalMousePosition;
+            Rect m_OriginalRect;
+            Rect m_ContainerRect;
+            Vector2 m_MinSize;
+            Vector2 m_MaxSize;
+            bool m_Active;
+
+            public OverlayResizer(Overlay overlay, Direction direction)
+            {
+                m_Overlay = overlay;
+                m_Direction = direction;
+
+                style.position = Position.Absolute;
+
+                bool hasLeft = HasDirection(Direction.Left);
+                bool hasRight = HasDirection(Direction.Right);
+                bool hasTop = HasDirection(Direction.Top);
+                bool hasBottom = HasDirection(Direction.Bottom);
+                bool isCorner = HasMultipleDirections();
+
+                var size = isCorner ? k_CornerSize : k_SideSize;
+
+                if (hasLeft) style.left = -size * .5f;
+                if (hasRight) style.right = -size * .5f;
+                if (hasTop) style.top = -size * .5f;
+                if (hasBottom) style.bottom = -size * .5f;
+
+                style.width = hasLeft || hasRight ? size : new Length(100, LengthUnit.Percent);
+                style.height = hasTop || hasBottom ? size : new Length(100, LengthUnit.Percent);
+
+                m_ModifyPosition = HasDirection(Direction.Left) || HasDirection(Direction.Top);
+
+                style.cursor = new Cursor { defaultCursorId = (int)GetCursor(direction) };
+
+                RegisterCallback<MouseDownEvent>(OnMouseDown);
+                RegisterCallback<MouseMoveEvent>(OnMouseMove);
+                RegisterCallback<MouseUpEvent>(OnMouseUp);
+            }
+
+            void OnMouseDown(MouseDownEvent evt)
+            {
+                m_OriginalRect = new Rect(
+                    m_Overlay.floating ?  m_Overlay.floatingPosition : m_Overlay.rootVisualElement.layout.position,
+                    m_Overlay.size);
+
+                m_ContainerRect = m_Overlay.rootVisualElement.parent.rect;
+                m_OriginalMousePosition = evt.mousePosition;
+                m_MaxSize = m_Overlay.maxSize;
+                m_MinSize = m_Overlay.minSize;
+
+                this.CaptureMouse();
+                evt.StopPropagation();
+                m_Active = true;
+            }
+
+            void OnMouseMove(MouseMoveEvent evt)
+            {
+                if (m_Active)
+                {
+                    var translation = evt.mousePosition - m_OriginalMousePosition;
+                    var rect = ResizeRect(m_OriginalRect, translation);
+
+                    m_Overlay.size = rect.size;
+
+                    if (m_ModifyPosition && m_Overlay.floating)
+                        m_Overlay.floatingPosition = rect.position;
+
+                    evt.StopPropagation();
+                }
+            }
+
+            void OnMouseUp(MouseUpEvent evt)
+            {
+                if (m_Active)
+                {
+                    evt.StopPropagation();
+                    this.ReleaseMouse();
+                    m_Active = false;
+                }
+            }
+
+            Rect ResizeRect(Rect rect, Vector2 delta)
+            {
+                delta = ClampDeltaToMinMax(delta, rect);
+                if (HasDirection(Direction.Left))
+                    rect.xMin = Mathf.Max(m_ContainerRect.xMin, rect.xMin + delta.x);
+                else if (HasDirection(Direction.Right))
+                    rect.xMax = Mathf.Min(m_ContainerRect.xMax, rect.xMax + delta.x);
+
+                if (HasDirection(Direction.Top))
+                    rect.yMin = Mathf.Max(m_ContainerRect.yMin, rect.yMin + delta.y);
+                else if (HasDirection(Direction.Bottom))
+                    rect.yMax = Mathf.Min(m_ContainerRect.yMax, rect.yMax + delta.y);
+
+                return rect;
+            }
+
+            Vector2 ClampDeltaToMinMax(Vector2 delta, Rect rect)
+            {
+                if (HasDirection(Direction.Left))
+                    delta.x = rect.width - Mathf.Clamp(rect.width - delta.x, m_MinSize.x, m_MaxSize.x);
+                else if (HasDirection(Direction.Right))
+                    delta.x = Mathf.Clamp(rect.width + delta.x, m_MinSize.x, m_MaxSize.x) - rect.width;
+
+                if (HasDirection(Direction.Top))
+                    delta.y = rect.height - Mathf.Clamp(rect.height - delta.y, m_MinSize.y, m_MaxSize.y);
+                else if (HasDirection(Direction.Bottom))
+                    delta.y = Mathf.Clamp(rect.height + delta.y, m_MinSize.y, m_MaxSize.y) - rect.height;
+
+                return delta;
+            }
+
+            static MouseCursor GetCursor(Direction direction)
+            {
+                MouseCursor cursorStyle = MouseCursor.Arrow;
+
+                switch (direction)
+                {
+                    case Direction.TopLeft:
+                    case Direction.BottomRight:
+                        cursorStyle = MouseCursor.ResizeUpLeft;
+                        break;
+                    case Direction.TopRight:
+                    case Direction.BottomLeft:
+                        cursorStyle = MouseCursor.ResizeUpRight;
+                        break;
+                    case Direction.Left:
+                    case Direction.Right:
+                        cursorStyle = MouseCursor.ResizeHorizontal;
+                        break;
+                    case Direction.Top:
+                    case Direction.Bottom:
+                        cursorStyle = MouseCursor.ResizeVertical;
+                        break;
+
+                }
+                return cursorStyle;
+            }
+
+            public bool HasDirection(Direction target)
+            {
+                return (m_Direction & target) == target;
+            }
+
+            public bool HasMultipleDirections()
+            {
+                return (m_Direction & (m_Direction - 1)) != 0;
+            }
+        }
+
+        readonly Overlay m_Overlay;
+        readonly OverlayResizer[] m_Resizers;
+
+        public OverlayResizerGroup(Overlay overlay)
+        {
+            this.StretchToParentSize();
+            pickingMode = PickingMode.Ignore;
+
+            m_Resizers = new []
+            {
+                new OverlayResizer(overlay, Direction.Top) { name = "ResizerTop" },
+                new OverlayResizer(overlay, Direction.Bottom) { name = "ResizerBottom" },
+                new OverlayResizer(overlay, Direction.Left) { name = "ResizerLeft" },
+                new OverlayResizer(overlay, Direction.Right) { name = "ResizerRight" },
+                new OverlayResizer(overlay, Direction.TopLeft) { name = "ResizerTopLeft" },
+                new OverlayResizer(overlay, Direction.TopRight) { name = "ResizerTopRight" },
+                new OverlayResizer(overlay, Direction.BottomLeft) { name = "ResizerBottomLeft" },
+                new OverlayResizer(overlay, Direction.BottomRight) { name = "ResizerBottomRight" },
+            };
+
+            m_Overlay = overlay;
+            foreach (var resizer in m_Resizers)
+                Add(resizer);
+
+            overlay.containerChanged += OnOverlayContainerChanged;
+            overlay.layoutChanged += OnOverlayLayoutChanged;
+            UpdateResizerVisibility();
+        }
+
+        void OnOverlayLayoutChanged(Layout layout)
+        {
+            UpdateResizerVisibility();
+        }
+
+        void OnOverlayContainerChanged(OverlayContainer container)
+        {
+            UpdateResizerVisibility();
+        }
+
+        bool ContainerCanShowResizer(OverlayResizer resizer)
+        {
+            var container = m_Overlay.container;
+            if (container == null)
+                return false;
+
+            if (container is FloatingOverlayContainer)
+                return true;
+
+            if (container is ToolbarOverlayContainer)
+                return false;
+
+            var alignment = container.resolvedStyle.alignItems;
+            bool hide = false;
+
+            // Check the opposite direction. If the content is align to one side, hide resizer on that side
+            switch (alignment)
+            {
+                case Align.FlexStart:
+                    hide |= resizer.HasDirection(container.isHorizontal ? Direction.Top : Direction.Left);
+                    break;
+
+                case Align.FlexEnd:
+                    hide |= resizer.HasDirection(container.isHorizontal ? Direction.Bottom : Direction.Right);
+                    break;
+            }
+
+            return !hide;
+        }
+
+        void UpdateResizerVisibility()
+        {
+            bool globalHide = m_Overlay.layout != Layout.Panel;
+            foreach (var resizer in m_Resizers)
+            {
+                bool hide = globalHide || !ContainerCanShowResizer(resizer);
+
+                if (resizer.HasMultipleDirections())
+                {
+                    hide |= m_Overlay.minSize == m_Overlay.maxSize;
+                }
+                else
+                {
+                    if (resizer.HasDirection(Direction.Left) || resizer.HasDirection(Direction.Right))
+                        hide |= Mathf.Approximately(m_Overlay.minSize.x, m_Overlay.maxSize.x);
+
+                    if (resizer.HasDirection(Direction.Top) || resizer.HasDirection(Direction.Bottom))
+                        hide |= Mathf.Approximately(m_Overlay.minSize.y, m_Overlay.maxSize.y);
+                }
+
+                resizer.style.display = hide ? DisplayStyle.None : DisplayStyle.Flex;
+            }
+        }
+    }
+}
diff --git a/Editor/Mono/Overlays/ToolbarOverlay.cs b/Editor/Mono/Overlays/ToolbarOverlay.cs
index 54d631d81b..789bd8b8c4 100644
--- a/Editor/Mono/Overlays/ToolbarOverlay.cs
+++ b/Editor/Mono/Overlays/ToolbarOverlay.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEditor.Toolbars;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.Overlays
diff --git a/Editor/Mono/PerformanceTools/FrameDebugger.cs b/Editor/Mono/PerformanceTools/FrameDebugger.cs
index 8d29d53ab0..eb64165626 100644
--- a/Editor/Mono/PerformanceTools/FrameDebugger.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebugger.cs
@@ -4,508 +4,183 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
+
 using UnityEngine;
-using UnityEngine.Rendering;
-using UnityEditor.Rendering;
+using UnityEngine.Profiling;
+using UnityEngine.Networking.PlayerConnection;
+
 using UnityEditorInternal;
-using System.Runtime.InteropServices;
 using UnityEditor.IMGUI.Controls;
-using UnityEngine.Networking.PlayerConnection;
 using UnityEditor.Networking.PlayerConnection;
-using UnityEngine.Experimental.Rendering;
-
-namespace UnityEditorInternal
-{
-    // match enum FrameEventType on C++ side!
-    // match kFrameEventTypeNames names array!
-    internal enum FrameEventType
-    {
-        // ReSharper disable InconsistentNaming
-        ClearNone = 0,
-        ClearColor,
-        ClearDepth,
-        ClearColorDepth,
-        ClearStencil,
-        ClearColorStencil,
-        ClearDepthStencil,
-        ClearAll,
-        SetRenderTarget,
-        ResolveRT,
-        ResolveDepth,
-        GrabIntoRT,
-        StaticBatch,
-        DynamicBatch,
-        Mesh,
-        DynamicGeometry,
-        GLDraw,
-        SkinOnGPU,
-        DrawProcedural,
-        DrawProceduralIndirect,
-        DrawProceduralIndexed,
-        DrawProceduralIndexedIndirect,
-        ComputeDispatch,
-        RayTracingDispatch,
-        PluginEvent,
-        InstancedMesh,
-        BeginSubpass,
-        SRPBatch,
-        HierarchyLevelBreak,
-        HybridBatch
-        // ReSharper restore InconsistentNaming
-    }
-
-    internal enum ShowAdditionalInfo
-    {
-        Preview,
-        ShaderProperties
-    }
-
-    // Match C++ ScriptingShaderFloatInfo memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderFloatInfo
-    {
-        public string name;
-        public int flags;
-        public float value;
-    }
-
-    // Match C++ ScriptingShaderIntInfo memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderIntInfo
-    {
-        public string name;
-        public int flags;
-        public int value;
-    }
-
-    // Match C++ ScriptingShaderVectorInfo memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderVectorInfo
-    {
-        public string name;
-        public int flags;
-        public Vector4 value;
-    }
-
-    // Match C++ ScriptingShaderMatrixInfo memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderMatrixInfo
-    {
-        public string name;
-        public int flags;
-        public Matrix4x4 value;
-    }
-
-    // Match C++ ScriptingShaderTextureInfo memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderTextureInfo
-    {
-        public string name;
-        public int flags;
-        public string textureName;
-        public Texture value;
-    }
-
-    // Match C++ ScriptingShaderBufferInfo memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderBufferInfo
-    {
-        public string name;
-        public int flags;
-    }
-
-    // Match C++ ScriptingShaderBufferInfo memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderConstantBufferInfo
-    {
-        public string name;
-        public int flags;
-    }
 
-    // Match C++ ScriptingShaderProperties memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ShaderProperties
-    {
-        public ShaderFloatInfo[] floats;
-        public ShaderIntInfo[] ints;
-        public ShaderVectorInfo[] vectors;
-        public ShaderMatrixInfo[] matrices;
-        public ShaderTextureInfo[] textures;
-        public ShaderBufferInfo[] buffers;
-        public ShaderConstantBufferInfo[] cbuffers;
-    }
-
-    // Match C++ ScriptingFrameDebuggerEventData memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal class FrameDebuggerEventData
-    {
-        public int frameEventIndex;
-        public int vertexCount;
-        public int indexCount;
-        public int instanceCount;
-        public int drawCallCount;
-        public string shaderName;
-        public string passName;
-        public string passLightMode;
-        public int shaderInstanceID;
-        public int subShaderIndex;
-        public int shaderPassIndex;
-        public string shaderKeywords;
-        public int componentInstanceID;
-        public Mesh mesh;
-        public int meshInstanceID;
-        public int meshSubset;
-        public int[] meshInstanceIDs;
-
-        // state for compute shader dispatches
-        public int csInstanceID;
-        public string csName;
-        public string csKernel;
-        public int csThreadGroupsX;
-        public int csThreadGroupsY;
-        public int csThreadGroupsZ;
-        public int csGroupSizeX;
-        public int csGroupSizeY;
-        public int csGroupSizeZ;
-
-        // state for ray tracing shader dispatches
-        public int rtsInstanceID;
-        public string rtsName;
-        public string rtsShaderPassName;
-        public string rtsRayGenShaderName;
-        public string rtsAccelerationStructureName;
-        public int rtsMaxRecursionDepth;
-        public int rtsWidth;
-        public int rtsHeight;
-        public int rtsDepth;
-        public int rtsMissShaderCount;
-        public int rtsCallableShaderCount;
-
-        // active render target info
-        public string rtName;
-        public int rtWidth;
-        public int rtHeight;
-        public int rtFormat;
-        public int rtDim;
-        public int rtFace;
-        public int rtLoadAction;
-        public int rtStoreAction;
-        public int rtDepthLoadAction;
-        public int rtDepthStoreAction;
-        public float rtClearColorR;
-        public float rtClearColorG;
-        public float rtClearColorB;
-        public float rtClearColorA;
-        public float rtClearDepth;
-        public uint rtClearStencil;
-        public short rtCount;
-        public sbyte rtHasDepthTexture;
-        public sbyte rtMemoryless;
-
-        // shader state
-        public FrameDebuggerBlendState blendState;
-        public FrameDebuggerRasterState rasterState;
-        public FrameDebuggerDepthState depthState;
-        public FrameDebuggerStencilState stencilState;
-        public int stencilRef;
-
-        // clear event data
-        public float clearColorR;
-        public float clearColorG;
-        public float clearColorB;
-        public float clearColorA;
-        public float clearDepth;
-        public uint clearStencil;
-
-        // shader properties
-        public int batchBreakCause;
-        public ShaderProperties shaderProperties;
-    }
-
-    // Match C++ MonoFrameDebuggerEvent memory layout!
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct FrameDebuggerEvent
-    {
-        public FrameEventType type;
-        public UnityEngine.Object obj;
-    }
-
-    // Match C++ ScriptingFrameDebuggerBlendState memory layout!
-    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    internal struct FrameDebuggerBlendState
-    {
-        public uint writeMask;
-        public BlendMode srcBlend;
-        public BlendMode dstBlend;
-        public BlendMode srcBlendAlpha;
-        public BlendMode dstBlendAlpha;
-        public BlendOp blendOp;
-        public BlendOp blendOpAlpha;
-    }
-
-    // Match C++ ScriptingFrameDebuggerRasterState memory layout!
-    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    internal struct FrameDebuggerRasterState
-    {
-        public CullMode cullMode;
-        public int depthBias;
-        public float slopeScaledDepthBias;
-        public bool depthClip;
-        public bool conservative;
-    }
-
-    // Match C++ ScriptingFrameDebuggerDepthState memory layout!
-    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    internal struct FrameDebuggerDepthState
-    {
-        public int depthWrite;
-        public CompareFunction depthFunc;
-    }
-
-    // Match C++ ScriptingFrameDebuggerStencilState memory layout!
-    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    internal struct FrameDebuggerStencilState
-    {
-        public bool stencilEnable;
-        public byte readMask;
-        public byte writeMask;
-        public byte padding;
-        public CompareFunction stencilFuncFront;
-        public StencilOp stencilPassOpFront;
-        public StencilOp stencilFailOpFront;
-        public StencilOp stencilZFailOpFront;
-        public CompareFunction stencilFuncBack;
-        public StencilOp stencilPassOpBack;
-        public StencilOp stencilFailOpBack;
-        public StencilOp stencilZFailOpBack;
-    }
-}
 
 namespace UnityEditor
 {
     internal class FrameDebuggerWindow : EditorWindow
     {
-        // match enum FrameEventType on C++ side!
-        static public readonly string[] s_FrameEventTypeNames = new[]
-        {
-            "Clear (nothing)",
-            "Clear (color)",
-            "Clear (Z)",
-            "Clear (color+Z)",
-            "Clear (stencil)",
-            "Clear (color+stencil)",
-            "Clear (Z+stencil)",
-            "Clear (color+Z+stencil)",
-            "SetRenderTarget",
-            "Resolve Color",
-            "Resolve Depth",
-            "Grab RenderTexture",
-            "Static Batch",
-            "Dynamic Batch",
-            "Draw Mesh",
-            "Draw Dynamic",
-            "Draw GL",
-            "GPU Skinning",
-            "Draw Procedural",
-            "Draw Procedural Indirect",
-            "Draw Procedural Indexed",
-            "Draw Procedural Indexed Indirect",
-            "Compute",
-            "Ray Tracing Dispatch",
-            "Plugin Event",
-            "Draw Mesh (instanced)",
-            "Begin Subpass",
-            "SRP Batch",
-            "",                 // on purpose empty string for kFrameEventHierarchyLevelBreak
-            "Hybrid Batch Group"
-        };
-
-        // Cached strings built from FrameDebuggerEventData.
-        // Only need to rebuild them when event data actually changes.
-        private struct EventDataStrings
-        {
-            public string drawCallCount;
-            public string drawInstancedCallCount;
-
-            public string shader;
-            public string pass;
-
-            public string stencilRef;
-            public string stencilReadMask;
-            public string stencilWriteMask;
-            public string stencilComp;
-            public string stencilPass;
-            public string stencilFail;
-            public string stencilZFail;
-
-            public string[] texturePropertyTooltips;
-        }
-
-        const float kResizerWidth = 5f;
-        const float kMinListWidth = 200f;
-        const float kMinDetailsWidth = 200f;
-        const float kDetailsMargin = 0f;
-        const float kMinPreviewSize = 64f;
-
-        const string kIntFormat = "d";
-        const string kFloatFormat = "g2";
-        const string kFloatDetailedFormat = "g7";
+        // Serialized
+        [SerializeField] private float m_TreeWidth = FrameDebuggerStyles.Window.k_MinTreeWidth;
+        [SerializeField] private TreeViewState m_TreeViewState;
+
+        // Private
+        private int m_RepaintFrames = k_NeedToRepaintFrames;
+        private int m_FrameEventsHash;
+        private Rect m_SearchRect;
+        private string m_SearchString = String.Empty;
+        private IConnectionState m_AttachToPlayerState;
+        private FrameDebuggerTreeView m_TreeView;
+        private FrameDebuggerEventDetailsView m_EventDetailsView;
+        private FrameDebuggerToolbarView m_Toolbar;
 
-        const float kShaderPropertiesIndention = 15.0f;
-        const float kNameFieldWidth = 250.0f;
-        const float kValueFieldWidth = 300.0f;
-        const float kArrayValuePopupBtnWidth = 25.0f;
+        // Statics
+        private static List<FrameDebuggerWindow> s_FrameDebuggers = new List<FrameDebuggerWindow>();
 
-        // See the comments for BaseParamInfo in FrameDebuggerInternal.h
-        const int kShaderTypeBits = (int)ShaderType.Count;
-        const int kArraySizeBitMask = 0x3FF;
+        // Constants
 
         // Sometimes when disabling the frame debugger, the UI does not update automatically -
         // the repaint happens, but we still think there's zero events present
         // (on Mac at least). Haven't figured out why, so whenever changing the
         // enable/limit state, just repaint a couple of times. Yeah...
-        const int kNeedToRepaintFrames = 4;
+        private const int k_NeedToRepaintFrames = 4;
 
+        // Properties
+        private bool IsDisabledInEditor => !FrameDebugger.enabled && m_AttachToPlayerState.connectedToTarget == ConnectionTarget.Editor;
+        private bool HasEventHashChanged => FrameDebuggerUtility.eventsHash != m_FrameEventsHash;
 
-        [SerializeField]
-        float   m_ListWidth = kMinListWidth * 1.5f;
 
-        private int m_RepaintFrames = kNeedToRepaintFrames;
+        [MenuItem("Window/Analysis/Frame Debugger", false, 10)]
+        public static FrameDebuggerWindow ShowFrameDebuggerWindow()
+        {
+            var wnd = GetWindow(typeof(FrameDebuggerWindow)) as FrameDebuggerWindow;
+            wnd.titleContent = EditorGUIUtility.TrTextContent("Frame Debug");
+            return wnd;
+        }
 
-        // Mesh preview
-        PreviewRenderUtility m_PreviewUtility;
+        private void OnGUI()
+        {
+            FrameDebuggerEvent[] descs = FrameDebuggerUtility.GetFrameEvents();
+            Initialize(descs);
 
-        // Texture preview
-        GUIContent m_TextureGUIContent = new GUIContent();
+            int oldLimit = FrameDebuggerUtility.limit;
 
-        // Frame events tree view
-        [SerializeField]
-        TreeViewState m_TreeViewState;
-        [NonSerialized]
-        FrameDebuggerTreeView m_Tree;
-        [NonSerialized] private int m_FrameEventsHash;
+            Profiler.BeginSample("DrawToolbar");
+            bool repaint = m_Toolbar.DrawToolbar(this, m_AttachToPlayerState);
+            Profiler.EndSample();
 
-        // Render target view options
-        [NonSerialized] int m_RTIndex;
-        [NonSerialized] int m_RTIndexLastSet = int.MaxValue;
-        [NonSerialized] int m_RTChannel;
+            if (IsDisabledInEditor)
+            {
+                GUI.enabled = true;
+                if (!FrameDebuggerUtility.locallySupported)
+                {
+                    string warningMessage = (FrameDebuggerHelper.IsOnLinuxOpenGL) ? FrameDebuggerStyles.EventDetails.warningLinuxOpenGLMsg : FrameDebuggerStyles.EventDetails.warningMultiThreadedMsg;
+                    EditorGUILayout.HelpBox(warningMessage, MessageType.Warning, true);
+                }
 
-        [NonSerialized] private float m_RTBlackLevel;
-        [NonSerialized] private float m_RTWhiteLevel = 1.0f;
+                EditorGUILayout.HelpBox(FrameDebuggerStyles.EventDetails.descriptionString, MessageType.Info, true);
+            }
+            else
+            {
+                if (FrameDebugger.IsLocalEnabled())
+                {
+                    PlayModeView playModeView = PlayModeView.GetMainPlayModeView();
+                    if (playModeView)
+                        playModeView.ShowTab();
+                }
 
-        private int m_PrevEventsLimit = 0;
-        private int m_PrevEventsCount = 0;
+                // captured frame event contents have changed, rebuild the tree data
+                if (HasEventHashChanged)
+                {
+                    m_TreeView.m_DataSource.SetEvents(descs);
+                    m_FrameEventsHash = FrameDebuggerUtility.eventsHash;
+                }
 
-        private FrameDebuggerEventData  m_CurEventData;
-        private uint                    m_CurEventDataHash = 0;
-        private EventDataStrings        m_CurEventDataStrings;
+                float toolbarHeight = EditorStyles.toolbar.fixedHeight;
 
-        // Shader Properties
-        private Vector2 m_ScrollViewShaderProps = Vector2.zero;
+                Rect dragRect = new Rect(m_TreeWidth, toolbarHeight, FrameDebuggerStyles.Window.k_ResizerWidth, position.height - toolbarHeight);
+                dragRect = EditorGUIUtility.HandleHorizontalSplitter(dragRect, position.width, FrameDebuggerStyles.Window.k_MinTreeWidth, FrameDebuggerStyles.Window.k_MinDetailsWidth);
+                m_TreeWidth = dragRect.x;
 
-        private ShowAdditionalInfo m_AdditionalInfo = ShowAdditionalInfo.ShaderProperties;
-        private GUIContent[] m_AdditionalInfoGuiContents = Enum.GetNames(typeof(ShowAdditionalInfo)).Select(m => new GUIContent(m)).ToArray();
+                // Search area
+                m_SearchRect = EditorGUILayout.GetControlRect();
+                m_SearchRect.width = m_TreeWidth - 5;
+                DrawSearchField(m_SearchString);
 
-        static List<FrameDebuggerWindow> s_FrameDebuggers = new List<FrameDebuggerWindow>();
+                Rect listRect = new Rect(
+                    0,
+                    toolbarHeight + m_SearchRect.y,
+                    m_TreeWidth,
+                    position.height - toolbarHeight - m_SearchRect.height - 5
+                );
 
-        private IConnectionState m_AttachToPlayerState;
+                Rect currentEventRect = new Rect(
+                    m_TreeWidth,
+                    toolbarHeight,
+                    position.width - m_TreeWidth,
+                    position.height - toolbarHeight
+                );
 
-        MeshPreview.Settings m_Settings;
+                Profiler.BeginSample("DrawTree");
+                m_TreeView.m_TreeView.searchString = m_SearchString;
+                m_TreeView.DrawTree(listRect);
+                Profiler.EndSample();
 
-        [MenuItem("Window/Analysis/Frame Debugger", false, 10)]
-        public static FrameDebuggerWindow ShowFrameDebuggerWindow()
-        {
-            var wnd = GetWindow(typeof(FrameDebuggerWindow)) as FrameDebuggerWindow;
-            if (wnd != null)
-            {
-                wnd.titleContent = EditorGUIUtility.TrTextContent("Frame Debug");
-            }
-            return wnd;
-        }
+                EditorGUIUtility.DrawHorizontalSplitter(dragRect);
 
-        internal static void RepaintAll()
-        {
-            foreach (var fd in s_FrameDebuggers)
-            {
-                fd.Repaint();
+                Profiler.BeginSample("DrawEvent");
+                m_EventDetailsView.DrawEvent(currentEventRect, descs, m_AttachToPlayerState.connectedToTarget == ConnectionTarget.Editor);
+                Profiler.EndSample();
             }
-        }
-
-        public FrameDebuggerWindow()
-        {
-            position = new Rect(50, 50, (kMinListWidth + kMinDetailsWidth) * 1.5f, 350f);
-            minSize = new Vector2(kMinListWidth + kMinDetailsWidth, 200);
-        }
 
-        internal void ChangeFrameEventLimit(int newLimit)
-        {
-            if (newLimit <= 0 || newLimit > FrameDebuggerUtility.count)
-            {
-                return;
-            }
+            if (repaint || oldLimit != FrameDebuggerUtility.limit)
+                RepaintOnLimitChange();
 
-            if (newLimit != FrameDebuggerUtility.limit && newLimit > 0)
+            if (m_RepaintFrames > 0)
             {
-                var obj = FrameDebuggerUtility.GetFrameEventObject(newLimit - 1);
-                if (obj != null)
-                    EditorGUIUtility.PingObject(obj);
+                m_TreeView.SelectFrameEventIndex(FrameDebuggerUtility.limit);
+                RepaintAllNeededThings();
+                --m_RepaintFrames;
             }
-
-            FrameDebuggerUtility.limit = newLimit;
-            if (m_Tree != null)
-                m_Tree.SelectFrameEventIndex(newLimit);
         }
 
-        static void DisableFrameDebugger()
+        internal void DrawSearchField(string str)
         {
-            if (FrameDebugger.IsLocalEnabled())
-            {
-                // if it was true before, we disabled and ask the game scene to repaint
-                EditorApplication.SetSceneRepaintDirty();
-            }
-
-            FrameDebuggerUtility.SetEnabled(false, FrameDebuggerUtility.GetRemotePlayerGUID());
+            m_SearchString = EditorGUI.ToolbarSearchField(m_SearchRect, str, false);
         }
 
-        internal void OnDidOpenScene()
+        private void OnDidOpenScene()
         {
             DisableFrameDebugger();
         }
 
-        void OnPauseStateChanged(PauseState state)
+        private void OnPauseStateChanged(PauseState state)
         {
             RepaintOnLimitChange();
         }
 
-        void OnPlayModeStateChanged(PlayModeStateChange state)
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
         {
             RepaintOnLimitChange();
         }
 
-        internal void OnEnable()
+        private void OnEnable()
         {
             if (m_AttachToPlayerState == null)
                 m_AttachToPlayerState = PlayerConnectionGUIUtility.GetConnectionState(this);
 
+            wantsLessLayoutEvents = true;
             autoRepaintOnSceneChange = true;
             s_FrameDebuggers.Add(this);
             EditorApplication.pauseStateChanged += OnPauseStateChanged;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
-            m_RepaintFrames = kNeedToRepaintFrames;
-
-            m_PreviewUtility = new PreviewRenderUtility();
-            m_PreviewUtility.camera.fieldOfView = 30.0f;
-            m_Settings = new MeshPreview.Settings();
-            m_Settings.previewDir = new Vector2(120, -20);
+            m_RepaintFrames = k_NeedToRepaintFrames;
         }
 
-        internal void OnDisable()
+        private void OnDisable()
         {
-            m_PreviewUtility?.Cleanup();
-            m_Settings?.Dispose();
+            if (m_EventDetailsView != null)
+                m_EventDetailsView.OnDisable();
+
+            FrameDebuggerStyles.OnDisable();
 
             m_AttachToPlayerState?.Dispose();
             m_AttachToPlayerState = null;
@@ -525,33 +200,91 @@ internal override void OnResized()
             base.OnResized();
         }
 
-        public void EnableIfNeeded()
+        private void Initialize(FrameDebuggerEvent[] descs)
+        {
+            if (m_Toolbar == null)
+                m_Toolbar = new FrameDebuggerToolbarView();
+
+            if (m_TreeViewState == null)
+                m_TreeViewState = new TreeViewState();
+
+            if (m_TreeView == null)
+            {
+                m_TreeView = new FrameDebuggerTreeView(descs, m_TreeViewState, this, new Rect(
+                    50,
+                    50,
+                    500, 100
+                ));
+                m_FrameEventsHash = FrameDebuggerUtility.eventsHash;
+                m_TreeView.m_DataSource.SetExpanded(m_TreeView.m_DataSource.root, true);
+
+                // Expand root's children only
+                foreach (var treeViewItem in m_TreeView.m_DataSource.root.children)
+                    if (treeViewItem != null)
+                        m_TreeView.m_DataSource.SetExpanded(treeViewItem, true);
+            }
+
+            if (m_EventDetailsView == null)
+                m_EventDetailsView = new FrameDebuggerEventDetailsView(this);
+        }
+
+        internal void ChangeFrameEventLimit(int newLimit)
+        {
+            if (newLimit <= 0 || newLimit > FrameDebuggerUtility.count)
+                return;
+
+            FrameDebuggerUtility.limit = newLimit;
+            m_EventDetailsView?.OnNewFrameEventSelected();
+            m_TreeView?.SelectFrameEventIndex(newLimit);
+        }
+
+        bool hasChosenParent = false;
+        FrameDebuggerTreeView.FrameDebuggerTreeViewItem parentItem = null;
+
+        internal void ChangeFrameEventLimit(int newLimit, FrameDebuggerTreeView.FrameDebuggerTreeViewItem originalItem)
+        {
+            if (newLimit <= 0 || newLimit > FrameDebuggerUtility.count)
+                return;
+
+            hasChosenParent = (originalItem != null);
+            parentItem = originalItem;
+
+            FrameDebuggerUtility.limit = newLimit;
+            m_EventDetailsView?.OnNewFrameEventSelected();
+            m_TreeView?.SelectFrameEventIndex(newLimit);
+        }
+
+        private static void DisableFrameDebugger()
+        {
+            // if it was true before, we disabled and ask the game scene to repaint
+            if (FrameDebugger.IsLocalEnabled())
+                EditorApplication.SetSceneRepaintDirty();
+
+            FrameDebuggerUtility.SetEnabled(false, FrameDebuggerUtility.GetRemotePlayerGUID());
+        }
+
+        internal void EnableIfNeeded()
         {
             if (FrameDebugger.enabled)
                 return;
-            m_RTChannel = 0;
-            m_RTIndex = 0;
-            m_RTBlackLevel = 0.0f;
-            m_RTWhiteLevel = 1.0f;
+
+            m_EventDetailsView.Reset();
             ClickEnableFrameDebugger();
             RepaintOnLimitChange();
         }
 
-        private void ClickEnableFrameDebugger()
+        internal void ClickEnableFrameDebugger()
         {
             bool isEnabled = FrameDebugger.enabled;
-
             bool enablingLocally = !isEnabled && m_AttachToPlayerState.connectedToTarget == ConnectionTarget.Editor;
 
             if (enablingLocally && !FrameDebuggerUtility.locallySupported)
                 return;
 
+            // pause play mode if needed
             if (enablingLocally)
-            {
-                // pause play mode if needed
                 if (EditorApplication.isPlaying && !EditorApplication.isPaused)
                     EditorApplication.isPaused = true;
-            }
 
             if (!isEnabled)
                 FrameDebuggerUtility.SetEnabled(true, ProfilerDriver.connectedProfiler);
@@ -561,1301 +294,34 @@ private void ClickEnableFrameDebugger()
             // Make sure game view is visible when enabling frame debugger locally
             if (FrameDebugger.IsLocalEnabled())
             {
-                var playModeView = PlayModeView.GetMainPlayModeView();
+                PlayModeView playModeView = PlayModeView.GetMainPlayModeView();
                 if (playModeView)
-                {
                     playModeView.ShowTab();
-                }
-            }
-
-            m_PrevEventsLimit = FrameDebuggerUtility.limit;
-            m_PrevEventsCount = FrameDebuggerUtility.count;
-        }
-
-        // Only call this when m_CurEventData changes.
-        void BuildCurEventDataStrings()
-        {
-            // we will show that only if drawcall count is bigger than one so update unconditionally
-            m_CurEventDataStrings.drawCallCount = string.Format("{0}", m_CurEventData.drawCallCount);
-            m_CurEventDataStrings.drawInstancedCallCount = string.Format("{0}", m_CurEventData.instanceCount);
-
-            // shader name & subshader index
-            m_CurEventDataStrings.shader = string.Format("{0}, SubShader #{1}", m_CurEventData.shaderName, m_CurEventData.subShaderIndex.ToString());
-
-            // pass name & LightMode tag
-            string passName = string.IsNullOrEmpty(m_CurEventData.passName) ? "#" + m_CurEventData.shaderPassIndex : m_CurEventData.passName;
-            string lightMode = string.IsNullOrEmpty(m_CurEventData.passLightMode) ? "" : string.Format(" ({0})", m_CurEventData.passLightMode);
-            m_CurEventDataStrings.pass = passName + lightMode;
-
-            // stencil states
-            if (m_CurEventData.stencilState.stencilEnable)
-            {
-                m_CurEventDataStrings.stencilRef = GetStencilString(m_CurEventData.stencilRef);
-
-                if (m_CurEventData.stencilState.readMask != 255)
-                    m_CurEventDataStrings.stencilReadMask = GetStencilString(m_CurEventData.stencilState.readMask);
-
-                if (m_CurEventData.stencilState.writeMask != 255)
-                    m_CurEventDataStrings.stencilWriteMask = GetStencilString(m_CurEventData.stencilState.writeMask);
-
-                // Only show *Front states when CullMode is set to Back.
-                // Only show *Back states when CullMode is set to Front.
-                // Show both *Front and *Back states for two-sided geometry.
-                if (m_CurEventData.rasterState.cullMode == CullMode.Back)
-                {
-                    m_CurEventDataStrings.stencilComp = m_CurEventData.stencilState.stencilFuncFront.ToString();
-                    m_CurEventDataStrings.stencilPass = m_CurEventData.stencilState.stencilPassOpFront.ToString();
-                    m_CurEventDataStrings.stencilFail = m_CurEventData.stencilState.stencilFailOpFront.ToString();
-                    m_CurEventDataStrings.stencilZFail = m_CurEventData.stencilState.stencilZFailOpFront.ToString();
-                }
-                else if (m_CurEventData.rasterState.cullMode == CullMode.Front)
-                {
-                    m_CurEventDataStrings.stencilComp = m_CurEventData.stencilState.stencilFuncBack.ToString();
-                    m_CurEventDataStrings.stencilPass = m_CurEventData.stencilState.stencilPassOpBack.ToString();
-                    m_CurEventDataStrings.stencilFail = m_CurEventData.stencilState.stencilFailOpBack.ToString();
-                    m_CurEventDataStrings.stencilZFail = m_CurEventData.stencilState.stencilZFailOpBack.ToString();
-                }
-                else
-                {
-                    m_CurEventDataStrings.stencilComp =
-                        string.Format("{0} {1}", m_CurEventData.stencilState.stencilFuncFront.ToString(), m_CurEventData.stencilState.stencilFuncBack.ToString());
-
-                    m_CurEventDataStrings.stencilPass =
-                        string.Format("{0} {1}", m_CurEventData.stencilState.stencilPassOpFront.ToString(), m_CurEventData.stencilState.stencilPassOpBack.ToString());
-
-                    m_CurEventDataStrings.stencilFail =
-                        string.Format("{0} {1}", m_CurEventData.stencilState.stencilFailOpFront.ToString(), m_CurEventData.stencilState.stencilFailOpBack.ToString());
-
-                    m_CurEventDataStrings.stencilZFail =
-                        string.Format("{0} {1}", m_CurEventData.stencilState.stencilZFailOpFront.ToString(), m_CurEventData.stencilState.stencilZFailOpBack.ToString());
-                }
-            }
-
-            // texture property tooltips
-            ShaderTextureInfo[] textureInfoArray = m_CurEventData.shaderProperties.textures;
-            m_CurEventDataStrings.texturePropertyTooltips = new string[textureInfoArray.Length];
-            StringBuilder tooltip = new StringBuilder();
-
-            for (int i = 0; i < textureInfoArray.Length; ++i)
-            {
-                Texture texture = textureInfoArray[i].value;
-                if (texture == null)
-                    continue;
-
-                tooltip.Clear();
-                int depth = 0;
-                if (texture.dimension == TextureDimension.Tex3D)
-                {
-                    if (texture is Texture3D)
-                        depth = (texture as Texture3D).depth;
-                    else if (texture is RenderTexture)
-                        depth = (texture as RenderTexture).volumeDepth;
-                }
-
-                if (depth == 0)
-                    tooltip.AppendFormat("Size: {0} x {1}", texture.width.ToString(), texture.height.ToString());
-                else
-                    tooltip.AppendFormat("Size: {0} x {1} x {2}", texture.width.ToString(), texture.height.ToString(), depth);
-
-                tooltip.AppendFormat("\nDimension: {0}", texture.dimension.ToString());
-
-                string formatFormat = "\nFormat: {0}";
-                string depthFormat = "\nDepth: {0}";
-
-                if (texture is Texture2D)
-                    tooltip.AppendFormat(formatFormat, (texture as Texture2D).format.ToString());
-                else if (texture is Cubemap)
-                    tooltip.AppendFormat(formatFormat, (texture as Cubemap).format.ToString());
-                else if (texture is Texture2DArray)
-                {
-                    tooltip.AppendFormat(formatFormat, (texture as Texture2DArray).format.ToString());
-                    tooltip.AppendFormat(depthFormat, (texture as Texture2DArray).depth.ToString());
-                }
-                else if (texture is Texture3D)
-                {
-                    tooltip.AppendFormat(formatFormat, (texture as Texture3D).format.ToString());
-                    tooltip.AppendFormat(depthFormat, (texture as Texture3D).depth.ToString());
-                }
-                else if (texture is CubemapArray)
-                {
-                    tooltip.AppendFormat(formatFormat, (texture as CubemapArray).format.ToString());
-                    tooltip.AppendFormat("\nCubemap Count: {0}", (texture as CubemapArray).cubemapCount.ToString());
-                }
-                else if (texture is RenderTexture)
-                {
-                    tooltip.AppendFormat("\nRT Format: {0}", (texture as RenderTexture).graphicsFormat.ToString());
-                }
-
-                tooltip.Append("\n\nCtrl or Shift + Click to show preview");
-
-                m_CurEventDataStrings.texturePropertyTooltips[i] = tooltip.ToString();
             }
         }
 
-        // Return true if should repaint
-        private bool DrawToolbar(FrameDebuggerEvent[] descs)
+        internal static void RepaintAll()
         {
-            bool repaint = false;
-
-            bool isSupported = m_AttachToPlayerState.connectedToTarget != ConnectionTarget.Editor || FrameDebuggerUtility.locallySupported;
-
-            GUILayout.BeginHorizontal(EditorStyles.toolbar);
-            // enable toggle
-            EditorGUI.BeginChangeCheck();
-            using (new EditorGUI.DisabledScope(!isSupported))
-            {
-                GUILayout.Toggle(FrameDebugger.enabled, styles.recordButton, EditorStyles.toolbarButtonLeft, GUILayout.MinWidth(80));
-            }
-            if (EditorGUI.EndChangeCheck())
-            {
-                ClickEnableFrameDebugger();
-                repaint = true;
-            }
-
-            if (FrameDebugger.IsLocalEnabled())
-            {
-                styles.recordButton.text = L10n.Tr("Disable");
-                styles.recordButton.tooltip = L10n.Tr("Disable Frame Debugging");
-            }
-            else
-            {
-                styles.recordButton.text = L10n.Tr("Enable");
-                styles.recordButton.tooltip = L10n.Tr("Enable Frame Debugging");
-            }
-
-            PlayerConnectionGUILayout.ConnectionTargetSelectionDropdown(m_AttachToPlayerState, EditorStyles.toolbarDropDown);
-
-            bool isAnyEnabled = FrameDebugger.enabled;
-            if (isAnyEnabled && ProfilerDriver.connectedProfiler != FrameDebuggerUtility.GetRemotePlayerGUID())
-            {
-                // Switch from local to remote debugger or vice versa
-                FrameDebuggerUtility.SetEnabled(false, FrameDebuggerUtility.GetRemotePlayerGUID());
-                FrameDebuggerUtility.SetEnabled(true, ProfilerDriver.connectedProfiler);
-            }
-
-            GUI.enabled = isAnyEnabled;
-
-            // event limit slider
-            EditorGUI.BeginChangeCheck();
-            int newLimit;
-            using (new EditorGUI.DisabledScope(FrameDebuggerUtility.count <= 1))
-            {
-                newLimit = EditorGUILayout.IntSlider(FrameDebuggerUtility.limit, 1, FrameDebuggerUtility.count, 1,
-                    EditorStyles.toolbarSlider);
-            }
-            if (EditorGUI.EndChangeCheck())
-            {
-                ChangeFrameEventLimit(newLimit);
-            }
-            GUILayout.Label("of " + FrameDebuggerUtility.count, EditorStyles.toolbarLabel);
-            // prev/next buttons
-            using (new EditorGUI.DisabledScope(newLimit <= 1))
-            {
-                if (GUILayout.Button(styles.prevFrame, EditorStyles.toolbarButton))
-                {
-                    ChangeFrameEventLimit(newLimit - 1);
-                }
-            }
-            using (new EditorGUI.DisabledScope(newLimit >= FrameDebuggerUtility.count))
-            {
-                if (GUILayout.Button(styles.nextFrame, EditorStyles.toolbarButtonRight))
-                {
-                    ChangeFrameEventLimit(newLimit + 1);
-                }
-                // If we had last event selected, and something changed in the scene so that
-                // number of events is different - then try to keep the last event selected.
-                if (m_PrevEventsLimit == m_PrevEventsCount)
-                {
-                    if (FrameDebuggerUtility.count != m_PrevEventsCount && FrameDebuggerUtility.limit == m_PrevEventsLimit)
-                    {
-                        ChangeFrameEventLimit(FrameDebuggerUtility.count);
-                    }
-                }
-                m_PrevEventsLimit = FrameDebuggerUtility.limit;
-                m_PrevEventsCount = FrameDebuggerUtility.count;
-            }
-
-            GUILayout.EndHorizontal();
-
-            return repaint;
+            foreach (var fd in s_FrameDebuggers)
+                fd.Repaint();
         }
 
-        void DrawMeshPreview(Rect previewRect, Rect meshInfoRect, Mesh mesh, int meshSubset)
+        private void RepaintOnLimitChange()
         {
-            m_PreviewUtility.BeginPreview(previewRect, "preBackground");
-            MeshPreview.RenderMeshPreview(mesh, m_PreviewUtility, m_Settings, meshSubset);
-            m_PreviewUtility.EndAndDrawPreview(previewRect);
-
-            // mesh info
-            string meshName = mesh.name;
-            if (string.IsNullOrEmpty(meshName))
-                meshName = "<no name>";
-            string info = meshName + " subset " + meshSubset + "\n" + m_CurEventData.vertexCount + " verts, " + m_CurEventData.indexCount + " indices";
-            if (m_CurEventData.instanceCount > 1)
-                info += ", " + m_CurEventData.instanceCount + " instances";
-
-            EditorGUI.DropShadowLabel(meshInfoRect, info);
+            m_RepaintFrames = k_NeedToRepaintFrames;
+            RepaintAllNeededThings();
         }
 
-        // Draw any mesh associated with the draw event
-        // Return false if no mesh.
-        private bool DrawEventMesh()
+        internal void RepaintAllNeededThings()
         {
-            Mesh mesh = m_CurEventData.mesh;
-            if (mesh == null)
-                return false;
+            // indicate that editor needs a redraw (mostly to get offscreen cameras rendered)
+            EditorApplication.SetSceneRepaintDirty();
 
-            Rect previewRect = GUILayoutUtility.GetRect(10, 10, GUILayout.ExpandHeight(true));
-            if (previewRect.width < kMinPreviewSize || previewRect.height < kMinPreviewSize)
-                return true;
-
-            UnityEngine.Object obj = FrameDebuggerUtility.GetFrameEventObject(m_CurEventData.frameEventIndex);
-
-            // Info display at bottom (and pings object when clicked)
-            Rect meshInfoRect = previewRect;
-            meshInfoRect.yMin = meshInfoRect.yMax - EditorGUIUtility.singleLineHeight * 2;
-            Rect goInfoRect = meshInfoRect;
-
-            meshInfoRect.xMin = meshInfoRect.center.x;
-            goInfoRect.xMax = goInfoRect.center.x;
-            var evt = Event.current;
-            if (evt.type == EventType.MouseDown)
-            {
-                if (meshInfoRect.Contains(evt.mousePosition))
-                {
-                    EditorGUIUtility.PingObject(m_CurEventData.mesh);
-                    evt.Use();
-                }
-                if (obj != null && goInfoRect.Contains(evt.mousePosition))
-                {
-                    EditorGUIUtility.PingObject(obj.GetInstanceID());
-                    evt.Use();
-                }
-            }
-
-            m_Settings.previewDir = PreviewGUI.Drag2D(m_Settings.previewDir, previewRect);
-
-            if (evt.type == EventType.Repaint)
-            {
-                int meshSubset = m_CurEventData.meshSubset;
-                DrawMeshPreview(previewRect, meshInfoRect, mesh, meshSubset);
-                if (obj != null)
-                {
-                    EditorGUI.DropShadowLabel(goInfoRect, obj.name);
-                }
-            }
-
-            return true;
-        }
-
-        private void DrawRenderTargetControls()
-        {
-            FrameDebuggerEventData cur = m_CurEventData;
-
-            if (cur.rtWidth <= 0 || cur.rtHeight <= 0)
-                return;
-
-            var isDepthOnlyRT = GraphicsFormatUtility.IsDepthFormat((GraphicsFormat)cur.rtFormat);
-            var hasShowableDepth = (cur.rtHasDepthTexture != 0);
-            var showableRTCount = cur.rtCount;
-            if (hasShowableDepth)
-                showableRTCount++;
-
-            GUILayout.BeginHorizontal(EditorStyles.toolbar);
-
-            EditorGUILayout.LabelField("RenderTarget", cur.rtName);
-
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginHorizontal(EditorStyles.toolbar);
-
-            // MRT to show
-            EditorGUI.BeginChangeCheck();
-            using (new EditorGUI.DisabledScope(showableRTCount <= 1))
-            {
-                var rtNames = new GUIContent[showableRTCount];
-                for (var i = 0; i < cur.rtCount; ++i)
-                {
-                    rtNames[i] = Styles.mrtLabels[i];
-                }
-                if (hasShowableDepth)
-                    rtNames[cur.rtCount] = Styles.depthLabel;
-
-                // if we showed depth before then try to keep showing depth
-                // otherwise try to keep showing color
-                if (m_RTIndexLastSet == -1)
-                    m_RTIndex = hasShowableDepth ? showableRTCount - 1 : 0;
-                else if (m_RTIndex >= cur.rtCount)
-                    m_RTIndex = 0;
-
-                m_RTIndex = EditorGUILayout.Popup(m_RTIndex, rtNames, EditorStyles.toolbarPopupLeft, GUILayout.Width(70));
-            }
-
-            // color channels
-            using (new EditorGUI.DisabledScope(isDepthOnlyRT))
-            {
-                GUILayout.Label(Styles.channelHeader, EditorStyles.toolbarLabel);
-                m_RTChannel = GUILayout.Toolbar(m_RTChannel, Styles.channelLabels, EditorStyles.toolbarButton);
-            }
-
-            // levels
-            GUILayout.BeginHorizontal(styles.toolbarLabelSliderGroup);
-            GUILayout.Label(Styles.levelsHeader);
-            EditorGUILayout.MinMaxSlider(ref m_RTBlackLevel, ref m_RTWhiteLevel, 0.0f, 1.0f, GUILayout.MaxWidth(200.0f));
-
-            int rtIndexToSet = m_RTIndex;
-            if (hasShowableDepth && rtIndexToSet == (showableRTCount - 1))
-                rtIndexToSet = -1;
-
-            if (EditorGUI.EndChangeCheck() || rtIndexToSet != m_RTIndexLastSet)
-            {
-                Vector4 mask = Vector4.zero;
-                if (m_RTChannel == 1)
-                    mask.x = 1f;
-                else if (m_RTChannel == 2)
-                    mask.y = 1f;
-                else if (m_RTChannel == 3)
-                    mask.z = 1f;
-                else if (m_RTChannel == 4)
-                    mask.w = 1f;
-                else
-                    mask = Vector4.one;
-
-                FrameDebuggerUtility.SetRenderTargetDisplayOptions(rtIndexToSet, mask, m_RTBlackLevel, m_RTWhiteLevel);
-                m_RTIndexLastSet = rtIndexToSet;
-                RepaintAllNeededThings();
-            }
-
-            GUILayout.EndHorizontal();
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-
-            string attachmentInfo = "";
-            if (cur.rtLoadAction >= 0 || cur.rtStoreAction >= 0 || cur.rtMemoryless != 0 || cur.rtDepthLoadAction != 0 || cur.rtDepthStoreAction != 0)
-            {
-                var sl = new List<string>();
-                if (cur.rtLoadAction >= 0)
-                    sl.Add(String.Format("LoadAction: {0}", (RenderBufferLoadAction)cur.rtLoadAction));
-                if (cur.rtStoreAction >= 0)
-                    sl.Add(String.Format("StoreAction: {0}", (RenderBufferStoreAction)cur.rtStoreAction));
-                if (cur.rtDepthLoadAction >= 0)
-                    sl.Add(String.Format("Depth LoadAction: {0}", (RenderBufferLoadAction)cur.rtDepthLoadAction));
-                if (cur.rtDepthStoreAction >= 0)
-                    sl.Add(String.Format("Depth StoreAction: {0}", (RenderBufferStoreAction)cur.rtDepthStoreAction));
-                if (cur.rtMemoryless != 0)
-                    sl.Add("memoryless");
-
-                attachmentInfo = String.Format("({0})", String.Join(", ", sl.ToArray()));
-            }
-
-            GUILayout.Label(string.Format("{0}x{1} {2} {3}", cur.rtWidth, cur.rtHeight, (GraphicsFormat)cur.rtFormat, attachmentInfo));
-
-            if (cur.rtLoadAction == (int)RenderBufferLoadAction.Clear)
-            {
-                bool isDepthFormat = GraphicsFormatUtility.IsDepthFormat((GraphicsFormat)cur.rtFormat);
-                bool isStencilFormat = GraphicsFormatUtility.IsStencilFormat((GraphicsFormat)cur.rtFormat);
-                if (!isDepthFormat && !isStencilFormat)
-                {
-                    GUILayout.Label(string.Format("Clear Color ({0}, {1}, {2}, {3})", cur.rtClearColorR, cur.rtClearColorG, cur.rtClearColorB, cur.rtClearColorA));
-                }
-                else
-                {
-                    if (isDepthFormat)
-                        GUILayout.Label($"Clear Depth {cur.rtClearDepth}");
-                    if (isStencilFormat)
-                        GUILayout.Label($"Clear Stencil {GetStencilString((int)cur.rtClearStencil)}");
-                }
-            }
-
-            if (cur.rtDim == (int)UnityEngine.Rendering.TextureDimension.Cube)
-                GUILayout.Label("Rendering into cubemap");
-        }
-
-        void DrawKeywords(string shaderName)
-        {
-            if (string.IsNullOrEmpty(m_CurEventData.shaderKeywords))
-                return;
-            EditorGUILayout.LabelField("Keywords", m_CurEventData.shaderKeywords);
-            if (GUI.Button(GUILayoutUtility.GetLastRect(), Styles.copyToClipboardTooltip, GUI.skin.label))
-                EditorGUIUtility.systemCopyBuffer = shaderName + Environment.NewLine + m_CurEventData.shaderKeywords;
-        }
-
-        private void DrawEventDrawCallInfo()
-        {
-            // shader, pass & keyword information
-            EditorGUILayout.LabelField("Shader", m_CurEventDataStrings.shader);
-
-            if (GUI.Button(GUILayoutUtility.GetLastRect(), Styles.selectShaderTooltip, GUI.skin.label))
-            {
-                EditorGUIUtility.PingObject(m_CurEventData.shaderInstanceID);
-                Event.current.Use();
-            }
-
-            EditorGUILayout.LabelField("Pass", m_CurEventDataStrings.pass);
-            DrawKeywords(m_CurEventDataStrings.shader);
-
-            DrawStates();
-
-            // Show why this draw call can't batch with the previous one.
-            if (m_CurEventData.batchBreakCause > 1)   // Valid batch break cause enum value on the C++ side starts at 2.
-            {
-                GUILayout.Space(10.0f);
-                GUILayout.Label(Styles.causeOfNewDrawCallLabel, EditorStyles.boldLabel);
-                GUILayout.Label(styles.batchBreakCauses[m_CurEventData.batchBreakCause], EditorStyles.wordWrappedLabel);
-            }
-
-            GUILayout.Space(15.0f);
-
-            // preview / properties
-            EditorGUILayout.BeginHorizontal();
-            m_AdditionalInfo = (ShowAdditionalInfo)GUILayout.Toolbar((int)m_AdditionalInfo, m_AdditionalInfoGuiContents, "LargeButton", GUI.ToolbarButtonSize.FitToContents);
-            GUILayout.FlexibleSpace();
-            EditorGUILayout.EndHorizontal();
-            switch (m_AdditionalInfo)
-            {
-                case ShowAdditionalInfo.Preview:
-                    // Show mesh preview if possible
-                    if (!DrawEventMesh())
-                    {
-                        // If no mesh preview, then show vertex/index count at least
-                        EditorGUILayout.LabelField("Vertices", m_CurEventData.vertexCount.ToString());
-                        EditorGUILayout.LabelField("Indices", m_CurEventData.indexCount.ToString());
-
-                        if (m_CurEventData.meshInstanceIDs != null)
-                        {
-                            EditorGUILayout.LabelField("Meshes", m_CurEventData.meshInstanceIDs.Length.ToString());
-                            ++EditorGUI.indentLevel;
-                            foreach (var id in m_CurEventData.meshInstanceIDs)
-                            {
-                                var mesh = EditorUtility.InstanceIDToObject(id) as Mesh;
-                                if (mesh != null)
-                                    EditorGUILayout.LabelField(mesh.name);
-                            }
-                            --EditorGUI.indentLevel;
-                        }
-                    }
-                    break;
-                case ShowAdditionalInfo.ShaderProperties:
-                    DrawShaderProperties(m_CurEventData.shaderProperties);
-                    break;
-            }
-        }
-
-        void DrawEventClearInfo(FrameEventType type)
-        {
-            if (((int)type & 1) != 0)
-                EditorGUILayout.LabelField("Color", $"{m_CurEventData.clearColorR:F3},{m_CurEventData.clearColorG:F3},{m_CurEventData.clearColorB:F3},{m_CurEventData.clearColorA:F3}");
-            if (((int)type & 2) != 0)
-                EditorGUILayout.LabelField("Depth", m_CurEventData.clearDepth.ToString("f3"));
-            if (((int)type & 4) != 0)
-                EditorGUILayout.LabelField("Stencil", GetStencilString((int)m_CurEventData.clearStencil));
-        }
-
-        private void DrawEventComputeDispatchInfo()
-        {
-            // compute shader & kernel information
-            EditorGUILayout.LabelField("Compute Shader", m_CurEventData.csName);
-            if (GUI.Button(GUILayoutUtility.GetLastRect(), GUIContent.none, GUI.skin.label))
-            {
-                EditorGUIUtility.PingObject(m_CurEventData.csInstanceID);
-                Event.current.Use();
-            }
-
-            EditorGUILayout.LabelField("Kernel", m_CurEventData.csKernel);
-            DrawKeywords(m_CurEventData.csKernel);
-
-            // dispatch size
-            string threadGroupsText;
-            if (m_CurEventData.csThreadGroupsX != 0 || m_CurEventData.csThreadGroupsY != 0 || m_CurEventData.csThreadGroupsZ != 0)
-                threadGroupsText = $"{m_CurEventData.csThreadGroupsX}x{m_CurEventData.csThreadGroupsY}x{m_CurEventData.csThreadGroupsZ}";
-            else
-                threadGroupsText = "indirect dispatch";
-
-            // thread group size
-            if (m_CurEventData.csGroupSizeX > 0)
-                threadGroupsText += $", group size {m_CurEventData.csGroupSizeX}x{m_CurEventData.csGroupSizeY}x{m_CurEventData.csGroupSizeZ}";
-
-            EditorGUILayout.LabelField("Thread Groups", threadGroupsText);
-
-            // properties
-            DrawShaderProperties(m_CurEventData.shaderProperties);
-        }
-
-        private void DrawEventRayTracingDispatchInfo()
-        {
-            // ray tracing shader information
-            EditorGUILayout.LabelField("Ray Tracing Shader", m_CurEventData.rtsName);
-            if (GUI.Button(GUILayoutUtility.GetLastRect(), Styles.selectShaderTooltip, GUI.skin.label))
-            {
-                EditorGUIUtility.PingObject(m_CurEventData.rtsInstanceID);
-                Event.current.Use();
-            }
-            EditorGUILayout.LabelField("Ray Generation Shader", m_CurEventData.rtsRayGenShaderName);
-            EditorGUILayout.LabelField("SubShader Pass", m_CurEventData.rtsShaderPassName);
-
-            // max. recursion depth
-            string maxRecursionDepthText = string.Format("{0}", m_CurEventData.rtsMaxRecursionDepth);
-            EditorGUILayout.LabelField("Max. Recursion Depth", maxRecursionDepthText);
-
-            // dispatch size
-            string dispatchSizeText = string.Format("{0} x {1} x {2}", m_CurEventData.rtsWidth, m_CurEventData.rtsHeight, m_CurEventData.rtsDepth);
-            EditorGUILayout.LabelField("Dispatch Size", dispatchSizeText);
-
-            if (m_CurEventData.rtsAccelerationStructureName.Length > 0)
-                EditorGUILayout.LabelField("Acceleration Structure", m_CurEventData.rtsAccelerationStructureName);
-
-            EditorGUILayout.LabelField("Miss Shader Count", string.Format("{0}", m_CurEventData.rtsMissShaderCount));
-            EditorGUILayout.LabelField("Callable Shader Count", string.Format("{0}", m_CurEventData.rtsCallableShaderCount));
-
-            // properties
-            DrawShaderProperties(m_CurEventData.shaderProperties);
-        }
-
-        private void DrawCurrentEvent(Rect rect, FrameDebuggerEvent[] descs)
-        {
-            int curEventIndex = FrameDebuggerUtility.limit - 1;
-            if (curEventIndex < 0 || curEventIndex >= descs.Length)
-                return;
-
-            if (m_CurEventData == null)
-                m_CurEventData = new FrameDebuggerEventData();
-
-            GUILayout.BeginArea(rect);
-
-            uint eventDataHash = FrameDebuggerUtility.eventDataHash;
-            bool isFrameEventDataValid = curEventIndex == m_CurEventData.frameEventIndex;
-
-            if (eventDataHash != 0 && m_CurEventDataHash != eventDataHash)
-            {
-                isFrameEventDataValid = FrameDebuggerUtility.GetFrameEventData(curEventIndex, m_CurEventData);
-                m_CurEventDataHash = eventDataHash;
-                BuildCurEventDataStrings();
-            }
-
-            // event type and draw call info
-            FrameDebuggerEvent cur = descs[curEventIndex];
-
-            // render target
-            if (isFrameEventDataValid && cur.type != FrameEventType.RayTracingDispatch)
-                DrawRenderTargetControls();
-
-            // event type
-            GUILayout.BeginHorizontal();
-            GUILayout.Label($"Event #{curEventIndex + 1}: {s_FrameEventTypeNames[(int) cur.type]}", EditorStyles.boldLabel);
-            if (isFrameEventDataValid)
-            {
-                if (m_CurEventData.instanceCount > 1)
-                    GUILayout.Label($" ({m_CurEventDataStrings.drawCallCount} draw calls, {m_CurEventDataStrings.drawInstancedCallCount} instances)");
-                else if (m_CurEventData.drawCallCount > 1)
-                    GUILayout.Label($" ({m_CurEventDataStrings.drawCallCount} draw calls)");
-                GUILayout.FlexibleSpace();
-            }
-            GUILayout.EndHorizontal();
-
-            if (FrameDebugger.IsRemoteEnabled() && FrameDebuggerUtility.receivingRemoteFrameEventData)
-            {
-                GUILayout.Label("Receiving frame event data...");
-            }
-            else if (isFrameEventDataValid)     // Is this a draw call?
-            {
-                if (m_CurEventData.vertexCount > 0 || m_CurEventData.indexCount > 0 || cur.type == FrameEventType.DrawProceduralIndirect || cur.type == FrameEventType.DrawProceduralIndexedIndirect)
-                {
-                    // a draw call, display extra info
-                    DrawEventDrawCallInfo();
-                }
-                else if (cur.type == FrameEventType.ComputeDispatch)
-                {
-                    // a compute dispatch, display extra info
-                    DrawEventComputeDispatchInfo();
-                }
-                else if (cur.type == FrameEventType.RayTracingDispatch)
-                {
-                    // a ray tracing dispatch
-                    DrawEventRayTracingDispatchInfo();
-                }
-                else if (cur.type >= FrameEventType.ClearNone && cur.type <= FrameEventType.ClearAll)
-                {
-                    // a render target clear
-                    DrawEventClearInfo(cur.type);
-                }
-            }
-
-            GUILayout.EndArea();
-        }
-
-        void DrawShaderPropertyFlags(int flags)
-        {
-            // lowest bits of flags are set for each shader stage that property is used in; matching ShaderType C++ enum
-            var str = string.Empty;
-            if ((flags & (1 << 1)) != 0)
-                str += 'v';
-            if ((flags & (1 << 2)) != 0)
-                str += 'f';
-            if ((flags & (1 << 3)) != 0)
-                str += 'g';
-            if ((flags & (1 << 4)) != 0)
-                str += 'h';
-            if ((flags & (1 << 5)) != 0)
-                str += 'd';
-
-            GUILayout.Label(str, EditorStyles.miniLabel, GUILayout.MinWidth(20.0f));
-        }
-
-        void ShaderPropertyCopyValueMenu(Rect valueRect, System.Object value)
-        {
-            var e = Event.current;
-            if (e.type == EventType.ContextClick && valueRect.Contains(e.mousePosition))
-            {
-                e.Use();
-                var menu = new GenericMenu();
-                menu.AddItem(EditorGUIUtility.TrTextContent("Copy value"), false, delegate
-                {
-                    var str = string.Empty;
-                    if (value is Vector4)
-                        str = ((Vector4)value).ToString(kFloatDetailedFormat);
-                    else if (value is Matrix4x4)
-                        str = ((Matrix4x4)value).ToString(kFloatDetailedFormat);
-                    else if (value is System.Single)
-                        str = ((System.Single)value).ToString(kFloatDetailedFormat);
-                    else
-                        str = value.ToString();
-                    EditorGUIUtility.systemCopyBuffer = str;
-                });
-                menu.ShowAsContext();
-            }
-        }
-
-        private void OnGUIShaderPropFloats(ShaderFloatInfo[] floats, int startIndex, int numValues)
-        {
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(kShaderPropertiesIndention);
-
-            ShaderFloatInfo t = floats[startIndex];
-
-            if (numValues == 1)
-            {
-                GUILayout.Label(t.name, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-                GUILayout.Label(t.value.ToString(kFloatFormat, CultureInfo.InvariantCulture.NumberFormat), EditorStyles.miniLabel, GUILayout.MinWidth(kValueFieldWidth));
-                ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
-            }
-            else
-            {
-                string arrayName = String.Format("{0} [{1}]", t.name, numValues);
-                GUILayout.Label(arrayName, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-
-                Rect buttonRect = GUILayoutUtility.GetRect(Styles.arrayValuePopupButton, GUI.skin.button, GUILayout.MinWidth(kValueFieldWidth));
-                buttonRect.width = kArrayValuePopupBtnWidth;
-                if (GUI.Button(buttonRect, Styles.arrayValuePopupButton))
-                {
-                    ArrayValuePopup.GetValueStringDelegate getValueString =
-                        (int index, bool highPrecision) => floats[index].value.ToString(highPrecision ? kFloatDetailedFormat : kFloatFormat, CultureInfo.InvariantCulture.NumberFormat);
-
-                    PopupWindowWithoutFocus.Show(
-                        buttonRect,
-                        new ArrayValuePopup(startIndex, numValues, 1, 100.0f, getValueString),
-                        new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right });
-                }
-            }
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-        }
-
-        private void OnGUIShaderPropInts(ShaderIntInfo[] ints, int startIndex, int numValues)
-        {
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(kShaderPropertiesIndention);
-
-            ShaderIntInfo t = ints[startIndex];
-
-            if (numValues == 1)
-            {
-                GUILayout.Label(t.name, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-                GUILayout.Label(t.value.ToString(kIntFormat, CultureInfo.InvariantCulture.NumberFormat), EditorStyles.miniLabel, GUILayout.MinWidth(kValueFieldWidth));
-                ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
-            }
-            else
-            {
-                string arrayName = String.Format("{0} [{1}]", t.name, numValues);
-                GUILayout.Label(arrayName, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-
-                Rect buttonRect = GUILayoutUtility.GetRect(Styles.arrayValuePopupButton, GUI.skin.button, GUILayout.MinWidth(kValueFieldWidth));
-                buttonRect.width = kArrayValuePopupBtnWidth;
-                if (GUI.Button(buttonRect, Styles.arrayValuePopupButton))
-                {
-                    ArrayValuePopup.GetValueStringDelegate getValueString =
-                        (int index, bool highPrecision) => ints[index].value.ToString(kIntFormat, CultureInfo.InvariantCulture.NumberFormat);
-
-                    PopupWindowWithoutFocus.Show(
-                        buttonRect,
-                        new ArrayValuePopup(startIndex, numValues, 1, 100.0f, getValueString),
-                        new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right });
-                }
-            }
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-        }
-
-        private void OnGUIShaderPropVectors(ShaderVectorInfo[] vectors, int startIndex, int numValues)
-        {
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(kShaderPropertiesIndention);
-
-            ShaderVectorInfo t = vectors[startIndex];
-
-            if (numValues == 1)
-            {
-                GUILayout.Label(t.name, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-                GUILayout.Label(t.value.ToString(kFloatDetailedFormat), EditorStyles.miniLabel, GUILayout.MinWidth(kValueFieldWidth));
-                ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
-            }
-            else
-            {
-                string arrayName = String.Format("{0} [{1}]", t.name, numValues);
-                GUILayout.Label(arrayName, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-
-                Rect buttonRect = GUILayoutUtility.GetRect(Styles.arrayValuePopupButton, GUI.skin.button, GUILayout.MinWidth(kValueFieldWidth));
-                buttonRect.width = kArrayValuePopupBtnWidth;
-                if (GUI.Button(buttonRect, Styles.arrayValuePopupButton))
-                {
-                    ArrayValuePopup.GetValueStringDelegate getValueString =
-                        (int index, bool highPrecision) => vectors[index].value.ToString(highPrecision ? kFloatDetailedFormat : kFloatFormat);
-
-                    PopupWindowWithoutFocus.Show(
-                        buttonRect,
-                        new ArrayValuePopup(startIndex, numValues, 1, 200.0f, getValueString),
-                        new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right });
-                }
-            }
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-        }
-
-        private void OnGUIShaderPropMatrices(ShaderMatrixInfo[] matrices, int startIndex, int numValues)
-        {
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(kShaderPropertiesIndention);
-
-            ShaderMatrixInfo t = matrices[startIndex];
-
-            if (numValues == 1)
-            {
-                GUILayout.Label(t.name, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-                GUILayout.Label(t.value.ToString(kFloatFormat), EditorStyles.miniLabel, GUILayout.MinWidth(kValueFieldWidth));
-                ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
-            }
-            else
-            {
-                string arrayName = String.Format("{0} [{1}]", t.name, numValues);
-                GUILayout.Label(arrayName, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-                DrawShaderPropertyFlags(t.flags);
-
-                Rect buttonRect = GUILayoutUtility.GetRect(Styles.arrayValuePopupButton, GUI.skin.button, GUILayout.MinWidth(kValueFieldWidth));
-                buttonRect.width = kArrayValuePopupBtnWidth;
-                if (GUI.Button(buttonRect, Styles.arrayValuePopupButton))
-                {
-                    ArrayValuePopup.GetValueStringDelegate getValueString =
-                        (int index, bool highPrecision) => '\n' + matrices[index].value.ToString(highPrecision ? kFloatDetailedFormat : kFloatFormat);
-
-                    PopupWindowWithoutFocus.Show(
-                        buttonRect,
-                        new ArrayValuePopup(startIndex, numValues, 5, 200.0f, getValueString),
-                        new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right });
-                }
-            }
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-        }
-
-        private void OnGUIShaderPropBuffer(ShaderBufferInfo t)
-        {
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(kShaderPropertiesIndention);
-
-            GUILayout.Label(t.name, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-            DrawShaderPropertyFlags(t.flags);
-            GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.miniLabel, GUILayout.MinWidth(kValueFieldWidth));
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-        }
-
-        private void OnGUIShaderPropConstantBuffer(ShaderConstantBufferInfo t)
-        {
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(kShaderPropertiesIndention);
-
-            GUILayout.Label(t.name, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-            DrawShaderPropertyFlags(t.flags);
-            GUILayoutUtility.GetRect(GUIContent.none, EditorStyles.miniLabel, GUILayout.MinWidth(kValueFieldWidth));
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-        }
-
-        private void OnGUIShaderPropTexture(int idx, ShaderTextureInfo t)
-        {
-            GUILayout.BeginHorizontal();
-            GUILayout.Space(kShaderPropertiesIndention);
-
-            GUILayout.Label(t.name, EditorStyles.miniLabel, GUILayout.MinWidth(kNameFieldWidth));
-            DrawShaderPropertyFlags(t.flags);
-
-            Rect valueRect = GUILayoutUtility.GetRect(GUIContent.none, GUI.skin.label, GUILayout.MinWidth(30));
-
-            // display texture similar to ObjectField, just without much of interaction or styling:
-            Event evt = Event.current;
-            Rect previewRect = valueRect;
-            previewRect.width = previewRect.height;
-
-            // Tooltip
-            if (t.value != null && previewRect.Contains(evt.mousePosition))
-                GUI.Label(previewRect, GUIContent.Temp(string.Empty, m_CurEventDataStrings.texturePropertyTooltips[idx]));
-
-            if (t.value != null)
-            {
-                // for 2D textures, we want to display them directly as a preview (this will make render textures display their contents);
-                // but for cube maps and other non-2D types DrawPreview does not do anything useful right now, so get their asset type
-                // icon at least
-                Texture previewTexture = t.value;
-                if (previewTexture.dimension != TextureDimension.Tex2D)
-                    previewTexture = AssetPreview.GetMiniThumbnail(previewTexture);
-                EditorGUI.DrawPreviewTexture(previewRect, previewTexture);
-
-                // Adding the path as a tooltip
-                m_TextureGUIContent.text = t.value.name;
-                m_TextureGUIContent.tooltip = AssetDatabase.GetAssetPath(t.value);
-            }
-            else
-            {
-                m_TextureGUIContent.text = t.textureName;
-                m_TextureGUIContent.tooltip = "";
-            }
-
-            GUILayout.Label(m_TextureGUIContent, GUILayout.ExpandWidth(true));
-
-            if (evt.type == EventType.MouseDown)
-            {
-                // ping or show preview of texture when clicked
-                if (valueRect.Contains(evt.mousePosition))
-                {
-                    EditorGUI.PingObjectOrShowPreviewOnClick(t.value, valueRect);
-                    evt.Use();
-                }
-            }
-            GUILayout.FlexibleSpace();
-            GUILayout.EndHorizontal();
-        }
-
-        void DrawShaderProperties(ShaderProperties props)
-        {
-            m_ScrollViewShaderProps = GUILayout.BeginScrollView(m_ScrollViewShaderProps);
-
-            if (props.textures.Length > 0)
-            {
-                GUILayout.Label("Textures", EditorStyles.boldLabel);
-
-                for (int i = 0; i < props.textures.Length; ++i)
-                {
-                    OnGUIShaderPropTexture(i, props.textures[i]);
-                }
-            }
-
-            if (props.floats.Length > 0)
-            {
-                GUILayout.Label("Floats", EditorStyles.boldLabel);
-
-                for (int i = 0; i < props.floats.Length;)
-                {
-                    int arraySize = (props.floats[i].flags >> kShaderTypeBits) & kArraySizeBitMask;
-                    OnGUIShaderPropFloats(props.floats, i, arraySize);
-                    i += arraySize;
-                }
-            }
-
-            if (props.ints.Length > 0)
-            {
-                GUILayout.Label("Integers", EditorStyles.boldLabel);
-
-                for (int i = 0; i < props.ints.Length;)
-                {
-                    int arraySize = (props.ints[i].flags >> kShaderTypeBits) & kArraySizeBitMask;
-                    OnGUIShaderPropInts(props.ints, i, arraySize);
-                    i += arraySize;
-                }
-            }
-
-            if (props.vectors.Length > 0)
-            {
-                GUILayout.Label("Vectors", EditorStyles.boldLabel);
-
-                for (int i = 0; i < props.vectors.Length;)
-                {
-                    int arraySize = (props.vectors[i].flags >> kShaderTypeBits) & kArraySizeBitMask;
-                    OnGUIShaderPropVectors(props.vectors, i, arraySize);
-                    i += arraySize;
-                }
-            }
-
-            if (props.matrices.Length > 0)
-            {
-                GUILayout.Label("Matrices", EditorStyles.boldLabel);
-
-                for (int i = 0; i < props.matrices.Length;)
-                {
-                    int arraySize = (props.matrices[i].flags >> kShaderTypeBits) & kArraySizeBitMask;
-                    OnGUIShaderPropMatrices(props.matrices, i, arraySize);
-                    i += arraySize;
-                }
-            }
-
-            if (props.buffers.Length > 0)
-            {
-                GUILayout.Label("Buffers", EditorStyles.boldLabel);
-
-                foreach (var d in props.buffers)
-                {
-                    OnGUIShaderPropBuffer(d);
-                }
-            }
-
-            if (props.cbuffers.Length > 0)
-            {
-                GUILayout.Label("Constant Buffers", EditorStyles.boldLabel);
-
-                foreach (var d in props.cbuffers)
-                {
-                    OnGUIShaderPropConstantBuffer(d);
-                }
-            }
-
-            GUILayout.EndScrollView();
-        }
-
-        void DrawStates()
-        {
-            FrameDebuggerBlendState blendState = m_CurEventData.blendState;
-            FrameDebuggerRasterState rasterState = m_CurEventData.rasterState;
-            FrameDebuggerDepthState depthState = m_CurEventData.depthState;
-
-            // blend state
-            string blendText = string.Format("{0} {1}", blendState.srcBlend, blendState.dstBlend);
-            // only add alpha blend mode if different from RGB one
-            if (blendState.srcBlendAlpha != blendState.srcBlend || blendState.dstBlendAlpha != blendState.dstBlend)
-                blendText += string.Format(", {0} {1}", blendState.srcBlendAlpha, blendState.dstBlendAlpha);
-
-            EditorGUILayout.LabelField("Blend", blendText);
-
-            // only add blend op if non-Add
-            if (blendState.blendOp != BlendOp.Add || blendState.blendOpAlpha != BlendOp.Add)
-            {
-                string blendOpText;
-                if (blendState.blendOp == blendState.blendOpAlpha)
-                    blendOpText = blendState.blendOp.ToString();
-                else
-                    blendOpText = string.Format("{0}, {1}", blendState.blendOp, blendState.blendOpAlpha);
-
-                EditorGUILayout.LabelField("BlendOp", blendOpText);
-            }
-
-            // only add color mask if non-RGBA
-            if (blendState.writeMask != 15)
-            {
-                string colorMaskText = "";
-                if (blendState.writeMask == 0)
-                    colorMaskText += '0';
-                else
-                {
-                    if ((blendState.writeMask & 8) != 0)
-                        colorMaskText += 'R';
-                    if ((blendState.writeMask & 4) != 0)
-                        colorMaskText += 'G';
-                    if ((blendState.writeMask & 2) != 0)
-                        colorMaskText += 'B';
-                    if ((blendState.writeMask & 1) != 0)
-                        colorMaskText += 'A';
-                }
-
-                EditorGUILayout.LabelField("ColorMask", colorMaskText);
-            }
-
-            // depth state
-            EditorGUILayout.LabelField("ZClip", rasterState.depthClip.ToString());
-            EditorGUILayout.LabelField("ZTest", depthState.depthFunc.ToString());
-            EditorGUILayout.LabelField("ZWrite", depthState.depthWrite == 0 ? "Off" : "On");
-            EditorGUILayout.LabelField("Cull", rasterState.cullMode.ToString());
-            EditorGUILayout.LabelField("Conservative", rasterState.conservative.ToString());
-
-            // only add depth offset if non zero
-            if (rasterState.slopeScaledDepthBias != 0 || rasterState.depthBias != 0)
-            {
-                string offsetText = UnityString.Format("{0}, {1}", rasterState.slopeScaledDepthBias, rasterState.depthBias);
-                EditorGUILayout.LabelField("Offset", offsetText);
-            }
-
-            // Stencil state
-            if (m_CurEventData.stencilState.stencilEnable)
-            {
-                EditorGUILayout.LabelField("Stencil Ref", m_CurEventDataStrings.stencilRef);
-
-                if (m_CurEventData.stencilState.readMask != 255)
-                    EditorGUILayout.LabelField("Stencil ReadMask", m_CurEventDataStrings.stencilReadMask);
-
-                if (m_CurEventData.stencilState.writeMask != 255)
-                    EditorGUILayout.LabelField("Stencil WriteMask", m_CurEventDataStrings.stencilWriteMask);
-
-                EditorGUILayout.LabelField("Stencil Comp", m_CurEventDataStrings.stencilComp);
-                EditorGUILayout.LabelField("Stencil Pass", m_CurEventDataStrings.stencilPass);
-                EditorGUILayout.LabelField("Stencil Fail", m_CurEventDataStrings.stencilFail);
-                EditorGUILayout.LabelField("Stencil ZFail", m_CurEventDataStrings.stencilZFail);
-            }
-        }
-
-        static string GetStencilString(int stencil)
-        {
-            return $"{stencil} (0b{Convert.ToString(stencil, 2)})";
-        }
-
-        internal void OnGUI()
-        {
-            FrameDebuggerEvent[] descs = FrameDebuggerUtility.GetFrameEvents();
-            if (m_TreeViewState == null)
-                m_TreeViewState = new TreeViewState();
-            if (m_Tree == null)
-            {
-                m_Tree = new FrameDebuggerTreeView(descs, m_TreeViewState, this, new Rect());
-                m_FrameEventsHash = FrameDebuggerUtility.eventsHash;
-                m_Tree.m_DataSource.SetExpanded(m_Tree.m_DataSource.root, true);
-
-                // Expand root's children only
-                foreach (var treeViewItem in m_Tree.m_DataSource.root.children)
-                {
-                    if (treeViewItem != null)
-                        m_Tree.m_DataSource.SetExpanded(treeViewItem, true);
-                }
-            }
-
-            // captured frame event contents have changed, rebuild the tree data
-            if (FrameDebuggerUtility.eventsHash != m_FrameEventsHash)
-            {
-                m_Tree.m_DataSource.SetEvents(descs);
-                m_FrameEventsHash = FrameDebuggerUtility.eventsHash;
-            }
-
-
-            int oldLimit = FrameDebuggerUtility.limit;
-            bool repaint = DrawToolbar(descs);
-
-            if (!FrameDebugger.enabled && m_AttachToPlayerState.connectedToTarget == ConnectionTarget.Editor)
-            {
-                GUI.enabled = true;
-
-                if (!FrameDebuggerUtility.locallySupported)
-                {
-                    var supportMessage = "The Frame Debugger requires multi-threaded renderer. If this error persists, try starting the Editor with -force-gfx-mt command line argument.";
-
-                    if (Application.platform == RuntimePlatform.LinuxEditor && SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLCore)
-                        supportMessage += " On Linux, the editor does not support a multi-threaded renderer when using OpenGL.";
-
-                    EditorGUILayout.HelpBox(supportMessage, MessageType.Warning, true);
-                }
-
-                // info box
-                EditorGUILayout.HelpBox("Frame Debugger lets you step through draw calls and see how exactly frame is rendered. Click Enable!", MessageType.Info, true);
-            }
-            else
-            {
-                float toolbarHeight = EditorStyles.toolbar.fixedHeight;
-
-                var dragRect = new Rect(m_ListWidth, toolbarHeight, kResizerWidth, position.height - toolbarHeight);
-                dragRect = EditorGUIUtility.HandleHorizontalSplitter(dragRect, position.width, kMinListWidth, kMinDetailsWidth);
-                m_ListWidth = dragRect.x;
-
-                var listRect = new Rect(
-                    0,
-                    toolbarHeight,
-                    m_ListWidth,
-                    position.height - toolbarHeight);
-                var currentEventRect = new Rect(
-                    m_ListWidth + kDetailsMargin,
-                    toolbarHeight + kDetailsMargin,
-                    position.width - m_ListWidth - kDetailsMargin * 2,
-                    position.height - toolbarHeight - kDetailsMargin * 2);
-
-
-                DrawEventsTree(listRect);
-                EditorGUIUtility.DrawHorizontalSplitter(dragRect);
-                DrawCurrentEvent(currentEventRect, descs);
-            }
-
-            if (repaint || oldLimit != FrameDebuggerUtility.limit)
-                RepaintOnLimitChange();
-
-            if (m_RepaintFrames > 0)
-            {
-                m_Tree.SelectFrameEventIndex(FrameDebuggerUtility.limit);
-                RepaintAllNeededThings();
-                --m_RepaintFrames;
-            }
-        }
-
-        private void RepaintOnLimitChange()
-        {
-            m_RepaintFrames = kNeedToRepaintFrames;
-            RepaintAllNeededThings();
-        }
-
-        private void RepaintAllNeededThings()
-        {
-            // indicate that editor needs a redraw (mostly to get offscreen cameras rendered)
-            EditorApplication.SetSceneRepaintDirty();
             // Note: do NOT add GameView.RepaintAll here; that would cause really confusing
             // behaviors when there are offscreen (rendering into RTs) cameras.
 
             // redraw ourselves
             Repaint();
         }
-
-        void DrawEventsTree(Rect rect)
-        {
-            m_Tree.OnGUI(rect);
-        }
-
-        internal class Styles
-        {
-            public GUIStyle rowText = "OL Label";
-            public GUIStyle rowTextRight = "OL RightLabel";
-
-            public GUIStyle miniLabel = new GUIStyle(EditorStyles.miniLabel)
-            {
-                margin = new RectOffset(4, 4, 1, 1)
-            };
-
-            public GUIStyle toolbarLabelSliderGroup = new GUIStyle(EditorStyles.toolbarButton)
-            {
-                margin = new RectOffset(4, 4, 0, 0),
-                padding = new RectOffset(4, 4, 0, 0)
-            };
-
-            public GUIContent recordButton = new GUIContent(EditorGUIUtility.TrTextContent("Record", "Record profiling information"));
-            public GUIContent prevFrame = new GUIContent(EditorGUIUtility.TrIconContent("Profiler.PrevFrame", "Go back one frame"));
-            public GUIContent nextFrame = new GUIContent(EditorGUIUtility.TrIconContent("Profiler.NextFrame", "Go one frame forwards"));
-
-            public GUIContent[] headerContent;
-            public readonly string[] batchBreakCauses;
-
-            public static readonly string[] s_ColumnNames = new[] { "#", "Type", "Vertices", "Indices" };
-            public static readonly GUIContent[] mrtLabels = new[]
-            {
-                EditorGUIUtility.TrTextContent("RT 0", "Show render target #0"),
-                EditorGUIUtility.TrTextContent("RT 1", "Show render target #1"),
-                EditorGUIUtility.TrTextContent("RT 2", "Show render target #2"),
-                EditorGUIUtility.TrTextContent("RT 3", "Show render target #3"),
-                EditorGUIUtility.TrTextContent("RT 4", "Show render target #4"),
-                EditorGUIUtility.TrTextContent("RT 5", "Show render target #5"),
-                EditorGUIUtility.TrTextContent("RT 6", "Show render target #6"),
-                EditorGUIUtility.TrTextContent("RT 7", "Show render target #7")
-            };
-            public static readonly GUIContent depthLabel = EditorGUIUtility.TrTextContent("Depth", "Show depth buffer");
-            public static readonly GUIContent[] channelLabels = new[]
-            {
-                EditorGUIUtility.TrTextContent("All", "Show all (RGB) color channels"),
-                EditorGUIUtility.TrTextContent("R", "Show red channel only"),
-                EditorGUIUtility.TrTextContent("G", "Show green channel only"),
-                EditorGUIUtility.TrTextContent("B", "Show blue channel only"),
-                EditorGUIUtility.TrTextContent("A", "Show alpha channel only")
-            };
-            public static readonly GUIContent channelHeader = EditorGUIUtility.TrTextContent("Channels", "Which render target color channels to show");
-            public static readonly GUIContent levelsHeader = EditorGUIUtility.TrTextContent("Levels", "Render target display black/white intensity levels");
-            public static readonly GUIContent causeOfNewDrawCallLabel = EditorGUIUtility.TrTextContent("Why this draw call can't be batched with the previous one");
-            public static readonly GUIContent selectShaderTooltip = EditorGUIUtility.TrTextContent("", "Click to select shader");
-            public static readonly GUIContent copyToClipboardTooltip = EditorGUIUtility.TrTextContent("", "Click to copy shader and keywords text to clipboard.");
-            public static readonly GUIContent arrayValuePopupButton = EditorGUIUtility.TrTextContent("...");
-
-            public Styles()
-            {
-                recordButton.text = "Enable";
-                recordButton.tooltip = "Enable Frame Debugging";
-                prevFrame.tooltip = "Previous event";
-                nextFrame.tooltip = "Next event";
-                headerContent = new GUIContent[s_ColumnNames.Length];
-                for (int i = 0; i < headerContent.Length; i++)
-                    headerContent[i] = EditorGUIUtility.TextContent(s_ColumnNames[i]);
-
-                batchBreakCauses = FrameDebuggerUtility.GetBatchBreakCauseStrings();
-            }
-        }
-
-        private static Styles ms_Styles;
-        public static Styles styles
-        {
-            get { return ms_Styles ?? (ms_Styles = new Styles()); }
-        }
-
-        private class ArrayValuePopup : PopupWindowContent
-        {
-            public delegate string GetValueStringDelegate(int index, bool highPrecision);
-            private GetValueStringDelegate GetValueString;
-
-            private Vector2 m_ScrollPos = Vector2.zero;
-            private int m_StartIndex;
-            private int m_NumValues;
-            private float m_WindowWidth;
-            private int m_RowCount;
-
-            private static readonly GUIStyle m_Style = EditorStyles.miniLabel;
-
-            public ArrayValuePopup(int startIndex, int numValues, int rowCount, float windowWidth, GetValueStringDelegate getValueString)
-            {
-                m_StartIndex = startIndex;
-                m_NumValues = numValues;
-                m_WindowWidth = windowWidth;
-                m_RowCount = rowCount;
-                GetValueString = getValueString;
-            }
-
-            public override Vector2 GetWindowSize()
-            {
-                float lineHeight = m_Style.lineHeight + m_Style.padding.vertical + m_Style.margin.top;
-                return new Vector2(m_WindowWidth, Math.Min(lineHeight * m_NumValues * m_RowCount, 250.0f));
-            }
-
-            public override void OnGUI(Rect rect)
-            {
-                m_ScrollPos = EditorGUILayout.BeginScrollView(m_ScrollPos);
-
-                for (int i = 0; i < m_NumValues; ++i)
-                {
-                    string text = String.Format("[{0}]\t{1}", i, GetValueString(m_StartIndex + i, false));
-                    GUILayout.Label(text, m_Style);
-                }
-
-                EditorGUILayout.EndScrollView();
-
-                // Right click to copy the values to clipboard.
-                var e = Event.current;
-                if (e.type == EventType.ContextClick && rect.Contains(e.mousePosition))
-                {
-                    e.Use();
-
-                    string allText = string.Empty;
-                    for (int i = 0; i < m_NumValues; ++i)
-                    {
-                        allText += String.Format("[{0}]\t{1}\n", i, GetValueString(m_StartIndex + i, true));
-                    }
-
-                    var menu = new GenericMenu();
-                    menu.AddItem(EditorGUIUtility.TrTextContent("Copy value"), false, delegate
-                    {
-                        EditorGUIUtility.systemCopyBuffer = allText;
-                    });
-                    menu.ShowAsContext();
-                }
-            }
-        }
     }
 }
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerData.cs b/Editor/Mono/PerformanceTools/FrameDebuggerData.cs
new file mode 100644
index 0000000000..553614df59
--- /dev/null
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerData.cs
@@ -0,0 +1,312 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine;
+using UnityEngine.Rendering;
+using System.Runtime.InteropServices;
+
+namespace UnityEditorInternal
+{
+    // match enum FrameEventType on C++ side!
+    // match kFrameEventTypeNames names array!
+    internal enum FrameEventType
+    {
+        // ReSharper disable InconsistentNaming
+        ClearNone = 0,
+        ClearColor,
+        ClearDepth,
+        ClearColorDepth,
+        ClearStencil,
+        ClearColorStencil,
+        ClearDepthStencil,
+        ClearAll,
+        SetRenderTarget,
+        ResolveRT,
+        ResolveDepth,
+        GrabIntoRT,
+        StaticBatch,
+        DynamicBatch,
+        Mesh,
+        DynamicGeometry,
+        GLDraw,
+        SkinOnGPU,
+        DrawProcedural,
+        DrawProceduralIndirect,
+        DrawProceduralIndexed,
+        DrawProceduralIndexedIndirect,
+        ComputeDispatch,
+        RayTracingDispatch,
+        PluginEvent,
+        InstancedMesh,
+        BeginSubpass,
+        SRPBatch,
+        HierarchyLevelBreak,
+        HybridBatch
+        // ReSharper restore InconsistentNaming
+    }
+
+    internal enum ShowAdditionalInfo
+    {
+        ShaderProperties = 0,
+        Preview = 1,
+    }
+
+    // Match C++ ScriptingShaderFloatInfo memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderFloatInfo : IComparable<ShaderFloatInfo>
+    {
+        public string name;
+        public int flags;
+        public float value;
+
+        public int CompareTo(ShaderFloatInfo other)
+        {
+            return string.Compare(name, other.name);
+        }
+    }
+
+    // Match C++ ScriptingShaderIntInfo memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderIntInfo : IComparable<ShaderIntInfo>
+    {
+        public string name;
+        public int flags;
+        public int value;
+
+        public int CompareTo(ShaderIntInfo other)
+        {
+            return string.Compare(name, other.name);
+        }
+    }
+
+    // Match C++ ScriptingShaderVectorInfo memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderVectorInfo : IComparable<ShaderVectorInfo>
+    {
+        public string name;
+        public int flags;
+        public Vector4 value;
+
+        public int CompareTo(ShaderVectorInfo other)
+        {
+            return string.Compare(name, other.name);
+        }
+    }
+
+    // Match C++ ScriptingShaderMatrixInfo memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderMatrixInfo : IComparable<ShaderMatrixInfo>
+    {
+        public string name;
+        public int flags;
+        public Matrix4x4 value;
+
+        public int CompareTo(ShaderMatrixInfo other)
+        {
+            return string.Compare(name, other.name);
+        }
+    }
+
+    // Match C++ ScriptingShaderTextureInfo memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderTextureInfo : IComparable<ShaderTextureInfo>
+    {
+        public string name;
+        public int flags;
+        public string textureName;
+        public Texture value;
+
+        public int CompareTo(ShaderTextureInfo other)
+        {
+            return string.Compare(name, other.name);
+        }
+    }
+
+    // Match C++ ScriptingShaderBufferInfo memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderBufferInfo : IComparable<ShaderBufferInfo>
+    {
+        public string name;
+        public int flags;
+
+        public int CompareTo(ShaderBufferInfo other)
+        {
+            return string.Compare(name, other.name);
+        }
+    }
+
+    // Match C++ ScriptingShaderBufferInfo memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderConstantBufferInfo : IComparable<ShaderConstantBufferInfo>
+    {
+        public string name;
+        public int flags;
+
+        public int CompareTo(ShaderConstantBufferInfo other)
+        {
+            return string.Compare(name, other.name);
+        }
+    }
+
+    // Match C++ ScriptingShaderProperties memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ShaderProperties
+    {
+        public ShaderFloatInfo[] floats;
+        public ShaderIntInfo[] ints;
+        public ShaderVectorInfo[] vectors;
+        public ShaderMatrixInfo[] matrices;
+        public ShaderTextureInfo[] textures;
+        public ShaderBufferInfo[] buffers;
+        public ShaderConstantBufferInfo[] cbuffers;
+    }
+
+    // Match C++ ScriptingFrameDebuggerEventData memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal class FrameDebuggerEventData
+    {
+        public int frameEventIndex;
+        public int vertexCount;
+        public int indexCount;
+        public int instanceCount;
+        public int drawCallCount;
+        public string shaderName;
+        public string passName;
+        public string passLightMode;
+        public int shaderInstanceID;
+        public int subShaderIndex;
+        public int shaderPassIndex;
+        public string shaderKeywords;
+        public int componentInstanceID;
+        public Mesh mesh;
+        public int meshInstanceID;
+        public int meshSubset;
+        public int[] meshInstanceIDs;
+
+        // state for compute shader dispatches
+        public int csInstanceID;
+        public string csName;
+        public string csKernel;
+        public int csThreadGroupsX;
+        public int csThreadGroupsY;
+        public int csThreadGroupsZ;
+        public int csGroupSizeX;
+        public int csGroupSizeY;
+        public int csGroupSizeZ;
+
+        // state for ray tracing shader dispatches
+        public int rtsInstanceID;
+        public string rtsName;
+        public string rtsShaderPassName;
+        public string rtsRayGenShaderName;
+        public string rtsAccelerationStructureName;
+        public int rtsMaxRecursionDepth;
+        public int rtsWidth;
+        public int rtsHeight;
+        public int rtsDepth;
+        public int rtsMissShaderCount;
+        public int rtsCallableShaderCount;
+
+        // active render target info
+        public string rtName;
+        public int rtWidth;
+        public int rtHeight;
+        public int rtFormat;
+        public int rtDim;
+        public int rtFace;
+        public int rtLoadAction;
+        public int rtStoreAction;
+        public int rtDepthLoadAction;
+        public int rtDepthStoreAction;
+        public float rtClearColorR;
+        public float rtClearColorG;
+        public float rtClearColorB;
+        public float rtClearColorA;
+        public float rtClearDepth;
+        public uint rtClearStencil;
+        public short rtCount;
+        public sbyte rtHasDepthTexture;
+        public sbyte rtMemoryless;
+        public bool rtIsBackBuffer;
+        public Texture rtOutput;
+
+        // shader state
+        public FrameDebuggerBlendState blendState;
+        public FrameDebuggerRasterState rasterState;
+        public FrameDebuggerDepthState depthState;
+        public FrameDebuggerStencilState stencilState;
+        public int stencilRef;
+
+        // clear event data
+        public float clearColorR;
+        public float clearColorG;
+        public float clearColorB;
+        public float clearColorA;
+        public float clearDepth;
+        public uint clearStencil;
+
+        // shader properties
+        public int batchBreakCause;
+        public ShaderProperties shaderProperties;
+    }
+
+    // Match C++ MonoFrameDebuggerEvent memory layout!
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct FrameDebuggerEvent
+    {
+        public FrameEventType type;
+        public UnityEngine.Object obj;
+    }
+
+    // Match C++ ScriptingFrameDebuggerBlendState memory layout!
+    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    internal struct FrameDebuggerBlendState
+    {
+        public uint writeMask;
+        public BlendMode srcBlend;
+        public BlendMode dstBlend;
+        public BlendMode srcBlendAlpha;
+        public BlendMode dstBlendAlpha;
+        public BlendOp blendOp;
+        public BlendOp blendOpAlpha;
+    }
+
+    // Match C++ ScriptingFrameDebuggerRasterState memory layout!
+    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    internal struct FrameDebuggerRasterState
+    {
+        public CullMode cullMode;
+        public int depthBias;
+        public float slopeScaledDepthBias;
+        public bool depthClip;
+        public bool conservative;
+    }
+
+    // Match C++ ScriptingFrameDebuggerDepthState memory layout!
+    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    internal struct FrameDebuggerDepthState
+    {
+        public int depthWrite;
+        public CompareFunction depthFunc;
+    }
+
+    // Match C++ ScriptingFrameDebuggerStencilState memory layout!
+    [System.Runtime.InteropServices.StructLayout(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    internal struct FrameDebuggerStencilState
+    {
+        public bool stencilEnable;
+        public byte readMask;
+        public byte writeMask;
+        public byte padding;
+        public CompareFunction stencilFuncFront;
+        public StencilOp stencilPassOpFront;
+        public StencilOp stencilFailOpFront;
+        public StencilOp stencilZFailOpFront;
+        public CompareFunction stencilFuncBack;
+        public StencilOp stencilPassOpBack;
+        public StencilOp stencilFailOpBack;
+        public StencilOp stencilZFailOpBack;
+    }
+}
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerEventDetailsView.cs b/Editor/Mono/PerformanceTools/FrameDebuggerEventDetailsView.cs
new file mode 100644
index 0000000000..09de61f797
--- /dev/null
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerEventDetailsView.cs
@@ -0,0 +1,1658 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Text;
+using System.Globalization;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.Profiling;
+using UnityEngine.Experimental.Rendering;
+using UnityEditor;
+using UnityEditor.Rendering;
+using UnityEditor.AnimatedValues;
+
+namespace UnityEditorInternal
+{
+    internal class FrameDebuggerEventDetailsView
+    {
+        // Render target view options
+        [NonSerialized] private int m_RTIndex;
+        [NonSerialized] private bool m_ForceRebuildStrings = false;
+        [NonSerialized] private int m_RTIndexLastSet = int.MaxValue;
+        [NonSerialized] private int m_RTSelectedChannel;
+        [NonSerialized] private float m_RTBlackLevel;
+        [NonSerialized] private float m_RTWhiteLevel = 1.0f;
+
+        // Private
+        private int m_SelectedColorChannel = 0;
+        private bool m_ShouldShowMeshListFoldout = false;
+        private Vector2 m_ScrollViewVector = Vector2.zero;
+        private Vector4 m_SelectedMask = Vector4.one;
+        private Material m_TargetTextureMaterial = null;
+        private AnimBool[] m_FoldoutAnimators = null;
+        private GUIContent[] m_OutputMeshTabsGuiContents = new[] { new GUIContent("Output"), new GUIContent("Mesh Preview") };
+        private List<string> m_KeywordsList = new List<String>();
+        private StringBuilder m_TempSB1 = new StringBuilder();
+        private StringBuilder m_TempSB2 = new StringBuilder();
+        private EventDisplayData m_LastEventData;
+        private ShowAdditionalInfo m_OutputMeshTabs = ShowAdditionalInfo.ShaderProperties;
+        private FrameDebuggerWindow m_FrameDebugger = null;
+        private Lazy<FrameDebuggerEventData> m_CurEventData = new Lazy<FrameDebuggerEventData>(() => new FrameDebuggerEventData());
+
+        // Constants
+        private const int k_NumberGUISections = 10;
+        private const int k_ArraySizeBitMask = 0x3FF;
+        private const int k_ShaderTypeBits = (int)ShaderType.Count;
+
+        // Properties
+        private FrameDebuggerEvent curEvent { get; set; }
+        private FrameDebuggerEventData curEventData => m_CurEventData.Value;
+
+        // Structs
+
+        // Shader Property ID's for the shader used to display the output texture
+        private struct ShaderPropertyIDs
+        {
+            public static int _Levels = Shader.PropertyToID("_Levels");
+            public static int _MainTex = Shader.PropertyToID("_MainTex");
+            public static int _Channels = Shader.PropertyToID("_Channels");
+            public static int _ShouldYFlip = Shader.PropertyToID("_ShouldYFlip");
+            public static int _UndoOutputSRGB = Shader.PropertyToID("_UndoOutputSRGB");
+        }
+
+        // Cached data built from FrameDebuggerEventData.
+        // Only need to rebuild them when event data actually changes.
+        private struct EventDisplayData
+        {
+            public uint hash;
+            public int index;
+            public bool isValid;
+            public bool isClearEvent;
+            public bool isResolveEvent;
+            public bool isComputeEvent;
+            public bool isRayTracingEvent;
+            public string title;
+            public string detailsLabelsLeftColumn;
+            public string detailsValuesLeftColumn;
+            public string detailLabelsRightColumn;
+            public string detailValuesRightColumn;
+            public string keywords;
+            public string shaderName;
+            public string passAndLightMode;
+            public string listOfMeshesString;
+            public string firstMeshName;
+            public string meshTitle;
+            public UnityEngine.Object shader;
+            public FrameEventType type;
+        }
+
+        // Public functions
+        public FrameDebuggerEventDetailsView(FrameDebuggerWindow frameDebugger)
+        {
+            m_FrameDebugger = frameDebugger;
+
+            m_LastEventData = new EventDisplayData();
+            m_LastEventData.keywords = string.Empty;
+        }
+
+        public void Reset()
+        {
+            m_RTSelectedChannel = 0;
+            m_SelectedColorChannel = 0;
+            m_RTIndex = 0;
+            m_RTBlackLevel = 0.0f;
+            m_RTWhiteLevel = 1.0f;
+        }
+
+        MeshPreview m_Preview;
+        public void OnNewFrameEventSelected()
+        {
+            m_KeywordsList.Clear();
+
+            m_Preview?.Dispose();
+            m_Preview = null;
+        }
+
+        public void OnDisable()
+        {
+            m_Preview?.Dispose();
+            m_Preview = null;
+        }
+
+        // Here is the major performance bottleneck!
+        public void DrawEvent(Rect rect, FrameDebuggerEvent[] descs, bool isDebuggingEditor)
+        {
+            int curEventIndex = FrameDebuggerUtility.limit - 1;
+            if (!FrameDebuggerHelper.IsAValidFrame(curEventIndex, descs.Length))
+                return;
+
+            Initialize(curEventIndex, descs, out bool isReceivingFrameEventData, out bool isFrameEventDataValid);
+
+            GUILayout.BeginArea(rect);
+            m_ScrollViewVector = GUILayout.BeginScrollView(m_ScrollViewVector);
+
+            // Toolbar
+            Profiler.BeginSample("DrawToolbar");
+            {
+                DrawRenderTargetToolbar();
+            }
+            Profiler.EndSample();
+
+            // Title
+            Profiler.BeginSample("DrawTitle");
+            {
+                GUILayout.BeginHorizontal(FrameDebuggerStyles.EventDetails.titleHorizontalStyle);
+                EditorGUILayout.LabelField(m_LastEventData.title, FrameDebuggerStyles.EventDetails.titleStyle);
+                GUILayout.EndHorizontal();
+            }
+            Profiler.EndSample();
+
+            // Output & Mesh
+            // We disable Output and Mesh for Compute and Ray Tracing events
+            bool shouldDrawOutputAndMesh = !m_LastEventData.isComputeEvent && !m_LastEventData.isRayTracingEvent;
+            Profiler.BeginSample("DrawOutputAndMesh");
+            {
+                DrawOutputAndMesh(rect, shouldDrawOutputAndMesh, isDebuggingEditor);
+            }
+            Profiler.EndSample();
+
+            // Event Details
+            Profiler.BeginSample("DrawEventDetails");
+            {
+                DrawEventDetails(rect);
+            }
+            Profiler.EndSample();
+
+            // We disable and hide keywords and shader properties for clear and resolve events.
+            bool shouldDisplayProperties = !m_LastEventData.isClearEvent && !m_LastEventData.isResolveEvent;
+
+            // Keywords...
+            Profiler.BeginSample("DrawKeywords");
+            {
+                DrawKeywords(shouldDisplayProperties);
+            }
+            Profiler.EndSample();
+
+            // Properties...
+            Profiler.BeginSample("DrawProperties");
+            {
+                DrawProperties(shouldDisplayProperties);
+            }
+            Profiler.EndSample();
+
+            GUILayout.EndScrollView();
+            GUILayout.EndArea();
+        }
+
+        ///////////////////////////////////////////////
+        // PRIVATE
+        ///////////////////////////////////////////////
+
+        private void Initialize(int curEventIndex, FrameDebuggerEvent[] descs, out bool isReceivingFrameEventData, out bool isFrameEventDataValid)
+        {
+            uint eventDataHash = FrameDebuggerUtility.eventDataHash;
+            isReceivingFrameEventData = FrameDebugger.IsRemoteEnabled() && FrameDebuggerUtility.receivingRemoteFrameEventData;
+            isFrameEventDataValid = curEventIndex == curEventData.frameEventIndex;
+
+            if (!isFrameEventDataValid || (eventDataHash != 0 && (eventDataHash != m_LastEventData.hash || m_ForceRebuildStrings)))
+            {
+                isFrameEventDataValid = FrameDebuggerUtility.GetFrameEventData(curEventIndex, curEventData);
+                m_LastEventData.hash = eventDataHash;
+                m_LastEventData.isValid = false;
+                m_ForceRebuildStrings = false;
+            }
+
+            // event type and draw call info
+            curEvent = descs[curEventIndex];
+            FrameEventType eventType = curEvent.type;
+
+            // Rebuild strings...
+            if (isFrameEventDataValid)
+                if (!m_LastEventData.isValid || m_LastEventData.index != curEventIndex || m_LastEventData.type != eventType)
+                    BuildCurEventDataStrings(curEvent, curEventData);
+
+            if (m_FoldoutAnimators == null || m_FoldoutAnimators.Length == 0)
+            {
+                m_FoldoutAnimators = new AnimBool[k_NumberGUISections];
+                for (int i = 0; i < m_FoldoutAnimators.Length; i++)
+                    m_FoldoutAnimators[i] = new AnimBool(i < 2);
+            }
+
+            // TODO: Sort the properties
+            // TODO: Make the sorting work for both single parameters as well
+            // TODO: as parameters in arrays. Found an issue in SRP0601_RealtimeLights
+            // TODO: in Mingwai's CustomSRP project.
+            /*ShaderProperties data = curEventData.shaderProperties;
+            if (!data.Equals(default(ShaderProperties)))
+            {
+                Array.Sort(data.buffers);
+                Array.Sort(data.cbuffers);
+                Array.Sort(data.floats);
+                Array.Sort(data.ints);
+                Array.Sort(data.matrices);
+                Array.Sort(data.textures);
+                Array.Sort(data.vectors);
+            }*/
+        }
+
+        private void DrawRenderTargetToolbar()
+        {
+            if (m_LastEventData.isRayTracingEvent)
+                return;
+
+            bool isBackBuffer = curEventData.rtIsBackBuffer;
+            bool isDepthOnlyRT = GraphicsFormatUtility.IsDepthFormat((GraphicsFormat)curEventData.rtFormat);
+            bool isClearAction = (int)curEvent.type <= 7;
+            bool hasShowableDepth = (curEventData.rtHasDepthTexture != 0);
+            int showableRTCount = curEventData.rtCount;
+
+            if (hasShowableDepth)
+                showableRTCount++;
+
+            GUILayout.BeginHorizontal(FrameDebuggerStyles.EventToolbar.toolbarHorizontalStyle);
+
+            // MRT to show
+            EditorGUI.BeginChangeCheck();
+            GUI.enabled = showableRTCount > 1;
+
+            var rtNames = new GUIContent[showableRTCount];
+            for (var i = 0; i < curEventData.rtCount; ++i)
+                rtNames[i] = FrameDebuggerStyles.EventToolbar.MRTLabels[i];
+
+            if (hasShowableDepth)
+                rtNames[curEventData.rtCount] = FrameDebuggerStyles.EventToolbar.depthLabel;
+
+            // If we showed depth before then try to keep showing depth
+            // otherwise try to keep showing color
+            if (m_RTIndexLastSet == -1)
+                m_RTIndex = hasShowableDepth ? showableRTCount - 1 : 0;
+            else if (m_RTIndex > curEventData.rtCount)
+                m_RTIndex = 0;
+
+            m_RTIndex = EditorGUILayout.Popup(m_RTIndex, rtNames, FrameDebuggerStyles.EventToolbar.popupLeftStyle, GUILayout.Width(70));
+
+
+            GUI.enabled = !isBackBuffer && !isDepthOnlyRT;
+
+            // color channels
+            EditorGUILayout.Space(5f);
+            GUILayout.Label(FrameDebuggerStyles.EventToolbar.channelHeader, FrameDebuggerStyles.EventToolbar.channelHeaderStyle);
+            EditorGUILayout.Space(5f);
+
+            int channelToDisplay = 0;
+            bool forceUpdate = false;
+            bool shouldDisableChannelButtons = isDepthOnlyRT || isClearAction || isBackBuffer;
+            UInt32 componentCount = GraphicsFormatUtility.GetComponentCount((GraphicsFormat)curEventData.rtFormat);
+            GUILayout.BeginHorizontal();
+            {
+                GUI.enabled = !shouldDisableChannelButtons && m_SelectedColorChannel != 0;
+                if (GUILayout.Button(FrameDebuggerStyles.EventToolbar.channelAll, FrameDebuggerStyles.EventToolbar.channelAllStyle)) { m_RTSelectedChannel = 0; }
+
+                GUI.enabled = !shouldDisableChannelButtons && componentCount > 0 && m_SelectedColorChannel != 1;
+                if (GUILayout.Button(FrameDebuggerStyles.EventToolbar.channelR, FrameDebuggerStyles.EventToolbar.channelStyle)) { m_RTSelectedChannel = 1; }
+
+                GUI.enabled = !shouldDisableChannelButtons && componentCount > 1 && m_SelectedColorChannel != 2;
+                if (GUILayout.Button(FrameDebuggerStyles.EventToolbar.channelG, FrameDebuggerStyles.EventToolbar.channelStyle)) { m_RTSelectedChannel = 2; }
+
+                GUI.enabled = !shouldDisableChannelButtons && componentCount > 2 && m_SelectedColorChannel != 3;
+                if (GUILayout.Button(FrameDebuggerStyles.EventToolbar.channelB, FrameDebuggerStyles.EventToolbar.channelStyle)) { m_RTSelectedChannel = 3; }
+
+                GUI.enabled = !shouldDisableChannelButtons && componentCount > 3 && m_SelectedColorChannel != 4;
+                if (GUILayout.Button(FrameDebuggerStyles.EventToolbar.channelA, FrameDebuggerStyles.EventToolbar.channelAStyle)) { m_RTSelectedChannel = 4; }
+
+                // Force the channel to be "All" when:
+                // * Showing the back buffer
+                // * Showing Shadows/Depth/Clear
+                // * Channel index is higher then the number available channels
+                bool shouldForceAll = isBackBuffer || (m_RTSelectedChannel != 0 && (shouldDisableChannelButtons || m_RTSelectedChannel < 4 && componentCount < m_RTSelectedChannel));
+                channelToDisplay = shouldForceAll ? 0 : m_RTSelectedChannel;
+
+                if (channelToDisplay != m_SelectedColorChannel)
+                {
+                    forceUpdate = true;
+                    m_SelectedColorChannel = channelToDisplay;
+                }
+
+                GUI.enabled = true;
+            }
+            GUILayout.EndHorizontal();
+
+            GUI.enabled = !isBackBuffer;
+
+            // levels
+            GUILayout.BeginHorizontal(FrameDebuggerStyles.EventToolbar.levelsHorizontalStyle);
+            GUILayout.Label(FrameDebuggerStyles.EventToolbar.levelsHeader);
+
+            EditorGUILayout.MinMaxSlider(ref m_RTBlackLevel, ref m_RTWhiteLevel, 0.0f, 1.0f, GUILayout.MaxWidth(200.0f));
+
+            int rtIndexToSet = m_RTIndex;
+            if (hasShowableDepth && rtIndexToSet == (showableRTCount - 1))
+                rtIndexToSet = -1;
+
+            if (EditorGUI.EndChangeCheck() || rtIndexToSet != m_RTIndexLastSet || forceUpdate)
+            {
+                m_SelectedMask = Vector4.zero;
+                switch (channelToDisplay)
+                {
+                    case 1: m_SelectedMask.x = 1f; break;
+                    case 2: m_SelectedMask.y = 1f; break;
+                    case 3: m_SelectedMask.z = 1f; break;
+                    case 4: m_SelectedMask.w = 1f; break;
+                    case 5: m_SelectedMask = Vector4.zero; break;
+                    default: m_SelectedMask = Vector4.one; break;
+                }
+
+                FrameDebuggerUtility.SetRenderTargetDisplayOptions(rtIndexToSet, m_SelectedMask, m_RTBlackLevel, m_RTWhiteLevel);
+                m_FrameDebugger.RepaintAllNeededThings();
+                m_RTIndexLastSet = rtIndexToSet;
+                m_ForceRebuildStrings = true;
+            }
+
+            GUILayout.EndHorizontal();
+            GUILayout.FlexibleSpace();
+            GUILayout.EndHorizontal();
+
+            GUI.enabled = true;
+        }
+
+        private void DrawOutputAndMesh(Rect rect, bool shouldDrawOutputAndMesh, bool isDebuggingEditor)
+        {
+            if (BeginFoldoutBox(0, shouldDrawOutputAndMesh, FrameDebuggerStyles.EventDetails.foldoutOutputOrMeshText, out float fadePercent))
+            {
+                if (shouldDrawOutputAndMesh)
+                {
+                    EditorGUILayout.BeginVertical();
+                    {
+                        float viewportWidth = Mathf.Max(850, rect.width) - 20f;
+                        if (viewportWidth < FrameDebuggerStyles.EventDetails.k_MaxViewportWidth)
+                            return;
+
+                        float viewportHeightFaded = FrameDebuggerStyles.EventDetails.k_MaxViewportHeight * fadePercent;
+                        float texWidth = viewportWidth;
+                        float texHeight = viewportHeightFaded;
+                        if (curEventData.rtOutput != null)
+                        {
+                            texWidth = curEventData.rtOutput.width;
+                            texHeight = curEventData.rtOutput.height;
+
+                            if (texWidth > viewportWidth)
+                            {
+                                float scale = viewportWidth / texWidth;
+                                texWidth *= scale;
+                                texHeight *= scale;
+                            }
+
+                            if (texHeight > FrameDebuggerStyles.EventDetails.k_MaxViewportHeight)
+                            {
+                                float scale = FrameDebuggerStyles.EventDetails.k_MaxViewportHeight / texHeight;
+                                texWidth *= scale;
+                                texHeight = FrameDebuggerStyles.EventDetails.k_MaxViewportHeight;
+                            }
+                        }
+
+                        EditorGUILayout.BeginHorizontal();
+                        {
+                            m_OutputMeshTabs = (ShowAdditionalInfo)GUILayout.Toolbar((int)m_OutputMeshTabs, m_OutputMeshTabsGuiContents, FrameDebuggerStyles.EventDetails.outputMeshTabStyle);
+                        }
+                        EditorGUILayout.EndHorizontal();
+
+                        if (m_OutputMeshTabs == 0)
+                        {
+                            DrawTargetTexture(viewportWidth, viewportHeightFaded, texWidth, texHeight, fadePercent, isDebuggingEditor);
+                        }
+                        else
+                        {
+                            DrawEventMesh(viewportWidth, viewportHeightFaded, texWidth);
+                        }
+                    }
+                    GUILayout.EndVertical();
+                }
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawTargetTexture(float viewportWidth, float viewportHeight, float texWidth, float texHeight, float fadePercent, bool isDebuggingEditor)
+        {
+            if (fadePercent < 1f)
+                viewportHeight *= fadePercent;
+
+            EditorGUILayout.BeginHorizontal(FrameDebuggerStyles.EventDetails.outputMeshTextureStyle);
+            Rect previewRect = GUILayoutUtility.GetRect(viewportWidth, viewportHeight);
+            Rect textureRect = new Rect(previewRect.x, previewRect.y, texWidth, texHeight);
+
+            if (Event.current.type == EventType.Repaint && curEventData.rtOutput != null && previewRect.height > 1.0f)
+            {
+                if (m_TargetTextureMaterial == null)
+                    m_TargetTextureMaterial = Resources.GetBuiltinResource<Material>("PerformanceTools/FrameDebuggerRenderTargetDisplay.mat");
+
+                GraphicsFormat targetTextureFormat = (GraphicsFormat)curEventData.rtFormat;
+
+                uint componentCount = GraphicsFormatUtility.GetComponentCount(targetTextureFormat);
+                m_TargetTextureMaterial.SetVector(ShaderPropertyIDs._Channels, (componentCount == 1) ? new Vector4(1, 0, 0, 0) : m_SelectedMask);
+
+                bool linearColorSpace = QualitySettings.activeColorSpace == ColorSpace.Linear;
+                bool textureSRGB = GraphicsFormatUtility.IsSRGBFormat(targetTextureFormat);
+                float undoOutputSRGB = (isDebuggingEditor && (!linearColorSpace || textureSRGB)) ? 0.0f : 1.0f;
+                m_TargetTextureMaterial.SetFloat(ShaderPropertyIDs._UndoOutputSRGB, undoOutputSRGB);
+
+                if (curEventData.rtIsBackBuffer && isDebuggingEditor)
+                {
+                    m_TargetTextureMaterial.SetVector(ShaderPropertyIDs._Levels, new Vector4(0f, 1f, 0f, 0f));
+                    m_TargetTextureMaterial.SetFloat(ShaderPropertyIDs._ShouldYFlip, 1f);
+                }
+                else
+                {
+                    m_TargetTextureMaterial.SetVector(ShaderPropertyIDs._Levels, new Vector4(m_RTBlackLevel, m_RTWhiteLevel, 0f, 0f));
+                    m_TargetTextureMaterial.SetFloat(ShaderPropertyIDs._ShouldYFlip, 0f);
+                }
+
+                m_TargetTextureMaterial.SetTexture(ShaderPropertyIDs._MainTex, curEventData.rtOutput);
+                m_TargetTextureMaterial.SetPass(0);
+
+                if (viewportWidth > texWidth)
+                    textureRect.x += (viewportWidth - texWidth) * 0.5f;
+
+                if (viewportHeight > texHeight)
+                    textureRect.y += (viewportHeight - texHeight) * 0.5f;
+
+                // Remember currently active render texture
+                RenderTexture currentActiveRT = RenderTexture.active;
+
+                // Blit to the Render Texture
+                RenderTexture targetRenderTexture = RenderTexture.GetTemporary((int)texWidth, (int)previewRect.height);
+                Graphics.Blit(null, targetRenderTexture, m_TargetTextureMaterial, 0);
+
+                // Restore previously active render texture
+                RenderTexture.active = currentActiveRT;
+
+                // Draw the texture to the screen
+                GUI.DrawTexture(textureRect, targetRenderTexture, ScaleMode.ScaleAndCrop, false, (texWidth / texHeight));
+
+                // Release
+                RenderTexture.ReleaseTemporary(targetRenderTexture);
+            }
+            EditorGUILayout.EndHorizontal();
+        }
+
+        private void DrawEventMesh(float viewportWidth, float viewportHeight, float texWidth)
+        {
+            Mesh mesh = curEventData.mesh;
+            if (viewportHeight - FrameDebuggerStyles.EventDetails.k_MeshBottomToolbarHeight < 1.0f)
+                return;
+
+            if (mesh == null)
+            {
+                // Draw the background
+                EditorGUILayout.BeginHorizontal(FrameDebuggerStyles.EventDetails.outputMeshTextureStyle, GUILayout.Width(viewportWidth));
+                GUILayoutUtility.GetRect(viewportWidth, viewportHeight);
+                EditorGUILayout.EndHorizontal();
+                return;
+            }
+
+            if (m_Preview == null)
+                m_Preview = new MeshPreview(mesh);
+            else
+                m_Preview.mesh = mesh;
+
+            // We need this rect called here to push the control buttons below the Mesh...
+            Rect previewRect = GUILayoutUtility.GetRect(viewportWidth, viewportHeight - FrameDebuggerStyles.EventDetails.k_MeshBottomToolbarHeight, GUILayout.ExpandHeight(false));
+
+            // Rectangle for the buttons...
+            Rect rect = EditorGUILayout.BeginHorizontal(GUIContent.none, FrameDebuggerStyles.EventDetails.meshPreToolbarStyle, GUILayout.Height(FrameDebuggerStyles.EventDetails.k_MeshBottomToolbarHeight));
+            {
+                GUILayout.FlexibleSpace();
+
+                GUIContent meshName = new GUIContent(mesh.name);
+                float meshNameWidth = EditorStyles.label.CalcSize(meshName).x + 10f;
+                Rect meshNameRect = EditorGUILayout.GetControlRect(GUILayout.Width(meshNameWidth));
+                meshNameRect.y -= 1;
+                meshNameRect.x = 10;
+
+                GUI.Label(meshNameRect, meshName, FrameDebuggerStyles.EventDetails.meshPreToolbarLabelStyle);
+
+                if (FrameDebuggerHelper.IsCurrentEventMouseDown() && FrameDebuggerHelper.IsClickingRect(meshNameRect))
+                {
+                    EditorGUIUtility.PingObject(mesh);
+                    Event.current.Use();
+                }
+
+                m_Preview.OnPreviewSettings();
+            }
+            EditorGUILayout.EndHorizontal();
+
+            m_Preview?.OnPreviewGUI(previewRect, EditorStyles.helpBox);
+        }
+
+        private void DrawEventDetails(Rect rect)
+        {
+            if (BeginFoldoutBox(1, true, FrameDebuggerStyles.EventDetails.foldoutEventDetailsText, out float fadePercent))
+            {
+                // Render Target...
+                EditorGUILayout.BeginHorizontal();
+                {
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalLabelStyle);
+                    {
+                        EditorGUILayout.LabelField("RenderTarget", FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                    EditorGUILayout.BeginVertical();
+                    {
+                        if (m_LastEventData.isComputeEvent || m_LastEventData.isRayTracingEvent)
+                            EditorGUILayout.LabelField(FrameDebuggerStyles.EventDetails.k_NotAvailable, FrameDebuggerStyles.EventDetails.labelStyle);
+                        else
+                            EditorGUILayout.LabelField(curEventData.rtName, FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                }
+                EditorGUILayout.EndHorizontal();
+
+                // Size, Color Actions, Blending, Z, Stencil...
+                EditorGUILayout.BeginHorizontal();
+                {
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalLabelStyle);
+                    {
+                        EditorGUILayout.LabelField(m_LastEventData.detailsLabelsLeftColumn, FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalValueStyle);
+                    {
+                        EditorGUILayout.LabelField(m_LastEventData.detailsValuesLeftColumn, FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalLabelStyle);
+                    {
+                        EditorGUILayout.LabelField(m_LastEventData.detailLabelsRightColumn, FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalValueStyle);
+                    {
+                        EditorGUILayout.LabelField(m_LastEventData.detailValuesRightColumn, FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                }
+                EditorGUILayout.EndHorizontal();
+
+                // Meshes
+                EditorGUILayout.BeginHorizontal();
+                {
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalLabelStyle);
+                    {
+                        EditorGUILayout.LabelField(m_LastEventData.meshTitle, FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalLabelStyle);
+                    {
+                        if (m_LastEventData.listOfMeshesString == null)
+                        {
+                            EditorGUILayout.LabelField(m_LastEventData.firstMeshName, FrameDebuggerStyles.EventDetails.labelStyle);
+                        }
+                        else
+                        {
+                            m_ShouldShowMeshListFoldout = EditorGUILayout.Foldout(m_ShouldShowMeshListFoldout, m_LastEventData.firstMeshName + ((m_ShouldShowMeshListFoldout) ? string.Empty : "..."));
+                            if (m_ShouldShowMeshListFoldout)
+                            {
+                                EditorGUILayout.LabelField(m_LastEventData.listOfMeshesString, FrameDebuggerStyles.EventDetails.labelStyle);
+                            }
+                        }
+                    }
+                    EditorGUILayout.EndVertical();
+                }
+                EditorGUILayout.EndHorizontal();
+
+                // Batch cause
+                EditorGUILayout.BeginHorizontal();
+                {
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalLabelStyle);
+                    {
+                        EditorGUILayout.LabelField(FrameDebuggerStyles.EventDetails.batchCauseText);
+                    }
+                    EditorGUILayout.EndVertical();
+                    EditorGUILayout.BeginVertical();
+                    {
+                        EditorGUILayout.LabelField(FrameDebuggerStyles.EventDetails.batchBreakCauses[curEventData.batchBreakCause], FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                }
+                EditorGUILayout.EndHorizontal();
+
+                // Shader
+                EditorGUILayout.BeginHorizontal();
+                {
+                    EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.verticalLabelStyle);
+                    {
+                        EditorGUILayout.LabelField(FrameDebuggerStyles.EventDetails.passLightModeText, FrameDebuggerStyles.EventDetails.labelStyle);
+                        EditorGUILayout.LabelField(FrameDebuggerStyles.EventDetails.shaderText, FrameDebuggerStyles.EventDetails.labelStyle);
+                    }
+                    EditorGUILayout.EndVertical();
+                    EditorGUILayout.BeginVertical();
+                    {
+                        EditorGUILayout.LabelField($"{m_LastEventData.passAndLightMode}", FrameDebuggerStyles.EventDetails.labelStyle);
+                        if (m_LastEventData.shader != null)
+                        {
+                            GUI.enabled = false;
+                            EditorGUILayout.ObjectField(m_LastEventData.shader, typeof(Shader), true);
+                            GUI.enabled = true;
+                        }
+                        else
+                        {
+                            EditorGUILayout.LabelField(m_LastEventData.shaderName);
+                        }
+
+                    }
+                    EditorGUILayout.EndVertical();
+                }
+                EditorGUILayout.EndHorizontal();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawKeywords(bool shouldDisplayProperties)
+        {
+            bool hasKeywords = m_LastEventData.keywords.Length != 0;
+            if (BeginFoldoutBox(2, shouldDisplayProperties && hasKeywords, FrameDebuggerStyles.EventDetails.foldoutKeywordsText, out float fadePercent))
+            {
+                GUILayout.BeginHorizontal(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    if (shouldDisplayProperties && hasKeywords)
+                        GUILayout.Label(m_LastEventData.keywords, FrameDebuggerStyles.EventDetails.labelStyle);
+                }
+                GUILayout.EndHorizontal();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawProperties(bool shouldDisplayProperties)
+        {
+            ShaderProperties props = curEventData.shaderProperties;
+
+            Profiler.BeginSample("DrawTextureProperties");
+            {
+                DrawTextureProperties(3, shouldDisplayProperties && props.textures.Length != 0, props.textures);
+            }
+            Profiler.EndSample();
+
+            Profiler.BeginSample("DrawIntProperties");
+            {
+                DrawIntProperties(4, shouldDisplayProperties && props.ints.Length != 0, props.ints);
+            }
+            Profiler.EndSample();
+            Profiler.BeginSample("DrawFloatProperties");
+            {
+                DrawFloatProperties(5, shouldDisplayProperties && props.floats.Length != 0, props.floats);
+            }
+            Profiler.EndSample();
+            Profiler.BeginSample("DrawVectorProperties");
+            {
+                DrawVectorProperties(6, shouldDisplayProperties && props.vectors.Length != 0, props.vectors);
+            }
+            Profiler.EndSample();
+            Profiler.BeginSample("DrawMatrixProperties");
+            {
+                DrawMatrixProperties(7, shouldDisplayProperties && props.matrices.Length != 0, props.matrices);
+            }
+            Profiler.EndSample();
+            Profiler.BeginSample("DrawBufferProperties");
+            {
+                DrawBufferProperties(8, shouldDisplayProperties && props.buffers.Length != 0, props.buffers);
+            }
+            Profiler.EndSample();
+            Profiler.BeginSample("DrawConstantBufferProperties");
+            {
+                DrawConstantBufferProperties(9, shouldDisplayProperties && props.cbuffers.Length != 0, props.cbuffers);
+            }
+            Profiler.EndSample();
+        }
+
+        private void DrawTextureProperties(int num, bool shouldDrawProperties, ShaderTextureInfo[] textures)
+        {
+            if (BeginFoldoutBox(num, shouldDrawProperties, FrameDebuggerStyles.EventDetails.foldoutTexturesText, out float fadePercent))
+            {
+                GUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    int numOfTextures = shouldDrawProperties ? textures.Length : 0;
+                    for (int i = 0; i < numOfTextures; i++)
+                    {
+                        ShaderTextureInfo t = textures[i];
+
+                        GUILayout.BeginHorizontal();
+                        {
+                            Event evt = Event.current;
+
+                            // Parameter name..
+                            DrawPropName(t.name);
+
+                            // Vertex/Fragment/Geometry/Hull..
+                            DrawShaderPropertyFlags(t.flags);
+
+                            Texture texture = t.value;
+                            if (texture != null)
+                            {
+                                // Texture Preview..
+                                // for 2D textures, we want to display them directly as a preview (this will make render textures display their contents) but0
+                                // for cube maps and other non-2D types DrawPreview does not do anything useful right now, so get their asset type icon at least
+                                bool isTex2D = texture.dimension == TextureDimension.Tex2D;
+                                Texture previewTexture = isTex2D ? texture : AssetPreview.GetMiniThumbnail(texture);
+
+                                Rect previewRect = GUILayoutUtility.GetRect(new GUIContent(previewTexture), FrameDebuggerStyles.EventDetails.textureButtonStyle);
+                                previewRect.x += 1f;
+                                previewRect.y += 4f;
+                                GUI.DrawTexture(previewRect, previewTexture, ScaleMode.StretchToFill, false);
+
+                                if (FrameDebuggerHelper.IsCurrentEventMouseDown() && FrameDebuggerHelper.IsClickingRect(previewRect))
+                                {
+                                    PopupWindowWithoutFocus.Show(
+                                        previewRect,
+                                        new ObjectPreviewPopup(previewTexture),
+                                        new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right }
+                                    );
+                                }
+
+                                // Dimensions: Tex2D, Tex3D. etc...
+                                GUILayout.Label($"{texture.dimension}", FrameDebuggerStyles.EventDetails.textureDimensionsStyle);
+
+                                // Texture Size...
+                                GUILayout.Label($"{texture.width}x{texture.height}", FrameDebuggerStyles.EventDetails.textureSizeStyle);
+
+                                // Texture format...
+                                GUILayout.Label(GetGUIContent(FrameDebuggerHelper.GetFormat(texture), FrameDebuggerStyles.EventDetails.k_TextureFormatMaxChars), FrameDebuggerStyles.EventDetails.textureFormatStyle);
+
+                                // Texture name...
+                                // Disable the GUI to prevent users from assigning textures to the field
+                                GUI.enabled = false;
+                                EditorGUILayout.ObjectField(texture, typeof(Texture), true);
+                                GUI.enabled = true;
+                            }
+                            else
+                            {
+                                EditorGUILayout.LabelField(t.textureName, FrameDebuggerStyles.EventDetails.labelStyle);
+                            }
+                        }
+                        GUILayout.EndHorizontal();
+                    }
+                }
+                GUILayout.EndVertical();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawIntProperties(int num, bool shouldDrawProperties, ShaderIntInfo[] ints)
+        {
+            if (BeginFoldoutBox(num, shouldDrawProperties, FrameDebuggerStyles.EventDetails.foldoutIntsText, out float fadePercent))
+            {
+                GUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    int numOfIntegers = shouldDrawProperties ? ints.Length : 0;
+                    for (int i = 0; i < numOfIntegers;)
+                    {
+                        ShaderIntInfo t = ints[i];
+                        int numValues = (ints[i].flags >> k_ShaderTypeBits) & k_ArraySizeBitMask;
+                        if (numValues == 0)
+                            break;
+
+                        GUILayout.BeginHorizontal();
+                        if (numValues == 1)
+                        {
+                            DrawPropName(t.name);
+                            DrawShaderPropertyFlags(t.flags);
+                            GUILayout.Label(t.value.ToString(FrameDebuggerStyles.EventDetails.k_IntFormat, CultureInfo.InvariantCulture.NumberFormat), FrameDebuggerStyles.EventDetails.labelStyle);
+                            ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
+                        }
+                        else
+                        {
+                            DrawPropName($"{t.name} [{numValues}]");
+                            DrawShaderPropertyFlags(t.flags);
+
+                            Rect buttonRect = GUILayoutUtility.GetRect(FrameDebuggerStyles.EventDetails.arrayPopupButtonText, GUI.skin.button);
+                            buttonRect.width = FrameDebuggerStyles.EventDetails.k_ArrayValuePopupBtnWidth;
+                            if (GUI.Button(buttonRect, FrameDebuggerStyles.EventDetails.arrayPopupButtonText))
+                            {
+                                FrameDebuggerStyles.ArrayValuePopup.GetValueStringDelegate getValueString =
+                                    (int index, bool highPrecision) => ints[index].value.ToString(FrameDebuggerStyles.EventDetails.k_IntFormat, CultureInfo.InvariantCulture.NumberFormat);
+
+                                PopupWindowWithoutFocus.Show(
+                                    buttonRect,
+                                    new FrameDebuggerStyles.ArrayValuePopup(i, numValues, 1, 100.0f, getValueString),
+                                    new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right }
+                                );
+                            }
+                        }
+
+                        GUILayout.FlexibleSpace();
+                        GUILayout.EndHorizontal();
+
+                        i += numValues;
+                    }
+                }
+                GUILayout.EndVertical();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawFloatProperties(int num, bool shouldDrawProperties, ShaderFloatInfo[] floats)
+        {
+            if (BeginFoldoutBox(num, shouldDrawProperties, FrameDebuggerStyles.EventDetails.foldoutFloatsText, out float fadePercent))
+            {
+                GUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    int numOfFloats = shouldDrawProperties ? floats.Length : 0;
+                    for (int i = 0; i < numOfFloats;)
+                    {
+                        ShaderFloatInfo t = floats[i];
+                        int numValues = (floats[i].flags >> k_ShaderTypeBits) & k_ArraySizeBitMask;
+                        if (numValues == 0)
+                            break;
+
+                        GUILayout.BeginHorizontal();
+                        if (numValues == 1)
+                        {
+                            DrawPropName(t.name);
+                            DrawShaderPropertyFlags(t.flags);
+                            GUILayout.Label(t.value.ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat, CultureInfo.InvariantCulture.NumberFormat), FrameDebuggerStyles.EventDetails.labelStyle);
+                            ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
+                        }
+                        else
+                        {
+                            string arrayName = $"{t.name} [{numValues}]";
+                            DrawPropName(arrayName);
+                            DrawShaderPropertyFlags(t.flags);
+
+                            Rect buttonRect = GUILayoutUtility.GetRect(FrameDebuggerStyles.EventDetails.arrayPopupButtonText, GUI.skin.button);
+                            buttonRect.width = FrameDebuggerStyles.EventDetails.k_ArrayValuePopupBtnWidth;
+                            if (GUI.Button(buttonRect, FrameDebuggerStyles.EventDetails.arrayPopupButtonText))
+                            {
+                                FrameDebuggerStyles.ArrayValuePopup.GetValueStringDelegate getValueString =
+                                    (int index, bool highPrecision) => floats[index].value.ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat, CultureInfo.InvariantCulture.NumberFormat);
+
+                                PopupWindowWithoutFocus.Show(
+                                    buttonRect,
+                                    new FrameDebuggerStyles.ArrayValuePopup(i, numValues, 1, 100.0f, getValueString),
+                                    new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right });
+                            }
+                        }
+                        GUILayout.FlexibleSpace();
+                        GUILayout.EndHorizontal();
+
+                        i += numValues;
+                    }
+                }
+                GUILayout.EndVertical();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawVectorProperties(int num, bool shouldDrawProperties, ShaderVectorInfo[] vectors)
+        {
+            if (BeginFoldoutBox(num, shouldDrawProperties, FrameDebuggerStyles.EventDetails.foldoutVectorsText, out float fadePercent))
+            {
+                GUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    int numOfVectors = shouldDrawProperties ? vectors.Length : 0;
+                    for (int i = 0; i < numOfVectors;)
+                    {
+                        ShaderVectorInfo t = vectors[i];
+                        int numValues = (vectors[i].flags >> k_ShaderTypeBits) & k_ArraySizeBitMask;
+                        if (numValues == 0)
+                            break;
+
+                        GUILayout.BeginHorizontal();
+                        if (numValues == 1)
+                        {
+                            DrawPropName(t.name);
+                            DrawShaderPropertyFlags(t.flags);
+                            GUILayout.Label(t.value.ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat), FrameDebuggerStyles.EventDetails.labelStyle);
+                            ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
+                        }
+                        else
+                        {
+                            DrawPropName($"{t.name} [{numValues}]");
+                            DrawShaderPropertyFlags(t.flags);
+
+                            Rect buttonRect = GUILayoutUtility.GetRect(FrameDebuggerStyles.EventDetails.arrayPopupButtonText, GUI.skin.button);
+                            if (GUI.Button(buttonRect, FrameDebuggerStyles.EventDetails.arrayPopupButtonText))
+                            {
+                                FrameDebuggerStyles.ArrayValuePopup.GetValueStringDelegate getValueString =
+                                    (int index, bool highPrecision) => vectors[index].value.ToString(highPrecision ? FrameDebuggerStyles.EventDetails.k_FloatFormat : FrameDebuggerStyles.EventDetails.k_FloatFormat);
+
+                                PopupWindowWithoutFocus.Show(
+                                    buttonRect,
+                                    new FrameDebuggerStyles.ArrayValuePopup(i, numValues, 1, 200.0f, getValueString),
+                                    new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right });
+                            }
+                        }
+                        GUILayout.FlexibleSpace();
+                        GUILayout.EndHorizontal();
+
+                        i += numValues;
+                    }
+                }
+                GUILayout.EndVertical();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawMatrixProperties(int num, bool shouldDrawProperties, ShaderMatrixInfo[] matrices)
+        {
+            if (BeginFoldoutBox(num, shouldDrawProperties, FrameDebuggerStyles.EventDetails.foldoutMatricesText, out float fadePercent))
+            {
+                GUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    int numOfMatrices = shouldDrawProperties ? matrices.Length : 0;
+                    for (int i = 0; i < numOfMatrices;)
+                    {
+                        ShaderMatrixInfo t = matrices[i];
+                        int numValues = (matrices[i].flags >> k_ShaderTypeBits) & k_ArraySizeBitMask;
+                        if (numValues == 0)
+                            break;
+
+                        GUILayout.BeginHorizontal();
+                        if (numValues == 1)
+                        {
+                            DrawPropName(t.name);
+                            DrawShaderPropertyFlags(t.flags);
+                            GUILayout.Label(t.value.ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat), FrameDebuggerStyles.EventDetails.labelStyle);
+                            ShaderPropertyCopyValueMenu(GUILayoutUtility.GetLastRect(), t.value);
+                        }
+                        else
+                        {
+                            DrawPropName($"{t.name} [{numValues}]");
+                            DrawShaderPropertyFlags(t.flags);
+
+                            Rect buttonRect = GUILayoutUtility.GetRect(FrameDebuggerStyles.EventDetails.arrayPopupButtonText, GUI.skin.button);
+                            if (GUI.Button(buttonRect, FrameDebuggerStyles.EventDetails.arrayPopupButtonText))
+                            {
+                                FrameDebuggerStyles.ArrayValuePopup.GetValueStringDelegate getValueString =
+                                    (int index, bool highPrecision) => '\n' + matrices[index].value.ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat);
+
+                                PopupWindowWithoutFocus.Show(
+                                    buttonRect,
+                                    new FrameDebuggerStyles.ArrayValuePopup(i, numValues, 5, 200.0f, getValueString),
+                                    new[] { PopupLocation.Left, PopupLocation.Below, PopupLocation.Right }
+                                );
+                            }
+                        }
+                        GUILayout.FlexibleSpace();
+                        GUILayout.EndHorizontal();
+
+                        i += numValues;
+                    }
+                }
+                GUILayout.EndVertical();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawBufferProperties(int num, bool shouldDrawProperties, ShaderBufferInfo[] buffers)
+        {
+            if (BeginFoldoutBox(num, shouldDrawProperties, FrameDebuggerStyles.EventDetails.foldoutBuffersText, out float fadePercent))
+            {
+                GUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    if (shouldDrawProperties)
+                    {
+                        foreach (var t in buffers)
+                        {
+                            GUILayout.BeginHorizontal();
+
+                            DrawPropName(t.name);
+                            DrawShaderPropertyFlags(t.flags);
+
+                            GUILayout.FlexibleSpace();
+                            GUILayout.EndHorizontal();
+                        }
+                    }
+                }
+                GUILayout.EndVertical();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawConstantBufferProperties(int num, bool shouldDrawProperties, ShaderConstantBufferInfo[] cbuffers)
+        {
+            if (BeginFoldoutBox(num, shouldDrawProperties, FrameDebuggerStyles.EventDetails.foldoutCBufferText, out float fadePercent))
+            {
+                GUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.propertiesVerticalStyle);
+                {
+                    if (shouldDrawProperties)
+                    {
+                        foreach (var t in cbuffers)
+                        {
+                            GUILayout.BeginHorizontal();
+
+                            DrawPropName(t.name);
+                            DrawShaderPropertyFlags(t.flags);
+
+                            GUILayout.FlexibleSpace();
+                            GUILayout.EndHorizontal();
+                        }
+                    }
+                }
+                GUILayout.EndVertical();
+            }
+            EndFoldoutBox();
+        }
+
+        private void DrawShaderPropertyFlags(int flags)
+        {
+            m_TempSB1.Clear();
+            m_TempSB2.Clear();
+
+            // Lowest bits of flags are set for each shader stage that property is used in; matching ShaderType C++ enum
+            const int k_VertexShaderFlag = (1 << 1);
+            const int k_FragmentShaderFlag = (1 << 2);
+            const int k_GeometryShaderFlag = (1 << 3);
+            const int k_HullShaderFlag = (1 << 4);
+            const int k_DomainShaderFlag = (1 << 5);
+
+            int shaderCounter = 0;
+            if ((flags & k_VertexShaderFlag) != 0) { shaderCounter++; m_TempSB1.Append("v/"); m_TempSB2.Append("vertex & "); }
+            if ((flags & k_FragmentShaderFlag) != 0) { shaderCounter++; m_TempSB1.Append("f/"); m_TempSB2.Append("fragment & "); }
+            if ((flags & k_GeometryShaderFlag) != 0) { shaderCounter++; m_TempSB1.Append("g/"); m_TempSB2.Append("geometry & "); }
+            if ((flags & k_HullShaderFlag) != 0) { shaderCounter++; m_TempSB1.Append("h/"); m_TempSB2.Append("hull & "); }
+            if ((flags & k_DomainShaderFlag) != 0) { shaderCounter++; m_TempSB1.Append("d/"); m_TempSB2.Append("domain & "); }
+
+            if (shaderCounter > 0)
+            {
+                m_TempSB1.Remove(m_TempSB1.Length - 1, 1); // Remove the last /
+                m_TempSB2.Remove(m_TempSB2.Length - 3, 2); // Remove the last &
+                m_TempSB2.Insert(0, "Used in ");
+                m_TempSB2.Append((shaderCounter > 1) ? "shaders" : "shader");
+            }
+
+            GUILayout.Label(EditorGUIUtility.TrTextContent(m_TempSB1.ToString(), m_TempSB2.ToString()), FrameDebuggerStyles.EventDetails.propertiesFlagsStyle);
+        }
+
+        private void ShaderPropertyCopyValueMenu(Rect valueRect, System.Object value)
+        {
+            var e = Event.current;
+            if (e.type == EventType.ContextClick && valueRect.Contains(e.mousePosition))
+            {
+                e.Use();
+                GenericMenu menu = new GenericMenu();
+                menu.AddItem(FrameDebuggerStyles.EventDetails.copyValueText, false, delegate
+                {
+                    if (value is Vector4)
+                    {
+                        EditorGUIUtility.systemCopyBuffer = ((Vector4)value).ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat);
+                    }
+                    else if (value is Matrix4x4)
+                    {
+                        EditorGUIUtility.systemCopyBuffer = ((Matrix4x4)value).ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat);
+                    }
+                    else if (value is System.Single)
+                    {
+                        EditorGUIUtility.systemCopyBuffer = ((System.Single)value).ToString(FrameDebuggerStyles.EventDetails.k_FloatFormat);
+                    }
+                    else
+                    {
+                        EditorGUIUtility.systemCopyBuffer = $"{value}";
+                    }
+                });
+                menu.ShowAsContext();
+            }
+        }
+
+        private GUIContent GetGUIContent(string text, int maxLength)
+        {
+            string fullName = text;
+            const int k_NumberOfDots = 3;
+
+            // If we need to shorten the name, we will add the full name as a tooltip
+            if (text.Length > maxLength - k_NumberOfDots)
+            {
+                string shortName = fullName.Substring(0, maxLength - k_NumberOfDots) + "...";
+                return EditorGUIUtility.TrTextContent(shortName, fullName);
+            }
+
+            return EditorGUIUtility.TrTextContent(fullName);
+        }
+
+        private void DrawPropName(string name)
+        {
+            GUILayout.Label(GetGUIContent(name, FrameDebuggerStyles.EventDetails.k_PropertyNameMaxChars), FrameDebuggerStyles.EventDetails.propertiesNameStyle);
+        }
+
+        private void BuildCurEventDataStrings(FrameDebuggerEvent curEvent, FrameDebuggerEventData curEventData)
+        {
+            m_LastEventData.index = FrameDebuggerUtility.limit - 1;
+            m_LastEventData.type = curEvent.type;
+            int eventTypeInt = (int)m_LastEventData.type;
+
+            // Figure out the type of event we have
+            m_LastEventData.isClearEvent = FrameDebuggerHelper.IsAClearEvent(m_LastEventData.type);
+            m_LastEventData.isResolveEvent = FrameDebuggerHelper.IsAResolveEvent(m_LastEventData.type);
+            m_LastEventData.isComputeEvent = FrameDebuggerHelper.IsAComputeEvent(m_LastEventData.type);
+            m_LastEventData.isRayTracingEvent = FrameDebuggerHelper.IsARayTracingEvent(m_LastEventData.type);
+
+            // Shader Pass name & LightMode tag
+            GetShaderData();
+            string pass = $"{(string.IsNullOrEmpty(curEventData.passName) ? FrameDebuggerStyles.EventDetails.k_NotAvailable : curEventData.passName)} ({curEventData.shaderPassIndex})";
+            string lightMode = $"{(string.IsNullOrEmpty(curEventData.passLightMode) ? FrameDebuggerStyles.EventDetails.k_NotAvailable : curEventData.passLightMode)}";
+            m_LastEventData.passAndLightMode = $"{pass}\n{lightMode}";
+
+            // Event title
+            var eventObj = FrameDebuggerUtility.GetFrameEventObject(m_LastEventData.index);
+            if (eventObj)
+                m_LastEventData.title = $"Event #{m_LastEventData.index + 1} {FrameDebuggerStyles.frameEventTypeNames[eventTypeInt]} {eventObj.name}";
+            else
+                m_LastEventData.title = $"Event #{m_LastEventData.index + 1} {FrameDebuggerStyles.frameEventTypeNames[eventTypeInt]}";
+
+            m_TempSB1.Clear();
+            m_TempSB2.Clear();
+
+
+            if (m_LastEventData.isComputeEvent || m_LastEventData.isRayTracingEvent)
+            {
+                m_TempSB1.AppendLine("Size");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Format");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Color Actions");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Depth Actions");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+            }
+            else
+            {
+                m_TempSB1.AppendLine("Size");
+                m_TempSB2.AppendLine($"{curEventData.rtWidth}x{curEventData.rtHeight}");
+
+                m_TempSB1.AppendLine("Format");
+                m_TempSB2.AppendLine($"{(GraphicsFormat)curEventData.rtFormat}");
+
+                m_TempSB1.AppendLine("Color Actions");
+                m_TempSB2.AppendLine((curEventData.rtLoadAction == -1) ? FrameDebuggerStyles.EventDetails.k_NotAvailable : $"{(RenderBufferLoadAction)curEventData.rtLoadAction} / {(RenderBufferStoreAction)curEventData.rtStoreAction}");
+
+                m_TempSB1.AppendLine("Depth Actions");
+                m_TempSB2.AppendLine((curEventData.rtDepthLoadAction == -1) ? FrameDebuggerStyles.EventDetails.k_NotAvailable : $"{(RenderBufferLoadAction)curEventData.rtDepthLoadAction} / {(RenderBufferStoreAction)curEventData.rtDepthStoreAction}");
+            }
+
+            m_LastEventData.isValid = true;
+            if (m_LastEventData.isComputeEvent)
+            {
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                m_TempSB1.AppendLine("Kernel");
+                m_TempSB2.AppendLine(curEventData.csKernel);
+
+                m_TempSB1.AppendLine("Thread Groups");
+                if (curEventData.csThreadGroupsX != 0 || curEventData.csThreadGroupsY != 0 || curEventData.csThreadGroupsZ != 0)
+                    m_TempSB2.AppendLine($"{curEventData.csThreadGroupsX}x{curEventData.csThreadGroupsY}x{curEventData.csThreadGroupsZ}");
+                else
+                    m_TempSB2.AppendLine("Indirect dispatch");
+
+                m_TempSB1.AppendLine("Thread Group Size");
+                if (curEventData.csGroupSizeX > 0)
+                    m_TempSB2.AppendLine($"{curEventData.csGroupSizeX}x{curEventData.csGroupSizeY}x{curEventData.csGroupSizeZ}");
+                else
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+            }
+            else if (m_LastEventData.isRayTracingEvent)
+            {
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                m_TempSB1.AppendLine("Ray Generation Shader");
+                m_TempSB2.AppendLine(curEventData.rtsRayGenShaderName);
+
+                m_TempSB1.AppendLine("SubShader Pass");
+                m_TempSB2.AppendLine(curEventData.rtsShaderPassName);
+
+                m_TempSB1.AppendLine("Acceleration Structure");
+                if (curEventData.rtsAccelerationStructureName.Length > 0)
+                    m_TempSB2.AppendLine(curEventData.rtsAccelerationStructureName);
+                else
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Dispatch Size");
+                m_TempSB2.AppendLine($"{curEventData.rtsWidth} x {curEventData.rtsHeight} x {curEventData.rtsDepth}");
+
+                m_TempSB1.AppendLine("Max. Recursion Depth");
+                m_TempSB2.AppendLine($"{curEventData.rtsMaxRecursionDepth}");
+
+                m_TempSB1.AppendLine("Miss Shader Count");
+                m_TempSB2.AppendLine($"{curEventData.rtsMissShaderCount}");
+
+                m_TempSB1.AppendLine("Callable Shader Count");
+                m_TempSB2.AppendLine($"{curEventData.rtsCallableShaderCount}");
+            }
+            else if (m_LastEventData.isClearEvent || m_LastEventData.isResolveEvent)
+            {
+                m_LastEventData.passAndLightMode = $"{FrameDebuggerStyles.EventDetails.k_NotAvailable}\n{FrameDebuggerStyles.EventDetails.k_NotAvailable}";
+
+                m_TempSB1.AppendLine("Memoryless");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                // Colormask
+                m_TempSB1.AppendLine("ColorMask");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                // Blend state
+                m_TempSB1.AppendLine("Blend Color");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Blend Alpha ");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("BlendOp Color");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("BlendOp Alpha");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                m_TempSB1.AppendLine("Draw Calls");
+                m_TempSB2.AppendLine($"{curEventData.drawCallCount}");
+
+                m_TempSB1.AppendLine("Vertices");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Indices");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                int type = (int)curEvent.type;
+
+                m_TempSB1.AppendLine("Clear Color");
+                if ((type & 1) != 0 && !m_LastEventData.isResolveEvent)
+                    m_TempSB2.AppendLine($"({curEventData.rtClearColorR:F3}, {curEventData.rtClearColorG:F3}, {curEventData.rtClearColorB:F3}, {curEventData.rtClearColorA:F3})");
+                else
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Clear Depth");
+                if ((type & 2) != 0)
+                    m_TempSB2.AppendLine(curEventData.clearDepth.ToString("f3"));
+                else
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Clear Stencil");
+                if ((type & 4) != 0)
+                    m_TempSB2.Append(FrameDebuggerHelper.GetStencilString((int)curEventData.clearStencil));
+                else
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+            }
+            else
+            {
+                m_TempSB1.AppendLine("Memoryless");
+                m_TempSB2.AppendLine((curEventData.rtMemoryless != 0) ? "Yes" : "No");
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                FrameDebuggerBlendState blendState = curEventData.blendState;
+
+                // Colormask
+                m_TempSB1.AppendLine("ColorMask");
+                if (blendState.writeMask == 0)
+                    m_TempSB2.AppendLine("0");
+                else
+                {
+                    if ((blendState.writeMask & 8) != 0)
+                        m_TempSB2.Append('R');
+
+                    if ((blendState.writeMask & 4) != 0)
+                        m_TempSB2.Append('G');
+
+                    if ((blendState.writeMask & 2) != 0)
+                        m_TempSB2.Append('B');
+
+                    if ((blendState.writeMask & 1) != 0)
+                        m_TempSB2.Append('A');
+
+                    m_TempSB2.Append("\n");
+                }
+
+                // Blend state
+                m_TempSB1.AppendLine("Blend Color");
+                m_TempSB2.AppendLine($"{blendState.srcBlend} {blendState.dstBlend}");
+
+                m_TempSB1.AppendLine("Blend Alpha ");
+                m_TempSB2.AppendLine($"{blendState.srcBlendAlpha} {blendState.dstBlendAlpha}");
+
+                m_TempSB1.AppendLine("BlendOp Color");
+                m_TempSB2.AppendLine(blendState.blendOp.ToString());
+
+                m_TempSB1.AppendLine("BlendOp Alpha");
+                m_TempSB2.AppendLine(blendState.blendOpAlpha.ToString());
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                if (curEventData.instanceCount > 1)
+                {
+                    m_TempSB1.AppendLine("DrawInstanced Calls");
+                    m_TempSB2.AppendLine($"{curEventData.drawCallCount}");
+
+                    m_TempSB1.AppendLine("Instances");
+                    m_TempSB2.AppendLine($"{curEventData.instanceCount}");
+                }
+                else
+                {
+                    m_TempSB1.AppendLine("Draw Calls");
+                    m_TempSB2.AppendLine($"{curEventData.drawCallCount}");
+                }
+
+                m_TempSB1.AppendLine("Vertices");
+                m_TempSB2.AppendLine(curEventData.vertexCount.ToString());
+
+                m_TempSB1.AppendLine("Indices");
+                m_TempSB2.AppendLine(curEventData.indexCount.ToString());
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                m_TempSB1.AppendLine("Clear Color");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Clear Depth");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Clear Stencil");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+            }
+
+            m_LastEventData.detailsLabelsLeftColumn = m_TempSB1.ToString();
+            m_LastEventData.detailsValuesLeftColumn = m_TempSB2.ToString();
+
+            m_TempSB1.Clear();
+            m_TempSB2.Clear();
+
+            m_LastEventData.firstMeshName = null;
+            m_LastEventData.listOfMeshesString = null;
+            if (curEventData.meshInstanceIDs != null && curEventData.meshInstanceIDs.Length > 0)
+            {
+                int numOfMeshesAdded = 0;
+                m_LastEventData.meshTitle = curEventData.meshInstanceIDs.Length < 2 ? "Mesh" : "Meshes";
+                for (int i = 0; i < curEventData.meshInstanceIDs.Length; i++)
+                {
+                    int id = curEventData.meshInstanceIDs[i];
+                    Mesh mesh = EditorUtility.InstanceIDToObject(id) as Mesh;
+                    if (mesh != null)
+                    {
+                        if (m_LastEventData.firstMeshName == null)
+                            m_LastEventData.firstMeshName = mesh.name;
+                        else
+                            m_TempSB2.AppendLine("   " + mesh.name);
+                        numOfMeshesAdded++;
+                    }
+                }
+
+                // We keep the meshes string null if it's only one instance
+                // and just show the firstMesh instead.
+                if (numOfMeshesAdded > 1)
+                {
+                    m_LastEventData.listOfMeshesString = m_TempSB2.ToString();
+                    m_TempSB2.Clear();
+                }
+            }
+            else
+            {
+                m_LastEventData.meshTitle = "Mesh";
+                m_LastEventData.firstMeshName = curEventData.mesh == null ? FrameDebuggerStyles.EventDetails.k_NotAvailable : curEventData.mesh.name;
+            }
+
+            if (m_LastEventData.isClearEvent
+                || m_LastEventData.isResolveEvent
+                || m_LastEventData.isComputeEvent
+                || m_LastEventData.isRayTracingEvent)
+            {
+                // Depth state
+                m_TempSB1.AppendLine("ZClip");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("ZTest");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("ZWrite");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Cull");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Conservative");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Offset");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                // Stencil state
+                m_TempSB1.AppendLine("Stencil");
+                m_TempSB2.AppendLine("Disabled");
+
+                m_TempSB1.AppendLine("Stencil Ref");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Stencil ReadMask");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Stencil WriteMask");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Stencil Comp");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Stencil Pass");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Stencil Fail");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                m_TempSB1.AppendLine("Stencil ZFail");
+                m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+            }
+            else
+            {
+                FrameDebuggerRasterState rasterState = curEventData.rasterState;
+                FrameDebuggerDepthState depthState = curEventData.depthState;
+
+                // Depth state
+                m_TempSB1.AppendLine("ZClip");
+                m_TempSB2.AppendLine(rasterState.depthClip.ToString());
+
+                m_TempSB1.AppendLine("ZTest");
+                m_TempSB2.AppendLine(depthState.depthFunc.ToString());
+
+                m_TempSB1.AppendLine("ZWrite");
+                m_TempSB2.AppendLine(depthState.depthWrite == 0 ? "Off" : "On");
+
+                m_TempSB1.AppendLine("Cull");
+                m_TempSB2.AppendLine(rasterState.cullMode.ToString());
+
+                m_TempSB1.AppendLine("Conservative");
+                m_TempSB2.AppendLine(rasterState.conservative.ToString());
+
+                m_TempSB1.AppendLine("Offset");
+                m_TempSB2.AppendLine($"{rasterState.slopeScaledDepthBias}, {rasterState.depthBias}");
+
+                m_TempSB1.AppendLine();
+                m_TempSB2.AppendLine();
+
+                // Stencil state
+                if (curEventData.stencilState.stencilEnable)
+                {
+                    m_TempSB1.AppendLine("Stencil");
+                    m_TempSB2.AppendLine("Enabled");
+
+                    m_TempSB1.AppendLine("Stencil Ref");
+                    m_TempSB2.AppendLine(FrameDebuggerHelper.GetStencilString(curEventData.stencilRef));
+
+                    m_TempSB1.AppendLine("Stencil ReadMask");
+                    m_TempSB2.AppendLine(curEventData.stencilState.readMask != 255 ? FrameDebuggerHelper.GetStencilString(curEventData.stencilState.readMask) : FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    m_TempSB1.AppendLine("Stencil WriteMask");
+                    m_TempSB2.AppendLine(curEventData.stencilState.writeMask != 255 ? FrameDebuggerHelper.GetStencilString(curEventData.stencilState.writeMask) : FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    // Only show *Front states when CullMode is set to Back.
+                    if (curEventData.rasterState.cullMode == CullMode.Back)
+                    {
+                        m_TempSB1.AppendLine("Stencil Comp");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilFuncFront}");
+                        m_TempSB1.AppendLine("Stencil Pass");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilPassOpFront}");
+                        m_TempSB1.AppendLine("Stencil Fail");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilFailOpFront}");
+                        m_TempSB1.AppendLine("Stencil ZFail");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilZFailOpFront}");
+                    }
+                    // Only show *Back states when CullMode is set to Front.
+                    else if (curEventData.rasterState.cullMode == CullMode.Front)
+                    {
+                        m_TempSB1.AppendLine("Stencil Comp");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilFuncBack}");
+                        m_TempSB1.AppendLine("Stencil Pass");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilPassOpBack}");
+                        m_TempSB1.AppendLine("Stencil Fail");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilFailOpBack}");
+                        m_TempSB1.AppendLine("Stencil ZFail");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilZFailOpBack}");
+                    }
+                    // Show both *Front and *Back states for two-sided geometry.
+                    else
+                    {
+                        m_TempSB1.AppendLine("Stencil Comp");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilFuncFront} {curEventData.stencilState.stencilFuncBack}");
+                        m_TempSB1.AppendLine("Stencil Pass");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilPassOpFront} {curEventData.stencilState.stencilPassOpBack}");
+                        m_TempSB1.AppendLine("Stencil Fail");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilFailOpFront} {curEventData.stencilState.stencilFailOpBack}");
+                        m_TempSB1.AppendLine("Stencil ZFail");
+                        m_TempSB2.AppendLine($"{curEventData.stencilState.stencilZFailOpFront} {curEventData.stencilState.stencilZFailOpBack}");
+                    }
+                }
+                else
+                {
+                    m_TempSB1.AppendLine("Stencil");
+                    m_TempSB2.AppendLine("Disabled");
+
+                    m_TempSB1.AppendLine("Stencil Ref");
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    m_TempSB1.AppendLine("Stencil ReadMask");
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    m_TempSB1.AppendLine("Stencil WriteMask");
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    m_TempSB1.AppendLine("Stencil Comp");
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    m_TempSB1.AppendLine("Stencil Pass");
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    m_TempSB1.AppendLine("Stencil Fail");
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+
+                    m_TempSB1.AppendLine("Stencil ZFail");
+                    m_TempSB2.AppendLine(FrameDebuggerStyles.EventDetails.k_NotAvailable);
+                }
+            }
+
+            m_LastEventData.detailLabelsRightColumn = m_TempSB1.ToString();
+            m_LastEventData.detailValuesRightColumn = m_TempSB2.ToString();
+
+            // Keywords
+            m_TempSB2.Clear();
+            if (!string.IsNullOrEmpty(curEventData.shaderKeywords))
+            {
+                if (m_KeywordsList.Count == 0)
+                    m_KeywordsList.AddRange(curEventData.shaderKeywords.Split(' '));
+
+                m_KeywordsList.Sort();
+                m_TempSB2.AppendLine(string.Join<string>("\n", m_KeywordsList));
+            }
+
+            m_LastEventData.keywords = m_TempSB2.ToString().Trim();
+        }
+
+        private void GetShaderData()
+        {
+            const string k_ComputeShaderFilter = "t:computeshader";
+            const string k_RayTracingShaderFilter = "t:raytracingshader";
+
+            // Clear or Resolve events
+            if (m_LastEventData.isClearEvent || m_LastEventData.isResolveEvent)
+            {
+                m_LastEventData.shaderName = FrameDebuggerStyles.EventDetails.k_NotAvailable;
+                m_LastEventData.shader = null;
+                return;
+            }
+
+            // Normal shader events
+            if (!m_LastEventData.isComputeEvent && !m_LastEventData.isRayTracingEvent)
+            {
+                m_LastEventData.shaderName = curEventData.shaderName;
+                m_LastEventData.shader = Shader.Find(m_LastEventData.shaderName);
+                return;
+            }
+
+            // Compute or RayTracing events
+            m_LastEventData.shader = null;
+            string filter;
+            if (m_LastEventData.isComputeEvent)
+            {
+                m_LastEventData.shaderName = curEventData.csName;
+                filter = k_ComputeShaderFilter;
+            }
+            else if (m_LastEventData.isRayTracingEvent)
+            {
+                m_LastEventData.shaderName = curEventData.rtsName;
+                filter = k_RayTracingShaderFilter;
+            }
+            else
+                return;
+
+            string[] guids = AssetDatabase.FindAssets($"{m_LastEventData.shaderName} {filter}");
+            if (guids.Length > 0)
+            {
+                string path = AssetDatabase.GUIDToAssetPath(guids[0]);
+                UnityEngine.Object shader = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(path);
+                if (shader != null)
+                    m_LastEventData.shader = shader;
+            }
+        }
+
+        private bool BeginFoldoutBox(int nr, bool hasData, GUIContent header, out float fadePercent)
+        {
+            GUI.enabled = hasData;
+
+            EditorGUILayout.BeginVertical(FrameDebuggerStyles.EventDetails.foldoutCategoryBoxStyle);
+            Rect r = GUILayoutUtility.GetRect(2, 21);
+
+            EditorGUI.BeginChangeCheck();
+            bool expanded = EditorGUI.FoldoutTitlebar(r, header, m_FoldoutAnimators[nr].target, true, EditorStyles.inspectorTitlebarFlat, EditorStyles.inspectorTitlebarText);
+            if (EditorGUI.EndChangeCheck())
+            {
+                m_FoldoutAnimators[nr].target = !m_FoldoutAnimators[nr].target;
+            }
+
+            GUI.enabled = true;
+            EditorGUI.indentLevel++;
+            fadePercent = m_FoldoutAnimators[nr].faded;
+
+            return EditorGUILayout.BeginFadeGroup(m_FoldoutAnimators[nr].faded);
+        }
+
+        private void EndFoldoutBox()
+        {
+            EditorGUILayout.EndFadeGroup();
+            EditorGUI.indentLevel--;
+            EditorGUILayout.EndVertical();
+        }
+    }
+}
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerHelper.cs b/Editor/Mono/PerformanceTools/FrameDebuggerHelper.cs
new file mode 100644
index 0000000000..ec11596e47
--- /dev/null
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerHelper.cs
@@ -0,0 +1,65 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace UnityEditorInternal
+{
+    internal class FrameDebuggerHelper
+    {
+        internal static bool IsOnLinuxOpenGL => Application.platform == RuntimePlatform.LinuxEditor && SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLCore;
+        internal static bool IsAValidFrame(int curEventIndex, int descsLength) => (curEventIndex >= 0 && curEventIndex < descsLength);
+        internal static bool IsAClearEvent(FrameEventType eventType) => eventType >= FrameEventType.ClearNone && eventType <= FrameEventType.ClearAll;
+        internal static bool IsAResolveEvent(FrameEventType eventType) => eventType == FrameEventType.ResolveRT || eventType == FrameEventType.ResolveDepth;
+        internal static bool IsAComputeEvent(FrameEventType eventType) => eventType == FrameEventType.ComputeDispatch;
+        internal static bool IsARayTracingEvent(FrameEventType eventType) => eventType == FrameEventType.RayTracingDispatch;
+        internal static bool IsAHiddenEvent(FrameEventType eventType) => eventType == FrameEventType.BeginSubpass;
+        internal static bool IsAHierarchyLevelBreakEvent(FrameEventType eventType) => eventType == FrameEventType.HierarchyLevelBreak;
+        internal static bool IsCurrentEventMouseDown() => Event.current.type == EventType.MouseDown;
+        internal static bool IsClickingRect(Rect rect) => rect.Contains(Event.current.mousePosition) && Event.current.type == EventType.MouseDown;
+
+        internal static string GetStencilString(int stencil)
+        {
+            const int k_NumOfUsedStencilBits = 8;
+            return $"(0b{Convert.ToString(stencil, 2).PadLeft(k_NumOfUsedStencilBits, '0')}) {stencil}";
+        }
+
+        internal static string GetFormat(Texture texture)
+        {
+            if (texture == null)
+            {
+                return string.Empty;
+            }
+
+            if (texture is Texture2D)
+            {
+                return (texture as Texture2D).format.ToString();
+            }
+            else if (texture is Cubemap)
+            {
+                return (texture as Cubemap).format.ToString();
+            }
+            else if (texture is Texture2DArray)
+            {
+                return (texture as Texture2DArray).format.ToString();
+            }
+            else if (texture is Texture3D)
+            {
+                return (texture as Texture3D).format.ToString();
+            }
+            else if (texture is CubemapArray)
+            {
+                return (texture as CubemapArray).format.ToString();
+            }
+            else if (texture is RenderTexture)
+            {
+                return (texture as RenderTexture).graphicsFormat.ToString();
+            }
+
+            return string.Empty;
+        }
+    }
+}
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerStyles.cs b/Editor/Mono/PerformanceTools/FrameDebuggerStyles.cs
new file mode 100644
index 0000000000..736daf0757
--- /dev/null
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerStyles.cs
@@ -0,0 +1,339 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine;
+using UnityEditor;
+
+namespace UnityEditorInternal
+{
+    internal static class FrameDebuggerStyles
+    {
+        // match enum FrameEventType on C++ side!
+        public static readonly string[] frameEventTypeNames = new[]
+        {
+            "Clear (nothing)",
+            "Clear (color)",
+            "Clear (Depth)",
+            "Clear (color+depth)",
+            "Clear (stencil)",
+            "Clear (color+stencil)",
+            "Clear (depth+stencil)",
+            "Clear (color+depth+stencil)",
+            "SetRenderTarget",
+            "Resolve Color",
+            "Resolve Depth",
+            "Grab RenderTexture",
+            "Static Batch",
+            "Dynamic Batch",
+            "Draw Mesh",
+            "Draw Dynamic",
+            "Draw GL",
+            "GPU Skinning",
+            "Draw Procedural",
+            "Draw Procedural Indirect",
+            "Draw Procedural Indexed",
+            "Draw Procedural Indexed Indirect",
+            "Compute",
+            "Ray Tracing Dispatch",
+            "Plugin Event",
+            "Draw Mesh (instanced)",
+            "Begin Subpass",
+            "SRP Batch",
+            "",                 // on purpose empty string for kFrameEventHierarchyLevelBreak
+            "Hybrid Batch Group"
+        };
+
+        // General settings for the Frame Debugger Window and layout
+        public struct Window
+        {
+            public const int k_StartWindowWidth = 1024;
+            public const float k_MinTreeWidth = k_StartWindowWidth * 0.33f;
+            public const float k_ResizerWidth = 5f;
+            public const float k_MinDetailsWidth = 200f;
+        }
+
+        // Tree
+        public struct Tree
+        {
+            public static readonly GUIStyle rowText = "OL Label";
+            public static readonly GUIStyle rowTextRight = "OL RightLabel";
+            public const string k_UnknownScopeString = "<unknown scope>";
+        }
+
+        // Top Toolbar
+        public struct TopToolbar
+        {
+            public static readonly GUIContent recordButtonEnable = EditorGUIUtility.TrTextContent(L10n.Tr("Enable"));
+            public static readonly GUIContent recordButtonDisable = EditorGUIUtility.TrTextContent(L10n.Tr("Disable"));
+            public static readonly GUIContent prevFrame = EditorGUIUtility.TrIconContent("Profiler.PrevFrame", "Go back one frame");
+            public static readonly GUIContent nextFrame = EditorGUIUtility.TrIconContent("Profiler.NextFrame", "Go one frame forwards");
+            public static readonly GUIContent levelsHeader = EditorGUIUtility.TrTextContent("Levels", "Render target display black/white intensity levels");
+        }
+
+        // Event Toolbar in the Event Details window
+        public struct EventToolbar
+        {
+            private const float k_ToolbarHeight = 22f;
+            private const float k_ToolbarButtondWidth = 30f;
+
+            public static readonly GUIStyle toolbarHorizontalStyle = new GUIStyle(EditorStyles.toolbar)
+            {
+                fixedHeight = k_ToolbarHeight + 1f
+            };
+            public static readonly GUIStyle channelHeaderStyle = new GUIStyle(EditorStyles.toolbarLabel)
+            {
+                fixedHeight = k_ToolbarHeight
+            };
+            public static readonly GUIStyle channelStyle = new GUIStyle(EditorStyles.miniButtonMid)
+            {
+                fixedWidth = k_ToolbarButtondWidth,
+            };
+            public static readonly GUIStyle channelAllStyle = new GUIStyle(EditorStyles.miniButtonLeft)
+            {
+                fixedWidth = k_ToolbarButtondWidth,
+            };
+            public static readonly GUIStyle channelAStyle = new GUIStyle(EditorStyles.miniButtonRight)
+            {
+                fixedWidth = k_ToolbarButtondWidth,
+            };
+            public static readonly GUIStyle popupLeftStyle = new GUIStyle(EditorStyles.toolbarPopupLeft)
+            {
+                fixedHeight = k_ToolbarHeight
+            };
+            public static readonly GUIStyle levelsHorizontalStyle = new GUIStyle(EditorStyles.toolbarButton)
+            {
+                margin = new RectOffset(4, 4, 0, 0),
+                padding = new RectOffset(4, 4, 0, 0),
+                fixedHeight = k_ToolbarHeight
+            };
+
+            public static readonly GUIContent depthLabel = EditorGUIUtility.TrTextContent("Depth", "Show depth buffer");
+            public static readonly GUIContent channelHeader = EditorGUIUtility.TrTextContent("Channels", "Which render target color channels to show");
+            public static readonly GUIContent channelAll = EditorGUIUtility.TrTextContent("All");
+            public static readonly GUIContent channelR = EditorGUIUtility.TrTextContent("R");
+            public static readonly GUIContent channelG = EditorGUIUtility.TrTextContent("G");
+            public static readonly GUIContent channelB = EditorGUIUtility.TrTextContent("B");
+            public static readonly GUIContent channelA = EditorGUIUtility.TrTextContent("A");
+            public static readonly GUIContent levelsHeader = EditorGUIUtility.TrTextContent("Levels", "Render target display black/white intensity levels");
+            public static readonly GUIContent[] MRTLabels = new[]
+            {
+                EditorGUIUtility.TrTextContent("RT 0", "Show render target #0"),
+                EditorGUIUtility.TrTextContent("RT 1", "Show render target #1"),
+                EditorGUIUtility.TrTextContent("RT 2", "Show render target #2"),
+                EditorGUIUtility.TrTextContent("RT 3", "Show render target #3"),
+                EditorGUIUtility.TrTextContent("RT 4", "Show render target #4"),
+                EditorGUIUtility.TrTextContent("RT 5", "Show render target #5"),
+                EditorGUIUtility.TrTextContent("RT 6", "Show render target #6"),
+                EditorGUIUtility.TrTextContent("RT 7", "Show render target #7")
+            };
+        }
+
+        // Event Details Window
+        public struct EventDetails
+        {
+            private const int k_Indent1 = 5;
+            private const int k_Indent2 = 20;
+
+            public const float k_MaxViewportHeight = 355f;
+            public const float k_MaxViewportWidth = 125f;
+
+            public const int k_PropertyNameMaxChars = 35;
+            public const int k_TextureFormatMaxChars = 16;
+
+
+            public const float k_MeshBottomToolbarHeight = 21f;
+            public const float k_ArrayValuePopupBtnWidth = 2.0f;
+
+            public const string k_FloatFormat = "g7";
+            public const string k_IntFormat = "d";
+            public const string k_NotAvailable = "-";
+
+
+
+            public static readonly GUIStyle titleStyle = new GUIStyle(EditorStyles.largeLabel)
+            {
+                padding = new RectOffset(k_Indent1, 0, k_Indent1, 0),
+                fontStyle = FontStyle.Bold,
+                fontSize = 18,
+                fixedHeight = 50,
+            };
+            public static readonly GUIStyle foldoutCategoryBoxStyle = new GUIStyle(EditorStyles.helpBox);
+
+            public static readonly GUIStyle labelStyle = new GUIStyle(EditorStyles.label)
+            {
+                wordWrap = true,
+            };
+            public static readonly GUIStyle titleHorizontalStyle = new GUIStyle(EditorStyles.label)
+            {
+                margin = new RectOffset(0, 0, 0, 10),
+            };
+
+            public static readonly GUIStyle verticalLabelStyle = new GUIStyle(EditorStyles.label)
+            {
+                fixedWidth = 175,
+                padding = new RectOffset(0, 0, 0, 0),
+                margin = new RectOffset(0, 0, 0, 0),
+            };
+
+            public static readonly GUIStyle verticalValueStyle = new GUIStyle(EditorStyles.label)
+            {
+                fixedWidth = 250,
+                padding = new RectOffset(0, 0, 0, 0),
+                margin = new RectOffset(0, 0, 0, 0),
+            };
+
+            public static readonly GUIStyle outputMeshTabStyle = new GUIStyle("LargeButton")
+            {
+                padding = new RectOffset(0, 0, 0, 0),
+                margin = new RectOffset(-2, 0, 0, 0),
+            };
+            public static readonly GUIStyle outputMeshTextureStyle = new GUIStyle();
+            public static readonly GUIStyle meshPreToolbarStyle = "toolbar";
+            public static readonly GUIStyle meshPreToolbarLabelStyle = EditorStyles.toolbarButton;
+
+            public static readonly GUIStyle propertiesVerticalStyle = new GUIStyle(EditorStyles.label)
+            {
+                margin = new RectOffset(k_Indent2, 0, 0, 7)
+            };
+            public static readonly GUIStyle propertiesNameStyle = new GUIStyle(EditorStyles.label)
+            {
+                fixedWidth = 215,
+            };
+            public static readonly GUIStyle propertiesFlagsStyle = new GUIStyle(EditorStyles.label)
+            {
+                fixedWidth = 55f,
+            };
+
+            public static readonly GUIStyle textureButtonStyle = new GUIStyle()
+            {
+                fixedWidth = 12f,
+                fixedHeight = 12f,
+            };
+            public static readonly GUIStyle textureDimensionsStyle = new GUIStyle(EditorStyles.label)
+            {
+                fixedWidth = 65f,
+            };
+            public static readonly GUIStyle textureSizeStyle = new GUIStyle(EditorStyles.label)
+            {
+                fixedWidth = 100f,
+            };
+            public static readonly GUIStyle textureFormatStyle = new GUIStyle(EditorStyles.label)
+            {
+                fixedWidth = 110f,
+            };
+
+            public const string warningMultiThreadedMsg = "The Frame Debugger requires multi-threaded renderer. If this error persists, try starting the Editor with -force-gfx-mt command line argument.";
+            public const string warningLinuxOpenGLMsg = warningMultiThreadedMsg + " On Linux, the editor does not support a multi-threaded renderer when using OpenGL.";
+            public const string descriptionString = "Frame Debugger lets you step through draw calls and see how exactly frame is rendered. Click Enable!";
+            public static readonly GUIContent copyValueText = EditorGUIUtility.TrTextContent("Copy value");
+            public static readonly GUIContent shaderText = EditorGUIUtility.TrTextContent("Shader");
+            public static readonly GUIContent batchCauseText = EditorGUIUtility.TrTextContent("Batch cause");
+            public static readonly GUIContent passLightModeText = EditorGUIUtility.TrTextContent("Pass\nLightMode");
+            public static readonly GUIContent arrayPopupButtonText = EditorGUIUtility.TrTextContent("...");
+            public static readonly GUIContent foldoutOutputOrMeshText = EditorGUIUtility.TrTextContent("Output / Mesh");
+            public static readonly GUIContent foldoutEventDetailsText = EditorGUIUtility.TrTextContent("Details");
+            public static readonly GUIContent foldoutTexturesText = EditorGUIUtility.TrTextContent("Textures");
+            public static readonly GUIContent foldoutKeywordsText = EditorGUIUtility.TrTextContent("Keywords");
+            public static readonly GUIContent foldoutFloatsText = EditorGUIUtility.TrTextContent("Floats");
+            public static readonly GUIContent foldoutIntsText = EditorGUIUtility.TrTextContent("Ints");
+            public static readonly GUIContent foldoutVectorsText = EditorGUIUtility.TrTextContent("Vectors");
+            public static readonly GUIContent foldoutMatricesText = EditorGUIUtility.TrTextContent("Matrices");
+            public static readonly GUIContent foldoutBuffersText = EditorGUIUtility.TrTextContent("Buffers");
+            public static readonly GUIContent foldoutCBufferText = EditorGUIUtility.TrTextContent("CBuffer");
+
+            public static Texture2D outputMeshTexture = null;
+            public static readonly string[] batchBreakCauses = FrameDebuggerUtility.GetBatchBreakCauseStrings();
+        }
+
+        // Constructor
+        static FrameDebuggerStyles()
+        {
+            float greyVal = 0.2196079f;
+            EventDetails.outputMeshTexture = MakeTex(1, 1, new Color(greyVal, greyVal, greyVal, 1f));
+            EventDetails.outputMeshTextureStyle.normal.background = EventDetails.outputMeshTexture;
+        }
+
+        private static Texture2D MakeTex(int width, int height, Color col)
+        {
+            Color[] pix = new Color[width * height];
+            for (int i = 0; i < pix.Length; i++)
+            {
+                pix[i] = col;
+            }
+
+            Texture2D result = new Texture2D(width, height);
+            result.SetPixels(pix);
+            result.Apply();
+
+            return result;
+        }
+
+        public static void OnDisable()
+        {
+            UnityEngine.Object.DestroyImmediate(EventDetails.outputMeshTexture);
+            EventDetails.outputMeshTexture = null;
+        }
+
+        public class ArrayValuePopup : PopupWindowContent
+        {
+            public delegate string GetValueStringDelegate(int index, bool highPrecision);
+            private GetValueStringDelegate GetValueString;
+            private Vector2 m_ScrollPos = Vector2.zero;
+            private int m_StartIndex;
+            private int m_NumValues;
+            private float m_WindowWidth;
+            private int m_RowCount;
+            private static readonly GUIStyle m_Style = EditorStyles.miniLabel;
+
+            public ArrayValuePopup(int startIndex, int numValues, int rowCount, float windowWidth, GetValueStringDelegate getValueString)
+            {
+                m_StartIndex = startIndex;
+                m_NumValues = numValues;
+                m_WindowWidth = windowWidth;
+                m_RowCount = rowCount;
+                GetValueString = getValueString;
+            }
+
+            public override Vector2 GetWindowSize()
+            {
+                float lineHeight = m_Style.lineHeight + m_Style.padding.vertical + m_Style.margin.top;
+                return new Vector2(m_WindowWidth, Math.Min(lineHeight * m_NumValues * m_RowCount, 250.0f));
+            }
+
+            public override void OnGUI(Rect rect)
+            {
+                m_ScrollPos = EditorGUILayout.BeginScrollView(m_ScrollPos);
+
+                for (int i = 0; i < m_NumValues; ++i)
+                {
+                    string text = $"[{i}]\t{GetValueString(m_StartIndex + i, false)}";
+                    GUILayout.Label(text, m_Style);
+                }
+
+                EditorGUILayout.EndScrollView();
+
+                // Right click to copy the values to clipboard.
+                var e = Event.current;
+                if (e.type == EventType.ContextClick && rect.Contains(e.mousePosition))
+                {
+                    e.Use();
+
+                    string allText = string.Empty;
+                    for (int i = 0; i < m_NumValues; ++i)
+                    {
+                        allText += $"[{i}]\t{GetValueString(m_StartIndex + i, true)}";
+                    }
+
+                    var menu = new GenericMenu();
+                    menu.AddItem(FrameDebuggerStyles.EventDetails.copyValueText, false, delegate
+                    {
+                        EditorGUIUtility.systemCopyBuffer = allText;
+                    });
+                    menu.ShowAsContext();
+                }
+            }
+        }
+    }
+}
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerToolbarView.cs b/Editor/Mono/PerformanceTools/FrameDebuggerToolbarView.cs
new file mode 100644
index 0000000000..b1bf0c34a0
--- /dev/null
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerToolbarView.cs
@@ -0,0 +1,118 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine;
+using UnityEditorInternal;
+using UnityEngine.Networking.PlayerConnection;
+using UnityEditor.Networking.PlayerConnection;
+using UnityEngine.Profiling;
+
+namespace UnityEditor
+{
+    internal class FrameDebuggerToolbarView
+    {
+        // Non-Serialized
+        [NonSerialized] private int m_PrevEventsLimit = 0;
+        [NonSerialized] private int m_PrevEventsCount = 0;
+
+        // Returns true if repaint is needed
+        public bool DrawToolbar(FrameDebuggerWindow frameDebugger, IConnectionState m_AttachToPlayerState)
+        {
+            GUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            Profiler.BeginSample("DrawEnableDisableButton");
+            DrawEnableDisableButton(frameDebugger, m_AttachToPlayerState, out bool needsRepaint);
+            Profiler.EndSample();
+
+            Profiler.BeginSample("DrawConnectionDropdown");
+            DrawConnectionDropdown(frameDebugger, m_AttachToPlayerState, out bool isEnabled);
+            Profiler.EndSample();
+
+            GUI.enabled = isEnabled;
+
+            Profiler.BeginSample("DrawEventLimitSlider");
+            DrawEventLimitSlider(frameDebugger, out int newLimit);
+            Profiler.EndSample();
+
+            Profiler.BeginSample("DrawPrevNextButtons");
+            DrawPrevNextButtons(frameDebugger, ref newLimit);
+            Profiler.EndSample();
+
+            GUILayout.EndHorizontal();
+
+            return needsRepaint;
+        }
+
+        private void DrawEnableDisableButton(FrameDebuggerWindow frameDebugger, IConnectionState m_AttachToPlayerState, out bool needsRepaint)
+        {
+            needsRepaint = false;
+
+            EditorGUI.BeginChangeCheck();
+
+            bool wasEnabled = GUI.enabled;
+            GUI.enabled = m_AttachToPlayerState.connectedToTarget != ConnectionTarget.Editor || FrameDebuggerUtility.locallySupported;
+            GUIContent button = (FrameDebugger.enabled) ? FrameDebuggerStyles.TopToolbar.recordButtonDisable : FrameDebuggerStyles.TopToolbar.recordButtonEnable;
+            GUILayout.Toggle(FrameDebugger.enabled, button, EditorStyles.toolbarButtonLeft, GUILayout.MinWidth(80));
+            GUI.enabled = wasEnabled;
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                frameDebugger.ClickEnableFrameDebugger();
+                needsRepaint = true;
+            }
+        }
+
+        private void DrawConnectionDropdown(FrameDebuggerWindow frameDebugger, IConnectionState m_AttachToPlayerState, out bool isEnabled)
+        {
+            PlayerConnectionGUILayout.ConnectionTargetSelectionDropdown(m_AttachToPlayerState, EditorStyles.toolbarDropDown);
+            isEnabled = FrameDebugger.enabled;
+            if (isEnabled && ProfilerDriver.connectedProfiler != FrameDebuggerUtility.GetRemotePlayerGUID())
+            {
+                // Switch from local to remote debugger or vice versa
+                FrameDebuggerUtility.SetEnabled(false, FrameDebuggerUtility.GetRemotePlayerGUID());
+                FrameDebuggerUtility.SetEnabled(true, ProfilerDriver.connectedProfiler);
+            }
+        }
+
+        private void DrawEventLimitSlider(FrameDebuggerWindow frameDebugger, out int newLimit)
+        {
+            newLimit = 0;
+
+            EditorGUI.BeginChangeCheck();
+
+            bool wasEnabled = GUI.enabled;
+            GUI.enabled = FrameDebuggerUtility.count > 1;
+            newLimit = EditorGUILayout.IntSlider(FrameDebuggerUtility.limit, 1, FrameDebuggerUtility.count, 1, EditorStyles.toolbarSlider);
+            GUI.enabled = wasEnabled;
+
+            if (EditorGUI.EndChangeCheck())
+                frameDebugger.ChangeFrameEventLimit(newLimit);
+        }
+
+        private void DrawPrevNextButtons(FrameDebuggerWindow frameDebugger, ref int newLimit)
+        {
+            bool wasEnabled = GUI.enabled;
+
+            GUI.enabled = newLimit > 1;
+            if (GUILayout.Button(FrameDebuggerStyles.TopToolbar.prevFrame, EditorStyles.toolbarButton))
+                frameDebugger.ChangeFrameEventLimit(newLimit - 1);
+
+            GUI.enabled = newLimit < FrameDebuggerUtility.count;
+            if (GUILayout.Button(FrameDebuggerStyles.TopToolbar.nextFrame, EditorStyles.toolbarButtonRight))
+                frameDebugger.ChangeFrameEventLimit(newLimit + 1);
+
+            // If we had last event selected, and something changed in the scene so that
+            // number of events is different - then try to keep the last event selected.
+            if (m_PrevEventsLimit == m_PrevEventsCount)
+                if (FrameDebuggerUtility.count != m_PrevEventsCount && FrameDebuggerUtility.limit == m_PrevEventsLimit)
+                    frameDebugger.ChangeFrameEventLimit(FrameDebuggerUtility.count);
+
+            m_PrevEventsLimit = FrameDebuggerUtility.limit;
+            m_PrevEventsCount = FrameDebuggerUtility.count;
+
+            GUI.enabled = wasEnabled;
+        }
+    }
+}
diff --git a/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs b/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs
index 06e8da3a91..97c873656f 100644
--- a/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs
+++ b/Editor/Mono/PerformanceTools/FrameDebuggerTreeView.cs
@@ -7,6 +7,7 @@
 using UnityEditor;
 using System.Globalization;
 using UnityEditor.IMGUI.Controls;
+using Object = UnityEngine.Object;
 
 
 namespace UnityEditorInternal
@@ -14,29 +15,36 @@ namespace UnityEditorInternal
     internal class FrameDebuggerTreeView
     {
         internal readonly TreeViewController m_TreeView;
-        internal FDTreeViewDataSource m_DataSource;
+        internal FrameDebuggerTreeViewDataSource m_DataSource;
         private readonly FrameDebuggerWindow m_FrameDebugger;
 
         public FrameDebuggerTreeView(FrameDebuggerEvent[] frameEvents, TreeViewState treeViewState, FrameDebuggerWindow window, Rect startRect)
         {
             m_FrameDebugger = window;
             m_TreeView = new TreeViewController(window, treeViewState);
-            m_DataSource = new FDTreeViewDataSource(m_TreeView, frameEvents);
-            var gui = new FDTreeViewGUI(m_TreeView);
+            m_DataSource = new FrameDebuggerTreeViewDataSource(m_TreeView, frameEvents);
+            var gui = new FrameDebuggerTreeViewGUI(m_TreeView);
             m_TreeView.Init(startRect, m_DataSource, gui, null);
             m_TreeView.ReloadData();
             m_TreeView.selectionChangedCallback += SelectionChanged;
+            m_TreeView.itemSingleClickedCallback += ItemSingleClicked;
+            m_TreeView.itemDoubleClickedCallback += PingFrameEventObject;
+        }
+
+        void ItemSingleClicked(int selectedID)
+        {
+            if (Event.current.type == EventType.MouseDown && EditorGUI.actionKey)
+                PingFrameEventObject(selectedID);
         }
 
         void SelectionChanged(int[] selectedIDs)
         {
             if (selectedIDs.Length < 1)
                 return;
+
             int id = selectedIDs[0];
             int eventIndex = id;
-
-            if (PopupWindowWithoutFocus.IsVisible())
-                PopupWindowWithoutFocus.Hide();
+            FrameDebuggerTreeViewItem originalItem = null;
 
             // For tree hierarchy nodes, their IDs are not the frame event indices;
             // fetch the ID from the node itself in that case.
@@ -47,14 +55,25 @@ void SelectionChanged(int[] selectedIDs)
             // so that rendered state corresponds to "everything up to and including this whole sub-tree".
             if (eventIndex <= 0)
             {
-                var item = m_TreeView.FindItem(id) as FDTreeViewItem;
+                originalItem = m_TreeView.FindItem(id) as FrameDebuggerTreeViewItem;
+                FrameDebuggerTreeViewItem item = m_TreeView.FindItem(id) as FrameDebuggerTreeViewItem;
                 if (item != null)
                     eventIndex = item.m_EventIndex;
+
+                // If still has no valid ID, do nothing.
+                if (eventIndex <= 0)
+                    return;
             }
-            // If still has no valid ID, do nothing.
-            if (eventIndex <= 0)
-                return;
-            m_FrameDebugger.ChangeFrameEventLimit(eventIndex);
+
+            m_FrameDebugger.ChangeFrameEventLimit(eventIndex, originalItem);
+        }
+
+        private void PingFrameEventObject(int selectedID)
+        {
+            Object obj = FrameDebuggerUtility.GetFrameEventObject(selectedID - 1);
+            if (obj != null)
+                EditorGUIUtility.PingObject(obj);
+            m_FrameDebugger.DrawSearchField(string.Empty);
         }
 
         public void SelectFrameEventIndex(int eventIndex)
@@ -66,7 +85,7 @@ public void SelectFrameEventIndex(int eventIndex)
             int[] selection = m_TreeView.GetSelection();
             if (selection.Length > 0)
             {
-                var item = m_TreeView.FindItem(selection[0]) as FDTreeViewItem;
+                FrameDebuggerTreeViewItem item = m_TreeView.FindItem(selection[0]) as FrameDebuggerTreeViewItem;
                 if (item != null && eventIndex == item.m_EventIndex)
                     return;
             }
@@ -74,9 +93,9 @@ public void SelectFrameEventIndex(int eventIndex)
             m_TreeView.SetSelection(new[] { eventIndex }, true);
         }
 
-        public void OnGUI(Rect rect)
+        public void DrawTree(Rect rect)
         {
-            var keyboardControlID = GUIUtility.GetControlID(FocusType.Keyboard);
+            int keyboardControlID = GUIUtility.GetControlID(FocusType.Keyboard);
             m_TreeView.OnGUI(rect, keyboardControlID);
         }
 
@@ -84,12 +103,13 @@ public void OnGUI(Rect rect)
         // ID is different for leaf nodes (actual frame events) vs hierarchy nodes (parent profiler nodes):
         // - leaf node IDs are frame event indices (always > 0).
         // - hierarchy node IDs are always negative; to get frame event index we want we need to lookup the node and get it from m_EventIndex.
-        private class FDTreeViewItem : TreeViewItem
+        public class FrameDebuggerTreeViewItem : TreeViewItem
         {
             public FrameDebuggerEvent m_FrameEvent;
             public int m_ChildEventCount;
             public int m_EventIndex;
-            public FDTreeViewItem(int id, int depth, FDTreeViewItem parent, string displayName)
+
+            public FrameDebuggerTreeViewItem(int id, int depth, FrameDebuggerTreeViewItem parent, string displayName)
                 : base(id, depth, parent, displayName)
             {
                 m_EventIndex = id;
@@ -97,12 +117,11 @@ public FDTreeViewItem(int id, int depth, FDTreeViewItem parent, string displayNa
         }
 
         // GUI for TreeView
-
-        private class FDTreeViewGUI : TreeViewGUI
+        private class FrameDebuggerTreeViewGUI : TreeViewGUI
         {
-            const float kSmallMargin = 4;
+            private const float kSmallMargin = 4;
 
-            public FDTreeViewGUI(TreeViewController treeView)
+            public FrameDebuggerTreeViewGUI(TreeViewController treeView)
                 : base(treeView)
             {
             }
@@ -112,45 +131,62 @@ protected override Texture GetIconForItem(TreeViewItem item)
                 return null;
             }
 
+            private int childCounter = 0;
+
             protected override void OnContentGUI(Rect rect, int row, TreeViewItem itemRaw, string label, bool selected, bool focused, bool useBoldFont, bool isPinging)
             {
                 if (Event.current.type != EventType.Repaint)
+                {
                     return;
+                }
+
+                FrameDebuggerTreeViewItem item = (FrameDebuggerTreeViewItem)itemRaw;
+                string text;
+                GUIContent tempContent;
+                GUIStyle style;
 
-                var item = (FDTreeViewItem)itemRaw;
+                bool isParent = (item.hasChildren);
+                FontStyle fontStyle = (isParent) ? FontStyle.Bold : FontStyle.Normal;
+                childCounter = (isParent) ? 1 : (childCounter + 1);
+
+                // Draw background
+                style = FrameDebuggerStyles.Tree.rowText;
+                tempContent = EditorGUIUtility.TempContent("");
+                style.Draw(rect, tempContent, false, false, false, false);
 
                 // indent
                 float indent = GetContentIndent(item);
                 rect.x += indent;
                 rect.width -= indent;
 
-                string text;
-                GUIContent gc;
-                GUIStyle style;
-
                 // child event count
-                if (item.m_ChildEventCount > 0)
+                if (isParent)
                 {
+                    text = item.m_ChildEventCount.ToString(CultureInfo.InvariantCulture);
+                    tempContent = EditorGUIUtility.TempContent(text);
+
+                    style = FrameDebuggerStyles.Tree.rowTextRight;
+                    style.fontStyle = fontStyle;
+
                     Rect r = rect;
                     r.width -= kSmallMargin;
-                    text = item.m_ChildEventCount.ToString(CultureInfo.InvariantCulture);
-                    gc = EditorGUIUtility.TempContent(text);
-                    style = FrameDebuggerWindow.styles.rowTextRight;
-                    style.Draw(r, gc, false, false, false, false);
+                    style.Draw(r, tempContent, false, false, false, false);
+
                     // reduce width of available space for the name, so that it does not overlap event count
-                    rect.width -= style.CalcSize(gc).x + kSmallMargin * 2;
+                    rect.width -= style.CalcSize(tempContent).x + kSmallMargin * 2;
                 }
 
+                style = FrameDebuggerStyles.Tree.rowText;
+                style.fontStyle = fontStyle;
+
                 // draw event name
-                if (item.id <= 0)
-                    text = item.displayName; // hierarchy item
-                else
-                    text = FrameDebuggerWindow.s_FrameEventTypeNames[(int)item.m_FrameEvent.type] + item.displayName; // leaf event
+                text = item.displayName;
+
                 if (string.IsNullOrEmpty(text))
-                    text = "<unknown scope>";
-                gc = EditorGUIUtility.TempContent(text);
-                style = FrameDebuggerWindow.styles.rowText;
-                style.Draw(rect, gc, false, false, false, selected && focused);
+                    text = FrameDebuggerStyles.Tree.k_UnknownScopeString;
+
+                tempContent = EditorGUIUtility.TempContent(text);
+                style.Draw(rect, tempContent, false, false, false, selected && focused);
             }
 
             protected override void RenameEnded()
@@ -160,12 +196,11 @@ protected override void RenameEnded()
 
         // Data source for TreeView
 
-        internal class FDTreeViewDataSource : TreeViewDataSource
+        internal class FrameDebuggerTreeViewDataSource : TreeViewDataSource
         {
             private FrameDebuggerEvent[] m_FrameEvents;
 
-            public FDTreeViewDataSource(TreeViewController treeView, FrameDebuggerEvent[] frameEvents)
-                : base(treeView)
+            public FrameDebuggerTreeViewDataSource(TreeViewController treeView, FrameDebuggerEvent[] frameEvents) : base(treeView)
             {
                 m_FrameEvents = frameEvents;
                 rootIsCollapsable = false;
@@ -174,7 +209,7 @@ public FDTreeViewDataSource(TreeViewController treeView, FrameDebuggerEvent[] fr
 
             public void SetEvents(FrameDebuggerEvent[] frameEvents)
             {
-                var wasEmpty = m_FrameEvents == null || m_FrameEvents.Length < 1;
+                bool wasEmpty = m_FrameEvents == null || m_FrameEvents.Length < 1;
 
                 m_FrameEvents = frameEvents;
                 m_NeedRefreshRows = true;
@@ -183,16 +218,7 @@ public void SetEvents(FrameDebuggerEvent[] frameEvents)
                 // Only expand whole events tree if it was empty before.
                 // If we already had something in there, we want to preserve user's expanded items.
                 if (wasEmpty)
-                {
-                    SetExpanded(m_RootItem, true);
-
-                    // Expand root's children only
-                    foreach (var treeViewItem in m_RootItem.children)
-                    {
-                        if (treeViewItem != null)
-                            SetExpanded(treeViewItem, true);
-                    }
-                }
+                    SetExpandedWithChildren(m_RootItem, true);
             }
 
             public override bool IsRenamingItemAllowed(TreeViewItem item)
@@ -206,92 +232,95 @@ public override bool CanBeMultiSelected(TreeViewItem item)
             }
 
             // Used while building the tree data source; represents current tree hierarchy level
-            private class FDTreeHierarchyLevel
+            private class FrameDebuggerTreeHierarchyLevel
             {
-                internal readonly FDTreeViewItem item;
+                internal readonly FrameDebuggerTreeViewItem item;
                 internal readonly List<TreeViewItem> children;
-                internal FDTreeHierarchyLevel(int depth, int id, string name, FDTreeViewItem parent)
+                internal FrameDebuggerTreeHierarchyLevel(int depth, int id, string name, FrameDebuggerTreeViewItem parent)
                 {
-                    item = new FDTreeViewItem(id, depth, parent, name);
+                    item = new FrameDebuggerTreeViewItem(id, depth, parent, name);
                     children = new List<TreeViewItem>();
                 }
             }
-            private static void CloseLastHierarchyLevel(List<FDTreeHierarchyLevel> eventStack, int prevFrameEventIndex)
+
+            private static void CloseLastHierarchyLevel(List<FrameDebuggerTreeHierarchyLevel> eventStack, int prevFrameEventIndex)
             {
                 var idx = eventStack.Count - 1;
                 eventStack[idx].item.children = eventStack[idx].children;
                 eventStack[idx].item.m_EventIndex = prevFrameEventIndex;
+
                 if (eventStack[idx].item.parent != null)
-                    ((FDTreeViewItem)eventStack[idx].item.parent).m_ChildEventCount += eventStack[idx].item.m_ChildEventCount;
-                eventStack.RemoveAt(idx);
-            }
+                    ((FrameDebuggerTreeViewItem)eventStack[idx].item.parent).m_ChildEventCount += eventStack[idx].item.m_ChildEventCount;
 
-            static bool IsHiddenEventType(FrameEventType et)
-            {
-                return et == FrameEventType.BeginSubpass;
+                eventStack.RemoveAt(idx);
             }
 
             public override void FetchData()
             {
-                var rootLevel = new FDTreeHierarchyLevel(0, 0, string.Empty, null);
+                FrameDebuggerTreeHierarchyLevel rootLevel = new FrameDebuggerTreeHierarchyLevel(0, 0, string.Empty, null);
 
                 // Hierarchy levels of a tree being built
-                var eventStack = new List<FDTreeHierarchyLevel>();
+                List<FrameDebuggerTreeHierarchyLevel> eventStack = new List<FrameDebuggerTreeHierarchyLevel>();
                 eventStack.Add(rootLevel);
 
                 int hierarchyIDCounter = -1;
-                for (var i = 0; i < m_FrameEvents.Length; ++i)
+                for (int i = 0; i < m_FrameEvents.Length; ++i)
                 {
                     // This will be a slash-delimited string, e.g. Foo/Bar/Baz.
                     // Add "/" in front to account for the single (invisible) root item
                     // that the TreeView always has.
                     string context = "/" + (FrameDebuggerUtility.GetFrameEventInfoName(i) ?? string.Empty);
                     string[] names = context.Split('/');
+
                     // find matching hierarchy level
                     int level = 0;
                     while (level < eventStack.Count && level < names.Length)
                     {
                         if (names[level] != eventStack[level].item.displayName)
                             break;
+
                         ++level;
                     }
+
                     // close all the further levels from previous events in the stack
                     while (eventStack.Count > 0 && eventStack.Count > level)
-                    {
                         CloseLastHierarchyLevel(eventStack, i);
-                    }
 
-                    if (m_FrameEvents[i].type == FrameEventType.HierarchyLevelBreak)
+                    if (FrameDebuggerHelper.IsAHierarchyLevelBreakEvent(m_FrameEvents[i].type))
                         continue;
 
                     // add all further levels for current event
-                    for (var j = level; j < names.Length; ++j)
+                    for (int j = level; j < names.Length; ++j)
                     {
                         var parent = eventStack[eventStack.Count - 1];
-                        var newLevel = new FDTreeHierarchyLevel(eventStack.Count - 1, --hierarchyIDCounter, names[j], parent.item);
+                        var newLevel = new FrameDebuggerTreeHierarchyLevel(eventStack.Count - 1, --hierarchyIDCounter, names[j], parent.item);
                         parent.children.Add(newLevel.item);
                         eventStack.Add(newLevel);
                     }
 
-                    if (IsHiddenEventType(m_FrameEvents[i].type))
+                    if (FrameDebuggerHelper.IsAHiddenEvent(m_FrameEvents[i].type))
                         continue;
 
                     // add leaf event to current level
                     var eventObj = FrameDebuggerUtility.GetFrameEventObject(i);
                     var displayName = string.Empty;
+
                     if (eventObj)
                         displayName = " " + eventObj.name;
-                    FDTreeHierarchyLevel parentEvent = eventStack[eventStack.Count - 1];
-                    var leafEventID = i + 1;
-                    var item = new FDTreeViewItem(leafEventID, eventStack.Count - 1, parentEvent.item, displayName);
+                    else
+                        displayName = FrameDebuggerStyles.frameEventTypeNames[(int)m_FrameEvents[i].type];
+
+                    FrameDebuggerTreeHierarchyLevel parentEvent = eventStack[eventStack.Count - 1];
+                    int leafEventID = i + 1;
+                    FrameDebuggerTreeViewItem item = new FrameDebuggerTreeViewItem(leafEventID, eventStack.Count - 1, parentEvent.item, displayName);
                     item.m_FrameEvent = m_FrameEvents[i];
                     parentEvent.children.Add(item);
                     ++parentEvent.item.m_ChildEventCount;
                 }
+
                 while (eventStack.Count > 0)
-                {
                     CloseLastHierarchyLevel(eventStack, m_FrameEvents.Length);
-                }
+
                 m_RootItem = rootLevel.item;
             }
         }
diff --git a/Editor/Mono/PlayModeView/PlayModeView.cs b/Editor/Mono/PlayModeView/PlayModeView.cs
index d4fbe5b3d0..4b6c9ef6d6 100644
--- a/Editor/Mono/PlayModeView/PlayModeView.cs
+++ b/Editor/Mono/PlayModeView/PlayModeView.cs
@@ -54,7 +54,19 @@ internal abstract class PlayModeView : EditorWindow
 
         private const int k_MaxSupportedDisplays = 8;
 
-        private Dictionary<Type, string> m_AvailableWindowTypes;
+        static Dictionary<Type, string> s_AvailableWindowTypes;
+
+        internal Vector2 viewPadding
+        {
+            get;
+            private protected set;
+        }
+
+        internal float viewMouseScale
+        {
+            get;
+            private protected set;
+        }
 
         protected string playModeViewName
         {
@@ -257,15 +269,15 @@ protected RenderTexture RenderView(Vector2 mousePosition, bool clearTexture)
             }
         }
 
-        protected string GetWindowTitle(Type type)
+        protected static string GetWindowTitle(Type type)
         {
             var attributes = type.GetCustomAttributes(typeof(EditorWindowTitleAttribute), true);
             return attributes.Length > 0 ? ((EditorWindowTitleAttribute)attributes[0]).title : type.Name;
         }
 
-        protected Dictionary<Type, string> GetAvailableWindowTypes()
+        internal static Dictionary<Type, string> GetAvailableWindowTypes()
         {
-            return m_AvailableWindowTypes ?? (m_AvailableWindowTypes = TypeCache.GetTypesDerivedFrom(typeof(PlayModeView)).OrderBy(GetWindowTitle).ToDictionary(t => t, GetWindowTitle));
+            return s_AvailableWindowTypes ?? (s_AvailableWindowTypes = TypeCache.GetTypesDerivedFrom(typeof(PlayModeView)).OrderBy(GetWindowTitle).ToDictionary(t => t, GetWindowTitle));
         }
 
         private void SetSerializedViews(Dictionary<string, string> serializedViews)
@@ -285,7 +297,7 @@ private Dictionary<string, string> ListsToDictionary(List<string> keys, List<str
             return dict;
         }
 
-        protected void SwapMainWindow(Type type)
+        protected internal void SwapMainWindow(Type type)
         {
             if (type.BaseType != typeof(PlayModeView))
                 throw new ArgumentException("Type should derive from " + typeof(PlayModeView).Name);
diff --git a/Editor/Mono/PlayModeView/PlayModeWindow.cs b/Editor/Mono/PlayModeView/PlayModeWindow.cs
new file mode 100644
index 0000000000..3475619c9e
--- /dev/null
+++ b/Editor/Mono/PlayModeView/PlayModeWindow.cs
@@ -0,0 +1,105 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Linq;
+using UnityEngine;
+
+namespace UnityEditor
+{
+    public class PlayModeWindow
+    {
+        static Type s_SimulatorWindowType =
+            PlayModeView.GetAvailableWindowTypes().Keys.FirstOrDefault(x => x.Name.Contains("SimulatorWindow"));
+
+        PlayModeWindow()
+        {
+        }
+
+        public enum PlayModeViewTypes
+        {
+            GameView,
+            SimulatorView
+        }
+
+        public static void GetRenderingResolution(out uint width, out uint height)
+        {
+            var view = GetOrCreateWindow();
+            width = (uint)view.targetSize.x;
+            height = (uint)view.targetSize.y;
+        }
+
+        public static void SetCustomRenderingResolution(uint width, uint height, string baseName)
+        {
+            var win = GetOrCreateWindow();
+            var gameView = win as GameView;
+
+            if (gameView != null)
+            {
+                gameView.SetCustomResolution(new Vector2(width, height), baseName);
+            }
+            else
+            {
+                Debug.LogError($"The {win.GetType().Name} does not support custom resolution");
+            }
+        }
+
+        public static void SetPlayModeFocused(bool focused)
+        {
+            GetOrCreateWindow().enterPlayModeBehavior = focused
+                ? PlayModeView.EnterPlayModeBehavior.PlayFocused
+                : PlayModeView.EnterPlayModeBehavior.PlayMaximized;
+        }
+
+        public static bool GetPlayModeFocused()
+        {
+            return GetOrCreateWindow().enterPlayModeBehavior == PlayModeView.EnterPlayModeBehavior.PlayFocused;
+        }
+
+        public static PlayModeViewTypes GetViewType()
+        {
+            var type = GetOrCreateWindow().GetType();
+            if (type == typeof(GameView))
+                return PlayModeViewTypes.GameView;
+            if (type == s_SimulatorWindowType)
+                return PlayModeViewTypes.SimulatorView;
+
+            throw new Exception("Unsupported PlayModeView type");
+        }
+
+        public static void SetViewType(PlayModeViewTypes type)
+        {
+            var view = GetOrCreateWindow();
+            switch (type)
+            {
+                case PlayModeViewTypes.GameView:
+                    view.SwapMainWindow(typeof(GameView));
+                    return;
+                case PlayModeViewTypes.SimulatorView:
+                {
+                    // DeviceSim is a Module that might be disabled in the future.
+                    if (s_SimulatorWindowType == null)
+                    {
+                        throw new Exception("Cannot find the SimulatorWindow type.");
+                    }
+                    view.SwapMainWindow(s_SimulatorWindowType);
+                    return;
+                }
+                default:
+                    throw new Exception("Unsupported PlayModeView type");
+            }
+        }
+
+        static PlayModeView GetOrCreateWindow()
+        {
+            var view = PlayModeView.GetMainPlayModeView();
+            if (view == null)
+            {
+                return EditorWindow.CreateWindow<GameView>();
+            }
+
+            return view;
+        }
+    }
+}
diff --git a/Editor/Mono/PlayerSettings.bindings.cs b/Editor/Mono/PlayerSettings.bindings.cs
index 4b068ba447..746342c186 100644
--- a/Editor/Mono/PlayerSettings.bindings.cs
+++ b/Editor/Mono/PlayerSettings.bindings.cs
@@ -32,6 +32,8 @@ public enum ScriptingImplementation
         Mono2x = 0,
         IL2CPP = 1,
         WinRTDotNET = 2,
+        [Obsolete("CoreCLR support is still a work in progress and is disabled for now.")] // Hide from intellisense while WIP
+        CoreCLR = 3,
     }
 
     // Must be in sync with Il2CppCompilerConfiguration enum in SerializationMetaFlags.h
@@ -42,25 +44,6 @@ public enum Il2CppCompilerConfiguration
         Master = 2,
     }
 
-    // Must be in sync with kAspectRatioSerializeNames and kAspectRatioValues
-    public enum AspectRatio
-    {
-        // Undefined aspect ratios.
-        AspectOthers = 0,
-
-        // 4:3 aspect ratio.
-        Aspect4by3 = 1,
-
-        // 5:4 aspect ratio.
-        Aspect5by4 = 2,
-
-        // 16:10 aspect ratio.
-        Aspect16by10 = 3,
-
-        // 16:9 aspect ratio.
-        Aspect16by9 = 4,
-    }
-
     // Mac fullscreen mode
     public enum MacFullscreenMode
     {
@@ -242,6 +225,14 @@ internal enum LightmapEncodingQuality
         High = 2
     }
 
+    // Keep in synch with HDRCubemapEncodingQuality enum from GfxDeviceTypes.h
+    internal enum HDRCubemapEncodingQuality
+    {
+        Low = 0,
+        Normal = 1,
+        High = 2
+    }
+
     // Must be in sync with ShaderPrecisionModel enum in EditorOnlyPlayerSettings.h
     public enum ShaderPrecisionModel
     {
@@ -489,13 +480,6 @@ public static Guid productGUID
         [Obsolete("displayResolutionDialog has been removed.", false)]
         public static extern ResolutionDialogSetting displayResolutionDialog { get; set; }
 
-        // Returns whether or not the specified aspect ratio is enabled.
-        [NativeMethod("AspectRatioEnabled")]
-        public static extern bool HasAspectRatio(AspectRatio aspectRatio);
-
-        // Enables the specified aspect ratio.
-        public static extern void SetAspectRatio(AspectRatio aspectRatio, bool enable);
-
         // If enabled, the game will default to fullscreen mode.
         [Obsolete("(defaultIsFullScreen is deprecated, use fullScreenMode instead")]
         [StaticAccessor("PlayerSettingsBindings", StaticAccessorType.DoubleColon)]
@@ -519,6 +503,9 @@ public static Guid productGUID
         // Use resizable window in standalone player builds.
         public static extern bool resizableWindow { get; set; }
 
+        // Should resolution be reset when native window size changes. Shared between iOS & Android platforms.
+        public static extern bool resetResolutionOnWindowResize { get; set; }
+
         /// Bake collision meshes into the mesh asset.
         public static extern bool bakeCollisionMeshes { get; set; }
 
@@ -577,6 +564,7 @@ public static bool singlePassStereoRendering
         public static bool protectGraphicsMemory { get { return false; } set {} }
 
         public static extern bool enableFrameTimingStats { get; set; }
+        public static extern bool enableOpenGLProfilerGPURecorders { get; set; }
 
         public static extern bool useHDRDisplay { get; set; }
 
@@ -717,6 +705,12 @@ internal static string GetPlatformName(BuildTargetGroup targetGroup)
         [NativeMethod("SetLightmapEncodingQuality")]
         internal static extern void SetLightmapEncodingQualityForPlatformGroup(BuildTargetGroup platformGroup, LightmapEncodingQuality encodingQuality);
 
+        [NativeMethod("GetHDRCubemapEncodingQuality")]
+        internal static extern HDRCubemapEncodingQuality GetHDRCubemapEncodingQualityForPlatformGroup(BuildTargetGroup platformGroup);
+
+        [NativeMethod("SetHDRCubemapEncodingQuality")]
+        internal static extern void SetHDRCubemapEncodingQualityForPlatformGroup(BuildTargetGroup platformGroup, HDRCubemapEncodingQuality encodingQuality);
+
         [FreeFunction("GetTargetPlatformGraphicsAPIAvailability")]
         internal static extern UnityEngine.Rendering.GraphicsDeviceType[] GetSupportedGraphicsAPIs(BuildTarget platform);
 
@@ -880,11 +874,11 @@ public static Il2CppCompilerConfiguration GetIl2CppCompilerConfiguration(BuildTa
         public static void SetIl2CppCompilerConfiguration(BuildTargetGroup targetGroup, Il2CppCompilerConfiguration configuration) =>
             SetIl2CppCompilerConfiguration(NamedBuildTarget.FromBuildTargetGroup(targetGroup), configuration);
 
-        // [Obsolete("Use GetIncrementalIl2CppBuild(NamedBuildTarget buildTarget) instead")]
+        [Obsolete("GetIncrementalIl2CppBuild has no impact on the build process")]
         public static bool GetIncrementalIl2CppBuild(BuildTargetGroup targetGroup) =>
             GetIncrementalIl2CppBuild(NamedBuildTarget.FromBuildTargetGroup(targetGroup));
 
-        // [Obsolete("Use SetIncrementalIl2CppBuild(NamedBuildTarget buildTarget, bool enabled) instead")]
+        [Obsolete("SetIncrementalIl2CppBuild has no impact on the build process")]
         public static void SetIncrementalIl2CppBuild(BuildTargetGroup targetGroup, bool enabled) =>
             SetIncrementalIl2CppBuild(NamedBuildTarget.FromBuildTargetGroup(targetGroup), enabled);
 
@@ -1065,12 +1059,14 @@ public static void SetIl2CppCompilerConfiguration(NamedBuildTarget buildTarget,
         [StaticAccessor("GetPlayerSettings().GetEditorOnly()")]
         [NativeMethod("GetPlatformIncrementalIl2CppBuild")]
         private static extern bool GetIncrementalIl2CppBuildInternal(string buildTargetName);
+        [Obsolete("GetIncrementalIl2CppBuild has no impact on the build process")]
         public static bool GetIncrementalIl2CppBuild(NamedBuildTarget buildTarget) => GetIncrementalIl2CppBuildInternal(buildTarget.TargetName);
 
         [NativeThrows]
         [StaticAccessor("GetPlayerSettings().GetEditorOnlyForUpdate()")]
         [NativeMethod("SetPlatformIncrementalIl2CppBuild")]
         private static extern void SetIncrementalIl2CppBuildInternal(string buildTargetName, bool enabled);
+        [Obsolete("SetIncrementalIl2CppBuild has no impact on the build process")]
         public static void SetIncrementalIl2CppBuild(NamedBuildTarget buildTarget, bool enabled) =>
             SetIncrementalIl2CppBuildInternal(buildTarget.TargetName, enabled);
 
@@ -1137,13 +1133,11 @@ public static void SetMobileMTRendering(NamedBuildTarget buildTarget, bool enabl
         public static void SetNormalMapEncoding(NamedBuildTarget buildTarget, NormalMapEncoding encoding) =>
             SetNormalMapEncodingInternal(buildTarget.TargetName, encoding);
 
-        public static extern bool assemblyVersionValidation
+        [Obsolete("assemblyVersionValidation has been deprecated due to the introduction of binding redirects")]
+        public static bool assemblyVersionValidation
         {
-            [StaticAccessor("GetPlayerSettings().GetEditorOnly()")]
-            get;
-
-            [StaticAccessor("GetPlayerSettings().GetEditorOnlyForUpdate()")]
-            set;
+            get => false;
+            set { }
         }
 
         [StaticAccessor("GetPlayerSettings().GetEditorOnly().additionalIl2CppArgs")]
diff --git a/Editor/Mono/PlayerSettings.deprecated.cs b/Editor/Mono/PlayerSettings.deprecated.cs
index d88fa2a8d3..3d8e4f326e 100644
--- a/Editor/Mono/PlayerSettings.deprecated.cs
+++ b/Editor/Mono/PlayerSettings.deprecated.cs
@@ -81,6 +81,26 @@ public enum iOSSystemGestureDeferMode: uint
         All = TopEdge | LeftEdge | BottomEdge | RightEdge
     }
 
+    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+    [Obsolete("AspectRatio enum has been deprecated and its functionality has been removed from Unity.", false)]
+    public enum AspectRatio
+    {
+        // Undefined aspect ratios.
+        AspectOthers = 0,
+
+        // 4:3 aspect ratio.
+        Aspect4by3 = 1,
+
+        // 5:4 aspect ratio.
+        Aspect5by4 = 2,
+
+        // 16:10 aspect ratio.
+        Aspect16by10 = 3,
+
+        // 16:9 aspect ratio.
+        Aspect16by9 = 4,
+    }
+
     partial class PlayerSettings
     {
         // deprecated since forever
@@ -111,6 +131,14 @@ partial class PlayerSettings
         [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
         [Obsolete("Use PlayerSettings.applicationIdentifier instead (UnityUpgradable) -> UnityEditor.PlayerSettings.applicationIdentifier", true)]
         public static string bundleIdentifier { get { return applicationIdentifier; } set { applicationIdentifier = value; } }
+
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [Obsolete("HasAspectRatio is deprecated, Unity supports all aspect ratios.", false)]
+        public static bool HasAspectRatio(AspectRatio aspectRatio) => true;
+
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [Obsolete("SetAspectRatio is deprecated, Unity supports all aspect ratios.", false)]
+        public static void SetAspectRatio(AspectRatio aspectRatio, bool enable) { }
     }
 
     partial class PlayerSettings
diff --git a/Editor/Mono/PlayerSettingsIOS.bindings.cs b/Editor/Mono/PlayerSettingsIOS.bindings.cs
index 03f13550c6..ff21f94e91 100644
--- a/Editor/Mono/PlayerSettingsIOS.bindings.cs
+++ b/Editor/Mono/PlayerSettingsIOS.bindings.cs
@@ -108,6 +108,7 @@ public enum iOSBackgroundMode: uint
         BluetoothPeripheral = 1 << 6,
         Fetch = 1 << 7,
         RemoteNotification = 1 << 8,
+        Processing = 1 << 9,
     }
 
     public enum iOSLaunchScreenImageType
diff --git a/Editor/Mono/PlayerSettingsWSA.bindings.cs b/Editor/Mono/PlayerSettingsWSA.bindings.cs
index 2f8af01e01..3daa66e699 100644
--- a/Editor/Mono/PlayerSettingsWSA.bindings.cs
+++ b/Editor/Mono/PlayerSettingsWSA.bindings.cs
@@ -375,6 +375,8 @@ private static extern WSASupportedFileType[] metroFTAFileTypes
                 set;
             }
 
+            public static extern string vcxProjDefaultLanguage { get; set; }
+
             public static class Declarations
             {
                 public static string protocolName
diff --git a/Editor/Mono/Plugins/PluginsHelper.cs b/Editor/Mono/Plugins/PluginsHelper.cs
index 12ffd4c269..9e9c0b76cc 100644
--- a/Editor/Mono/Plugins/PluginsHelper.cs
+++ b/Editor/Mono/Plugins/PluginsHelper.cs
@@ -11,7 +11,7 @@ namespace UnityEditorInternal
 {
     internal class PluginsHelper
     {
-        public static bool CheckFileCollisions(BuildTarget buildTarget)
+        public static bool CheckFileCollisions(BuildTarget buildTarget, string[] defineConstraints)
         {
             // Checks that plugins don't collide with each other
             IPluginImporterExtension pluginImporterExtension = null;
@@ -26,7 +26,7 @@ public static bool CheckFileCollisions(BuildTarget buildTarget)
                     pluginImporterExtension = new DefaultPluginImporterExtension(null);
             }
 
-            if (pluginImporterExtension.CheckFileCollisions(BuildPipeline.GetBuildTargetName(buildTarget)))
+            if (pluginImporterExtension.CheckFileCollisions(BuildPipeline.GetBuildTargetName(buildTarget), defineConstraints))
                 return true;
 
             return false;
diff --git a/Editor/Mono/PointEditor.cs b/Editor/Mono/PointEditor.cs
index 6390ee46c6..d0c6ed7321 100644
--- a/Editor/Mono/PointEditor.cs
+++ b/Editor/Mono/PointEditor.cs
@@ -15,7 +15,7 @@ namespace UnityEditor
     /// The point editor uses this to make callbacks to your editor so no assumptions about your data structure is made.
     internal interface IEditablePoint
     {
-        /// Get the world-space position of a specifc point
+        /// Get the world-space position of a specific point
         Vector3 GetPosition(int idx);
         /// Set the world-space position of a specific point
         void SetPosition(int idx, Vector3 position);
diff --git a/Editor/Mono/Prefabs/PrefabFamilyPopup.cs b/Editor/Mono/Prefabs/PrefabFamilyPopup.cs
new file mode 100644
index 0000000000..bcb8593948
--- /dev/null
+++ b/Editor/Mono/Prefabs/PrefabFamilyPopup.cs
@@ -0,0 +1,748 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using UnityEngine;
+using Object = UnityEngine.Object;
+using UnityEditor.SceneManagement;
+using System.Linq;
+using System;
+using UnityEngine.Assertions;
+
+namespace UnityEditor
+{
+    class PrefabFamilyPopup : PopupWindowContent
+    {
+        GameObject m_Target;
+        string m_TargetPath;
+        string m_TargetGUID;
+
+        struct AncestorItem
+        {
+            public string assetPath;
+            public int overrideCount;
+        }
+        AncestorItem[] m_AncestorItems;
+        OverridesCounterForPrefabAssets m_OverridesCounter;
+        int numRows => m_AncestorItems.Length;
+
+        bool m_DisplayChildren = false;
+        ObjectListArea m_ListArea;
+        ObjectListAreaState m_ListAreaState = new ObjectListAreaState() { m_GridSize = 56 };
+        SavedInt m_SavedGridSize = new SavedInt("PrefabFamilyPopup.GridSize", 56);
+        int[] m_Results = null;
+        Delayer m_Debounce;
+        SearchFilter m_SearchFilter;
+        string m_SearchFilterString = "";
+        Vector2 m_Scroll = Vector2.zero;
+        IEnumerator<HierarchyProperty> m_Enumerator = null;
+        const int k_MinIconSize = 20;
+
+        static bool s_Open = false;
+        bool m_Debug = false;
+
+        float m_WindowWidth, m_NamesWidth, m_MaxNameWidth, m_NoResultsX, m_OverridesX;
+
+        const int k_MaxSearchIterationPerFrame = 500;
+        const int k_MaxTableRows = 10;
+        const float k_MinWindowWidth = 300f, k_MaxWindowWidth = 700f;
+        const float k_HeaderHeight = 28f;
+        const float k_EntryHeight = 20f;
+        const float k_SliderWidth = 55f;
+        const float k_SearchHeight = 150f;
+        const float k_Padding = 3f;
+        const float k_OffsetX = 6f;
+        const float k_SplitWidth = 1f;
+        readonly float k_MinNameWidth;
+        readonly float k_TitleWidth = k_OffsetX + 50f;
+        readonly float k_OverridesWidth = k_SplitWidth + EditorStyles.miniLabel.CalcSize(Styles.overridesLabel).x + 2 * k_Padding;
+        readonly float k_ScrollbarWidth = GUI.skin.verticalScrollbar.fixedWidth + GUI.skin.verticalScrollbar.margin.left;
+        readonly float k_ScrollbarHeight = GUI.skin.horizontalScrollbar.fixedHeight + GUI.skin.horizontalScrollbar.margin.top;
+
+
+        public static class Colors
+        {
+            static Color header_l = new Color32(0xDF, 0xDF, 0xDF, 0xFF);
+            static Color header_d = new Color(0.5f, 0.5f, 0.5f, 0.2f);
+
+            static Color[] rows_l = new Color[2]
+            {
+                new Color32(0xC8, 0xC8, 0xC8, 0xFF),
+                new Color32(0xCE, 0xCE, 0xCE, 0xFF)
+            };
+
+            static Color[] rows_d = new Color[2]
+            {
+                new Color32(0x38, 0x38, 0x38, 0xFF),
+                new Color32(0x3E, 0x3E, 0x3E, 0xFF)
+            };
+
+            public static Color headerBackground { get { return EditorGUIUtility.isProSkin ? Colors.header_d : Colors.header_l; } }
+            public static Color rowBackground(int i) => EditorGUIUtility.isProSkin ? Colors.rows_d[i % 2] : Colors.rows_l[i % 2];
+        }
+
+        public static class Styles
+        {
+            public static readonly GUIContent rootLabel = EditorGUIUtility.TrTextContent("Root", "The root of the Prefab Variant hierarchy");
+            public static readonly GUIContent selectedLabel = EditorGUIUtility.TrTextContent("Current", "The currently selected Prefab");
+            public static readonly GUIContent titlePrefixLabel = EditorGUIUtility.TrTextContent("Variant Family of");
+            public static readonly GUIContent ancestorLabel = EditorGUIUtility.TrTextContent("Ancestors");
+            public static readonly GUIContent overridesLabel = EditorGUIUtility.TrTextContent("Overrides");
+            public static readonly GUIContent childrenLabel = EditorGUIUtility.TrTextContent("Children");
+            public static readonly GUIContent noResultsLabel = EditorGUIUtility.TrTextContent("No results");
+            public static readonly GUIContent noChildrenLabel = EditorGUIUtility.TrTextContent("This Prefab doesn't have any children.\nPrefab Variants created from this Prefab\nwill be listed here.");
+            public static readonly GUIStyle searchBackground = new GUIStyle("ProjectBrowserIconAreaBg");
+            public static readonly GUIStyle centered = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleCenter };
+            public static readonly GUIStyle boldRightAligned = new GUIStyle(EditorStyles.boldLabel)
+            {
+                alignment = TextAnchor.MiddleRight,
+                fontSize = (int)(1.1f * EditorStyles.boldLabel.fontSize)
+            };
+            public static readonly GUIStyle boldNumber = new GUIStyle(EditorStyles.boldLabel)
+            {
+                fontSize = (int)(0.9f * EditorStyles.boldLabel.fontSize)
+            };
+
+            public static readonly GUIStyle searchFieldStyle = new GUIStyle(EditorStyles.toolbarSearchField)
+            {
+                margin = new RectOffset(5, 4, 4, 5)
+            };
+        }
+
+        internal PrefabFamilyPopup(GameObject target)
+        {
+            if (isOpen)
+                throw new InvalidOperationException("PrefabFamilyPopup is already open");
+
+            this.m_Target = target;
+            m_TargetPath = AssetDatabase.GetAssetPath(target);
+            m_TargetGUID = AssetDatabase.AssetPathToGUID(m_TargetPath);
+
+            k_MinNameWidth = k_MinWindowWidth - (k_TitleWidth + k_SplitWidth + k_OverridesWidth);
+
+            m_SearchFilter = new SearchFilter()
+            {
+                classNames = new string[] { "Prefab" },
+                searchArea = SearchFilter.SearchArea.AllAssets
+            };
+            m_Debounce = Delayer.Debounce(_ =>
+            {
+                SearchFilterChanged();
+                editorWindow.Repaint();
+            });
+
+            Init();
+        }
+
+        public override void OnOpen()
+        {
+            base.OnOpen();
+            s_Open = true;
+
+            if (m_Debug)
+                Debug.Log("[PrefabFamilyPopup] Open");
+        }
+
+        public override void OnClose()
+        {
+            base.OnClose();
+            s_Open = false;
+
+            EditorApplication.update -= CalculateOverrideCountsTimeSliced;
+            if (m_ListArea != null)
+                m_ListArea.OnDestroy();
+
+            if (m_Debug)
+                Debug.Log("[PrefabFamilyPopup] Close");
+        }
+
+        bool isVariant { get { return PrefabUtility.GetCorrespondingObjectFromSource(m_Target) != null; } }
+
+        public static bool isOpen => s_Open;
+
+        public static string ObjectToGUID(Object asset)
+        {
+            Assert.IsNotNull(asset);
+
+            string guid;
+            AssetDatabase.TryGetGUIDAndLocalFileIdentifier(asset, out guid, out long _);
+            return guid;
+
+        }
+
+        AncestorItem[] GetAncestorItems()
+        {
+            if (!isVariant)
+                throw new InvalidOperationException("GetAncestorItems() should only be called for prefab variants");
+
+            var items = new List<AncestorItem>();
+
+            var currentGUID = ObjectToGUID(m_Target);
+            while (!string.IsNullOrEmpty(currentGUID))
+            {
+                var assetPath = AssetDatabase.GUIDToAssetPath(currentGUID);
+                Assert.IsNotNull(assetPath);
+
+                items.Add(new AncestorItem { assetPath = assetPath, overrideCount = -1 });
+
+                var instanceID = AssetDatabase.GetMainAssetInstanceID(assetPath);
+                currentGUID = PrefabUtility.GetVariantParentGUID(instanceID);
+            }
+
+            return items.ToArray();
+        }
+
+
+        void Init()
+        {
+            if (isVariant)
+            {
+                m_NamesWidth = k_MinNameWidth;
+                m_AncestorItems = GetAncestorItems();
+                foreach (var item in m_AncestorItems)
+                {
+                    var prefabName = System.IO.Path.GetFileNameWithoutExtension(item.assetPath);
+                    m_NamesWidth = Mathf.Max(GUI.skin.label.CalcSize(EditorGUIUtility.TempContent(prefabName)).x + 40, m_NamesWidth);
+                }
+
+                m_OverridesCounter = new OverridesCounterForPrefabAssets(m_AncestorItems.Select(x => AssetDatabase.LoadAssetAtPath<GameObject>(x.assetPath)).ToList());
+                EditorApplication.update += CalculateOverrideCountsTimeSliced;
+
+                float scrollBarWidthOffset = numRows >= k_MaxTableRows ? k_ScrollbarWidth : 0;
+                m_MaxNameWidth = k_MaxWindowWidth - (k_TitleWidth + k_SplitWidth + k_OverridesWidth) - scrollBarWidthOffset;
+
+                float prevWidth = m_WindowWidth;
+                if (m_NamesWidth <= k_MinNameWidth)
+                    m_WindowWidth = k_MinWindowWidth;
+                else if (m_NamesWidth >= m_MaxNameWidth)
+                    m_WindowWidth = k_MaxWindowWidth;
+                else
+                    m_WindowWidth = k_TitleWidth + m_NamesWidth + k_SplitWidth + k_OverridesWidth;
+
+                m_OverridesX = m_WindowWidth - k_OverridesWidth - scrollBarWidthOffset;
+            }
+            else
+            {
+                // Just showing children area
+                var titleWidth = GUI.skin.label.CalcSize(EditorGUIUtility.TempContent(m_Target.name)).x + GUI.skin.label.CalcSize(Styles.titlePrefixLabel).x + 60;
+                m_WindowWidth = Mathf.Min(k_MaxWindowWidth, Mathf.Max(titleWidth, k_MinWindowWidth));
+            }
+
+            m_NoResultsX = (m_WindowWidth - EditorStyles.label.CalcSize(Styles.noResultsLabel).x) * 0.5f;
+        }
+
+        void CalculateOverrideCountsTimeSliced()
+        {
+            if (m_OverridesCounter.MoveNext())
+            {
+                if (m_OverridesCounter.changedCount)
+                {
+                    for (int i = 0; i < m_AncestorItems.Count(); ++i)
+                    {
+                        m_AncestorItems[i].overrideCount = m_OverridesCounter.GetCurrentOverrideCount(i);
+                    }
+
+                    editorWindow.Repaint();
+                }
+            }
+            else
+            {
+                EditorApplication.update -= CalculateOverrideCountsTimeSliced;
+                if (m_Debug)
+                    Debug.Log("[PrefabFamilyPopup] Timesliced overrides calculation done");
+            }
+        }
+
+        public override Vector2 GetWindowSize()
+        {
+            if (m_Target == null)
+            {
+                editorWindow.Close();
+                return Vector2.one;
+            }
+
+            var height = k_HeaderHeight;
+
+            if (isVariant)
+            {
+                // Horizontal scrollbar
+                if (m_NamesWidth > m_MaxNameWidth)
+                    height += k_ScrollbarHeight;
+
+                // Ancestors table
+                height += Mathf.Min(numRows, k_MaxTableRows) * k_EntryHeight + k_EntryHeight;
+            }
+
+            // Children list
+            height += k_EntryHeight;
+            if (!isVariant || m_DisplayChildren)
+                height += k_SearchHeight;
+
+            return new Vector2(m_WindowWidth, height);
+        }
+
+        public override void OnGUI(Rect rect)
+        {
+            if (m_Target == null)
+            {
+                editorWindow.Close();
+                return;
+            }
+
+            // Escape closes the window
+            if (Event.current.type == EventType.KeyDown && Event.current.keyCode == KeyCode.Escape)
+            {
+                editorWindow.Close();
+                GUIUtility.ExitGUI();
+            }
+
+            DrawHeader();
+
+            float height = k_HeaderHeight;
+            if (isVariant)
+                height += DrawVariantHierarchy();
+            height += DrawChildrenLabel(height);
+
+            if (!isVariant || m_DisplayChildren)
+                DrawChildren(height);
+        }
+
+        void DrawHeader()
+        {
+            Rect headerRect = GUILayoutUtility.GetRect(20, m_WindowWidth, k_HeaderHeight, k_HeaderHeight);
+            EditorGUI.DrawRect(headerRect, Colors.headerBackground);
+
+            float labelSize = Styles.boldRightAligned.CalcSize(Styles.titlePrefixLabel).x;
+
+            Rect labelRect = new Rect(k_OffsetX, headerRect.y + k_Padding, labelSize, EditorGUIUtility.singleLineHeight);
+            Rect contentRect = new Rect(labelRect.x + labelRect.width + k_Padding, labelRect.y, m_WindowWidth, labelRect.height);
+
+            GUI.Label(labelRect, Styles.titlePrefixLabel, Styles.boldRightAligned);
+            DoObjectLabel(contentRect, AssetDatabase.GetAssetPath(m_Target), EditorStyles.boldLabel);
+
+            labelRect.y = labelRect.height + 2 * k_Padding;
+        }
+
+        float DrawVariantHierarchy()
+        {
+            // Draw table header
+            Rect entryRect = new Rect(0, k_HeaderHeight, m_WindowWidth, k_EntryHeight);
+            EditorGUI.DrawRect(entryRect, Colors.rowBackground(0));
+
+            var labelRect = entryRect;
+            labelRect.x = k_TitleWidth;
+            GUI.Label(labelRect, Styles.ancestorLabel, EditorStyles.miniLabel);
+
+            labelRect.x = m_OverridesX + k_Padding;
+            GUI.Label(labelRect, Styles.overridesLabel, EditorStyles.miniLabel);
+
+            float tableHeight = Mathf.Min(numRows, k_MaxTableRows) * k_EntryHeight + (m_NamesWidth > m_MaxNameWidth ? k_ScrollbarHeight : 0);
+            float realHeight = numRows * k_EntryHeight + (m_NamesWidth > m_MaxNameWidth ? k_ScrollbarHeight : 0);
+            var tableRect = new Rect(0, k_HeaderHeight + k_EntryHeight, m_WindowWidth - 1, tableHeight);
+
+            m_Scroll.y = GUI.BeginScrollView(tableRect, m_Scroll, new Rect(tableRect) { width = tableRect.width - k_ScrollbarWidth, height = realHeight }).y;
+            {
+                // Draw overrides and locks table
+                for (int i = 0; i < m_AncestorItems.Length; i++)
+                {
+                    entryRect.y = k_HeaderHeight + (i+1) * k_EntryHeight;
+                    EditorGUI.DrawRect(entryRect, Colors.rowBackground(i+1));
+
+                    DisplayOverridesAndLocks(entryRect, m_AncestorItems[m_AncestorItems.Length - 1 - i]);
+                }
+
+                var scrollRect = new Rect(k_TitleWidth, k_HeaderHeight + k_EntryHeight, Mathf.Min(m_NamesWidth, m_MaxNameWidth), numRows * k_EntryHeight);
+                m_Scroll.x = GUI.BeginScrollView(new Rect(scrollRect) { height = scrollRect.height + k_ScrollbarHeight }, m_Scroll, new Rect(scrollRect) { width = m_NamesWidth }).x;
+                {
+                    // Draw scrollable table
+                    entryRect.x = k_TitleWidth;
+                    for (int i = 0; i < m_AncestorItems.Length; i++)
+                    {
+                        entryRect.y = k_HeaderHeight + (i + 1) * k_EntryHeight;
+                        var assetPath = m_AncestorItems[m_AncestorItems.Length - 1 - i].assetPath;
+
+                        DoObjectLabel(entryRect, assetPath);
+                    }
+                }
+                GUI.EndScrollView();
+
+
+                // Draw selected label
+                labelRect.x = k_OffsetX;
+                labelRect.y = k_HeaderHeight + numRows * k_EntryHeight;
+                labelRect.width = k_TitleWidth - labelRect.x;
+                GUI.Label(labelRect, Styles.selectedLabel);
+
+                // Draw root label
+                if (labelRect.y != k_HeaderHeight + k_EntryHeight)
+                {
+                    labelRect.y = k_HeaderHeight + k_EntryHeight;
+                    GUI.Label(labelRect, Styles.rootLabel);
+                }
+
+                // Draw vertical splits
+                Rect splitBar = new Rect(m_OverridesX - k_SplitWidth, k_HeaderHeight, k_SplitWidth, (numRows + 1) * k_EntryHeight);
+                EditorGUI.DrawRect(splitBar, Colors.headerBackground);
+            }
+            GUI.EndScrollView();
+
+            float height = tableHeight + k_EntryHeight;
+            return height;
+        }
+
+        float DrawChildrenLabel(float yMin)
+        {
+            var labelRect = new Rect(k_OffsetX, yMin, 100, k_EntryHeight);
+            if (isVariant)
+                m_DisplayChildren = EditorGUI.Foldout(labelRect, m_DisplayChildren, Styles.childrenLabel, true);
+            else
+                EditorGUI.LabelField(labelRect, Styles.childrenLabel);
+
+            if (!isVariant || m_DisplayChildren)
+            {
+                if (m_ListArea == null)
+                    InitListArea();
+
+                labelRect = new Rect(labelRect.x + 70, labelRect.y + 2, k_SliderWidth, EditorGUI.kSingleLineHeight);
+                if (m_Results.Length != 0)
+                    EditorGUI.LabelField(labelRect, m_Results.Length.ToString(), Styles.boldNumber);
+
+                EditorGUI.BeginChangeCheck();
+                labelRect.x = m_WindowWidth - k_OffsetX - k_SliderWidth;
+                var newGridSize = (int)GUI.HorizontalSlider(labelRect, m_ListArea.gridSize, m_ListArea.minGridSize, m_ListArea.maxGridSize);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    m_ListArea.gridSize = m_SavedGridSize.value = newGridSize;
+                }
+            }
+
+            return k_EntryHeight;
+        }
+
+        void DrawChildren(float yMin)
+        {
+            int listKeyboardControlID = GUIUtility.GetControlID(FocusType.Keyboard);
+
+            var backgroundRect = new Rect(0, yMin, m_WindowWidth, k_SearchHeight);
+            GUI.Label(backgroundRect, GUIContent.none, Styles.searchBackground);
+
+            EditorGUI.BeginChangeCheck();
+            var searchRect = new Rect(k_OffsetX + k_Padding, backgroundRect.y + k_Padding, m_WindowWidth - 2 * k_OffsetX - k_Padding, Styles.searchFieldStyle.fixedHeight);
+            m_SearchFilterString = EditorGUI.ToolbarSearchField(searchRect, m_SearchFilterString, false);
+            if (EditorGUI.EndChangeCheck())
+                m_Debounce.Execute();
+
+            if (m_Enumerator != null)
+                Search();
+
+            yMin = searchRect.height + (m_ListArea.gridSize < k_MinIconSize ? 11f : 0f);
+            var listRect = new Rect(k_Padding, searchRect.y + yMin, m_WindowWidth - 2 * k_Padding, k_SearchHeight - yMin - k_Padding);
+
+            m_ListArea.OnGUI(listRect, listKeyboardControlID);
+
+            if (m_Enumerator == null && m_Results.Length == 0)
+            {
+                var labelRect = new Rect(m_NoResultsX, backgroundRect.y + 69f, m_WindowWidth, EditorGUI.kSingleLineHeight);
+                EditorGUI.LabelField(backgroundRect, m_SearchFilter.nameFilter.Length == 0 ? Styles.noChildrenLabel : Styles.noResultsLabel, Styles.centered);
+            }
+        }
+
+        void InitListArea()
+        {
+            m_ListAreaState.m_GridSize = m_SavedGridSize;
+            m_ListArea = new ObjectListArea(m_ListAreaState, editorWindow, false)
+            {
+                allowDeselection = true,
+                allowMultiSelect = false,
+                allowRenaming = false,
+                allowBuiltinResources = true,
+            };
+
+            m_ListArea.itemSelectedCallback += (bool doubleClicked) =>
+            {
+                if (m_ListArea.GetSelection().Length == 0)
+                    return;
+                var selection = m_ListArea.GetSelection()[0];
+                if (doubleClicked)
+                {
+                    Selection.SetActiveObjectWithContext(EditorUtility.InstanceIDToObject(selection), null);
+                    Event.current.Use();
+                    editorWindow.Close();
+                    GUIUtility.ExitGUI();
+                }
+                else
+                {
+                    EditorGUIUtility.PingObject(selection);
+                    Event.current.Use();
+                }
+            };
+
+            SearchFilterChanged();
+        }
+
+        static IEnumerator<HierarchyProperty> FindInAllAssets(SearchFilter searchFilter)
+        {
+            var rootPaths = new List<string>();
+            rootPaths.Add("Assets");
+            foreach (var package in PackageManagerUtilityInternal.GetAllVisiblePackages(false))
+            {
+                if (package.source == PackageManager.PackageSource.Local)
+                    rootPaths.Add(package.assetPath);
+            }
+
+            foreach (var rootPath in rootPaths)
+            {
+                var property = new HierarchyProperty(rootPath, false);
+                property.SetSearchFilter(searchFilter);
+                while (property.Next(null))
+                    yield return property;
+            }
+        }
+
+        void SearchFilterChanged()
+        {
+            m_SearchFilter.nameFilter = m_SearchFilterString;
+
+            var size = GetWindowSize();
+            var rect = new Rect(0, size.y - k_SearchHeight, size.x, k_SearchHeight);
+
+            m_ListArea.Init(rect, HierarchyType.Assets, new SearchFilter(), true, SearchService.SearchSessionOptions.Default);
+            m_Enumerator = FindInAllAssets(m_SearchFilter);
+            m_Results = new int[0];
+        }
+
+        void Search()
+        {
+            var newResults = new List<int>();
+
+            var maxAddCount = k_MaxSearchIterationPerFrame;
+            while (--maxAddCount >= 0)
+            {
+                if (!m_Enumerator.MoveNext())
+                {
+                    m_Enumerator = null;
+                    break;
+                }
+
+                var currentInstanceID = m_Enumerator.Current.instanceID;
+                var variantParentGUID = PrefabUtility.GetVariantParentGUID(currentInstanceID);
+                if (variantParentGUID == m_TargetGUID)
+                {
+                    newResults.Add(currentInstanceID);
+                }
+            }
+
+            int newCount = newResults.Count;
+            int i = m_Results.Length;
+            Array.Resize(ref m_Results, m_Results.Length + newCount);
+            for (var j = 0; j < newCount && i < m_Results.Length; ++j, ++i)
+                m_Results[i] = newResults[j];
+
+            m_ListArea.ShowObjectsInList(m_Results);
+        }
+
+        void DisplayOverridesAndLocks(Rect rect, AncestorItem item)
+        {
+            rect.x = m_OverridesX;
+            rect.width = k_OverridesWidth;
+            string text;
+            if (item.overrideCount == -1)
+                text = string.Empty;
+            else if (item.overrideCount == 0)
+                text = "-";
+            else if (item.overrideCount >= 10000)
+                text = "+9999";
+            else
+                text = item.overrideCount.ToString();
+            GUI.Label(rect, GUIContent.Temp(text, item.overrideCount.ToString()), Styles.centered);
+        }
+
+        void DoObjectLabel(Rect rect, string assetPath)
+        {
+            DoObjectLabel(rect, assetPath, GUI.skin.label);
+        }
+
+        void DoObjectLabel(Rect rect, string assetPath, GUIStyle style)
+        {
+            if (Event.current.type == EventType.MouseDown && Event.current.button == 0 && rect.Contains(Event.current.mousePosition))
+            {
+                // One click shows where the referenced object is
+                if (Event.current.clickCount == 1)
+                {
+                    GUIUtility.keyboardControl = GUIUtility.GetControlID(FocusType.Keyboard);
+
+                    var instanceID = AssetDatabase.GetMainAssetInstanceID(assetPath);
+                    EditorGUIUtility.PingObject(instanceID);
+                    Event.current.Use();
+                }
+                // Double click changes selection to referenced object
+                else if (Event.current.clickCount == 2)
+                {
+                    var instanceID = AssetDatabase.GetMainAssetInstanceID(assetPath);
+                    Selection.activeInstanceID = instanceID;
+                    Event.current.Use();
+                    editorWindow.Close();
+                    GUIUtility.ExitGUI();
+                }
+            }
+
+            var icon = AssetDatabase.GetCachedIcon(assetPath);
+            var name = System.IO.Path.GetFileNameWithoutExtension(assetPath);
+            GUI.Label(rect, EditorGUIUtility.TempContent(name, icon), style);
+        }
+    }
+
+    [Serializable]
+    class PrefabAssetInfo
+    {
+        [SerializeField]
+        public Hash128 prefabFileHash;
+
+        [SerializeField]
+        public int overrideCount;
+    }
+
+    static class PrefabAssetStateCache
+    {
+        static StateCache<PrefabAssetInfo> s_StateCache = new StateCache<PrefabAssetInfo>("Library/StateCache/PrefabAssetInfo/");
+
+        public static void SetState(string guid, PrefabAssetInfo obj)
+        {
+            var key = GetPrefabAssetIdentifier(guid);
+            s_StateCache.SetState(key, obj);
+        }
+
+        public static PrefabAssetInfo GetState(string guid)
+        {
+            var id = GetPrefabAssetIdentifier(guid);
+            var cachedPrefabAssetInfo = s_StateCache.GetState(id);
+            if (cachedPrefabAssetInfo == null)
+                return null; // not cached yet
+
+            var currentPrefabSourceFileHash = AssetDatabase.GetSourceAssetFileHash(guid);
+            if (currentPrefabSourceFileHash != cachedPrefabAssetInfo.prefabFileHash)
+                return null; // cache is out of sync
+
+            return cachedPrefabAssetInfo;
+        }
+        public static Hash128 GetPrefabAssetIdentifier(string guid)
+        {
+            if (string.IsNullOrEmpty(guid))
+                throw new ArgumentNullException(nameof(guid));
+
+            return Hash128.Compute(guid);
+        }
+    }
+
+    class OverridesCounterForPrefabAssets
+    {
+        List<GameObject> m_PrefabAssetRoots;
+        List<int> m_OverridesCount;
+        int m_CurrentAssetIndex;
+        int m_CurrentStep;
+        bool m_ChangedCount;
+
+        bool m_Debug = false;
+
+        public OverridesCounterForPrefabAssets(List<GameObject> prefabInstanceRoots)
+        {
+            m_PrefabAssetRoots = prefabInstanceRoots;
+            m_OverridesCount = new List<int>();
+            m_OverridesCount.AddRange(new int[prefabInstanceRoots.Count]);
+        }
+
+        public bool changedCount => m_ChangedCount;
+
+        public int GetCurrentOverrideCount(int assetIndex)
+        {
+            return m_OverridesCount[assetIndex];
+        }
+
+        bool IsDone()
+        {
+            return m_CurrentAssetIndex >= m_PrefabAssetRoots.Count -1; // No more prefabs to process (last prefab is the root prefab which does not have overrides)
+        }
+
+        // Returns true if overrides count changed during the update
+        public bool MoveNext()
+        {
+            if (IsDone())
+                return false;
+
+            var assetRoot = m_PrefabAssetRoots[m_CurrentAssetIndex];
+            var startCount = m_OverridesCount[m_CurrentAssetIndex];
+
+            switch (m_CurrentStep)
+            {
+                case 0:
+                    {
+                        // First check if we have cached overides count for the prefab
+                        var path = AssetDatabase.GetAssetPath(assetRoot);
+                        var guid = AssetDatabase.AssetPathToGUID(path);
+                        var cachedPrefabAssetInfo = PrefabAssetStateCache.GetState(guid);
+                        if (cachedPrefabAssetInfo != null)
+                        {
+                            m_OverridesCount[m_CurrentAssetIndex] = cachedPrefabAssetInfo.overrideCount;
+                            m_ChangedCount = true;
+                            m_CurrentAssetIndex++;
+                            if (m_Debug)
+                                Debug.Log($"[OverridesCounterForPrefabAssets] Using cached overridecount {cachedPrefabAssetInfo.overrideCount} ({path})");
+                            return true;
+                        }
+                    }
+                    break;
+                case 1:
+                    PropertyModification[] mods = PrefabUtility.GetPropertyModifications(assetRoot);
+                    foreach (PropertyModification mod in mods)
+                    {
+                        if (mod.target == null)
+                            continue;
+
+                        if (!PrefabUtility.IsDefaultOverride(mod))
+                            m_OverridesCount[m_CurrentAssetIndex]++;
+                    }
+                    break;
+                case 2:
+                    m_OverridesCount[m_CurrentAssetIndex] += PrefabOverridesUtility.GetAddedComponents(assetRoot).Count;
+                    break;
+                case 3:
+                    m_OverridesCount[m_CurrentAssetIndex] += PrefabOverridesUtility.GetRemovedComponents(assetRoot).Count;
+                    break;
+                case 4:
+                    m_OverridesCount[m_CurrentAssetIndex] += PrefabOverridesUtility.GetAddedGameObjects(assetRoot).Count;
+                    break;
+                default:
+                    {
+                        // Cache result
+                        var path = AssetDatabase.GetAssetPath(assetRoot);
+                        var guid = AssetDatabase.AssetPathToGUID(path);
+                        var prefabAssetInfo = new PrefabAssetInfo();
+                        prefabAssetInfo.overrideCount = m_OverridesCount[m_CurrentAssetIndex];
+                        prefabAssetInfo.prefabFileHash = AssetDatabase.GetSourceAssetFileHash(guid);
+                        PrefabAssetStateCache.SetState(guid, prefabAssetInfo);
+                        if (m_Debug)
+                            Debug.Log($"[OverridesCounterForPrefabAssets] Set cached overridecount {prefabAssetInfo.overrideCount} for {path}");
+
+                        // Move to next asset
+                        m_CurrentAssetIndex++;
+                        m_CurrentStep = 0;
+                    }
+                    break;
+            }
+
+            if (m_Debug)
+                Debug.Log($"[OverridesCounterForPrefabAssets] Current asset index: {m_CurrentAssetIndex}, current step: {m_CurrentStep}");
+
+            m_CurrentStep++;
+
+            // Simulate heavy calculation
+            if (m_Debug)
+                System.Threading.Thread.Sleep(500);
+
+            m_ChangedCount = m_OverridesCount[m_CurrentAssetIndex] != startCount;
+
+            return true;
+        }
+    }
+}
diff --git a/Editor/Mono/Prefabs/PrefabImporterEditor.cs b/Editor/Mono/Prefabs/PrefabImporterEditor.cs
index 8bfce9f342..7919ffb1ab 100644
--- a/Editor/Mono/Prefabs/PrefabImporterEditor.cs
+++ b/Editor/Mono/Prefabs/PrefabImporterEditor.cs
@@ -19,10 +19,12 @@ static class Styles
             public static GUIContent missingSerializeReferenceHelpText = EditorGUIUtility.TrTextContent("Prefab has missing SerializeReference Types. Open Prefab to fix the issue. Changing the Prefab directly will cause those types to be lost.");
             public static GUIContent multiSelectionMissingScriptsHelpText = EditorGUIUtility.TrTextContent("Some of the selected Prefabs have missing scripts and needs to be fixed before editing them. Click to Open Prefab to fix the issue.");
             public static GUIContent savingFailedHelpText = EditorGUIUtility.TrTextContent("Saving has failed. Check the Console window to get more insight into what needs to be fixed on the Prefab Asset.\n\nOpen Prefab to fix the issue.");
-            public static GUIContent baseContent = EditorGUIUtility.TrTextContent("Base");
+            public static GUIContent variantOfText = EditorGUIUtility.TrTextContent("Variant Parent");
             public static string localizedTitleMultiplePrefabs = L10n.Tr("Prefab Assets");
             public static string localizedTitleSinglePrefab = L10n.Tr("Prefab Asset");
             public static GUIStyle openButtonStyle = "AC Button";
+            public static readonly GUIContent hierarchyIcon = EditorGUIUtility.IconContent("UnityEditor.SceneHierarchyWindow");
+            public const int kHierarchyIconWidth = 44;
         }
 
         int m_HasMixedBaseVariants = -1;
@@ -246,15 +248,15 @@ void CacheHasMixedBaseVariants()
             if (m_HasMixedBaseVariants >= 0)
                 return; // already cached
 
-            var firstBaseVarient = PrefabUtility.GetCorrespondingObjectFromSource(assetTarget);
-            if (firstBaseVarient == null)
+            var firstVariantParent = PrefabUtility.GetCorrespondingObjectFromSource(assetTarget);
+            if (firstVariantParent == null)
                 return;
 
             m_HasMixedBaseVariants = 0;
             foreach (var t in assetTargets)
             {
-                var variantBase = PrefabUtility.GetCorrespondingObjectFromSource(t);
-                if (variantBase != firstBaseVarient)
+                var variantParent = PrefabUtility.GetCorrespondingObjectFromSource(t);
+                if (variantParent != firstVariantParent)
                 {
                     m_HasMixedBaseVariants = 1;
                     break;
@@ -275,24 +277,60 @@ internal override string targetTitle
             }
         }
 
-        public override void OnInspectorGUI()
+        void PrefabFamilyButton()
         {
-            if (assetTarget is DefaultAsset)
+            if (EditorGUILayout.DropdownButton(GUIContent.none, FocusType.Passive, GUILayout.MaxWidth(Styles.kHierarchyIconWidth)))
             {
-                return;
+                if (!PrefabFamilyPopup.isOpen)
+                    PopupWindow.Show(GUILayoutUtility.topLevel.GetLast(), new PrefabFamilyPopup((GameObject)assetTarget));
+                GUIUtility.ExitGUI();
+            }
+            var rect = new Rect(GUILayoutUtility.topLevel.GetLast());
+            rect.x += 6;
+            EditorGUI.LabelField(rect, Styles.hierarchyIcon);
+        }
+
+        internal override void OnHeaderControlsGUI()
+        {
+            GUILayout.FlexibleSpace();
+
+            using (new EditorGUI.DisabledScope(targets.Length != 1))
+            {
+                PrefabFamilyButton();
+            }
+
+            if (!ShouldHideOpenButton())
+            {
+                var assets = assetTargets;
+                ShowOpenButton(assets, assetTarget != null);
             }
 
-            var variantBase = PrefabUtility.GetCorrespondingObjectFromSource(assetTarget);
-            if (variantBase != null)
+            var variantParent = PrefabUtility.GetCorrespondingObjectFromSource(assetTarget) as GameObject;
+            if (variantParent != null)
             {
+                // OnHeaderControlsGUI() is called within a BeginHorizontal() scope so to create a new line
+                // we end and start a new BeginHorizontal().
+                EditorGUILayout.EndHorizontal();
+                EditorGUILayout.BeginHorizontal();
                 using (new EditorGUI.DisabledScope(true))
                 {
                     CacheHasMixedBaseVariants();
                     EditorGUI.showMixedValue = m_HasMixedBaseVariants == 1;
-                    EditorGUILayout.ObjectField(Styles.baseContent, variantBase, typeof(GameObject), false);
+                    var oldLabelWidth = EditorGUIUtility.labelWidth;
+                    EditorGUIUtility.labelWidth = 90;
+                    EditorGUILayout.ObjectField(Styles.variantOfText, variantParent, typeof(GameObject), false);
+                    EditorGUIUtility.labelWidth = oldLabelWidth;
                     EditorGUI.showMixedValue = false;
                 }
             }
+        }
+
+        public override void OnInspectorGUI()
+        {
+            if (assetTarget is DefaultAsset)
+            {
+                return;
+            }
 
             if (hasMissingScripts)
             {
diff --git a/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesUtility.cs b/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesUtility.cs
index 560493719b..137884a4d5 100644
--- a/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesUtility.cs
+++ b/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesUtility.cs
@@ -171,6 +171,10 @@ static bool CheckForRemovedComponents(Transform transform, object userData)
                 // Find asset objects that no instance objects are referencing
                 foreach (var assetComponent in s_AssetComponentList)
                 {
+                    // This is possible if there's a component with a missing script.
+                    if (assetComponent == null)
+                        continue;
+
                     bool found = false;
                     foreach (var instanceComponent in s_ComponentList)
                     {
diff --git a/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs b/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs
index 387308d12f..b20f39a601 100644
--- a/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs
+++ b/Editor/Mono/Prefabs/PrefabOverrides/PrefabOverridesWindow.cs
@@ -22,9 +22,8 @@ internal class PrefabOverridesWindow : PopupWindowContent
         const float k_HeaderLeftMargin = 6;
         const float k_NoOverridesLabelHeight = 26f;
         const float k_UnusedOverridesButtonHeight = 26f;
-        const float k_ApplyButtonHeight = 36f;
-        const float k_HelpBoxHeight = 40f;
         const float k_RowPadding = 6;
+        float m_ApplyButtonHeight = 0;
         GameObject[] m_SelectedGameObjects = null;
 
         // TreeView not used when there are multiple Prefabs.
@@ -53,8 +52,8 @@ static class Styles
             public static GUIContent revertSelectedContent = EditorGUIUtility.TrTextContent("Revert Selected", "Revert selected overrides.");
             public static GUIContent applyAllContent = EditorGUIUtility.TrTextContent("Apply All", "Apply all overrides to Prefab source '{0}'.");
             public static GUIContent applySelectedContent = EditorGUIUtility.TrTextContent("Apply Selected", "Apply selected overrides to Prefab source '{0}'.");
-            public static GUIContent applyAllToBaseContent = EditorGUIUtility.TrTextContent("Apply All to Base", "Apply all overrides to base Prefab source '{0}'.");
-            public static GUIContent applySelectedToBaseContent = EditorGUIUtility.TrTextContent("Apply Selected to Base", "Apply selected overrides to base Prefab source '{0}'.");
+            public static GUIContent applyAllToBaseContent = EditorGUIUtility.TrTextContent("Apply All to Prefab Variant parent", "Apply all overrides to Prefab Variant parent '{0}'.");
+            public static GUIContent applySelectedToBaseContent = EditorGUIUtility.TrTextContent("Apply Selected to Prefab Variant parent", "Apply selected overrides to Prefab Variant parent '{0}'.");
             public static GUIContent titleLabelDefault = EditorGUIUtility.TrTextContent("Review, Revert or Apply Overrides");
             public static GUIContent titleLabelNoApply = EditorGUIUtility.TrTextContent("Review or Revert Overrides");
             public static GUIContent noOverridesText = EditorGUIUtility.TrTextContent("No overrides");
@@ -62,7 +61,8 @@ static class Styles
             public static GUIContent contextLabel = EditorGUIUtility.TrTextContent("in");
             public static GUIContent removeUnusedOverridesButtonContent = EditorGUIUtility.TrTextContentWithIcon("Unused overrides", EditorGUIUtility.LoadIcon("Clear"));
 
-            public static string nonApplicableTooltip = L10n.Tr("There are no overrides that can be applied to Prefab source '{0}'.");
+            public static string nonApplicableTooltipApply = L10n.Tr("There are no overrides that can be applied to Prefab source '{0}'.");
+            public static string nonApplicableTooltipRevert = L10n.Tr("There are no overrides that can be reverted.");
 
             public static GUIContent infoMultiple = EditorGUIUtility.TrTextContent("Multiple Prefabs selected. Cannot show overrides.");
             public static GUIContent infoMultipleNoApply = EditorGUIUtility.TrTextContent("Multiple Prefabs selected. Cannot show overrides.\nApplying is not possible for one or more Prefabs. Select individual Prefabs for details.");
@@ -116,17 +116,17 @@ internal PrefabOverridesWindow(GameObject[] selectedGameObjects)
 
         public override void OnOpen()
         {
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
             base.OnOpen();
         }
 
         public override void OnClose()
         {
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
             base.OnClose();
         }
 
-        void OnUndoRedoPerformed()
+        void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             RefreshStatus();
         }
@@ -160,15 +160,6 @@ internal void RefreshStatus(bool reloadTreeView = true)
             else
                 UpdateTextMultiple();
 
-            // There are a few cases where the Tree View reports no overrides even though
-            // PrefabUtility.HasPrefabInstanceAnyOverrides says there are; for example if
-            // a component has been removed on an instance, but also removed on the Asset.
-            // In these cases we want to make the UI not show apply/revert buttons,
-            // since it's confusing and inconsistent to have those when the view says
-            // "No overrides". Case 1197800.
-            if (m_TreeView != null && !m_TreeView.hasModifications)
-                m_AnyOverrides = false;
-
             m_UnusedOverridesExist = PrefabUtility.HavePrefabInstancesUnusedOverrides(m_SelectedGameObjects);
         }
 
@@ -211,11 +202,6 @@ bool HasMultiSelection()
             return m_SelectedGameObjects.Length > 1;
         }
 
-        bool DisplayingTreeView()
-        {
-            return m_AnyOverrides && !HasMultiSelection();
-        }
-
         bool IsShowingApplyWarning()
         {
             return
@@ -226,52 +212,86 @@ bool IsShowingApplyWarning()
         }
 
         public override Vector2 GetWindowSize()
+        {
+            return CalculateWindowSize();
+        }
+
+        Vector2 CalculateWindowSize()
         {
             const float k_MaxAllowedTreeViewWidth = 1800f;
             const float k_MaxAllowedTreeViewHeight = 1000f;
             var width = 300f;
             var height = k_HeaderHeight;
 
+            // Match the call order as in OnGUI() to ensure the correct height is calculated
+
             if (!IsShowingActionButton())
             {
-                if (!IsShowingUnusedOverridesButton())
+                if (IsShowingUnusedOverridesButton())
+                    height += k_UnusedOverridesButtonHeight;
+                else
                     height += k_NoOverridesLabelHeight;
+
+                return new Vector2(width, height);
+            }
+
+            if (HasMultiSelection())
+            {
+                if (m_InvalidComponentOnAsset || m_HasManagedReferencesWithMissingTypesOnAsset || m_InvalidComponentOnInstance || m_ModelPrefab || m_Immutable)
+                    height += CalcHeightForHelpBox(Styles.infoMultipleNoApply, MessageType.Info, width);
+                else
+                    height += CalcHeightForHelpBox(Styles.infoMultiple, MessageType.Info, width);
+
+                if (m_UnusedOverridesExist)
+                    height += k_UnusedOverridesButtonHeight + k_RowPadding;
+                else
+                    height += 2;
             }
             else
             {
-                if (DisplayingTreeView())
+                height += k_TreeViewPadding.top;
+                if (m_TreeView.hasModifications)
                 {
-                    height += k_TreeViewPadding.top + Mathf.Min(k_MaxAllowedTreeViewHeight, m_TreeView.totalHeight) + k_TreeViewPadding.bottom;
+                    height += Mathf.Min(k_MaxAllowedTreeViewHeight, m_TreeView.totalHeight);
                     width = Mathf.Max(Mathf.Min(m_TreeView.maxItemWidth, k_MaxAllowedTreeViewWidth), width);
                 }
-                else
+
+                if (m_AnyOverrides)
                 {
-                    if (!m_AnyOverrides)
-                        height += k_NoOverridesLabelHeight;
-                    else if (IsShowingUnusedOverridesButton())
-                        height += k_HelpBoxHeight - 8;
-                    else
-                        height += k_HelpBoxHeight - 6;
-                }
+                    if (m_UnusedOverridesExist)
+                        height += k_UnusedOverridesButtonHeight + k_RowPadding;
 
-                height += k_ApplyButtonHeight;
+                    if (m_ModelPrefab)
+                        height += CalcHeightForHelpBox(Styles.infoModel, MessageType.Info, width);
+                }
 
                 if (IsShowingApplyWarning())
-                    height += k_HelpBoxHeight; // A second help box in this case.
+                {
+                    if (m_InvalidComponentOnAsset)
+                        height += CalcHeightForHelpBox(Styles.warningInvalidAsset, MessageType.Warning, width);
+                    else if (m_InvalidComponentOnInstance)
+                        height += CalcHeightForHelpBox(Styles.warningInvalidInstance, MessageType.Warning, width);
+                    else if (m_HasManagedReferencesWithMissingTypesOnAsset)
+                        height += CalcHeightForHelpBox(Styles.warningHasManagedReferencesWithMissingTypes, MessageType.Warning, width);
+                    else if (m_Immutable)
+                        height += CalcHeightForHelpBox(Styles.warningImmutable, MessageType.Warning, width);
+                }
             }
 
-            if (IsShowingUnusedOverridesButton())
-            {
-                height += k_UnusedOverridesButtonHeight;
-                if (IsShowingActionButton())
-                    height += k_RowPadding;
-            }
+            if (m_ApplyButtonHeight == 0)
+                m_ApplyButtonHeight = GUI.skin.button.CalcHeight(Styles.applySelectedContent, width) + GUI.skin.button.margin.top + GUI.skin.button.margin.bottom;
+
+            height += m_ApplyButtonHeight + k_RowPadding;
 
-            // Width should be no smaller than minimum width, but we could potentially improve
-            // width handling by making it expand if needed based on tree view content.
             return new Vector2(width, height);
         }
 
+        float CalcHeightForHelpBox(GUIContent content, MessageType messageType, float width)
+        {
+            var tempContent = EditorGUIUtility.TempContent(content.text, EditorGUIUtility.GetHelpIcon(messageType));
+            return EditorStyles.helpBox.CalcHeight(tempContent, width) + EditorStyles.helpBox.margin.top + EditorStyles.helpBox.margin.bottom;
+        }
+
         Color headerBgColor { get { return EditorGUIUtility.isProSkin ? new Color(0.5f, 0.5f, 0.5f, 0.2f) : new Color(0.9f, 0.9f, 0.9f, 0.6f); } }
         Color horizontalLineColor = new Color(0.5f, 0.5f, 0.5f, 0.3f);
         public override void OnGUI(Rect rect)
@@ -356,11 +376,14 @@ public override void OnGUI(Rect rect)
             {
                 GUILayout.Space(k_TreeViewPadding.top);
 
-                if (m_AnyOverrides)
+                if (m_TreeView.hasModifications)
                 {
                     Rect treeViewRect = GUILayoutUtility.GetRect(100, 10000, 0, 10000);
                     m_TreeView.OnGUI(treeViewRect);
+                }
 
+                if (m_AnyOverrides)
+                {
                     if (m_UnusedOverridesExist)
                     {
                         DrawUnusedOverridesButton();
@@ -380,9 +403,9 @@ public override void OnGUI(Rect rect)
                         EditorGUILayout.HelpBox(Styles.warningInvalidAsset.text, MessageType.Warning);
                     else if (m_InvalidComponentOnInstance)
                         EditorGUILayout.HelpBox(Styles.warningInvalidInstance.text, MessageType.Warning);
-                    if (m_HasManagedReferencesWithMissingTypesOnAsset)
+                    else if (m_HasManagedReferencesWithMissingTypesOnAsset)
                         EditorGUILayout.HelpBox(Styles.warningHasManagedReferencesWithMissingTypes.text, MessageType.Warning);
-                    else
+                    else if (m_Immutable)
                         EditorGUILayout.HelpBox(Styles.warningImmutable.text, MessageType.Warning);
                 }
             }
@@ -453,6 +476,17 @@ void DrawUnusedOverridesButton()
         {
             Rect buttonRect = GUILayoutUtility.GetRect(100, 10000, k_NoOverridesLabelHeight, k_NoOverridesLabelHeight);
 
+            var isHovered = buttonRect.Contains(UnityEngine.Event.current.mousePosition);
+            if (isHovered)
+            {
+                GUIView.current.MarkHotRegion(GUIClip.UnclipToWindow(buttonRect));
+
+                using (new GUI.BackgroundColorScope(GameObjectStyles.hoveredBackgroundColor))
+                {
+                    GUI.Label(buttonRect, GUIContent.none, GameObjectStyles.hoveredItemBackgroundStyle);
+                }
+            }
+
             if (Event.current.type == EventType.Repaint)
             {
                 if (UnusedOverridesViewPopup.s_IsOpen)
@@ -467,17 +501,6 @@ void DrawUnusedOverridesButton()
                 Styles.removeOverridesButtonLineStyle.Draw(buttonRect, Styles.removeUnusedOverridesButtonContent, false, false, UnusedOverridesViewPopup.s_IsOpen, true);
             }
 
-            var isHovered = buttonRect.Contains(UnityEngine.Event.current.mousePosition);
-            if (isHovered)
-            {
-                GUIView.current.MarkHotRegion(GUIClip.UnclipToWindow(buttonRect));
-
-                using (new GUI.BackgroundColorScope(GameObjectStyles.hoveredBackgroundColor))
-                {
-                    GUI.Label(buttonRect, GUIContent.none, GameObjectStyles.hoveredItemBackgroundStyle);
-                }
-            }
-
             if (GUI.Button(buttonRect, GUIContent.none, GUIStyle.none))
             {
                 PopupWindowWithoutFocus.Show(buttonRect,
@@ -621,18 +644,24 @@ void UpdateText(Texture assetIcon, string assetName)
 
             m_ButtonWidth = k_ButtonWidth;
             var applyAllContent = new GUIContent(Styles.applyAllContent);
+            var revertAllContent = new GUIContent(Styles.revertAllContent);
             var applySelectedContent = Styles.applySelectedContent;
             if (stage is PrefabStage && PrefabUtility.IsPartOfVariantPrefab(AssetDatabase.LoadAssetAtPath<Object>(stage.assetPath)))
             {
                 m_ButtonWidth = k_ButtonWidthVariant;
                 applyAllContent = Styles.applyAllToBaseContent;
                 applySelectedContent = Styles.applySelectedToBaseContent;
+
             }
 
             if (!m_HasApplicableOverrides)
-                applyAllContent.tooltip = Styles.nonApplicableTooltip;
+            {
+                applyAllContent.tooltip = Styles.nonApplicableTooltipApply;
+                revertAllContent.tooltip = Styles.nonApplicableTooltipRevert;
+            }
 
             m_ApplyAllContent = new GUIContent(applyAllContent.text, string.Format(applyAllContent.tooltip, assetName));
+            m_RevertAllContent = new GUIContent(revertAllContent.text, revertAllContent.tooltip);
             m_ApplySelectedContent.text = applySelectedContent.text;
             m_ApplySelectedContent.tooltip = string.Format(applySelectedContent.tooltip, assetName);
         }
@@ -665,6 +694,8 @@ static class Styles
             public static GUIContent editorLogHint = EditorGUIUtility.TrTextContent("Details will be written to the Editor log.");
             public static GUIContent buttonContent = EditorGUIUtility.TrTextContent("Remove");
             public static GUIContent headerContent = EditorGUIUtility.TrTextContent("{0} unused overrides");
+            public static GUIContent unusedRemovedComponentsContentSingular = EditorGUIUtility.TrTextContent("{0} has 1 unused removed component");
+            public static GUIContent unusedRemovedComponentsContentPlural = EditorGUIUtility.TrTextContent("{0} has {1} unused removed components");
             public static GUIContent headerContentSingular = EditorGUIUtility.TrTextContent("1 unused override");
             public static GUIContent extraOverridesContent = EditorGUIUtility.TrTextContent("and {0} others");
             public static GUIContent extraInstancesContent = EditorGUIUtility.TrTextContent("on {0} instances");
@@ -702,6 +733,7 @@ static Styles()
         int m_AffectedInstanceCount = 0;
         int m_UnusedOverridesCount = 0;
         int m_UsedOverridesCount = 0;
+        int m_UnusedRemovedComponentsCount = 0;
 
         public UnusedOverridesViewPopup(GameObject[] selectedGameObjects, PrefabOverridesWindow owner)
         {
@@ -804,12 +836,13 @@ void CalculateStatistics()
             {
                 foreach (PrefabUtility.InstanceOverridesInfo instanceMods in m_InstanceOverridesInfos)
                 {
-                    if (!instanceMods.unusedMods.Any())
+                    if (!instanceMods.unusedMods.Any() && instanceMods.unusedRemovedComponentCount == 0)
                         continue;
 
                     m_AffectedInstanceCount++;
                     m_UnusedOverridesCount += instanceMods.unusedMods.Length;
                     m_UsedOverridesCount += instanceMods.usedMods.Length;
+                    m_UnusedRemovedComponentsCount += instanceMods.unusedRemovedComponentCount;
                     m_SingleInstanceWithUnusedMods = instanceMods;
                 }
             }
@@ -818,7 +851,10 @@ void CalculateStatistics()
                 m_AffectedInstanceCount = 1;
                 m_UnusedOverridesCount = m_SingleInstanceWithUnusedMods.unusedMods.Length;
                 m_UsedOverridesCount = m_SingleInstanceWithUnusedMods.usedMods.Length;
+                m_UnusedRemovedComponentsCount = m_SingleInstanceWithUnusedMods.unusedRemovedComponentCount;
             }
+
+            m_UnusedOverridesCount += m_UnusedRemovedComponentsCount;
         }
 
         float BuildHeaderText()
@@ -862,6 +898,27 @@ float BuildMultilineSummary()
                     addedLines = true;
                 }
 
+                if (instanceMods.unusedRemovedComponentCount > 0 && totalLineEntries < k_MaxEntries)
+                {
+                    string itemText = string.Empty;
+
+                    if (instanceMods.unusedRemovedComponentCount > 1)
+                        itemText = string.Format(Styles.unusedRemovedComponentsContentPlural.text, instanceMods.instance.name, instanceMods.unusedRemovedComponentCount);
+                    else
+                        itemText = string.Format(Styles.unusedRemovedComponentsContentSingular.text, instanceMods.instance.name);
+
+                    GUIContent lineContent = new GUIContent(itemText);
+                    m_OverridesContent.Add(lineContent);
+
+                    float w = GetTextWidth(lineContent.text, Styles.bodyStyle);
+                    if (w > maxLineWidth)
+                        maxLineWidth = w;
+
+                    entriesFromThisInstance++;
+                    totalLineEntries++;
+                    addedLines = true;
+                }
+
                 if (addedLines && instanceMods.unusedMods.Length <= entriesFromThisInstance)
                     remainingAffectedInstanceCount--;
             }
diff --git a/Editor/Mono/Prefabs/PrefabUtility.bindings.cs b/Editor/Mono/Prefabs/PrefabUtility.bindings.cs
index a112cc2919..e3ffb22ba7 100644
--- a/Editor/Mono/Prefabs/PrefabUtility.bindings.cs
+++ b/Editor/Mono/Prefabs/PrefabUtility.bindings.cs
@@ -56,6 +56,9 @@ public sealed partial class PrefabUtility
         [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
         extern internal static bool HasPrefabInstanceUnusedOverrides_Internal(GameObject gameObject);
 
+        [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
+        extern internal static int GetPrefabInstanceUnusedRemovedComponentCount_Internal(GameObject gameObject);
+
         [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
         extern internal static string TryGetCurrentPropertyPathFromOldPropertyPath_Internal(GameObject gameObject, Object target, string propertyPath);
 
@@ -108,13 +111,17 @@ public sealed partial class PrefabUtility
         [NativeThrows]
         extern private static void MergePrefabInstance_internal([NotNull] Object gameObjectOrComponent);
 
+        [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
+        [NativeThrows]
+        extern private static MergeStatus GetMergeStatus(GameObject componentOrGameObject);
+
         [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
         [NativeThrows]
         extern private static GameObject[] FindAllInstancesOfPrefab_internal([NotNull("NullExceptionObject")] GameObject prefabRoot, int sceneHandle);
 
         [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
         [NativeThrows]
-        extern public static GameObject[] UnpackPrefabInstanceAndReturnNewOutermostRoots(GameObject instanceRoot, PrefabUnpackMode unpackMode);
+        extern private static GameObject[] UnpackPrefabInstanceAndReturnNewOutermostRoots_internal(GameObject instanceRoot, PrefabUnpackMode unpackMode);
 
         [StaticAccessor("PrefabUtilityBindings", StaticAccessorType.DoubleColon)]
         [NativeThrows]
@@ -362,7 +369,13 @@ internal static void AddGameObjectsToPrefabAndConnect(GameObject[] gameObjects,
         [FreeFunction]
         extern internal static bool CheckIfAddingPrefabWouldResultInCyclicNesting(Object prefabAssetThatIsAddedTo, Object prefabAssetThatWillBeAdded);
 
+        [FreeFunction]
+        extern internal static bool WasCreatedAsPrefabInstancePlaceholderObject(Object componentOrGameObject);
+
         [FreeFunction]
         extern internal static void ShowCyclicNestingWarningDialog();
+
+        [NativeMethod("PrefabUtilityBindings::GetVariantParentGUID_Internal", IsFreeFunction = true, ThrowsException = true)]
+        extern internal static string GetVariantParentGUID(int instanceID);
     }
 }
diff --git a/Editor/Mono/Prefabs/PrefabUtility.cs b/Editor/Mono/Prefabs/PrefabUtility.cs
index 23b0f0a117..9375929e47 100644
--- a/Editor/Mono/Prefabs/PrefabUtility.cs
+++ b/Editor/Mono/Prefabs/PrefabUtility.cs
@@ -14,6 +14,7 @@
 using Object = UnityEngine.Object;
 using RequiredByNativeCodeAttribute = UnityEngine.Scripting.RequiredByNativeCodeAttribute;
 using UnityEditor.VersionControl;
+using UnityEngine.Scripting;
 
 namespace UnityEditor
 {
@@ -79,6 +80,15 @@ public enum ReplacePrefabOptions
         ReplaceNameBased = 2,
     }
 
+    // This must match C++ MergeStatus
+    internal enum MergeStatus
+    {
+        NotMerged,                       // Initial state, before trying to merge
+        NormalMerge,                     // Prefab source was found and merged successfully
+        MergedAsMissing,                 // Prefab source was missing and the Prefab couldn't be merged
+        MergedAsMissingWithSceneBackup   // Prefab source was missing, but Prefab data was found in the scene file - no merging was done
+    }
+
     internal delegate void AddApplyMenuItemDelegate(GUIContent menuItem, Object sourceObject, Object instanceOrAssetObject);
 
     public sealed partial class PrefabUtility
@@ -924,6 +934,20 @@ public static void RevertObjectOverride(Object instanceComponentOrGameObject, In
             }
         }
 
+        static bool DidComponentOrderChange(Component[] originalComponentOrder, Component[] newComponentOrder)
+        {
+            if (originalComponentOrder.Length != newComponentOrder.Length)
+                return true;
+
+            for (int i = 0; i < originalComponentOrder.Length; ++i)
+            {
+                if (originalComponentOrder[i] != newComponentOrder[i])
+                    return true;
+            }
+
+            return false;
+        }
+
         public static void ApplyAddedComponent(Component component, string assetPath, InteractionMode action)
         {
             DateTime startTime = DateTime.UtcNow;
@@ -942,6 +966,8 @@ public static void ApplyAddedComponent(Component component, string assetPath, In
                 if (prefabSourceGameObject == null)
                     return;
 
+                var originalComponentOrder = component.gameObject.GetComponents<Component>();
+
                 var actionName = "Apply Added Component";
                 if (action == InteractionMode.UserAction)
                 {
@@ -974,6 +1000,13 @@ public static void ApplyAddedComponent(Component component, string assetPath, In
                         PrefabUtility.ApplyAddedComponent(coupledComponent, prefabSourceGameObject);
                         Undo.RegisterCreatedObjectUndo(GetCorrespondingObjectFromOriginalSource(coupledComponent), actionName);
                     }
+
+                    var postApplyComponentOrder = component.gameObject.GetComponents<Component>();
+                    bool orderChanged = DidComponentOrderChange(originalComponentOrder, postApplyComponentOrder);
+                    if (orderChanged)
+                    {
+                        EditorUtility.DisplayDialog(L10n.Tr("Notice!"), L10n.Tr("Some component(s) changed position because of other added components in the variant/nesting chain."), L10n.Tr("OK"));
+                    }
                 }
             }
             catch (ArgumentException exception)
@@ -1034,10 +1067,14 @@ public static void RevertAddedComponent(Component component, InteractionMode act
                     Undo.DestroyObjectImmediate(coupledComponent);
             }
             else
-                Object.DestroyImmediate(component);
+                Object.DestroyImmediate(component, true);
 
-            // Remerge the prefab instance to make any suppressed components show up if no longer suppressed
-            PrefabUtility.MergePrefabInstance_internal(prefabInstanceGameObject);
+            // Remerge the Prefab instance to make any suppressed components show up if no longer suppressed
+            // For the Prefab assets this is not necessary because they will be remerged by the importer when saved
+            if (!PrefabUtility.IsPartOfPrefabAsset(prefabInstanceGameObject))
+            {
+                PrefabUtility.MergePrefabInstance_internal(prefabInstanceGameObject);
+            }
         }
 
         private static bool IsPrefabInstanceObjectOf(Object instance, Object source)
@@ -1067,9 +1104,9 @@ internal static void RemoveRemovedComponentOverridesWhichAreNull(Object prefabIn
             PrefabUtility.SetRemovedComponents(prefabInstanceObject, filteredRemovedComponents);
         }
 
-        // We can't use the same pattern of identifyiong the prefab asset via assetPath only,
+        // We can't use the same pattern of identifying the prefab asset via assetPath only,
         // since when the component is removed in the instance, the only way to identify which component it is,
-        // is via the corresponding component on the asset. Additionally supplying an assetPath would be redundant.
+        // is via the corresponding component on the asset. We find it by matching FileIds. Additionally supplying an assetPath would be redundant.
         public static void ApplyRemovedComponent(GameObject instanceGameObject, Component assetComponent, InteractionMode action)
         {
             DateTime startTime = DateTime.UtcNow;
@@ -1095,20 +1132,51 @@ public static void ApplyRemovedComponent(GameObject instanceGameObject, Componen
                     EditorUtility.DisplayDialog(L10n.Tr("Can't apply removed component"), error, L10n.Tr("OK"));
                     return;
                 }
+            }
 
-                var coupledAssetComponent = assetComponent.GetCoupledComponent();
+            string assetPath = AssetDatabase.GetAssetPath(assetComponent);
+            GameObject assetRoot = GetRootGameObject(assetComponent);
 
-                Undo.DestroyObjectUndoable(assetComponent, actionName);
-                // Undo.DestroyObjectUndoable saves prefab asset internally.
+            Component coupledAssetComponent = null;
+            byte[] originalFileContent = null;
+            if (action == InteractionMode.UserAction)
+            {
+                coupledAssetComponent = assetComponent.GetCoupledComponent();
+                if(!FileUtil.ReadFileContentBinary(assetPath, out originalFileContent, out string errorMessage))
+                    Debug.LogError($"No undo was registered when removing {assetComponent.name} from {assetRoot.name}. \nError: {errorMessage}", assetRoot);
+            }
 
+            using (var scope = new EditPrefabContentsScope(assetPath))
+            {
+                //Search components in file that matches the FileIds of componentInAsset
+                void DeleteCorrespondingComponent(Component componentInAsset)
+                {
+                    var assetComponentId = Unsupported.GetFileIDHint(componentInAsset);
+                    var componentsOfTypeInAsset = scope.prefabContentsRoot.GetComponentsInChildren(componentInAsset.GetType(), true);
+
+                    foreach (var component in componentsOfTypeInAsset)
+                    {
+                        if (Unsupported.GetOrGenerateFileIDHint(component) == assetComponentId)
+                        {
+                            Object.DestroyImmediate(component);
+                            return;
+                        }
+                    }
+                    Debug.LogError($"Component {componentInAsset} could not be found and deleted from corresponding asset.");
+                }
+
+                DeleteCorrespondingComponent(assetComponent);
                 if (coupledAssetComponent != null)
-                    Undo.DestroyObjectUndoable(coupledAssetComponent, actionName);
+                    DeleteCorrespondingComponent(coupledAssetComponent);
             }
-            else
+
+            if (action == InteractionMode.UserAction && originalFileContent != null)
             {
-                GameObject prefabAsset = assetComponent.transform.root.gameObject;
-                Object.DestroyImmediate(assetComponent, true);
-                SavePrefabAsset(prefabAsset);
+                var guid = AssetDatabase.GUIDFromAssetPath(assetPath);
+                if (FileUtil.ReadFileContentBinary(assetPath, out byte[] newFileContent, out string errorMessage))
+                    Undo.RegisterFileChangeUndo(guid, originalFileContent, newFileContent);
+                else
+                    Debug.LogError($"No undo was registered when removing {assetComponent.name} from {assetRoot.name}. \nError: {errorMessage}", assetRoot);
             }
 
             var prefabInstanceObject = PrefabUtility.GetPrefabInstanceHandle(instanceGameObject);
@@ -1581,8 +1649,15 @@ private static void SaveAsPrefabAssetArgumentCheck(GameObject instanceRoot, stri
             if (EditorUtility.IsPersistent(instanceRoot))
                 throw new ArgumentException("Can't save persistent object as a Prefab asset");
 
-            if (IsPrefabAssetMissing(instanceRoot))
-                throw new ArgumentException("Can't save Prefab instance with missing asset as a Prefab. You may unpack the instance and save the unpacked GameObjects as a Prefab.");
+            if (IsPartOfNonAssetPrefabInstance(instanceRoot))
+            {
+                // A PrefabInstance with missing asset can be correctly restored only if CorrespondingObjects info is available
+                // CorrespondingObject info is available when a PrefabInstance with missing asset was merged before deleting the asset (kNormalMerge) or when it has a scene backup (kMergedAsMissingWithSceneBackup)
+                var mergeStatus = GetMergeStatus(instanceRoot);
+                var hasCorrespondingSourceObjectInfo = mergeStatus == MergeStatus.NormalMerge || mergeStatus == MergeStatus.MergedAsMissingWithSceneBackup;
+                if (IsPrefabAssetMissing(instanceRoot) && !hasCorrespondingSourceObjectInfo)
+                    throw new ArgumentException("Can't save Prefab instance with missing asset and scene backup as a Prefab. You may unpack the instance and save the unpacked GameObjects as a Prefab.");
+            }
 
             var actualInstanceRoot = GetOutermostPrefabInstanceRoot(instanceRoot);
             if (actualInstanceRoot)
@@ -1942,6 +2017,12 @@ internal enum SaveVerb
             Apply
         }
 
+        [RequiredByNativeCode]
+        internal static bool PromptAndCheckoutPrefabIfNeeded_Internal(string[] assetPaths, SaveVerb saveVerb)
+        {
+            return PromptAndCheckoutPrefabIfNeeded(assetPaths, saveVerb);
+        }
+
         internal static bool PromptAndCheckoutPrefabIfNeeded(string assetPath, SaveVerb saveVerb)
         {
             return PromptAndCheckoutPrefabIfNeeded(new string[] { assetPath }, saveVerb);
@@ -1981,8 +2062,14 @@ internal static bool PromptAndCheckoutPrefabIfNeeded(string[] assetPaths, SaveVe
             return result;
         }
 
+        public static event Action<GameObject, PrefabUnpackMode> prefabInstanceUnpacking;
+        public static event Action<GameObject, PrefabUnpackMode> prefabInstanceUnpacked;
+
         public static void UnpackPrefabInstance(GameObject instanceRoot, PrefabUnpackMode unpackMode, InteractionMode action)
         {
+            if (instanceRoot == null)
+                throw new ArgumentNullException(nameof(instanceRoot));
+
             if (!IsPartOfNonAssetPrefabInstance(instanceRoot))
                 throw new ArgumentException("UnpackPrefabInstance must be called with a Prefab instance.");
 
@@ -2007,8 +2094,23 @@ public static void UnpackPrefabInstance(GameObject instanceRoot, PrefabUnpackMod
             {
                 UnpackPrefabInstanceAndReturnNewOutermostRoots(instanceRoot, unpackMode);
             }
+        }
 
-            prefabInstanceUnpacked?.Invoke(instanceRoot);
+        public static GameObject[] UnpackPrefabInstanceAndReturnNewOutermostRoots(GameObject instanceRoot, PrefabUnpackMode unpackMode)
+        {
+            if (instanceRoot == null)
+                throw new ArgumentNullException(nameof(instanceRoot));
+
+            prefabInstanceUnpacking?.Invoke(instanceRoot, unpackMode);
+
+            // The user can delete the instance in the prefabInstanceUnpacking callback
+            if (instanceRoot == null)
+                throw new InvalidOperationException($"The input '{nameof(instanceRoot)}' was destroyed in the prefabInstanceUnpacking callback");
+
+            var newRoots = UnpackPrefabInstanceAndReturnNewOutermostRoots_internal(instanceRoot, unpackMode);
+            prefabInstanceUnpacked?.Invoke(instanceRoot, unpackMode);
+
+            return newRoots;
         }
 
         public static void UnpackAllInstancesOfPrefab(GameObject prefabRoot, PrefabUnpackMode unpackMode, InteractionMode action)
@@ -2020,7 +2122,8 @@ public static void UnpackAllInstancesOfPrefab(GameObject prefabRoot, PrefabUnpac
             }
         }
 
-        static internal event Action<GameObject> prefabInstanceUnpacked;
+
+
 
         internal static bool HasInvalidComponent(Object gameObjectOrComponent)
         {
@@ -2627,16 +2730,18 @@ static List<Component> GetComponentsWhichThisDependsOn(Component component, List
 
         internal readonly struct InstanceOverridesInfo
         {
-            public InstanceOverridesInfo(GameObject prefabInstance, PropertyModification[] usedMods, PropertyModification[] unusedMods)
+            public InstanceOverridesInfo(GameObject prefabInstance, PropertyModification[] usedMods, PropertyModification[] unusedMods, int unusedRemovedComponentCount)
             {
                 this.instance = prefabInstance;
                 this.usedMods = usedMods;
                 this.unusedMods = unusedMods;
+                this.unusedRemovedComponentCount = unusedRemovedComponentCount;
             }
 
             public GameObject instance { get; }
             public PropertyModification[] usedMods { get; }
             public PropertyModification[] unusedMods { get; }
+            public int unusedRemovedComponentCount { get; }
         }
 
         internal static bool HavePrefabInstancesUnusedOverrides(GameObject[] gameObjects)
@@ -2664,11 +2769,13 @@ internal static InstanceOverridesInfo[] GetPrefabInstancesOverridesInfos(GameObj
 
             foreach (GameObject go in selectedGameObjects)
             {
-                var outerMostPrefabInstance = PrefabUtility.GetOutermostPrefabInstanceRoot(go);
+                var outerMostInstance = PrefabUtility.GetOutermostPrefabInstanceRoot(go);
+                if (outerMostInstance == null)
+                    continue;
 
-                if (PrefabUtility.HasPrefabInstanceNonDefaultOverrides_CachedForUI(outerMostPrefabInstance) || PrefabUtility.HasPrefabInstanceUnusedOverrides(outerMostPrefabInstance))
+                if (PrefabUtility.HasPrefabInstanceNonDefaultOverridesOrUnusedOverrides_CachedForUI(outerMostInstance))
                 {
-                    InstanceOverridesInfo instancePropMods = GetPrefabInstanceOverridesInfo(outerMostPrefabInstance);
+                    InstanceOverridesInfo instancePropMods = GetPrefabInstanceOverridesInfo(outerMostInstance);
                     allInstanceMods.Add(instancePropMods);
                 }
             }
@@ -2730,7 +2837,9 @@ internal static InstanceOverridesInfo GetPrefabInstanceOverridesInfo(GameObject
                 }
             }
 
-            return new InstanceOverridesInfo(selectedGameObject, validModifications.ToArray(), invalidModifications.ToArray());
+            int unusedRemovedComponentCount = GetPrefabInstanceUnusedRemovedComponentCount_Internal(selectedGameObject);
+
+            return new InstanceOverridesInfo(selectedGameObject, validModifications.ToArray(), invalidModifications.ToArray(), unusedRemovedComponentCount);
         }
 
         internal static bool DoRemovePrefabInstanceUnusedOverridesDialog(InstanceOverridesInfo[] instanceOverridesInfos)
@@ -2768,11 +2877,11 @@ internal static bool DoRemovePrefabInstanceUnusedOverridesDialog(InstanceOverrid
             {
                 foreach (PrefabUtility.InstanceOverridesInfo instanceMods in instanceOverridesInfos)
                 {
-                    if (!instanceMods.unusedMods.Any())
+                    if (!instanceMods.unusedMods.Any() && instanceMods.unusedRemovedComponentCount == 0)
                         continue;
 
                     affectedInstanceCount++;
-                    unusedOverridesCount += instanceMods.unusedMods.Length;
+                    unusedOverridesCount += instanceMods.unusedMods.Length + instanceMods.unusedRemovedComponentCount;
                     usedOverridesCount += instanceMods.usedMods.Length;
                     currInstanceWithUnusedMods = instanceMods;
                 }
@@ -2797,7 +2906,7 @@ internal static bool DoRemovePrefabInstanceUnusedOverridesDialog(InstanceOverrid
             }
             else// Single selection
             {
-                unusedOverridesCount = currInstanceWithUnusedMods.unusedMods.Length;
+                unusedOverridesCount = currInstanceWithUnusedMods.unusedMods.Length + currInstanceWithUnusedMods.unusedRemovedComponentCount;
                 usedOverridesCount = currInstanceWithUnusedMods.usedMods.Length;
                 if (unusedOverridesCount > 0)
                 {
@@ -2829,30 +2938,50 @@ internal static bool DoRemovePrefabInstanceUnusedOverridesDialog(InstanceOverrid
 
         internal static void RemovePrefabInstanceUnusedOverrides(InstanceOverridesInfo[] instanceOverridesInfos)
         {
+            bool updatedEditorLog = false;
+
             foreach (InstanceOverridesInfo ipmods in instanceOverridesInfos)
-                PrefabUtility.RemovePrefabInstanceUnusedOverrides(ipmods);
+                updatedEditorLog |= PrefabUtility.RemovePrefabInstanceUnusedOverrides(ipmods);
+
+            if (updatedEditorLog)
+                System.Console.WriteLine("");
         }
 
-        private static void RemovePrefabInstanceUnusedOverrides(InstanceOverridesInfo iovInfo)
+        private static bool RemovePrefabInstanceUnusedOverrides(InstanceOverridesInfo iovInfo)
         {
-            if (iovInfo.unusedMods.Any())
+            if (iovInfo.instance == null)
+                throw new ArgumentNullException(nameof(iovInfo), "InstanceOverridesInfo.instance was null");
+            else if (iovInfo.unusedMods == null)
+                throw new ArgumentNullException(nameof(iovInfo), "InstanceOverridesInfo.unusedMods was null");
+            else if (iovInfo.usedMods == null)
+                throw new ArgumentNullException(nameof(iovInfo), "InstanceOverridesInfo.usedMods was null");
+
+            bool updatedEditorLog = false;
+            if (iovInfo.unusedMods.Any() || iovInfo.unusedRemovedComponentCount > 0)
             {
                 Undo.RegisterCompleteObjectUndo(iovInfo.instance, "Remove unused overrides");
 
-                SetPropertyModifications(iovInfo.instance, iovInfo.usedMods);
-                PrefabUtility.LogRemovedOverrides(iovInfo.instance, iovInfo.unusedMods);
+                if (iovInfo.unusedMods.Any())
+                {
+                    SetPropertyModifications(iovInfo.instance, iovInfo.usedMods);
+                    updatedEditorLog |= PrefabUtility.LogRemovedPropertyOverrides(iovInfo.instance, iovInfo.unusedMods);
+                }
 
-                PrefabUtility.RemoveRemovedComponentOverridesWhichAreNull(iovInfo.instance);
+                if (iovInfo.unusedRemovedComponentCount > 0)
+                {
+                    PrefabUtility.RemoveRemovedComponentOverridesWhichAreNull(iovInfo.instance);
+                    updatedEditorLog |= PrefabUtility.LogRemovedUnusedRemovedComponents(iovInfo.instance, iovInfo.unusedRemovedComponentCount);
+                }
             }
+            return updatedEditorLog;
         }
 
-        internal static void LogRemovedOverrides(GameObject instance, PropertyModification[] mods)
+        internal static bool LogRemovedPropertyOverrides(GameObject instance, PropertyModification[] mods)
         {
             if (mods.Length == 0)
-                return;
+                return false;
 
             System.Text.StringBuilder info = new System.Text.StringBuilder();
-            info.AppendLine("");
 
             if (mods.Length > 1)
                 info.AppendLine("Removed " + mods.Length + " unused overrides from instance '" + instance.name + "':");
@@ -2867,9 +2996,46 @@ internal static void LogRemovedOverrides(GameObject instance, PropertyModificati
                     info.AppendLine("   '" + mod.propertyPath + "' refers to a non-existent property.");
             }
 
-            System.Console.WriteLine(info.ToString(), instance);
+            System.Console.Write(info.ToString(), instance);
+            return true;
+        }
+
+        internal static bool LogRemovedUnusedRemovedComponents(GameObject instance, int unusedRemovedComponentCount)
+        {
+            if (unusedRemovedComponentCount == 0)
+                return false;
+
+            System.Text.StringBuilder info = new System.Text.StringBuilder();
+
+            if (unusedRemovedComponentCount > 1)
+                info.AppendLine("Removed " + unusedRemovedComponentCount + " unused removed components from instance '" + instance.name + "'");
+            else
+                info.AppendLine("Removed 1 unused removed component from instance '" + instance.name + "'");
+
+            System.Console.Write(info.ToString(), instance);
+
+            return true;
+        }
+
+        internal static event Func<UnityEngine.Object, bool> allowRecordingPrefabPropertyOverridesFor;
+
+
+        [RequiredByNativeCode]
+        static bool AllowRecordingPrefabPropertyOverridesFor(UnityEngine.Object componentOrGameObject)
+        {
+            if (allowRecordingPrefabPropertyOverridesFor == null)
+                return true;
+
+            foreach (Func<UnityEngine.Object, bool> deleg in allowRecordingPrefabPropertyOverridesFor.GetInvocationList())
+            {
+                if (deleg(componentOrGameObject) == false)
+                    return false;
+            }
+
+            return true;
         }
 
+
         internal static class Analytics
         {
             public enum ApplyScope
diff --git a/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs b/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs
index 903c3c8fd9..e02f245fdd 100644
--- a/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs
+++ b/Editor/Mono/PreferencesWindow/AssetPipelinePreferences.cs
@@ -227,7 +227,9 @@ void ShowGUI()
                 GUILayout.Label(Properties.cacheServer, EditorStyles.boldLabel);
                 if (GUILayout.Button(Properties.cacheServerLearnMore, EditorStyles.linkLabel))
                 {
-                    Application.OpenURL("https://docs.unity3d.com/Manual/UnityAccelerator.html#UsingWithAssetPipeline");
+                    // Known issue with Docs redirect - versioned pages might not open offline docs
+                    var help = Help.FindHelpNamed("UnityAccelerator");
+                    Application.OpenURL(help);
                 }
                 GUILayout.EndHorizontal();
                 EditorGUI.BeginChangeCheck();
@@ -293,7 +295,9 @@ void DoImportWorkerCount()
 
             if (GUILayout.Button(Properties.desiredImportWorkerCountPctOfLogicalCPUsLearnMore, EditorStyles.linkLabel))
             {
-                Application.OpenURL("https://docs.unity3d.com/Manual/ParallelImport.html");
+                // Known issue with Docs redirect - versioned pages might not open offline docs
+                var help = Help.FindHelpNamed("ParallelImport");
+                Application.OpenURL(help);
             }
 
             GUILayout.EndHorizontal();
@@ -310,6 +314,31 @@ void DoDirectoryMonitoring()
             }
         }
 
+        internal static bool ParseCacheServerAddress(string input, out string ip, out UInt16 port)
+        {
+            var address = input.Split(':');
+            ip = address[0];
+            port = 0;
+            if (address.Length == 2)
+            {
+                try
+                {
+                    port = UInt16.Parse(address[1]);
+                }
+                catch (Exception e)
+                {
+                    Debug.LogError($"{e.Message} Exception thrown attempting to parse the port '{address[1]}'. Please double check the 'Default IP Address' and try again.");
+                    return false;
+                }
+            }
+            else if (address.Length > 2)
+            {
+                Debug.LogError($"Failure attempting to parse the address '{input}' as multiple ports were detected. Please double check the 'Default IP Address' and try again.");
+                return false;
+            }
+            return true;
+        }
+
         static void CacheServerGUI()
         {
             bool changeStateBeforeControls = GUI.changed;
@@ -327,13 +356,7 @@ static void CacheServerGUI()
 
             if (GUILayout.Button("Check Connection", GUILayout.Width(150)))
             {
-                var address = s_CacheServer2IPAddress.Split(':');
-                var ip = address[0];
-                UInt16 port = 0;
-                if (address.Length == 2)
-                    port = Convert.ToUInt16(address[1]);
-
-                if (AssetDatabase.CanConnectToCacheServer(ip, port))
+                if (ParseCacheServerAddress(s_CacheServer2IPAddress, out var ip, out var port) && AssetDatabase.CanConnectToCacheServer(ip, port))
                     s_ConnectionState = ConnectionState.Success;
                 else
                     s_ConnectionState = ConnectionState.Failure;
diff --git a/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs b/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs
index dc1eb9741b..bdbfdbebda 100644
--- a/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs
+++ b/Editor/Mono/PreferencesWindow/PreferencesSettingsProviders.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using UnityEngine;
+using UnityEditor.Analytics;
 using UnityEditor.Modules;
 using UnityEditorInternal;
 using System.Collections.Generic;
@@ -13,6 +14,7 @@
 using Unity.CodeEditor;
 using UnityEngine.UIElements;
 using UnityEditor.Experimental;
+using UnityEditor.SceneManagement;
 
 namespace UnityEditor
 {
@@ -45,13 +47,15 @@ static Styles()
         class GeneralProperties
         {
             public static readonly GUIContent loadPreviousProjectOnStartup = EditorGUIUtility.TrTextContent("Load Previous Project on Startup");
-            public static readonly GUIContent disableEditorAnalytics = EditorGUIUtility.TrTextContent("Disable Editor Analytics (Pro Only)");
+            public static readonly GUIContent disableEditorAnalytics = EditorGUIUtility.TrTextContent("Disable Editor Analytics");
             public static readonly GUIContent autoSaveScenesBeforeBuilding = EditorGUIUtility.TrTextContent("Auto-save scenes before building");
             public static readonly GUIContent scriptChangesDuringPlay = EditorGUIUtility.TrTextContent("Script Changes While Playing");
             public static readonly GUIContent editorFont = EditorGUIUtility.TrTextContent("Editor Font");
             public static readonly GUIContent editorSkin = EditorGUIUtility.TrTextContent("Editor Theme");
             public static readonly GUIContent[] editorSkinOptions = { EditorGUIUtility.TrTextContent("Light"), EditorGUIUtility.TrTextContent("Dark") };
-            public static readonly GUIContent enableAlphaNumericSorting = EditorGUIUtility.TrTextContent("Enable Alphanumeric Sorting");
+            public static readonly GUIContent hierarchyHeader = EditorGUIUtility.TrTextContent("Hierarchy window");
+            public static readonly GUIContent enableAlphaNumericSorting = EditorGUIUtility.TrTextContent("Enable Alphanumeric Sorting", "If enabled then you can choose between Transform sorting and Alphabetical sorting in the Hierarchy.");
+            public static readonly GUIContent defaultPrefabMode = EditorGUIUtility.TrTextContent("Default Prefab Mode", "This mode will be used when opening Prefab Mode from a Prefab instance in the Hierarchy.");
             public static readonly GUIContent applicationFrameThrottling = EditorGUIUtility.TrTextContent("Frame Throttling (milliseconds)", "The number of milliseconds the Editor can idle between frames.");
             public static readonly GUIContent inputMaxProcessTime = EditorGUIUtility.TrTextContent("Input Throttling (milliseconds)", "The maximum number of milliseconds the Editor will take to process user inputs.");
             public static readonly GUIContent interactionMode = EditorGUIUtility.TrTextContent("Interaction Mode", "Specifies how long the Editor can idle before it updates.");
@@ -121,7 +125,7 @@ class SceneViewProperties
         {
             public static readonly GUIContent enableFilteringWhileSearching = EditorGUIUtility.TrTextContent("Enable filtering while searching", "If enabled, searching will cause non-matching items in the scene view to be greyed out");
             public static readonly GUIContent enableFilteringWhileLodGroupEditing = EditorGUIUtility.TrTextContent("Enable filtering while editing LOD groups", "If enabled, editing LOD groups will cause other objects in the scene view to be greyed out");
-            public static readonly GUIContent handlesLineThickness = EditorGUIUtility.TrTextContent("Line Thickness", "Thickness of manipulator tool handle lines in UI points (0 = single pixel)");
+            public static readonly GUIContent handlesLineThickness = EditorGUIUtility.TrTextContent("Line Thickness", "Thickness of manipulator tool handle lines");
             public static readonly GUIContent createObjectsAtWorldOrigin = EditorGUIUtility.TrTextContent("Create Objects at Origin", "Enable this preference to instantiate new 3D objects at World coordinates 0,0,0. Disable it to instantiate them at the Scene pivot (in front of the Scene view Camera).");
             public static readonly GUIContent enableConstrainProportionsScalingForNewObjects = EditorGUIUtility.TrTextContent("Create Objects with Constrained Proportions scale on", "If enabled, scale in the transform component will be set to constrain proportions for new GameObjects by default");
             public static readonly GUIContent useInspectorExpandedStateContent = EditorGUIUtility.TrTextContent("Auto-hide gizmos", "Automatically hide gizmos of Components collapsed in the Inspector");
@@ -137,6 +141,7 @@ class LanguageProperties
         class DeveloperModeProperties
         {
             public static readonly GUIContent developerMode = EditorGUIUtility.TrTextContent("Developer Mode", "Enable or disable developer mode features.");
+            public static readonly GUIContent generateOnPostprocessAllAssets = EditorGUIUtility.TrTextContent("Generate OnPostprocessAllAssets Dependency Diagram", "Generates a graphviz diagram to show OnPostprocessAllAssets dependencies.");
             public static readonly GUIContent showRepaintDots = EditorGUIUtility.TrTextContent("Show Repaint Dots", "Enable or disable the colored dots that flash when an EditorWindow repaints.");
             public static readonly GUIContent redirectionServer = EditorGUIUtility.TrTextContent("Documentation Server", "Select the documentation redirection server.");
         }
@@ -187,6 +192,7 @@ private struct GICacheSettings
         private bool m_EnableCompilerMessagesLocalization;
 
         private bool m_AllowAlphaNumericHierarchy = false;
+        private PrefabStage.Mode m_DefaultPrefabModeFromHierarchy = PrefabStage.Mode.InContext;
         private bool m_Create3DObjectsAtOrigin = false;
         private float m_ProgressDialogDelay = 3.0f;
         private bool m_GraphSnapping;
@@ -457,14 +463,15 @@ private void ShowGeneral(string searchContext)
             // Options
             m_ReopenLastUsedProjectOnStartup = EditorGUILayout.Toggle(GeneralProperties.loadPreviousProjectOnStartup, m_ReopenLastUsedProjectOnStartup);
 
-            bool pro = UnityEngine.Application.HasProLicense();
-            using (new EditorGUI.DisabledScope(!pro))
+            bool enableEditorAnalyticsOld = m_EnableEditorAnalytics;
+
+            using (new EditorGUI.DisabledScope(m_AnalyticSettingChangedThisSession))
             {
-                bool enableEditorAnalyticsOld = m_EnableEditorAnalytics;
-                m_EnableEditorAnalytics = !EditorGUILayout.Toggle(GeneralProperties.disableEditorAnalytics, !m_EnableEditorAnalytics) || !pro && !m_EnableEditorAnalytics;
+                m_EnableEditorAnalytics = !EditorGUILayout.Toggle(GeneralProperties.disableEditorAnalytics, !m_EnableEditorAnalytics);
                 if (enableEditorAnalyticsOld != m_EnableEditorAnalytics)
                 {
                     m_AnalyticSettingChangedThisSession = true;
+                    EditorAnalytics.enabled = m_EnableEditorAnalytics;
                 }
                 if (m_AnalyticSettingChangedThisSession)
                 {
@@ -507,9 +514,6 @@ private void ShowGeneral(string searchContext)
                 }
             }
 
-            bool oldAlphaNumeric = m_AllowAlphaNumericHierarchy;
-            m_AllowAlphaNumericHierarchy = EditorGUILayout.Toggle(GeneralProperties.enableAlphaNumericSorting, m_AllowAlphaNumericHierarchy);
-
             if (InternalEditorUtility.IsGpuDeviceSelectionSupported())
             {
                 // Cache gpu devices
@@ -562,16 +566,27 @@ private void ShowGeneral(string searchContext)
 
             GameView.openWindowOnEnteringPlayMode = EditorGUILayout.Toggle(GeneralProperties.enterPlayModeSettingsFocusGameView, GameView.openWindowOnEnteringPlayMode);
 
-            ApplyChangesToPrefs();
-
-            if (oldAlphaNumeric != m_AllowAlphaNumericHierarchy)
-                EditorApplication.DirtyHierarchyWindowSorting();
-
             DrawInteractionModeOptions();
 
             DrawPackageManagerOptions();
             DrawDynamicHintsOptions();
             DrawPerformBumpMapCheck();
+
+            EditorGUILayout.Space();
+            GUILayout.Label(GeneralProperties.hierarchyHeader, EditorStyles.boldLabel);
+
+            EditorGUI.indentLevel++;
+            bool oldAlphaNumeric = m_AllowAlphaNumericHierarchy;
+            m_AllowAlphaNumericHierarchy = EditorGUILayout.Toggle(GeneralProperties.enableAlphaNumericSorting, m_AllowAlphaNumericHierarchy);
+            m_DefaultPrefabModeFromHierarchy = (PrefabStage.Mode)EditorGUILayout.EnumPopup(GeneralProperties.defaultPrefabMode, m_DefaultPrefabModeFromHierarchy);
+            EditorGUI.indentLevel--;
+
+            EditorGUILayout.Space();
+
+            ApplyChangesToPrefs();
+
+            if (oldAlphaNumeric != m_AllowAlphaNumericHierarchy)
+                EditorApplication.DirtyHierarchyWindowSorting();
         }
 
         enum InteractionMode
@@ -775,7 +790,7 @@ private void ShowSceneView(string searchContext)
             AnnotationUtility.useInspectorExpandedState = EditorGUILayout.Toggle(SceneViewProperties.useInspectorExpandedStateContent, AnnotationUtility.useInspectorExpandedState);
 
             GUILayout.Label("Handles", EditorStyles.boldLabel);
-            Handles.s_LineThickness.value = EditorGUILayout.IntSlider(SceneViewProperties.handlesLineThickness, (int)Handles.s_LineThickness.value, 0, 5);
+            Handles.s_LineThickness.value = EditorGUILayout.IntSlider(SceneViewProperties.handlesLineThickness, (int)Handles.s_LineThickness.value, 1, 5);
 
             GUILayout.Label("Search", EditorStyles.boldLabel);
             SceneView.s_PreferenceEnableFilteringWhileSearching.value = EditorGUILayout.Toggle(SceneViewProperties.enableFilteringWhileSearching, SceneView.s_PreferenceEnableFilteringWhileSearching);
@@ -983,6 +998,11 @@ private void ShowDeveloperMode(string searchContext)
                 {
                     Help.docRedirectionServer = docServer;
                 }
+
+                if (GUILayout.Button(DeveloperModeProperties.generateOnPostprocessAllAssets))
+                {
+                    AssetPostprocessingInternal.s_OnPostprocessAllAssetsCallbacks.GenerateDependencyDiagram("OnPostprocessAllAssets.dot");
+                }
             }
 
             if (m_DeveloperModeDirty)
@@ -1054,6 +1074,7 @@ private void WritePreferences()
             EditorPrefs.SetBool("Editor.kEnableCompilerMessagesLocalization", m_EnableCompilerMessagesLocalization);
 
             EditorPrefs.SetBool("AllowAlphaNumericHierarchy", m_AllowAlphaNumericHierarchy);
+            EditorPrefs.SetInt("DefaultPrefabModeFromHierarchy", (int)m_DefaultPrefabModeFromHierarchy);
 
             EditorPrefs.SetFloat("EditorBusyProgressDialogDelay", m_ProgressDialogDelay);
             GOCreationCommands.s_PlaceObjectsAtWorldOrigin.value = m_Create3DObjectsAtOrigin;
@@ -1121,7 +1142,7 @@ private void ReadPreferences()
 
             m_ReopenLastUsedProjectOnStartup = EditorPrefs.GetBool("ReopenLastUsedProjectOnStartup");
 
-            m_EnableEditorAnalytics = EditorPrefs.GetBool("EnableEditorAnalytics", true);
+            m_EnableEditorAnalytics = EditorPrefs.GetBool("EnableEditorAnalyticsV2", EditorPrefs.GetBool("EnableEditorAnalytics", true));
 
             m_ScriptCompilationDuringPlay = (ScriptChangesDuringPlayOptions)EditorPrefs.GetInt("ScriptCompilationDuringPlay", 0);
             m_DeveloperMode = Unsupported.IsDeveloperMode();
@@ -1137,6 +1158,7 @@ private void ReadPreferences()
             m_SelectedLanguage = EditorPrefs.GetString("Editor.kEditorLocale", LocalizationDatabase.GetDefaultEditorLanguage().ToString());
             m_EnableCompilerMessagesLocalization = EditorPrefs.GetBool("Editor.kEnableCompilerMessagesLocalization", false);
             m_AllowAlphaNumericHierarchy = EditorPrefs.GetBool("AllowAlphaNumericHierarchy", false);
+            m_DefaultPrefabModeFromHierarchy = GetDefaultPrefabModeForHierarchy();
             m_ProgressDialogDelay = EditorPrefs.GetFloat("EditorBusyProgressDialogDelay", 3.0f);
             m_Create3DObjectsAtOrigin = GOCreationCommands.s_PlaceObjectsAtWorldOrigin;
 
@@ -1329,5 +1351,10 @@ private string[] BuildFriendlyAppNameList(string[] appPathList, Dictionary<strin
 
             return list.ToArray();
         }
+
+        internal static PrefabStage.Mode GetDefaultPrefabModeForHierarchy()
+        {
+            return (PrefabStage.Mode)EditorPrefs.GetInt("DefaultPrefabModeFromHierarchy", (int)PrefabStage.Mode.InContext);
+        }
     }
 }
diff --git a/Editor/Mono/Progress/Progress.bindings.cs b/Editor/Mono/Progress/Progress.bindings.cs
index 4f9f02d690..37d25ed507 100644
--- a/Editor/Mono/Progress/Progress.bindings.cs
+++ b/Editor/Mono/Progress/Progress.bindings.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using UnityEngine.Assertions;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
@@ -76,6 +77,15 @@ internal enum Updates : uint
             EverythingChanged = 0xffffffff
         }
 
+        [StructLayout(LayoutKind.Sequential)]
+        [NativeHeader("Editor/Src/Progress.h")]
+        [RequiredByNativeCode(GenerateProxy = true)]
+        internal struct ProgressIdAndUpdates
+        {
+            public int id;
+            public Updates updates;
+        }
+
         [NativeMethod(IsFreeFunction = true, IsThreadSafe = true, Name = "Editor::Progress::Start")]
         private static extern int Internal_Start(string name, string description, Options options, int parentId);
 
@@ -238,7 +248,7 @@ public static void SetPriority(int id, Priority priority)
 
         public static void ShowDetails(bool shouldReposition = true)
         {
-            EditorUIService.instance.ProgressWindowShowDetails(shouldReposition);
+            ProgressWindow.ShowDetails(shouldReposition);
         }
 
         private static List<Item> s_ProgressItems = new List<Item>(8);
@@ -344,22 +354,23 @@ private static void OnOperationStateChanged(int id, Updates progressUpdates)
         }
 
         [RequiredByNativeCode]
-        private static void OnOperationsStateChanged(int[] ids, Updates[] progressUpdates)
+        private static void OnOperationsStateChanged(ReadOnlySpan<ProgressIdAndUpdates> progressUpdates)
         {
             if (!s_Initialized)
                 RestoreProgressItems();
-            if (ids.Length == 0) return;
+            if (progressUpdates.Length == 0) return;
 
-            var items = new Item[ids.Length];
+            var items = new Item[progressUpdates.Length];
 
-            for (var i = 0; i < ids.Length; ++i)
+            for (var i = 0; i < progressUpdates.Length; i++)
             {
-                var id = ids[i];
-                var item = GetProgressById(id);
+                ref readonly var update = ref progressUpdates[i];
+                var item = GetProgressById(update.id);
                 Assert.IsNotNull(item);
-                item.Dirty(progressUpdates[i]);
+                item.Dirty(update.updates);
                 items[i] = item;
             }
+
             s_ProgressDirty = true;
             s_RemainingTimeDirty = true;
 
@@ -465,6 +476,9 @@ internal static void ClearProgressItems()
             s_Initialized = false;
             s_ProgressDirty = true;
             s_RemainingTimeDirty = true;
+            s_Progress = 0f;
+            s_RemainingTime = TimeSpan.Zero;
+            s_LastRemainingTimeUpdate = DateTime.Now;
         }
     }
 
diff --git a/Editor/Mono/ProjectBrowser.cs b/Editor/Mono/ProjectBrowser.cs
index 70e0ae1008..9778cc149e 100644
--- a/Editor/Mono/ProjectBrowser.cs
+++ b/Editor/Mono/ProjectBrowser.cs
@@ -836,27 +836,28 @@ public void EndRenaming()
                 m_ListArea.EndRename(true);
         }
 
-        string[] GetTypesDisplayNames()
-        {
-            return new[]
-            {
-                "AnimationClip",
-                "AudioClip",
-                "AudioMixer",
-                "ComputeShader",
-                "Font",
-                "GUISkin",
-                "Material",
-                "Mesh",
-                "Model",
-                "PhysicMaterial",
-                "Prefab",
-                "Scene",
-                "Script",
-                "Shader",
-                "Sprite",
-                "Texture",
-                "VideoClip",
+        Dictionary<string, string[]> GetTypesDisplayNames()
+        {
+            return new Dictionary<string, string[]>
+            {
+                { "Animation Clip", new [] { "AnimationClip" } },
+                { "Audio Clip", new [] { "AudioClip"} },
+                { "Audio Mixer", new [] { "AudioMixer" } },
+                { "Compute Shader", new [] { "ComputeShader" } },
+                { "Font", new [] { "Font" } },
+                { "GUI Skin", new [] { "GUISkin" } },
+                { "Material", new [] { "Material" } },
+                { "Mesh", new [] { "Mesh" } },
+                { "Model", new [] { "Model" } },
+                { "Physic Material", new [] { "PhysicMaterial" } },
+                { "Prefab", new [] { "Prefab" } },
+                { "Scene", new [] { "Scene"} },
+                { "Script", new [] { "Script" } },
+                { "Shader", new [] { "Shader" } },
+                { "Sprite", new [] { "Sprite" } },
+                { "Texture", new [] { "Texture" } },
+                { "Video Clip", new [] { "VideoClip" } },
+                { "Visual Effect Asset", new [] { "VisualEffectAsset", "VisualEffectSubgraph" } },
 
                 // "Texture2D",
                 // "RenderTexture",
@@ -877,7 +878,7 @@ public void TypeListCallback(PopupList.ListElement element)
 
             // Toggle clicked element
             element.selected = !element.selected;
-            string[] selectedDisplayNames = (from item in m_ObjectTypes.m_ListElements where item.selected select item.text).ToArray();
+            string[] selectedDisplayNames = m_ObjectTypes.m_ListElements.Where(x => x.selected).SelectMany(x => x.types).ToArray();
 
             m_SearchFilter.classNames = selectedDisplayNames;
             m_SearchFieldText = m_SearchFilter.FilterToSearchFieldString();
@@ -917,13 +918,12 @@ void SetupDroplists()
             m_ObjectTypes.m_OnSelectCallback = TypeListCallback;
             m_ObjectTypes.m_SortAlphabetically = false;
             m_ObjectTypes.m_MaxCount = 0;
-            string[] types = GetTypesDisplayNames();
-            for (int i = 0; i < types.Length; ++i)
+            var types = GetTypesDisplayNames();
+            foreach (var keyPair in types)
             {
-                PopupList.ListElement element = m_ObjectTypes.NewOrMatchingElement(types[i]);
-                if (i == 0)
-                    element.selected = true;
+                m_ObjectTypes.AddElement(keyPair.Key, keyPair.Value);
             }
+            m_ObjectTypes.m_ListElements[0].selected = true;
         }
 
         void SetupAssetLabelList()
@@ -1199,6 +1199,11 @@ void ListAreaItemSelectedCallback(bool doubleClicked)
                 Selection.activeObject = null;
             }
 
+            if (Selection.instanceIDs != m_ListArea.GetSelection())
+            {
+                m_ListArea.InitSelection(Selection.instanceIDs);
+            }
+
             m_FocusSearchField = false;
 
             if (Event.current.button == 1 && Event.current.type == EventType.MouseDown)
@@ -1349,9 +1354,15 @@ void AssetTreeSelectionCallback(int[] selectedTreeViewInstanceIDs)
         {
             SetAsLastInteractedProjectBrowser();
 
-            Selection.activeObject = null;
             if (selectedTreeViewInstanceIDs.Length > 0)
-                Selection.instanceIDs = selectedTreeViewInstanceIDs;
+                Selection.SetSelectionWithActiveInstanceID(selectedTreeViewInstanceIDs, selectedTreeViewInstanceIDs[0]);
+            else
+                Selection.activeInstanceID = 0;
+
+            // The selection could be cancelled if an Inspector with hasUnsavedChanges is opened.
+            // In that case, let's update the tree so the highlight is set back to the actual selection.
+            if(Selection.instanceIDs != selectedTreeViewInstanceIDs)
+                m_AssetTree.SetSelection(Selection.instanceIDs, true);
 
             RefreshSelectedPath();
             SetSearchFoldersFromCurrentSelection();
@@ -1896,8 +1907,6 @@ float GetListHeaderHeight()
         {
             if (!m_SearchFilter.IsSearching())
                 return k_ToolbarHeight;
-            if (SearchService.ProjectSearch.HasEngineOverride())
-                return 0f;
             return m_SearchFilter.GetState() == SearchFilter.State.EmptySearchFilter ? 0f : k_ToolbarHeight;
         }
 
@@ -2079,8 +2088,9 @@ void HandleContextClickInListArea(Rect listRect)
                     {
                         GUIUtility.hotControl = 0;
 
-                        // Only show menu if there are instances selected
-                        if (Selection.instanceIDs.Length > 0)
+                        // In safe mode non-scripts assets aren't selectable and therefore if you context click a non-script
+                        // asset, then a context menu shouldn't be displayed.
+                        if (!EditorUtility.isInSafeMode || Selection.instanceIDs.Length > 0)
                         {
                             // Context click in list area
                             EditorUtility.DisplayPopupMenu(new Rect(evt.mousePosition.x, evt.mousePosition.y, 0, 0), "Assets/", null);
@@ -2568,9 +2578,6 @@ void IconSizeSlider(Rect r)
 
         void SearchAreaBar()
         {
-            if (SearchService.ProjectSearch.HasEngineOverride())
-                return;
-
             // Background
             GUI.Label(m_ListHeaderRect, GUIContent.none, s_Styles.topBarBg);
 
@@ -2814,6 +2821,8 @@ internal void BeginPreimportedNameEditing(int instanceID, EndNameEditAction endA
 
         public void FrameObject(int instanceID, bool ping)
         {
+            m_LockTracker.StopPingIcon();
+
             bool canFrame = CanFrameAsset(instanceID);
             if (!canFrame)
             {
@@ -2833,7 +2842,19 @@ public void FrameObject(int instanceID, bool ping)
                 }
             }
 
-            bool frame = !m_LockTracker.isLocked && (ping || canFrame);
+            bool frame = ping || canFrame;
+            if (frame && m_LockTracker.isLocked)
+            {
+                frame = false;
+
+                // If the item is visible then we can ping it however if it requires revealing then we can not and should indicate why(locked project view).
+                if ((m_ViewMode == ViewMode.TwoColumns && !m_ListArea.IsShowing(instanceID)) || (m_ViewMode == ViewMode.OneColumn && m_AssetTree.data.GetRow(instanceID) == -1))
+                {
+                    Repaint();
+                    m_LockTracker.PingIcon();
+                }
+            }
+
             FrameObjectPrivate(instanceID, frame, ping);
             if (s_LastInteractedProjectBrowser == this)
             {
@@ -3038,7 +3059,8 @@ protected virtual void ShowButton(Rect r)
             if (s_Styles == null)
                 s_Styles = new Styles();
 
-            m_LockTracker.ShowButton(r, s_Styles.lockButton);
+            if (m_LockTracker.ShowButton(r, s_Styles.lockButton))
+                Repaint();
         }
 
         internal bool SelectionIsFavorite()
diff --git a/Editor/Mono/ProjectBrowserPopups.cs b/Editor/Mono/ProjectBrowserPopups.cs
index b02bfbc175..b999d94fac 100644
--- a/Editor/Mono/ProjectBrowserPopups.cs
+++ b/Editor/Mono/ProjectBrowserPopups.cs
@@ -30,8 +30,11 @@ public class ListElement
             private bool m_WasSelected;
             private bool m_PartiallySelected;
             private bool m_Enabled;
+            private string[] m_Types;
 
-            public ListElement(string text, bool selected, float score)
+            public ListElement(string text, bool selected, float score) : this(text, new [] { text }, selected, score) { }
+
+            public ListElement(string text, string[] types, bool selected, float score)
             {
                 m_Content = new GUIContent(text);
                 if (!string.IsNullOrEmpty(m_Content.text))
@@ -40,6 +43,7 @@ public ListElement(string text, bool selected, float score)
                     a[0] = char.ToUpper(a[0]);
                     m_Content.text = new string(a);
                 }
+                m_Types = types;
                 m_Selected = selected;
                 filterScore = score;
                 m_PartiallySelected = false;
@@ -124,6 +128,14 @@ public string text
                 }
             }
 
+            public IEnumerable<string> types
+            {
+                get
+                {
+                    return m_Types;
+                }
+            }
+
             public void ResetScore()
             {
                 m_WasSelected = m_Selected || m_PartiallySelected;
@@ -189,6 +201,12 @@ public int GetFilteredCount(string prefix)
                 return res.Count();
             }
 
+            public void AddElement(string label, string[] types)
+            {
+                var res = new ListElement(label, types, false, -1);
+                m_ListElements.Add(res);
+            }
+
             public ListElement NewOrMatchingElement(string label)
             {
                 foreach (var element in m_ListElements)
diff --git a/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs b/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs
index 72c6ff09eb..b22a068080 100644
--- a/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs
+++ b/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs
@@ -288,6 +288,7 @@ public static void CreateAsset(Object asset, string pathName)
         }
 
         // Create a folder
+        [ShortcutManagement.ShortcutAttribute("Project Browser/Create/Folder", typeof(ProjectBrowser), KeyCode.N, ShortcutManagement.ShortcutModifiers.Shift | ShortcutManagement.ShortcutModifiers.Action)]
         public static void CreateFolder()
         {
             StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreateFolder>(), "New Folder", EditorGUIUtility.IconContent(EditorResources.emptyFolderIconName).image as Texture2D, null);
@@ -509,6 +510,8 @@ internal static string SetLineEndings(string content, LineEndingsMode lineEnding
 
         internal static Object CreateScriptAssetWithContent(string pathName, string templateContent)
         {
+            AssetModificationProcessorInternal.OnWillCreateAsset(pathName);
+
             templateContent = SetLineEndings(templateContent, EditorSettings.lineEndingsForNewScripts);
 
             string fullPath = Path.GetFullPath(pathName);
@@ -868,6 +871,83 @@ public static string[] GetBaseFolders(string[] folders)
             return result.ToArray();
         }
 
+        static bool AnyTargetMaterialHasChildren(string[] targetPaths)
+        {
+            GUID[] guids = targetPaths.Select(path => AssetDatabase.GUIDFromAssetPath(path)).ToArray();
+
+            Func<string, bool> HasChildrenInPath = (string rootPath) => {
+                var property = new HierarchyProperty(rootPath, false);
+                property.SetSearchFilter(new SearchFilter { classNames = new string[] { "Material" }, searchArea = SearchFilter.SearchArea.AllAssets });
+                while (property.Next(null))
+                {
+                    GUID parent;
+                    var child = InternalEditorUtility.GetLoadedObjectFromInstanceID(property.GetInstanceIDIfImported()) as Material;
+                    if (child)
+                    {
+                        if (AssetDatabase.IsForeignAsset(child))
+                            continue;
+                        parent = AssetDatabase.GUIDFromAssetPath(AssetDatabase.GetAssetPath(child.parent));
+                    }
+                    else
+                    {
+                        var path = AssetDatabase.GUIDToAssetPath(property.guid);
+                        if (!path.EndsWith(".mat", StringComparison.OrdinalIgnoreCase))
+                            continue;
+                        parent = EditorMaterialUtility.GetMaterialParentFromFile(path);
+                    }
+
+                    for (int i = 0; i < guids.Length; i++)
+                    {
+                        if (guids[i] == parent)
+                            return true;
+                    }
+                }
+                return false;
+            };
+
+            if (HasChildrenInPath("Assets"))
+                return true;
+            foreach (var package in PackageManagerUtilityInternal.GetAllVisiblePackages(false))
+            {
+                if (package.source == PackageManager.PackageSource.Local && HasChildrenInPath(package.assetPath))
+                    return true;
+            }
+            return false;
+        }
+
+        static void ReparentMaterialChildren(string assetPath)
+        {
+            var toDelete = AssetDatabase.LoadAssetAtPath<Material>(assetPath);
+            var toDeleteGUID = AssetDatabase.GUIDFromAssetPath(assetPath);
+            var newParent = toDelete.parent;
+
+            Action<string> ReparentInPath = (string rootPath) => {
+                var property = new HierarchyProperty(rootPath, false);
+                property.SetSearchFilter(new SearchFilter { classNames = new string[] { "Material" }, searchArea = SearchFilter.SearchArea.AllAssets });
+                while (property.Next(null))
+                {
+                    var child = InternalEditorUtility.GetLoadedObjectFromInstanceID(property.GetInstanceIDIfImported()) as Material;
+                    if (!child)
+                    {
+                        // First check guid from file to avoid loading all materials in memory
+                        string path = AssetDatabase.GUIDToAssetPath(property.guid);
+                        if (EditorMaterialUtility.GetMaterialParentFromFile(path) != toDeleteGUID)
+                            continue;
+                        child = AssetDatabase.LoadAssetAtPath<Material>(path);
+                    }
+                    if (child != null && child.parent == toDelete && !AssetDatabase.IsForeignAsset(child))
+                        child.parent = newParent;
+                }
+            };
+
+            ReparentInPath("Assets");
+            foreach (var package in PackageManagerUtilityInternal.GetAllVisiblePackages(false))
+            {
+                if (package.source == PackageManager.PackageSource.Local)
+                    ReparentInPath(package.assetPath);
+            }
+        }
+
         // Deletes the assets of the instance IDs, with an optional user confirmation dialog.
         // Returns true if the delete operation was successfully performed on all assets.
         // Note: Zero input assets always returns true.
@@ -884,15 +964,16 @@ internal static bool DeleteAssets(List<int> instanceIDs, bool askIfSure)
                 return false;
             }
 
-            var paths = GetMainPathsOfAssets(instanceIDs).ToList();
+            bool reparentMaterials = false;
+            var paths = GetMainPathsOfAssets(instanceIDs).ToArray();
 
-            if (paths.Count == 0)
+            if (paths.Length == 0)
                 return false;
 
             if (askIfSure)
             {
                 string title;
-                if (paths.Count > 1)
+                if (paths.Length > 1)
                 {
                     title = L10n.Tr("Delete selected assets?");
                 }
@@ -901,32 +982,63 @@ internal static bool DeleteAssets(List<int> instanceIDs, bool askIfSure)
                     title = L10n.Tr("Delete selected asset?");
                 }
 
+                int maxCount = 3;
+                bool containsMaterial = false;
+
                 var infotext = new StringBuilder();
-                int pathsCount = Mathf.Min(3, paths.Count);
-                for (int i = 0; i < pathsCount; ++i)
+                for (int i = 0; i < paths.Length; ++i)
                 {
-                    infotext.AppendLine(paths[i]);
+                    if (i < maxCount)
+                        infotext.AppendLine(paths[i]);
+
+                    if (paths[i].EndsWith(".mat", StringComparison.OrdinalIgnoreCase))
+                    {
+                        containsMaterial = true;
+                        if (i >= maxCount)
+                            break;
+                    }
                 }
 
-                if (paths.Count > pathsCount)
+                if (paths.Length > maxCount)
                 {
                     infotext.AppendLine("...");
                 }
                 infotext.AppendLine("");
                 infotext.AppendLine(L10n.Tr("You cannot undo the delete assets action."));
 
-                if (!EditorUtility.DisplayDialog(title, infotext.ToString(), L10n.Tr("Delete"), L10n.Tr("Cancel")))
+                containsMaterial &= AnyTargetMaterialHasChildren(paths);
+                if (containsMaterial)
                 {
-                    return false;
+                    infotext.AppendLine();
+                    string name = (paths.Length == 1) ? "This Material" : "One or more of these Material(s)";
+                    infotext.AppendLine(name + " has one or more children. Would you like to reparent all of these children to their closest remaining ancestor?");
+                    int dialogOptionIndex = EditorUtility.DisplayDialogComplex(title, infotext.ToString(), L10n.Tr("Delete and reparent children"), L10n.Tr("Delete only"), L10n.Tr("Cancel"));
+                    if (dialogOptionIndex == 0)
+                        reparentMaterials = true;
+                    else if (dialogOptionIndex == 2)
+                        return false;
                 }
+                else if (!EditorUtility.DisplayDialog(title, infotext.ToString(), L10n.Tr("Delete"), L10n.Tr("Cancel")))
+                    return false;
             }
 
             bool success = true;
             List<string> failedPaths = new List<string>();
 
             AssetDatabase.StartAssetEditing();
-            if (!AssetDatabase.MoveAssetsToTrash(paths.ToArray(), failedPaths))
+
+            if (reparentMaterials)
+            {
+                for (int i = 0; i < paths.Length; i++)
+                {
+                    if (paths[i].EndsWith(".mat", StringComparison.OrdinalIgnoreCase))
+                        ReparentMaterialChildren(paths[i]);
+                }
+            }
+
+            if (!AssetDatabase.MoveAssetsToTrash(paths, failedPaths))
                 success = false;
+
             AssetDatabase.StopAssetEditing();
 
             if (!success)
diff --git a/Editor/Mono/SceneHierarchy.cs b/Editor/Mono/SceneHierarchy.cs
index 6f1ca61372..dbde1ae469 100644
--- a/Editor/Mono/SceneHierarchy.cs
+++ b/Editor/Mono/SceneHierarchy.cs
@@ -677,6 +677,7 @@ void TreeViewItemDoubleClicked(int instanceID)
             else
             {
                 SceneView.FrameLastActiveSceneView();
+                EditorGUIUtility.ExitGUI();
             }
         }
 
@@ -695,17 +696,11 @@ public void SetExpandedRecursive(int id, bool expand)
                 treeView.data.SetExpandedWithChildren(item, expand);
         }
 
-        void OnRowGUICallback(int instanceID, Rect rect)
-        {
-            if (EditorApplication.hierarchyWindowItemOnGUI != null)
-            {
-                // Adjust rect for the right aligned column for the prefab isolation button
-                rect.xMax -=
-                    GameObjectTreeViewGUI.GameObjectStyles.rightArrow.fixedWidth +
-                    GameObjectTreeViewGUI.GameObjectStyles.rightArrow.margin.horizontal;
 
-                EditorApplication.hierarchyWindowItemOnGUI(instanceID, rect);
-            }
+
+        void OnRowGUICallback(int itemID, Rect rect)
+        {
+            GameObjectTreeViewGUI.UserCallbackRowGUI(itemID, rect);
         }
 
         void OnDragEndedCallback(int[] draggedInstanceIds, bool draggedItemsFromOwnTreeView)
@@ -788,10 +783,13 @@ public void SetSearchFilter(string searchString, SearchableEditorWindow.SearchMo
         void TreeViewSelectionChanged(int[] ids)
         {
             //Last selected should be the active selected object to reflect the behavior of the scene view selection
-            if (ids.Length > 0)
-                Selection.activeInstanceID = ids[ids.Length - 1];
+            int active = ids.Length > 0 ? ids[ids.Length - 1] : 0;
+            Selection.SetSelectionWithActiveInstanceID(ids, active);
 
-            Selection.instanceIDs = ids;
+            if (!IsTreeViewSelectionInSyncWithBackend())
+            {
+                selectionSyncNeeded = true;
+            }
 
             m_DidSelectSearchResult = !string.IsNullOrEmpty(m_SearchFilter);
         }
@@ -1050,13 +1048,13 @@ void ExecuteCommands()
             }
             else if (evt.commandName == EventCommandNames.Cut)
             {
-                CutCopyPasteUtility.CutGO();
+                ClipboardUtility.CutGO();
                 GUIUtility.ExitGUI();
             }
             else if (evt.commandName == EventCommandNames.Copy)
             {
                 if (execute)
-                    CutCopyPasteUtility.CopyGO();
+                    ClipboardUtility.CopyGO();
                 evt.Use();
                 GUIUtility.ExitGUI();
             }
@@ -1115,7 +1113,7 @@ void HandleKeyboard()
 
             if (evt.keyCode == KeyCode.Escape && CutBoard.CanGameObjectsBePasted())
             {
-                CutCopyPasteUtility.ResetCutboardAndRepaintHierarchyWindows();
+                ClipboardUtility.ResetCutboardAndRepaintHierarchyWindows();
                 GUIUtility.ExitGUI();
             }
         }
@@ -1125,14 +1123,14 @@ void CreateSubSceneGameObjectContextClick(GenericMenu menu, int contextClickedIt
             // For Sub Scenes GameObjects, have menu items for cut, paste and delete.
             // Not copy or duplicate, since multiple of the same Sub Scene is not supported anyway.
 
-            menu.AddItem(EditorGUIUtility.TrTextContent("Cut"), false, CutCopyPasteUtility.CutGO);
+            menu.AddItem(EditorGUIUtility.TrTextContent("Cut"), false, ClipboardUtility.CutGO);
             if (CutBoard.CanGameObjectsBePasted() || Unsupported.CanPasteGameObjectsFromPasteboard())
                 menu.AddItem(EditorGUIUtility.TrTextContent("Paste"), false, PasteGO);
             else
                 menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Paste"));
 
-            if (CutCopyPasteUtility.CanPasteAsChild())
-                menu.AddItem(EditorGUIUtility.TrTextContent("Paste As Child"), false, CutCopyPasteUtility.PasteGOAsChild);
+            if (ClipboardUtility.CanPasteAsChild())
+                menu.AddItem(EditorGUIUtility.TrTextContent("Paste As Child"), false, ClipboardUtility.PasteGOAsChild);
             else
                 menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Paste As Child"));
 
@@ -1146,14 +1144,14 @@ void CreateSubSceneGameObjectContextClick(GenericMenu menu, int contextClickedIt
 
         void CreateGameObjectContextClick(GenericMenu menu, int contextClickedItemID)
         {
-            menu.AddItem(EditorGUIUtility.TrTextContent("Cut"), false, CutCopyPasteUtility.CutGO);
-            menu.AddItem(EditorGUIUtility.TrTextContent("Copy"), false, CutCopyPasteUtility.CopyGO);
+            menu.AddItem(EditorGUIUtility.TrTextContent("Cut"), false, ClipboardUtility.CutGO);
+            menu.AddItem(EditorGUIUtility.TrTextContent("Copy"), false, ClipboardUtility.CopyGO);
             if (CutBoard.CanGameObjectsBePasted() || Unsupported.CanPasteGameObjectsFromPasteboard())
                 menu.AddItem(EditorGUIUtility.TrTextContent("Paste"), false, PasteGO);
             else
                 menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Paste"));
-            if (CutCopyPasteUtility.CanPasteAsChild())
-                menu.AddItem(EditorGUIUtility.TrTextContent("Paste As Child"), false, CutCopyPasteUtility.PasteGOAsChild);
+            if (ClipboardUtility.CanPasteAsChild())
+                menu.AddItem(EditorGUIUtility.TrTextContent("Paste As Child"), false, ClipboardUtility.PasteGOAsChild);
             else
                 menu.AddDisabledItem(EditorGUIUtility.TrTextContent("Paste As Child"));
 
@@ -1399,7 +1397,7 @@ internal void CreateSceneHeaderContextClick(GenericMenu menu, Scene scene)
                 menu.AddSeparator("");
             }
 
-            bool isUnloadOrRemoveValid = EditorSceneManager.loadedSceneCount != GetNumLoadedScenesInSelection();
+            bool isUnloadOrRemoveValid = SceneManager.loadedSceneCount != GetNumLoadedScenesInSelection();
 
             if (!scene.isSubScene)
             {
@@ -1583,12 +1581,12 @@ void ItemContextClick(int contextClickedItemID)
 
         void PasteGO()
         {
-            CutCopyPasteUtility.PasteGO(m_CustomParentForNewGameObjects);
+            ClipboardUtility.PasteGO(m_CustomParentForNewGameObjects);
         }
 
         void DuplicateGO()
         {
-            CutCopyPasteUtility.DuplicateGO(m_CustomParentForNewGameObjects);
+            ClipboardUtility.DuplicateGO(m_CustomParentForNewGameObjects);
         }
 
         void RenameGO()
@@ -1695,7 +1693,7 @@ List<GameObject> GetScenePrefabInstancesWithNonDefaultOverrides(Scene scene)
             {
                 visitor.VisitAll(root.transform, (transform, list) => {
                     GameObject go = transform.gameObject;
-                    if (PrefabUtility.IsOutermostPrefabInstanceRoot(go) && PrefabUtility.HasPrefabInstanceNonDefaultOverrides_CachedForUI(go))
+                    if (PrefabUtility.IsOutermostPrefabInstanceRoot(go) && PrefabUtility.HasPrefabInstanceNonDefaultOverridesOrUnusedOverrides_CachedForUI(go))
                     {
                         gameObjects.Add(go);
                     }
diff --git a/Editor/Mono/SceneHierarchyWindow.cs b/Editor/Mono/SceneHierarchyWindow.cs
index 9d58bd46bd..6ffe17a549 100644
--- a/Editor/Mono/SceneHierarchyWindow.cs
+++ b/Editor/Mono/SceneHierarchyWindow.cs
@@ -87,6 +87,12 @@ public override void OnDisable()
             PrefabUtility.prefabInstanceModificationCacheCleared -= OnPrefabInstanceModificationCacheCleared;
         }
 
+        internal override void ClickedSearchField()
+        {
+            // End renaming any GameObjects (case 1078881)
+            m_SceneHierarchy.treeView.EndNameEditing(true);
+        }
+
         void OnDestroy()
         {
             // Set another existing hierarchy as last interacted if available
@@ -322,13 +328,13 @@ internal void RebuildStageHeader()
         [MenuItem("Edit/Paste As Child %#V", false, 103)]
         static void PasteAsChild()
         {
-            CutCopyPasteUtility.PasteGOAsChild();
+            ClipboardUtility.PasteGOAsChild();
         }
 
         [MenuItem("Edit/Paste As Child %#V", true, 103)]
         static bool ValidatePasteAsChild()
         {
-            return CutCopyPasteUtility.CanPasteAsChild();
+            return ClipboardUtility.CanPasteAsChild();
         }
 
         internal static SceneHierarchyWindow GetSceneHierarchyWindowToFocusForNewGameObjects()
diff --git a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs
index 5d82705e25..6e840b0d6a 100644
--- a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs
+++ b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStage.cs
@@ -86,6 +86,8 @@ public enum Mode
         Transform m_LastRootTransform;
         const float kDurationBeforeShowingSavingBadge = 1.0f;
         static ExposablePopupMenu s_ContextRenderModeSelector;
+        Hash128 m_InitialFileHash;
+        byte[] m_InitialFileContent;
         Hash128 m_LastPrefabSourceFileHash;
         bool m_NeedsReloadingWhenReturningToStage;
         bool m_IsAssetMissing;
@@ -216,7 +218,7 @@ void ReconstructInContextStateIfNeeded()
                 }
                 else
                 {
-                    // Could not find GameObject with fileID: m_FileIdForOpenedFromInstanceObject, this can happen if inserting a base in a Variant and then discarding changes when entering in-context of the new base
+                    // Could not find GameObject with fileID: m_FileIdForOpenedFromInstanceObject, this can happen if inserting a variant parent in a Variant and then discarding changes when entering in-context of the new base
                 }
             }
         }
@@ -236,7 +238,7 @@ protected override void OnEnable()
             PrefabUtility.savingPrefab += OnSavingPrefab;
             PrefabUtility.prefabInstanceUpdated += OnPrefabInstanceUpdated;
             AssetEvents.assetsChangedOnHDD += OnAssetsChangedOnHDD;
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
 
             m_AllPrefabStages.Add(this);
@@ -248,7 +250,7 @@ protected override void OnDisable()
             PrefabUtility.savingPrefab -= OnSavingPrefab;
             PrefabUtility.prefabInstanceUpdated -= OnPrefabInstanceUpdated;
             AssetEvents.assetsChangedOnHDD -= OnAssetsChangedOnHDD;
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
 
             // Also cleanup any potential registered event handlers
@@ -563,7 +565,16 @@ protected internal override bool OnOpenStage()
                 return false;
             }
 
-            return OpenStage();
+            bool success = OpenStage();
+            if (success)
+            {
+                var guid = AssetDatabase.AssetPathToGUID(m_PrefabAssetPath);
+                m_InitialFileHash = AssetDatabase.GetSourceAssetFileHash(guid);
+                if (!FileUtil.ReadFileContentBinary(assetPath, out m_InitialFileContent, out string errorMessage))
+                    Debug.LogError($"No undo will be registered for {m_PrefabContentsRoot.name}. \nError: {errorMessage}");
+            }
+
+            return success;
         }
 
         bool OpenStage()
@@ -604,7 +615,21 @@ protected override void OnCloseStage()
             if (isValid)
                 prefabStageClosing?.Invoke(this);
 
+            var initialFileContent = m_InitialFileContent;
+            var path = m_PrefabAssetPath;
+            var guid = AssetDatabase.AssetPathToGUID(m_PrefabAssetPath);
+            var currentPrefabSourceFileHash = AssetDatabase.GetSourceAssetFileHash(guid);
+
             CleanupBeforeClosing();
+
+            if (initialFileContent?.Length > 0 && currentPrefabSourceFileHash != m_InitialFileHash)
+            {
+                if (FileUtil.ReadFileContentBinary(path, out byte[] newFileContent, out string errorMessage))
+                    Undo.RegisterFileChangeUndo(AssetDatabase.GUIDFromAssetPath(path), initialFileContent, newFileContent);
+                else
+                    Debug.LogError($"No undo will be registered for {m_PrefabContentsRoot.name}. \nError: {errorMessage}");
+
+            }
         }
 
         protected internal override void OnReturnToStage()
@@ -906,7 +931,7 @@ void ApplyPatchedPropertiesToContent()
             StageUtility.CallAwakeFromLoadOnSubHierarchy(m_PrefabContentsRoot);
         }
 
-        void UndoRedoPerformed()
+        void UndoRedoPerformed(in UndoRedoInfo info)
         {
             if (m_Mode == Mode.InContext)
             {
@@ -941,6 +966,8 @@ void CleanupBeforeClosing()
             m_OpenedFromInstanceObject = null;
             m_HideFlagUtility = null;
             m_PrefabAssetPath = null;
+            m_InitialFileContent = null;
+            m_InitialFileHash = new Hash128();
             m_InitialSceneDirtyID = 0;
             m_StageDirtiedFired = false;
             m_LastSceneDirtyID = 0;
@@ -1294,12 +1321,12 @@ public void ClearDirtiness()
             m_StageDirtiedFired = false;
         }
 
-        bool PromptIfMissingBasePrefabForVariant()
+        bool PromptIfMissingVariantParentForVariant()
         {
             if (PrefabUtility.IsPrefabAssetMissing(m_PrefabContentsRoot))
             {
                 string title = L10n.Tr("Saving Variant Failed");
-                string message = L10n.Tr("Can't save the Prefab Variant when its base Prefab is missing. You have to unpack the root GameObject or recover the missing base Prefab in order to save the Prefab Variant");
+                string message = L10n.Tr("Can't save the Prefab Variant when its parent Prefab is missing. You have to unpack the root GameObject or recover the missing parent Prefab in order to save the Prefab Variant");
                 if (autoSave)
                     message += L10n.Tr("\n\nAuto Save has been temporarily disabled.");
                 EditorUtility.DisplayDialog(title, message, L10n.Tr("OK"));
@@ -1348,7 +1375,7 @@ internal bool SavePrefab()
 
             var startTime = EditorApplication.timeSinceStartup;
 
-            if (PromptIfMissingBasePrefabForVariant())
+            if (PromptIfMissingVariantParentForVariant())
                 return false;
 
             // The user can have deleted required folders
diff --git a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs
index 76b9efe80e..a7c104d8a8 100644
--- a/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs
+++ b/Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs
@@ -649,22 +649,29 @@ static Canvas GetCanvasInScene(GameObject instanceRoot)
         internal static PrefabStage.Mode GetPrefabStageModeFromModifierKeys()
         {
             // Update GetPrefabButtonContent if this logic changes
-            return Event.current.alt ? PrefabStage.Mode.InIsolation : PrefabStage.Mode.InContext;
+            var defaultPrefabMode = PreferencesProvider.GetDefaultPrefabModeForHierarchy();
+            var alternativePrefabMode = (defaultPrefabMode == PrefabStage.Mode.InContext) ? PrefabStage.Mode.InIsolation : PrefabStage.Mode.InContext;
+
+            return Event.current.alt ? alternativePrefabMode : defaultPrefabMode;
         }
 
-        static Dictionary<int, GUIContent> m_PrefabButtonContents = new Dictionary<int, GUIContent>();
         internal static GUIContent GetPrefabButtonContent(int instanceID)
         {
             GUIContent result;
-            if (m_PrefabButtonContents.TryGetValue(instanceID, out result))
+            var defaultPrefabMode = PreferencesProvider.GetDefaultPrefabModeForHierarchy();
+            switch (defaultPrefabMode)
             {
-                return result;
+                case PrefabStage.Mode.InContext:
+                    result = new GUIContent("", null, $"Open Prefab Asset in context.\nPress modifier key [Alt] to open in isolation.");
+                    break;
+                case PrefabStage.Mode.InIsolation:
+                    result = new GUIContent("", null, "Open Prefab Asset in isolation.\nPress modifier key [Alt] to open in context.");
+                    break;
+                default:
+                    result = new GUIContent("");
+                    Debug.LogError("Unhandled defaultPrefabMode enum");
+                    break;
             }
-
-            string path = PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(EditorUtility.InstanceIDToObject(instanceID) as GameObject);
-            string filename = System.IO.Path.GetFileNameWithoutExtension(path);
-            result = new GUIContent("", null, "Open Prefab Asset '" + filename + "'" + "\nPress modifier key [Alt] to open in isolation.");
-            m_PrefabButtonContents[instanceID] = result;
             return result;
         }
     }
diff --git a/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs b/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs
index 0d27087c07..ca1dd05b43 100644
--- a/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs
+++ b/Editor/Mono/SceneModeWindows/DefaultLightingExplorerExtension.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using UnityEngine.Rendering;
 using UnityEngine.U2D;
+using UnityEditor.SceneManagement;
 using Object = UnityEngine.Object;
 
 namespace UnityEditor
@@ -78,14 +79,49 @@ private static bool IsEditable(Object target)
             return ((target.hideFlags & HideFlags.NotEditable) == 0);
         }
 
-        protected virtual UnityEngine.Object[] GetLights()
+        protected static System.Collections.Generic.IEnumerable<T> GetObjectsForLightingExplorer<T>() where T : UnityEngine.Component
         {
-            return Resources.FindObjectsOfTypeAll<Light>();
+            var objects = Resources.FindObjectsOfTypeAll<T>().Where((T obj) =>
+            {
+                return !EditorUtility.IsPersistent(obj) && !obj.hideFlags.HasFlag(HideFlags.HideInHierarchy) && !obj.hideFlags.HasFlag(HideFlags.HideAndDontSave);
+            });
+
+            var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
+            // No prefab mode.
+            if (prefabStage == null)
+            {
+                // Return all object instances in the scene including prefab instances, but not those that are in prefab assets.
+                return objects;
+            }
+            // In Context prefab mode with Normal rendering mode
+            else if (prefabStage.mode == PrefabStage.Mode.InContext &&
+                    StageNavigationManager.instance.contextRenderMode == StageUtility.ContextRenderMode.Normal)
+            {
+                // Return all object instances in the scene and objects in the opened prefab asset, but not objects in the opened prefab instance.
+                return objects.Where((T obj) =>
+                {
+                    return !StageUtility.IsPrefabInstanceHiddenForInContextEditing(obj.gameObject);
+                });
+            }
+            // All remaining cases, e.g. In Context with Hidden or GrayedOut rendering mode, or In Isolation prefab mode.
+            else
+            {
+                // Return only objects in the opened prefab asset.
+                return objects.Where((T obj) =>
+                {
+                    return EditorSceneManager.IsPreviewSceneObject(obj);
+                });
+            }
         }
 
-        protected virtual UnityEngine.Object[] Get2DLights()
+        protected internal virtual UnityEngine.Object[] GetLights()
         {
-            return Resources.FindObjectsOfTypeAll<Light2DBase>();
+            return GetObjectsForLightingExplorer<Light>().ToArray();
+        }
+
+        protected internal virtual UnityEngine.Object[] Get2DLights()
+        {
+            return GetObjectsForLightingExplorer<Light2DBase>().ToArray();
         }
 
         protected virtual  LightingExplorerTableColumn[] Get2DLightColumns()
@@ -338,9 +374,9 @@ protected virtual LightingExplorerTableColumn[] GetLightColumns()
             };
         }
 
-        protected virtual UnityEngine.Object[] GetReflectionProbes()
+        protected internal virtual UnityEngine.Object[] GetReflectionProbes()
         {
-            return Resources.FindObjectsOfTypeAll<ReflectionProbe>();
+            return GetObjectsForLightingExplorer<ReflectionProbe>().ToArray();
         }
 
         protected virtual LightingExplorerTableColumn[] GetReflectionProbeColumns()
@@ -365,9 +401,9 @@ protected virtual LightingExplorerTableColumn[] GetReflectionProbeColumns()
             };
         }
 
-        protected virtual UnityEngine.Object[] GetLightProbes()
+        protected internal virtual UnityEngine.Object[] GetLightProbes()
         {
-            return Resources.FindObjectsOfTypeAll<LightProbeGroup>();
+            return GetObjectsForLightingExplorer<LightProbeGroup>().ToArray();
         }
 
         protected virtual LightingExplorerTableColumn[] GetLightProbeColumns()
@@ -379,13 +415,16 @@ protected virtual LightingExplorerTableColumn[] GetLightProbeColumns()
             };
         }
 
-        protected virtual UnityEngine.Object[] GetEmissives()
+        protected internal virtual UnityEngine.Object[] GetEmissives()
         {
-            return Resources.FindObjectsOfTypeAll<MeshRenderer>().Where((MeshRenderer mr) => {
-                return (GameObjectUtility.AreStaticEditorFlagsSet(mr.gameObject, StaticEditorFlags.ContributeGI));
-            }).SelectMany(meshRenderer => meshRenderer.sharedMaterials).Where((Material m) => {
-                    return m != null && ((m.globalIlluminationFlags & MaterialGlobalIlluminationFlags.AnyEmissive) != 0) && m.HasProperty("_EmissionColor");
-                }).Distinct().ToArray();
+            return GetObjectsForLightingExplorer<MeshRenderer>().Where((MeshRenderer mr) =>
+            {
+                return GameObjectUtility.AreStaticEditorFlagsSet(mr.gameObject, StaticEditorFlags.ContributeGI);
+            }).SelectMany(meshRenderer => meshRenderer.sharedMaterials).Where((Material m) =>
+
+            {
+                return m != null && ((m.globalIlluminationFlags & MaterialGlobalIlluminationFlags.AnyEmissive) != 0) && m.HasProperty("_EmissionColor");
+            }).Distinct().ToArray();
         }
 
         protected virtual LightingExplorerTableColumn[] GetEmissivesColumns()
diff --git a/Editor/Mono/SceneModeWindows/LightingWindow.cs b/Editor/Mono/SceneModeWindows/LightingWindow.cs
index 14dffe7f1b..959010ad09 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindow.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindow.cs
@@ -44,6 +44,14 @@ static class Styles
             public static readonly float ButtonWidth = 90;
         }
 
+        public interface WindowTab
+        {
+            void OnEnable();
+            void OnDisable();
+            void OnGUI();
+            void OnSelectionChange();
+        }
+
         enum BakeMode
         {
             BakeReflectionProbes = 0,
@@ -64,10 +72,7 @@ enum Mode
         List<Mode> m_Modes = null;
         GUIContent[] m_ModeStrings;
 
-        LightingWindowLightingTab           m_LightingSettingsTab;
-        LightingWindowEnvironmentTab        m_EnvironmentSettingsTab;
-        LightingWindowLightmapPreviewTab    m_RealtimeLightmapsTab;
-        LightingWindowLightmapPreviewTab    m_BakedLightmapsTab;
+        Dictionary<Mode, WindowTab> m_Tabs = new Dictionary<Mode, WindowTab>();
 
         SerializedObject m_LightingSettings;
         SerializedProperty m_WorkflowMode;
@@ -106,19 +111,22 @@ internal void SetSelectedTabIndex(int index)
             m_SelectedModeIndex = index;
         }
 
+        LightingWindow()
+        {
+            m_Tabs.Add(Mode.LightingSettings, new LightingWindowLightingTab());
+            m_Tabs.Add(Mode.EnvironmentSettings, new LightingWindowEnvironmentTab());
+            m_Tabs.Add(Mode.RealtimeLightmaps, new LightingWindowLightmapPreviewTab(LightmapType.DynamicLightmap));
+            m_Tabs.Add(Mode.BakedLightmaps, new LightingWindowLightmapPreviewTab(LightmapType.StaticLightmap));
+        }
+
         void OnEnable()
         {
             titleContent = GetLocalizedTitleContent();
 
-            m_LightingSettingsTab = new LightingWindowLightingTab();
-            m_LightingSettingsTab.OnEnable();
-            m_EnvironmentSettingsTab = new LightingWindowEnvironmentTab();
-            m_EnvironmentSettingsTab.OnEnable();
-
-            m_RealtimeLightmapsTab = new LightingWindowLightmapPreviewTab(LightmapType.DynamicLightmap);
-            m_BakedLightmapsTab = new LightingWindowLightmapPreviewTab(LightmapType.StaticLightmap);
+            foreach (var pair in m_Tabs)
+                pair.Value.OnEnable();
 
-            Undo.undoRedoPerformed += Repaint;
+            Undo.undoRedoEvent += OnUndoRedo;
             Lightmapping.lightingDataUpdated += Repaint;
 
             Repaint();
@@ -126,11 +134,18 @@ void OnEnable()
 
         void OnDisable()
         {
-            m_LightingSettingsTab.OnDisable();
-            Undo.undoRedoPerformed -= Repaint;
+            foreach (var pair in m_Tabs)
+                pair.Value.OnDisable();
+
+            Undo.undoRedoEvent -= OnUndoRedo;
             Lightmapping.lightingDataUpdated -= Repaint;
         }
 
+        private void OnUndoRedo(in UndoRedoInfo info)
+        {
+            Repaint();
+        }
+
         void OnBecameVisible()
         {
             RepaintSceneAndGameViews();
@@ -143,14 +158,14 @@ void OnBecameInvisible()
 
         void OnSelectionChange()
         {
-            if (m_RealtimeLightmapsTab == null || m_BakedLightmapsTab == null || m_Modes == null)
+            if (m_Modes == null)
                 return;
 
-            if (m_Modes.Contains(Mode.RealtimeLightmaps))
-                m_RealtimeLightmapsTab.UpdateActiveGameObjectSelection();
-
-            if (m_Modes.Contains(Mode.BakedLightmaps))
-                m_BakedLightmapsTab.UpdateActiveGameObjectSelection();
+            foreach (var pair in m_Tabs)
+            {
+                if (m_Modes.Contains(pair.Key))
+                    pair.Value.OnSelectionChange();
+            }
 
             Repaint();
         }
@@ -178,24 +193,8 @@ void OnGUI()
 
             EditorGUILayout.Space();
 
-            switch (selectedMode)
-            {
-                case Mode.LightingSettings:
-                    m_LightingSettingsTab.OnGUI();
-                    break;
-
-                case Mode.EnvironmentSettings:
-                    m_EnvironmentSettingsTab.OnGUI();
-                    break;
-
-                case Mode.RealtimeLightmaps:
-                    m_RealtimeLightmapsTab.OnGUI(position);
-                    break;
-
-                case Mode.BakedLightmaps:
-                    m_BakedLightmapsTab.OnGUI(position);
-                    break;
-            }
+            if (m_Tabs.ContainsKey(selectedMode))
+                m_Tabs[selectedMode].OnGUI();
 
             Buttons();
             Summary();
diff --git a/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs b/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs
index d3ef1cc1df..d6dfc8b917 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindowEnvironmentTab.cs
@@ -17,7 +17,7 @@ public virtual void OnDisable() {}
         public virtual void OnInspectorGUI() {}
     }
 
-    internal class LightingWindowEnvironmentTab
+    internal class LightingWindowEnvironmentTab : LightingWindow.WindowTab
     {
         class Styles
         {
@@ -62,8 +62,7 @@ public override void OnDisable()
         SavedBool       m_ShowOtherSettings;
         Object          m_RenderSettings = null;
         Vector2         m_ScrollPosition = Vector2.zero;
-
-        Type m_SRP      = GraphicsSettings.currentRenderPipeline?.GetType();
+        Type            m_SRP;
 
         Object renderSettings
         {
@@ -130,6 +129,7 @@ Editor otherRenderingEditor
 
         public void OnEnable()
         {
+            m_SRP = GraphicsSettings.currentRenderPipeline?.GetType();
             m_ShowOtherSettings = new SavedBool($"LightingWindow.ShowOtherSettings", true);
         }
 
@@ -172,6 +172,10 @@ public void OnGUI()
             EditorGUILayout.Space();
         }
 
+        public void OnSelectionChange()
+        {
+        }
+
         void OtherSettingsGUI()
         {
             if (SupportedRenderingFeatures.active.overridesFog && SupportedRenderingFeatures.active.overridesOtherLightingSettings)
diff --git a/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs b/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs
index ed4b24d130..0c6be7a1d6 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindowLightingTab.cs
@@ -16,7 +16,7 @@
 
 namespace UnityEditor
 {
-    internal class LightingWindowLightingTab
+    internal class LightingWindowLightingTab : LightingWindow.WindowTab
     {
         class Styles
         {
@@ -24,6 +24,7 @@ class Styles
 
             public static readonly GUIContent newLightingSettings = EditorGUIUtility.TrTextContent("New Lighting Settings");
 
+            public static readonly GUIContent lightingSettings = EditorGUIUtility.TrTextContent("Lighting Settings");
             public static readonly GUIContent workflowSettings = EditorGUIUtility.TrTextContent("Workflow Settings");
             public static readonly GUIContent lightProbeVisualization = EditorGUIUtility.TrTextContent("Light Probe Visualization");
             public static readonly GUIContent displayWeights = EditorGUIUtility.TrTextContent("Display Weights");
@@ -49,6 +50,7 @@ class Styles
             };
         }
 
+        SavedBool m_ShowLightingSettings;
         SavedBool m_ShowWorkflowSettings;
         SavedBool m_ShowProbeDebugSettings;
         Vector2 m_ScrollPosition = Vector2.zero;
@@ -78,6 +80,7 @@ public void OnEnable()
             m_BakeSettings = new LightingWindowBakeSettings();
             m_BakeSettings.OnEnable();
 
+            m_ShowLightingSettings = new SavedBool("LightingWindow.ShowLightingSettings", true);
             m_ShowWorkflowSettings = new SavedBool("LightingWindow.ShowWorkflowSettings", true);
             m_ShowProbeDebugSettings = new SavedBool("LightingWindow.ShowProbeDebugSettings", false);
         }
@@ -95,23 +98,7 @@ public void OnGUI()
 
             m_ScrollPosition = EditorGUILayout.BeginScrollView(m_ScrollPosition);
 
-            EditorGUILayout.PropertyField(m_LightingSettingsAsset);
-
-            EditorGUILayout.Space();
-            GUILayout.BeginHorizontal();
-            GUILayout.FlexibleSpace();
-
-            if (GUILayout.Button(Styles.newLightingSettings, GUILayout.Width(170)))
-            {
-                var ls = new LightingSettings();
-                ls.name = "New Lighting Settings";
-                Undo.RecordObject(m_LightmapSettings.targetObject, "New Lighting Settings");
-                Lightmapping.lightingSettingsInternal = ls;
-                ProjectWindowUtil.CreateAsset(ls, (ls.name + ".lighting"));
-            }
-
-            GUILayout.EndHorizontal();
-            EditorGUILayout.Space();
+            LightingSettingsGUI();
 
             m_BakeSettings.OnGUI();
             WorkflowSettingsGUI();
@@ -122,6 +109,40 @@ public void OnGUI()
             lightmapSettings.ApplyModifiedProperties();
         }
 
+        public void OnSelectionChange()
+        {
+        }
+
+        void LightingSettingsGUI()
+        {
+            m_ShowLightingSettings.value = EditorGUILayout.FoldoutTitlebar(m_ShowLightingSettings.value, Styles.lightingSettings, true);
+
+            if (m_ShowLightingSettings.value)
+            {
+                ++EditorGUI.indentLevel;
+
+                EditorGUILayout.PropertyField(m_LightingSettingsAsset, GUIContent.Temp("Lighting Settings Asset"));
+
+                EditorGUILayout.Space();
+                GUILayout.BeginHorizontal();
+                GUILayout.FlexibleSpace();
+
+                if (GUILayout.Button(Styles.newLightingSettings, GUILayout.Width(170)))
+                {
+                    var ls = new LightingSettings();
+                    ls.name = "New Lighting Settings";
+                    Undo.RecordObject(m_LightmapSettings.targetObject, "New Lighting Settings");
+                    Lightmapping.lightingSettingsInternal = ls;
+                    ProjectWindowUtil.CreateAsset(ls, (ls.name + ".lighting"));
+                }
+
+                GUILayout.EndHorizontal();
+                EditorGUILayout.Space();
+
+                --EditorGUI.indentLevel;
+            }
+        }
+
         void WorkflowSettingsGUI()
         {
             m_ShowWorkflowSettings.value = EditorGUILayout.FoldoutTitlebar(m_ShowWorkflowSettings.value, Styles.workflowSettings, true);
diff --git a/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs b/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs
index 6c53d5d201..757d5542aa 100644
--- a/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs
+++ b/Editor/Mono/SceneModeWindows/LightingWindowLightmapPreviewTab.cs
@@ -15,7 +15,7 @@
 
 namespace UnityEditor
 {
-    internal class LightingWindowLightmapPreviewTab
+    internal class LightingWindowLightmapPreviewTab : LightingWindow.WindowTab
     {
         LightmapType m_LightmapType         = LightmapType.NoLightmap;
         Vector2 m_ScrollPosition            = Vector2.zero;
@@ -41,8 +41,6 @@ static class Styles
         public LightingWindowLightmapPreviewTab(LightmapType type)
         {
             m_LightmapType = type;
-
-            InitSettings();
         }
 
         private bool isRealtimeLightmap
@@ -61,7 +59,7 @@ private bool showDebugInfo
             }
         }
 
-        public void UpdateActiveGameObjectSelection()
+        public void OnSelectionChange()
         {
             MeshRenderer renderer;
             Terrain terrain = null;
@@ -92,7 +90,16 @@ public void UpdateActiveGameObjectSelection()
             m_ShouldScrollToLightmapIndex = true;
         }
 
-        public void OnGUI(Rect position)
+        public void OnEnable()
+        {
+            InitSettings();
+        }
+
+        public void OnDisable()
+        {
+        }
+
+        public void OnGUI()
         {
             InitSettings();
 
diff --git a/Editor/Mono/SceneModeWindows/NavigationWindow.cs b/Editor/Mono/SceneModeWindows/NavigationWindow.cs
index a12580bf79..447f1fe15d 100644
--- a/Editor/Mono/SceneModeWindows/NavigationWindow.cs
+++ b/Editor/Mono/SceneModeWindows/NavigationWindow.cs
@@ -37,7 +37,7 @@ internal class NavMeshEditorWindow : EditorWindow, IHasCustomMenu
         SerializedProperty m_MinRegionArea;
         SerializedProperty m_ManualCellSize;
         SerializedProperty m_CellSize;
-        SerializedProperty m_AccuratePlacement;
+        SerializedProperty m_BuildHeightMesh;
 
         // Project based configuration
         SerializedObject m_NavMeshProjectSettingsObject;
@@ -202,7 +202,7 @@ private void InitSceneBakeSettings()
             m_MinRegionArea = m_SettingsObject.FindProperty(kRootPath + "minRegionArea");
             m_ManualCellSize = m_SettingsObject.FindProperty(kRootPath + "manualCellSize");
             m_CellSize = m_SettingsObject.FindProperty(kRootPath + "cellSize");
-            m_AccuratePlacement = m_SettingsObject.FindProperty(kRootPath + "accuratePlacement");
+            m_BuildHeightMesh = m_SettingsObject.FindProperty(kRootPath + "buildHeightMesh");
         }
 
         private void InitAreas()
@@ -541,6 +541,13 @@ static void DisplayControls()
                     NavMeshVisualizationSettings.showHeightMeshBVTree = !showHeightMeshBVTree;
                     bRepaint = true;
                 }
+
+                var showHeightMaps = NavMeshVisualizationSettings.showHeightMaps;
+                if (showHeightMaps != EditorGUILayout.Toggle(EditorGUIUtility.TrTextContent("Show HeightMaps"), showHeightMaps))
+                {
+                    NavMeshVisualizationSettings.showHeightMaps = !showHeightMaps;
+                    bRepaint = true;
+                }
             }
 
             if (bRepaint)
@@ -971,8 +978,9 @@ private void SceneBakeSettings()
                 EditorGUILayout.Space();
 
                 //Height mesh
-                var accurate = EditorGUILayout.Toggle(s_Styles.m_BakePlacementContent, m_AccuratePlacement.boolValue);
-                if (accurate != m_AccuratePlacement.boolValue) m_AccuratePlacement.boolValue = accurate;
+                var heightMesh = EditorGUILayout.Toggle(s_Styles.m_BakePlacementContent, m_BuildHeightMesh.boolValue);
+                if (heightMesh != m_BuildHeightMesh.boolValue)
+                    m_BuildHeightMesh.boolValue = heightMesh;
 
                 EditorGUI.indentLevel--;
             }
diff --git a/Editor/Mono/SceneView/RectSelection.cs b/Editor/Mono/SceneView/RectSelection.cs
index 5fc0f82cfa..4b1d6882b8 100644
--- a/Editor/Mono/SceneView/RectSelection.cs
+++ b/Editor/Mono/SceneView/RectSelection.cs
@@ -246,12 +246,8 @@ static void UpdateSelection(Object[] existingSelection, Object[] newObjects, Sel
                         System.Array.Copy(existingSelection, newSelection, existingSelection.Length);
                         for (int i = 0; i < newObjects.Length; i++)
                             newSelection[existingSelection.Length + i] = newObjects[i];
-                        if (!isRectSelection)
-                            Selection.activeObject = newObjects[0];
-                        else
-                            Selection.activeObject = newSelection[0];
-
-                        Selection.objects = newSelection;
+                        Object active = isRectSelection ? newSelection[0] : newObjects[0];
+                        Selection.SetSelectionWithActiveObject(newSelection, active);
                     }
                     else
                     {
@@ -276,6 +272,7 @@ static void UpdateSelection(Object[] existingSelection, Object[] newObjects, Sel
                     Selection.objects = newObjects;
                     break;
             }
+            GUIUtility.ExitGUI();
         }
 
         // When rect selecting, we update the selected objects based on which modifier keys are currently held down,
diff --git a/Editor/Mono/SceneView/SceneOrientationGizmo.cs b/Editor/Mono/SceneView/SceneOrientationGizmo.cs
index 432e6bbc32..1beb98ce4d 100644
--- a/Editor/Mono/SceneView/SceneOrientationGizmo.cs
+++ b/Editor/Mono/SceneView/SceneOrientationGizmo.cs
@@ -3,7 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Collections.Generic;
 using UnityEditor;
 using UnityEditor.AnimatedValues;
 using UnityEditor.Overlays;
@@ -45,7 +44,6 @@ sealed class SceneOrientationGizmo : IMGUIOverlay
         new GUIContent("x"), new GUIContent("y"), new GUIContent("z")
     };
 
-
     bool showBackGround
     {
         get
@@ -142,7 +140,7 @@ public SceneOrientationGizmo()
         collapsedChanged += OnCollapsedChanged;
     }
 
-    void OnCollapsedChanged(bool collapsed)
+    void OnCollapsedChanged(bool _)
     {
         UpdateHeaderAndBackground();
     }
@@ -216,16 +214,12 @@ public override void OnCreated()
         {
             m_ViewDirectionControlIDs = new int[kDirectionRotations.Length];
             for (int i = 0; i < m_ViewDirectionControlIDs.Length; ++i)
-            {
                 m_ViewDirectionControlIDs[i] = GUIUtility.GetPermanentControlID();
-            }
 
             m_CenterButtonControlID = GUIUtility.GetPermanentControlID();
             m_RotationLockControlID = GUIUtility.GetPermanentControlID();
             m_PerspectiveIsoControlID = GUIUtility.GetPermanentControlID();
         }
-
-        UpdateHeaderAndBackground();
     }
 
     public override void OnWillBeDestroyed()
@@ -237,7 +231,12 @@ public override void OnWillBeDestroyed()
             Object.DestroyImmediate(m_Camera.gameObject);
     }
 
-    void AxisSelectors(SceneView view, Camera cam, float size, float sgn, GUIStyle viewAxisLabelStyle)
+    internal override void OnContentRebuild()
+    {
+        UpdateHeaderAndBackground();
+    }
+
+    void AxisSelectors(SceneView view, Camera cam, float size, float sgn, bool hovered)
     {
         for (int h = kDirectionRotations.Length - 1; h >= 0; h--)
         {
@@ -289,7 +288,7 @@ void AxisSelectors(SceneView view, Camera cam, float size, float sgn, GUIStyle v
 
                 // axis widget when drawn behind label
                 if (sgn > 0 && Handles.Button(m_ViewDirectionControlIDs[h], q1 * Vector3.forward * size * -1.2f, q1,
-                    size, size * 0.7f, Handles.ConeHandleCap))
+                    size, size * 0.7f, Handles.ConeHandleCap, hovered))
                 {
                     if (!view.in2DMode && !view.isRotationLocked)
                         ViewAxisDirection(view, h);
@@ -311,8 +310,10 @@ void AxisSelectors(SceneView view, Camera cam, float size, float sgn, GUIStyle v
                 }
 
                 // axis widget when drawn in front of label
+                // Adding the hovered parameter to avoid all the axis proximity checks that are time consuming
+                // when the cursor is not hovering the Orientation Gizmo
                 if (sgn < 0 && Handles.Button(m_ViewDirectionControlIDs[h], q1 * Vector3.forward * size * -1.2f, q1,
-                    size, size * 0.7f, Handles.ConeHandleCap))
+                    size, size * 0.7f, Handles.ConeHandleCap, hovered))
                 {
                     if (!view.in2DMode && !view.isRotationLocked)
                         ViewAxisDirection(view, h);
@@ -585,7 +586,7 @@ public override void OnGUI()
                     GUIClip.Internal_PushParentClip(Matrix4x4.identity, GUIClip.GetParentMatrix(), gizmoRect);
                 }
 
-                DoOrientationHandles(view, m_Camera);
+                DoOrientationHandles(view, m_Camera, gizmoRect.Contains(evt.mousePosition));
 
                 if (evt.type == EventType.Repaint)
                     GUIClip.Internal_PopParentClip();
@@ -601,7 +602,7 @@ public override void OnGUI()
         }
     }
 
-    void DoOrientationHandles(SceneView view, Camera camera)
+    void DoOrientationHandles(SceneView view, Camera camera, bool isMouseHovering)
     {
         Handles.BeginGUI();
         DrawRotationLock(view, camera.pixelRect);
@@ -617,7 +618,7 @@ void DoOrientationHandles(SceneView view, Camera camera)
         float size = HandleUtility.GetHandleSize(Vector3.zero) * .2f;
 
         // Do axes behind the center one
-        AxisSelectors(view, camera, size, -1.0f, Styles.viewAxisLabelStyle);
+        AxisSelectors(view, camera, size, -1.0f, isMouseHovering);
 
         // Do center handle
         Color centerColor = Handles.centerColor;
@@ -645,7 +646,7 @@ void DoOrientationHandles(SceneView view, Camera camera)
         }
 
         // Do axes in front of the center one
-        AxisSelectors(view, camera, size, 1.0f, Styles.viewAxisLabelStyle);
+        AxisSelectors(view, camera, size, 1.0f, isMouseHovering);
 
         GUI.enabled = true;
 
diff --git a/Editor/Mono/SceneView/SceneView.cs b/Editor/Mono/SceneView/SceneView.cs
index 1c3ebaad00..e2421bf5cf 100644
--- a/Editor/Mono/SceneView/SceneView.cs
+++ b/Editor/Mono/SceneView/SceneView.cs
@@ -23,6 +23,7 @@
 using UnityEditor.EditorTools;
 using UnityEditor.Overlays;
 using UnityEditor.Profiling;
+using UnityEditor.UIElements;
 using UnityEngine.Serialization;
 using UnityEngine.UIElements;
 using Component = UnityEngine.Component;
@@ -183,11 +184,13 @@ internal static Transform GetDefaultParentObjectIfSet()
         static void OnSelectedObjectWasDestroyed(int unused)
         {
             s_ActiveEditorsDirty = true;
+            s_SelectionCacheDirty = true;
         }
 
         static void OnEditorTrackerRebuilt()
         {
             s_ActiveEditorsDirty = true;
+            s_SelectionCacheDirty = true;
         }
 
         internal static void SetActiveEditorsDirty(bool forceRepaint = false)
@@ -203,6 +206,7 @@ internal static void SetActiveEditorsDirty(bool forceRepaint = false)
         static List<Editor> s_ActiveEditors = new List<Editor>();
 
         static bool s_ActiveEditorsDirty;
+        static bool s_SelectionCacheDirty;
 
         internal static IEnumerable<Editor> activeEditors
         {
@@ -368,7 +372,7 @@ public bool sceneLighting
 
         private bool m_WasFocused = false;
 
-        private int[] m_CachedParentRenderersFromSelection, m_CachedChildRenderersFromSelection;
+        private static int[] s_CachedParentRenderersFromSelection, s_CachedChildRenderersFromSelection;
 
         [Serializable]
         public class SceneViewState
@@ -1199,6 +1203,7 @@ public override void OnEnable()
 
             UpdateHiddenObjectCount();
 
+            ObjectFactory.componentWasAdded += OnComponentWasAdded;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
 
             EditorApplication.modifierKeysChanged += RepaintAll; // Because we show handles on shift
@@ -1235,7 +1240,7 @@ public override void OnEnable()
             baseRootVisualElement.styleSheets.Add(EditorGUIUtility.Load(k_StyleCommon) as StyleSheet);
             baseRootVisualElement.styleSheets.Add(EditorGUIUtility.Load(EditorGUIUtility.isProSkin ? k_StyleDark : k_StyleLight) as StyleSheet);
 
-            HandleUtility.FilterRendererIDs(Selection.gameObjects, out m_CachedParentRenderersFromSelection, out m_CachedChildRenderersFromSelection);
+            s_SelectionCacheDirty = true;
         }
 
         IMGUIContainer m_PrefabToolbar;
@@ -1265,7 +1270,7 @@ IMGUIContainer prefabToolbar
                         viewDataKey = name,
                         renderHints = RenderHints.ClipWithScissors
                     };
-                    EditorUIService.instance.AddDefaultEditorStyleSheets(m_PrefabToolbar);
+                    UIElementsEditorUtility.AddDefaultEditorStyleSheets(m_PrefabToolbar);
                     m_PrefabToolbar.style.overflow = UnityEngine.UIElements.Overflow.Hidden;
                 }
 
@@ -1284,7 +1289,7 @@ VisualElement CreateCameraRectVisualElement()
                 renderHints = RenderHints.ClipWithScissors
             };
 
-            EditorUIService.instance.AddDefaultEditorStyleSheets(root);
+            UIElementsEditorUtility.AddDefaultEditorStyleSheets(root);
             root.style.overflow = Overflow.Hidden;
             root.style.flexGrow = 1;
 
@@ -1299,6 +1304,13 @@ VisualElement CreateCameraRectVisualElement()
             return root;
         }
 
+        void OnComponentWasAdded(Component component)
+        {
+            var renderer = component as Renderer;
+            if (renderer != null)
+                s_SelectionCacheDirty = true;
+        }
+
         void GridOnGridVisibilityChanged(bool visible)
         {
             gridVisibilityChanged?.Invoke(visible);
@@ -1441,6 +1453,8 @@ public override void OnDisable()
             if (m_StageHandling != null)
                 m_StageHandling.OnDisable();
             SceneViewMotion.DeactivateFlyModeContext();
+            ObjectFactory.componentWasAdded -= OnComponentWasAdded;
+
             base.OnDisable();
         }
 
@@ -1567,7 +1581,7 @@ void OnSelectionChange()
 
             m_WasFocused = false;
 
-            HandleUtility.FilterRendererIDs(Selection.gameObjects, out m_CachedParentRenderersFromSelection, out m_CachedChildRenderersFromSelection);
+            s_SelectionCacheDirty = true;
 
             Repaint();
         }
@@ -1917,7 +1931,7 @@ internal bool IsSceneCameraDeferred()
             bool usingScriptableRenderPipeline = (GraphicsSettings.currentRenderPipeline != null);
             if (m_Camera == null || usingScriptableRenderPipeline)
                 return false;
-            if (m_Camera.actualRenderingPath == RenderingPath.DeferredLighting || m_Camera.actualRenderingPath == RenderingPath.DeferredShading)
+            if (m_Camera.actualRenderingPath == RenderingPath.DeferredShading)
                 return true;
             return false;
         }
@@ -2035,6 +2049,7 @@ bool SceneCameraRendersIntoRT()
         private void DoDrawCamera(Rect windowSpaceCameraRect, Rect groupSpaceCameraRect, out bool pushedGUIClip)
         {
             pushedGUIClip = false;
+
             if (!m_Camera.gameObject.activeInHierarchy)
                 return;
 
@@ -2067,13 +2082,24 @@ private void DoDrawCamera(Rect windowSpaceCameraRect, Rect groupSpaceCameraRect,
                 if (SceneCameraRendersIntoRT())
                 {
                     GUIClip.Push(new Rect(0f, 0f, position.width, position.height), Vector2.zero, Vector2.zero, true);
+                    GUIClip.Internal_PushParentClip(Matrix4x4.identity, GUIClip.GetParentMatrix(), groupSpaceCameraRect);
                     pushedGUIClip = true;
                 }
                 Handles.DrawCameraStep1(groupSpaceCameraRect, m_Camera, m_CameraMode.drawMode, gridParam, drawGizmos, true);
 
-                if (AnnotationUtility.showSelectionOutline && evt.type == EventType.Repaint)
+                if (evt.type == EventType.Repaint)
                 {
-                    Handles.DrawOutlineInternal(kSceneViewSelectedOutline, kSceneViewSelectedChildrenOutline, 1 - alphaMultiplier, m_CachedParentRenderersFromSelection, m_CachedChildRenderersFromSelection);
+                    if (s_SelectionCacheDirty)
+                    {
+                        HandleUtility.FilterInstanceIDs(Selection.gameObjects, out s_CachedParentRenderersFromSelection, out s_CachedChildRenderersFromSelection);
+                        s_SelectionCacheDirty = false;
+                    }
+
+                    OutlineDrawMode selectionOutlineWireFlags = 0;
+                    if (AnnotationUtility.showSelectionOutline) selectionOutlineWireFlags |= OutlineDrawMode.SelectionOutline;
+                    if (AnnotationUtility.showSelectionWire) selectionOutlineWireFlags |= OutlineDrawMode.SelectionWire;
+                    if (selectionOutlineWireFlags != 0)
+                        Handles.DrawOutlineOrWireframeInternal(kSceneViewSelectedOutline, kSceneViewSelectedChildrenOutline, 1 - alphaMultiplier, s_CachedParentRenderersFromSelection, s_CachedChildRenderersFromSelection, selectionOutlineWireFlags);
                 }
 
                 DrawRenderModeOverlay(groupSpaceCameraRect);
@@ -2169,6 +2195,24 @@ void RenderFilteredScene(Rect groupSpaceCameraRect)
             RenderTexture.ReleaseTemporary(colorRT);
             RenderTexture.ReleaseTemporary(fadedRT);
 
+            OutlineDrawMode selectionDrawModeMask = 0;
+            if (AnnotationUtility.showSelectionOutline)
+                selectionDrawModeMask |= OutlineDrawMode.SelectionOutline;
+            if (AnnotationUtility.showSelectionWire)
+               selectionDrawModeMask |= OutlineDrawMode.SelectionWire;
+
+            if (Event.current.type == EventType.Repaint && selectionDrawModeMask != 0)
+            {
+                if (s_SelectionCacheDirty)
+                {
+                    HandleUtility.FilterInstanceIDs(Selection.gameObjects, out s_CachedParentRenderersFromSelection, out s_CachedChildRenderersFromSelection);
+                    s_SelectionCacheDirty = false;
+                }
+
+                Handles.DrawOutlineOrWireframeInternal(kSceneViewSelectedOutline, kSceneViewSelectedChildrenOutline, 1 - alphaMultiplier, s_CachedParentRenderersFromSelection, s_CachedChildRenderersFromSelection, selectionDrawModeMask);
+                Handles.Internal_FinishDrawingCamera(m_Camera, true);
+            }
+
             // Reset camera
             m_Camera.SetReplacementShader(m_ReplacementShader, m_ReplacementString);
             m_Camera.renderingPath = oldRenderingPath;
@@ -2401,9 +2445,14 @@ void DoOnGUI()
                     Profiler.BeginSample("SceneView.BlitRT");
                     Graphics.SetRenderTarget(null);
                 }
+
                 // If we reset the offsets pop that clip off now.
                 if (pushedGUIClip)
+                {
+                    GUIClip.Internal_PopParentClip();
                     GUIClip.Pop();
+                }
+
                 if (evt.type == EventType.Repaint)
                 {
                     Graphics.DrawTexture(groupSpaceCameraRect, m_SceneTargetTexture, new Rect(0, 0, 1, 1), 0, 0, 0, 0, GUI.color, EditorGUIUtility.GUITextureBlit2SRGBMaterial);
@@ -3291,7 +3340,7 @@ internal void HandleDragging(Event evt)
                     if (DragAndDrop.HasHandler(DragAndDropWindowTarget.sceneView))
                     {
                         PickObject(ref pickedObject, ref parentTransform);
-                        DragAndDrop.visualMode = DragAndDrop.Drop(DragAndDropWindowTarget.sceneView, pickedObject, pivot, Event.current.mousePosition, parentTransform, isPerform);
+                        DragAndDrop.visualMode = DragAndDrop.DropOnSceneWindow(pickedObject, pivot, Event.current.mousePosition, parentTransform, isPerform);
                         dropHandled = DragAndDrop.visualMode != DragAndDropVisualMode.None;
                     }
 
@@ -3371,28 +3420,28 @@ void CommandsGUI()
                 case EventCommandNames.Duplicate:
                     if (execute)
                     {
-                        CutCopyPasteUtility.DuplicateGO(customParentForNewGameObjects);
+                        ClipboardUtility.DuplicateGO(customParentForNewGameObjects);
                     }
                     Event.current.Use();
                     break;
                 case EventCommandNames.Copy:
                     if (execute)
                     {
-                        CutCopyPasteUtility.CopyGO();
+                        ClipboardUtility.CopyGO();
                     }
                     Event.current.Use();
                     break;
                 case EventCommandNames.Cut:
                     if (execute)
                     {
-                        CutCopyPasteUtility.CutGO();
+                        ClipboardUtility.CutGO();
                     }
                     Event.current.Use();
                     break;
                 case EventCommandNames.Paste:
                     if (execute)
                     {
-                        CutCopyPasteUtility.PasteGO(customParentForNewGameObjects);
+                        ClipboardUtility.PasteGO(customParentForNewGameObjects);
                     }
                     Event.current.Use();
                     break;
@@ -3451,7 +3500,7 @@ void CommandsGUI()
             // Detect if we are canceling 'Cut' operation
             if (Event.current.keyCode == KeyCode.Escape && CutBoard.hasCutboardData)
             {
-                CutCopyPasteUtility.ResetCutboardAndRepaintHierarchyWindows();
+                ClipboardUtility.ResetCutboardAndRepaintHierarchyWindows();
                 Repaint();
             }
         }
@@ -3711,9 +3760,9 @@ void CallOnSceneGUI()
                             GUIUtility.ExitGUI();
                     }
                 }
+                EditorToolManager.InvokeOnSceneGUICustomEditorTools();
             }
 
-            EditorToolManager.InvokeOnSceneGUICustomEditorTools();
 
             if (duringSceneGui != null)
             {
@@ -3819,12 +3868,6 @@ static void ShowCompileErrorNotification()
             ShowNotification("All compiler errors have to be fixed before you can enter playmode!");
         }
 
-        static void ShowPrefabErrorNotification()
-        {
-            ShowNotification("All Prefab instances without a source Prefab must be fixed before you can enter playmode!");
-            Debug.LogError("All Prefab instances without a source Prefab Asset must be fixed before you can enter playmode!\nYou can find them by searching for 'Missing Prefab' in the Hierarchy");
-        }
-
         internal static void ShowSceneViewPlayModeSaveWarning()
         {
             // In this case, we want to explicitly try the GameView before passing it on to whatever notificationView we have
@@ -3960,7 +4003,7 @@ void CopyLastActiveSceneViewSettings()
             m_2DMode = view.m_2DMode;
             pivot = view.pivot;
             rotation = view.rotation;
-            m_Size = view.m_Size;
+            size = view.size;
             m_Ortho.value = view.orthographic;
             if (m_Grid == null)
                 m_Grid = new SceneViewGrid();
diff --git a/Editor/Mono/SceneView/SceneViewMotion.cs b/Editor/Mono/SceneView/SceneViewMotion.cs
index 651f12526c..92b73613f4 100644
--- a/Editor/Mono/SceneView/SceneViewMotion.cs
+++ b/Editor/Mono/SceneView/SceneViewMotion.cs
@@ -530,7 +530,7 @@ private static void HandleScrollWheel(SceneView view, bool zoomTowardsCenter)
 
                 GUIContent cameraSpeedContent = EditorGUIUtility.TempContent(string.Format("{0}{1}",
                     cameraSpeedDisplayValue,
-                    s_CurrentSceneView.cameraSettings.accelerationEnabled ? "x" : ""));
+                    view.cameraSettings.accelerationEnabled ? "x" : ""));
 
                 view.ShowNotification(cameraSpeedContent, .5f);
             }
diff --git a/Editor/Mono/SceneView/SceneViewToolbars.cs b/Editor/Mono/SceneView/SceneViewToolbars.cs
index 4ab2f6a3c9..50e1277712 100644
--- a/Editor/Mono/SceneView/SceneViewToolbars.cs
+++ b/Editor/Mono/SceneView/SceneViewToolbars.cs
@@ -53,7 +53,7 @@ public OverlayToolbar CreateHorizontalToolbarContent()
 
         public override VisualElement CreatePanelContent()
         {
-            return CreatePanelContent();
+            return CreateHorizontalToolbarContent();
         }
 
         public IEnumerable<string> toolbarElements
diff --git a/Editor/Mono/SceneVisibilityManager.cs b/Editor/Mono/SceneVisibilityManager.cs
index 0f09161b48..1322efa7d8 100644
--- a/Editor/Mono/SceneVisibilityManager.cs
+++ b/Editor/Mono/SceneVisibilityManager.cs
@@ -57,7 +57,7 @@ internal bool enableScenePicking
         [InitializeOnLoadMethod]
         private static void Initialize()
         {
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             EditorSceneManager.newSceneCreated += EditorSceneManagerOnNewSceneCreated;
             EditorSceneManager.sceneSaving += EditorSceneManagerOnSceneSaving;
             EditorSceneManager.sceneSaved += EditorSceneManagerOnSceneSaved;
@@ -150,7 +150,7 @@ private static void EditorSceneManagerOnNewSceneCreated(Scene scene, NewSceneSet
             SceneVisibilityState.ClearScene(scene);
         }
 
-        private static void UndoRedoPerformed()
+        private static void UndoRedoPerformed(in UndoRedoInfo info)
         {
             SceneVisibilityState.ForceDataUpdate();
         }
@@ -680,46 +680,16 @@ private static void ToggleSelectionAndDescendantsVisibility()
         [Shortcut("Scene Picking/Toggle Picking On Selection And Descendants", typeof(ShortcutContext), KeyCode.L)]
         private static void ToggleSelectionAndDescendantsPicking()
         {
-            bool shouldDisablePicking = true;
-            foreach (var gameObject in Selection.gameObjects)
-            {
-                if (!instance.IsPickingDisabled(gameObject))
-                {
-                    break;
-                }
-
-                shouldDisablePicking = false;
-            }
-
-            instance.m_SelectedScenes.Clear();
-
-            if (shouldDisablePicking)
-            {
-                SceneHierarchyWindow.lastInteractedHierarchyWindow.GetSelectedScenes(instance.m_SelectedScenes);
-
-                foreach (var scene in instance.m_SelectedScenes)
-                {
-                    if (!instance.IsPickingDisabled(scene))
-                        break;
-
-                    shouldDisablePicking = false;
-                }
-            }
-
-            Undo.RecordObject(SceneVisibilityState.GetInstance(), "Toggle Selection And Descendants Picking");
-            SceneVisibilityState.SetGameObjectsPickingDisabled(Selection.gameObjects, shouldDisablePicking, true);
-
-            foreach (var scene in instance.m_SelectedScenes)
-            {
-                if (shouldDisablePicking)
-                    instance.DisablePicking(scene);
-                else
-                    instance.EnablePicking(scene);
-            }
+            ToggleSelectionPicking(true);
         }
 
         [Shortcut("Scene Picking/Toggle Picking On Selection")]
         internal static void ToggleSelectionPickable()
+        {
+            ToggleSelectionPicking(false);
+        }
+
+        private static void ToggleSelectionPicking(bool includeChildren)
         {
             bool shouldDisablePicking = true;
             foreach (var gameObject in Selection.gameObjects)
@@ -732,7 +702,6 @@ internal static void ToggleSelectionPickable()
                 shouldDisablePicking = false;
             }
 
-
             instance.m_SelectedScenes.Clear();
 
             if (shouldDisablePicking)
@@ -748,9 +717,9 @@ internal static void ToggleSelectionPickable()
                 }
             }
 
-            Undo.RecordObject(SceneVisibilityState.GetInstance(), "Toggle Selection Pickable");
-            SceneVisibilityState.SetGameObjectsPickingDisabled(Selection.gameObjects, shouldDisablePicking, false);
-
+            var undoName = includeChildren ? "Toggle Selection And Descendants Picking" : "Toggle Selection Pickable";
+            Undo.RecordObject(SceneVisibilityState.GetInstance(), undoName);
+            SceneVisibilityState.SetGameObjectsPickingDisabled(Selection.gameObjects, shouldDisablePicking, includeChildren);
 
             foreach (var scene in instance.m_SelectedScenes)
             {
@@ -759,8 +728,11 @@ internal static void ToggleSelectionPickable()
                 else
                     instance.EnablePicking(scene);
             }
+
+            EditorApplication.RepaintHierarchyWindow();
         }
 
+
         [Shortcut("Scene Visibility/Exit Isolation")]
         private static void ExitIsolationShortcut()
         {
diff --git a/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs b/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs
index 9e3c76b032..0e3338835d 100644
--- a/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs
+++ b/Editor/Mono/ScriptAttributeGUI/Implementations/ExposedReferenceDrawer.cs
@@ -207,7 +207,14 @@ protected override void OnRenderProperty(Rect position,
         ExposedPropertyMode mode,
         IExposedPropertyTable exposedPropertyTable)
     {
-        var typeOfExposedReference = fieldInfo.FieldType.GetGenericArguments()[0];
+        var propertyType = fieldInfo.FieldType;
+
+        if (propertyType.IsArrayOrList())
+        {
+            propertyType = propertyType.GetArrayOrListElementType();
+        }
+
+        var typeOfExposedReference = propertyType.GetGenericArguments()[0];
 
         EditorGUI.BeginChangeCheck();
         var newValue = EditorGUI.ObjectField(position, currentReferenceValue, typeOfExposedReference, exposedPropertyTable != null);
diff --git a/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs b/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs
index 984566716e..7f6d05b507 100644
--- a/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs
+++ b/Editor/Mono/ScriptAttributeGUI/Implementations/PropertyDrawers.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -121,43 +122,52 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             {
                 if (property.type == "float")
                 {
-                    newField = EditorUIService.instance.CreateFloatField(property.displayName, OnValidateValue);
+                    newField = new FloatField(property.displayName);
+                    ((BaseField<float>)newField).onValidateValue += OnValidateValue;
                 }
                 else if (property.type == "double")
                 {
-                    newField = EditorUIService.instance.CreateDoubleField(property.displayName, OnValidateValue);
+                    newField = new DoubleField(property.displayName);
+                    ((BaseField<double>)newField).onValidateValue += OnValidateValue;
                 }
             }
             else if (property.propertyType == SerializedPropertyType.Integer)
             {
                 if (property.type == "int")
                 {
-                    newField = EditorUIService.instance.CreateIntField(property.displayName, OnValidateValue);
+                    newField = new IntegerField(property.displayName);
+                    ((BaseField<int>)newField).onValidateValue += OnValidateValue;
                 }
                 else if (property.type == "long")
                 {
-                    newField = EditorUIService.instance.CreateLongField(property.displayName, OnValidateValue);
+                    newField = new LongField(property.displayName);
+                    ((BaseField<long>)newField).onValidateValue += OnValidateValue;
                 }
             }
             else if (property.propertyType == SerializedPropertyType.Vector2)
             {
-                newField = EditorUIService.instance.CreateVector2Field(property.displayName, OnValidateValue);
+                newField = new Vector2Field(property.displayName);
+                ((BaseField<Vector2>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector2Int)
             {
-                newField = EditorUIService.instance.CreateVector2IntField(property.displayName, OnValidateValue);
+                newField = new Vector2IntField(property.displayName);
+                ((BaseField<Vector2Int>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector3)
             {
-                newField = EditorUIService.instance.CreateVector3Field(property.displayName, OnValidateValue);
+                newField =  new Vector3Field(property.displayName);
+                ((BaseField<Vector3>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector3Int)
             {
-                newField = EditorUIService.instance.CreateVector3IntField(property.displayName, OnValidateValue);
+                newField = new Vector3IntField(property.displayName);
+                ((BaseField<Vector3Int>)newField).onValidateValue += OnValidateValue;
             }
             else if (property.propertyType == SerializedPropertyType.Vector4)
             {
-                newField = EditorUIService.instance.CreateVector4Field(property.displayName, OnValidateValue);
+                newField = new Vector4Field(property.displayName);
+                ((BaseField<Vector4>)newField).onValidateValue += OnValidateValue;
             }
 
             if (newField != null)
@@ -248,7 +258,8 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             if (property.propertyType == SerializedPropertyType.String)
             {
                 var lines = ((MultilineAttribute)attribute).lines;
-                var field = EditorUIService.instance.CreateTextField(property.displayName, true);
+                var field = new TextField(property.displayName);
+                field.multiline = true;
                 field.bindingPath = property.propertyPath;
                 field.style.height = EditorGUI.kSingleLineHeight + (lines - 1) * kLineHeight;
                 return field;
@@ -301,7 +312,8 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
                 var element = new VisualElement();
                 var label = new Label(property.displayName);
                 var scrollView = new ScrollView();
-                var textField = EditorUIService.instance.CreateTextField(null, true);
+                var textField = new TextField();
+                textField.multiline = true;
                 var minHeight = EditorGUI.kSingleLineHeight + (textAreaAttribute.minLines - 1) * kLineHeight;
                 var maxHeight = minHeight;
 
@@ -367,7 +379,9 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             if (property.propertyType == SerializedPropertyType.Color)
             {
                 var colorUsage = (ColorUsageAttribute)attribute;
-                var field = EditorUIService.instance.CreateColorField(property.displayName, colorUsage.showAlpha, colorUsage.hdr);
+                var field = new ColorField(property.displayName);
+                field.showAlpha = colorUsage.showAlpha;
+                field.hdr = colorUsage.hdr;
                 field.bindingPath = property.propertyPath;
                 return field;
             }
@@ -398,7 +412,9 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             if (property.propertyType == SerializedPropertyType.Gradient)
             {
                 var gradientUsage = (GradientUsageAttribute)attribute;
-                var field = EditorUIService.instance.CreateGradientField(property.displayName, gradientUsage.hdr, gradientUsage.colorSpace);
+                var field = new GradientField(property.displayName);
+                field.hdr = gradientUsage.hdr;
+                field.colorSpace = gradientUsage.colorSpace;
                 return field;
             }
 
@@ -430,27 +446,32 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             {
                 if (property.type == "float")
                 {
-                    newField = EditorUIService.instance.CreateFloatField(property.displayName, null, true);
+                    newField = new FloatField(property.displayName);
+                    ((TextInputBaseField<float>)newField).isDelayed = true;
                 }
                 else if (property.type == "double")
                 {
-                    newField = EditorUIService.instance.CreateDoubleField(property.displayName, null, true);
+                    newField = new DoubleField(property.displayName);
+                    ((TextInputBaseField<double>)newField).isDelayed = true;
                 }
             }
             else if (property.propertyType == SerializedPropertyType.Integer)
             {
                 if (property.type == "int")
                 {
-                    newField = EditorUIService.instance.CreateIntField(property.displayName, null, true);
+                    newField = new IntegerField(property.displayName);
+                    ((TextInputBaseField<int>)newField).isDelayed = true;
                 }
                 else if (property.type == "long")
                 {
-                    newField = EditorUIService.instance.CreateLongField(property.displayName, null, true);
+                    newField = new LongField(property.displayName);
+                    ((TextInputBaseField<long>)newField).isDelayed = true;
                 }
             }
             else if (property.propertyType == SerializedPropertyType.String)
             {
-                newField = EditorUIService.instance.CreateTextField(property.displayName, false, true);
+                newField = new TextField(property.displayName);
+                ((TextInputBaseField<string>)newField).isDelayed = true;
             }
 
             if (newField != null)
diff --git a/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs b/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs
index 8c8964fb4e..5761c9d712 100644
--- a/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs
+++ b/Editor/Mono/ScriptAttributeGUI/PropertyHandler.cs
@@ -37,7 +37,12 @@ internal PropertyDrawer propertyDrawer
 
         static PropertyHandler()
         {
-            Undo.undoRedoPerformed += () => ReorderableList.ClearExistingListCaches();
+            Undo.undoRedoEvent += OnUndoRedo;
+        }
+
+        static void OnUndoRedo(in UndoRedoInfo info)
+        {
+            ReorderableList.InvalidateExistingListCaches();
         }
 
         public static void ClearCache()
@@ -46,11 +51,13 @@ public static void ClearCache()
             s_LastInspectionTarget = 0;
         }
 
-        public static void ClearListCacheIncludingChildren(string propertyPath)
+        public static void InvalidateListCacheIncludingChildren(SerializedProperty property)
         {
             foreach (var listEntry in s_reorderableLists)
             {
-                if (listEntry.Key.Contains(propertyPath)) listEntry.Value.ClearCache();
+                if (listEntry.Key.Contains(property.propertyPath)
+                    && listEntry.Key.Contains(property.serializedObject.targetObject.GetInstanceID().ToString() + (GUIView.current?.nativeHandle.ToInt32() ?? -1)))
+                    listEntry.Value.InvalidateCache();
             }
         }
 
@@ -77,9 +84,6 @@ public void HandleAttribute(SerializedProperty property, PropertyAttribute attri
 
             if (attribute is ContextMenuItemAttribute)
             {
-                // Use context menu items on array elements, not on array itself
-                if (propertyType.IsArrayOrList())
-                    return;
                 if (contextMenuItems == null)
                     contextMenuItems = new List<ContextMenuItemAttribute>();
                 contextMenuItems.Add(attribute as ContextMenuItemAttribute);
@@ -203,11 +207,19 @@ internal bool OnGUI(Rect position, SerializedProperty property, GUIContent label
                     // Calculate visibility rect specifically for reorderable list as when applied for the whole serialized object,
                     // it causes collapsed out of sight array elements appear thus messing up scroll-bar experience
                     var screenPos = GUIUtility.GUIToScreenPoint(position.position);
-                    screenPos.y = Mathf.Clamp(screenPos.y, 0, Screen.height);
-                    Rect listVisibility = new Rect(screenPos.x, screenPos.y, Screen.width, Screen.height);
+
+                    screenPos.y = Mathf.Clamp(screenPos.y,
+                        GUIView.current?.screenPosition.yMin ?? 0,
+                        GUIView.current?.screenPosition.yMax ?? Screen.height);
+
+                    Rect listVisibility = new Rect(screenPos.x, screenPos.y,
+                        GUIView.current?.screenPosition.width ?? Screen.width,
+                        GUIView.current?.screenPosition.height ?? Screen.height);
+
                     listVisibility = GUIUtility.ScreenToGUIRect(listVisibility);
 
-                    reorderableList.Property = property;
+                    // Copy helps with recursive list rendering
+                    reorderableList.Property = property.Copy();
                     reorderableList.Draw(label, position, listVisibility, tooltip, includeChildren);
                     return !includeChildren && property.isExpanded;
                 }
@@ -228,12 +240,21 @@ internal bool OnGUI(Rect position, SerializedProperty property, GUIContent label
                 bool childrenAreExpanded = EditorGUI.DefaultPropertyField(position, prop, label) && EditorGUI.HasVisibleChildFields(prop);
                 position.y += position.height + EditorGUI.kControlVerticalSpacing;
 
+                if (property.isArray)
+                    EditorGUI.BeginIsInsideList(prop.depth);
+
                 // Loop through all child properties
                 if (childrenAreExpanded)
                 {
                     SerializedProperty endProperty = prop.GetEndProperty();
                     while (prop.NextVisible(childrenAreExpanded) && !SerializedProperty.EqualContents(prop, endProperty))
                     {
+                        if (GUI.isInsideList && prop.depth <= EditorGUI.GetInsideListDepth())
+                            EditorGUI.EndIsInsideList();
+
+                        if (prop.isArray)
+                            EditorGUI.BeginIsInsideList(prop.depth);
+
                         var handler = ScriptAttributeUtility.GetHandler(prop);
                         EditorGUI.indentLevel = prop.depth + relIndent;
                         position.height = handler.GetHeight(prop, null, UseReorderabelListControl(prop) && includeChildren);
@@ -253,6 +274,8 @@ internal bool OnGUI(Rect position, SerializedProperty property, GUIContent label
                 }
 
                 // Restore state
+                if (GUI.isInsideList && property.depth <= EditorGUI.GetInsideListDepth())
+                    EditorGUI.EndIsInsideList();
                 GUI.enabled = wasEnabled;
                 EditorGUIUtility.SetIconSize(oldIconSize);
                 EditorGUI.indentLevel = origIndent;
@@ -306,7 +329,8 @@ public float GetHeight(SerializedProperty property, GUIContent label, bool inclu
                     s_reorderableLists[key] = reorderableList;
                 }
 
-                reorderableList.Property = property;
+                // Copy helps with recursive list rendering
+                reorderableList.Property = property.Copy();
                 height += s_reorderableLists[key].GetHeight();
                 return height;
             }
diff --git a/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs b/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs
index 167b2f6010..ee0fe213a9 100644
--- a/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs
+++ b/Editor/Mono/Scripting/APIUpdater/APIUpdaterAssemblyHelper.cs
@@ -7,7 +7,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Diagnostics;
 
 using UnityEditor.Utils;
 using UnityEngine;
@@ -49,13 +48,7 @@ internal static int Run(string arguments, string workingDir, out string stdOut,
             return assemblyUpdaterProcess.ExitCode;
         }
 
-        static string AssemblyUpdaterPath()
-        {
-            var unescapedAssemblyUpdaterPath = EditorApplication.applicationContentsPath + "/Tools/ScriptUpdater/AssemblyUpdater.exe";
-            return Application.platform == RuntimePlatform.WindowsEditor
-                ? CommandLineFormatter.EscapeCharsWindows(unescapedAssemblyUpdaterPath)
-                : CommandLineFormatter.EscapeCharsQuote(unescapedAssemblyUpdaterPath);
-        }
+        static string AssemblyUpdaterPath() => EditorApplication.applicationContentsPath + "/Tools/ScriptUpdater/AssemblyUpdater.exe";
 
         internal static string ArgumentsForUpdateAssembly(string assemblyPath, string tempOutputPath, IEnumerable<string> updateConfigSourcePaths)
         {
@@ -97,10 +90,29 @@ private static string ResolveAssemblyPath(string assemblyPath)
 
         private static string AssemblySearchPathArgument(IEnumerable<string> configurationSourceDirectories = null)
         {
+            var req = PackageManager.Client.List(offlineMode: true, includeIndirectDependencies: true);
+            while (!req.IsCompleted)
+                System.Threading.Thread.Sleep(10);
+
+            var packagePathsToSearchForAssemblies = new StringBuilder();
+
+            if (req.Status == PackageManager.StatusCode.Success)
+            {
+                foreach(var resolvedPackage in req.Result)
+                {
+                    packagePathsToSearchForAssemblies.Append($"{Path.PathSeparator}+{resolvedPackage.resolvedPath.Escape(Path.PathSeparator)}");
+                }
+            }
+            else
+            {
+                APIUpdaterLogger.WriteToFile(L10n.Tr($"Unable to retrieve project configured packages; AssemblyUpdater may fail to resolve assemblies from packages. Status = {req.Error?.message} ({req.Error?.errorCode})"));
+            }
+
             var searchPath = NetStandardFinder.GetReferenceDirectory().Escape(Path.PathSeparator) + Path.PathSeparator
                 + NetStandardFinder.GetNetStandardCompatShimsDirectory().Escape(Path.PathSeparator) + Path.PathSeparator
                 + NetStandardFinder.GetDotNetFrameworkCompatShimsDirectory().Escape(Path.PathSeparator) + Path.PathSeparator
-                + "+" + Application.dataPath.Escape(Path.PathSeparator);
+                + "+" + Application.dataPath.Escape(Path.PathSeparator)
+                + packagePathsToSearchForAssemblies.ToString();
 
             if (configurationSourceDirectories != null)
             {
diff --git a/Editor/Mono/Scripting/Compilers/MicrosoftResponseFileParser.cs b/Editor/Mono/Scripting/Compilers/MicrosoftResponseFileParser.cs
index a83e00c362..be1873ceb1 100644
--- a/Editor/Mono/Scripting/Compilers/MicrosoftResponseFileParser.cs
+++ b/Editor/Mono/Scripting/Compilers/MicrosoftResponseFileParser.cs
@@ -104,9 +104,8 @@ public static ResponseFileData ParseResponseFileFromFile(
             projectDirectory = Paths.ConvertSeparatorsToUnity(projectDirectory);
 
             var relativeResponseFilePath = Paths.GetPathRelativeToProjectDirectory(responseFilePath);
-            var responseFile = AssetDatabase.LoadAssetAtPath<TextAsset>(relativeResponseFilePath);
 
-            if (!responseFile && File.Exists(responseFilePath))
+            if (File.Exists(responseFilePath))
             {
                 var responseFileText = File.ReadAllText(responseFilePath);
                 return ParseResponseFileText(
@@ -115,8 +114,7 @@ public static ResponseFileData ParseResponseFileFromFile(
                     projectDirectory,
                     systemReferenceDirectories);
             }
-
-            if (!responseFile)
+            else
             {
                 var empty = new ResponseFileData
                 {
@@ -129,12 +127,6 @@ public static ResponseFileData ParseResponseFileFromFile(
 
                 return empty;
             }
-
-            return ParseResponseFileText(
-                responseFile.text,
-                responseFile.name,
-                projectDirectory,
-                systemReferenceDirectories);
         }
 
         static ResponseFileData ParseResponseFileText(
diff --git a/Editor/Mono/Scripting/PragmaFixing30.cs b/Editor/Mono/Scripting/PragmaFixing30.cs
deleted file mode 100644
index f4accaaab8..0000000000
--- a/Editor/Mono/Scripting/PragmaFixing30.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using UnityEngine;
-using UnityEditor;
-using UnityEditorInternal;
-using System;
-using System.IO;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Collections.Generic;
-using RequiredByNativeCodeAttribute = UnityEngine.Scripting.RequiredByNativeCodeAttribute;
-
-namespace UnityEditor.Scripting
-{
-    internal class PragmaFixing30
-    {
-        [RequiredByNativeCode]
-        static void FixJavaScriptPragmas()
-        {
-            string[] filesToFix = CollectBadFiles();
-            if (filesToFix.Length == 0)
-                return;
-
-            if (!InternalEditorUtility.inBatchMode)
-                PragmaFixingWindow.ShowWindow(filesToFix);
-            else
-                FixFiles(filesToFix);
-        }
-
-        public static void FixFiles(string[] filesToFix)
-        {
-            foreach (string f in filesToFix)
-            {
-                try
-                {
-                    FixPragmasInFile(f);
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogError("Failed to fix pragmas in file '" + f + "'.\n" + ex.Message);
-                }
-            }
-        }
-
-        static bool FileNeedsPragmaFixing(string fileName)
-        {
-            return CheckOrFixPragmas(fileName, true);
-        }
-
-        static void FixPragmasInFile(string fileName)
-        {
-            CheckOrFixPragmas(fileName, false);
-        }
-
-        static bool CheckOrFixPragmas(string fileName, bool onlyCheck)
-        {
-            string oldText = File.ReadAllText(fileName);
-            StringBuilder text = new StringBuilder(oldText);
-
-            LooseComments(text);
-
-            Match strictMatch = PragmaMatch(text, "strict");
-
-            if (!strictMatch.Success)
-                return false;
-
-            bool hasDowncast = PragmaMatch(text, "downcast").Success;
-            bool hasImplicit = PragmaMatch(text, "implicit").Success;
-
-            if (hasDowncast && hasImplicit)
-                return false;
-
-            if (!onlyCheck)
-                DoFixPragmasInFile(fileName, oldText, strictMatch.Index + strictMatch.Length, hasDowncast, hasImplicit);
-
-            return true;
-        }
-
-        static void DoFixPragmasInFile(string fileName, string oldText, int fixPos, bool hasDowncast, bool hasImplicit)
-        {
-            string textToAdd = string.Empty;
-            string lineEndings = HasWinLineEndings(oldText) ? "\r\n" : "\n";
-
-            if (!hasImplicit)
-                textToAdd += lineEndings + "#pragma implicit";
-            if (!hasDowncast)
-                textToAdd += lineEndings + "#pragma downcast";
-
-            File.WriteAllText(fileName, oldText.Insert(fixPos, textToAdd));
-        }
-
-        static bool HasWinLineEndings(string text)
-        {
-            return text.IndexOf("\r\n") != -1;
-        }
-
-        static IEnumerable<string> SearchRecursive(string dir, string mask)
-        {
-            foreach (string d in Directory.GetDirectories(dir))
-                foreach (string f in SearchRecursive(d, mask))
-                    yield return f;
-            foreach (string f in Directory.GetFiles(dir, mask))
-                yield return f;
-        }
-
-        static void LooseComments(StringBuilder sb)
-        {
-            // TODO: better comment ignoring? this one sort of does the job, it handles //
-            // and if it's in multiline comments, our added lines will end up commented as well
-            Regex r = new Regex("//");
-            foreach (Match m in r.Matches(sb.ToString()))
-            {
-                int pos = m.Index;
-                while (pos < sb.Length && sb[pos] != '\n' && sb[pos] != '\r')
-                    sb[pos++] = ' ';
-            }
-        }
-
-        static Match PragmaMatch(StringBuilder sb, string pragma)
-        {
-            // unity java script, like regex, treats new line as space character as well
-            return new Regex(@"#\s*pragma\s*" + pragma).Match(sb.ToString());
-        }
-
-        static string[] CollectBadFiles()
-        {
-            List<string> filesToFix = new List<string>();
-
-            foreach (string f in SearchRecursive(Path.Combine(Directory.GetCurrentDirectory(), "Assets"), "*.js"))
-            {
-                try
-                {
-                    if (FileNeedsPragmaFixing(f))
-                        filesToFix.Add(f);
-                }
-                catch (Exception ex)
-                {
-                    Debug.LogError("Failed to fix pragmas in file '" + f + "'.\n" + ex.Message);
-                }
-            }
-
-            return filesToFix.ToArray();
-        }
-    }
-}
diff --git a/Editor/Mono/Scripting/ScriptCompilation/ArrayHelper.cs b/Editor/Mono/Scripting/ScriptCompilation/ArrayHelper.cs
deleted file mode 100644
index a55871025b..0000000000
--- a/Editor/Mono/Scripting/ScriptCompilation/ArrayHelper.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-
-namespace UnityEditor.Scripting.ScriptCompilation
-{
-    internal class ArrayHelper
-    {
-        public static T[] Merge<T>(params T[][] arrays)
-        {
-            int arraySize = 0;
-            foreach (var array in arrays)
-            {
-                if (array == null)
-                {
-                    continue;
-                }
-
-                arraySize += array.Length;
-            }
-
-            var result = new T[arraySize];
-            int index = 0;
-            foreach (var array in arrays)
-            {
-                if (array == null)
-                {
-                    continue;
-                }
-
-                Array.Copy(array, 0, result, index, array.Length);
-                index += array.Length;
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/Editor/Mono/Scripting/ScriptCompilation/AssemblyBuilder.cs b/Editor/Mono/Scripting/ScriptCompilation/AssemblyBuilder.cs
index d7bd8b0c26..84dcd0091a 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/AssemblyBuilder.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/AssemblyBuilder.cs
@@ -113,7 +113,7 @@ internal bool Build(EditorCompilation editorCompilation)
             activeBeeBuild = new BeeScriptCompilationState
             {
                 assemblies = new[] { assembly },
-                Driver = UnityBeeDriver.Make(EditorCompilation.ScriptCompilationBuildProgram, editorCompilation, $"{(int)assembly.BuildTarget}{"AB"}", beeAssemblyBuilderDirectory),
+                Driver = UnityBeeDriver.Make(EditorCompilation.ScriptCompilationBuildProgram, editorCompilation, $"{(int)assembly.BuildTarget}{"AB"}", new ILPostProcessingProgram(), beeAssemblyBuilderDirectory),
                 editorCompilation = editorCompilation,
                 finishedCompiling = false,
             };
@@ -175,7 +175,7 @@ private void InvokeBuildFinished(BeeDriverResult result)
             try
             {
                 buildFinished?.Invoke(assemblyPath, EditorCompilation.ConvertCompilerMessages(BeeScriptCompilation
-                    .ParseAllNodeResultsIntoCompilerMessages(result.NodeResults, EditorCompilationInterface.Instance)
+                    .ParseAllResultsIntoCompilerMessages(result.BeeDriverMessages, result.NodeResults, EditorCompilationInterface.Instance)
                     .SelectMany(a => a).ToArray()));
             }
             catch (Exception e)
diff --git a/Editor/Mono/Scripting/ScriptCompilation/AssemblyDefinitionException.cs b/Editor/Mono/Scripting/ScriptCompilation/AssemblyDefinitionException.cs
index b44a0ea0a1..9bb737e4f0 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/AssemblyDefinitionException.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/AssemblyDefinitionException.cs
@@ -6,30 +6,17 @@
 
 namespace UnityEditor.Compilation
 {
-    enum AssemblyDefinitionErrorType
-    {
-        LoadError,
-        CyclicReferences
-    }
-
     public class AssemblyDefinitionException : Exception
     {
-        internal AssemblyDefinitionErrorType errorType { get; }
         public string[] filePaths { get; }
 
-        internal AssemblyDefinitionException(string message, AssemblyDefinitionErrorType errorType, params string[] filePaths) : base(message)
-        {
-            this.errorType = errorType;
-            this.filePaths = filePaths;
-        }
-
         public AssemblyDefinitionException(string message, params string[] filePaths) : base(message)
         {
-            this.errorType = AssemblyDefinitionErrorType.LoadError;
             this.filePaths = filePaths;
         }
     }
 
+    [Obsolete("PrecompiledAssemblyException is no longer being thrown by Unity and will be removed.")]
     public class PrecompiledAssemblyException : Exception
     {
         public string[] filePaths { get; }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilder.cs b/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilder.cs
new file mode 100644
index 0000000000..cb89af1c19
--- /dev/null
+++ b/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilder.cs
@@ -0,0 +1,237 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace UnityEditor.Scripting.ScriptCompilation
+{
+    internal interface IAssemblyGraphBuilder
+    {
+        Dictionary<CustomScriptAssembly, List<string>> Match(
+            IReadOnlyCollection<string> sources);
+    }
+
+    internal class AssemblyGraphBuilder : IAssemblyGraphBuilder
+    {
+        private readonly string _projectPath;
+        private readonly CustomScriptAssembly _globalAssemblyDefinition;
+        private readonly CustomScriptAssembly _editorAssebmlyDefinition;
+        private readonly CustomScriptAssembly _globalFirstpassAssemblyDefinition;
+        private readonly CustomScriptAssembly _editorFirstpassAssemblyDefinition;
+        static readonly string _guidFormat = "N";
+
+        private readonly CustomScriptAssemblyReference[] _globalFirstpassAssemblyReferences;
+
+        private PathMultidimensionalDivisionTree<CustomScriptAssembly> _npp =
+            new PathMultidimensionalDivisionTree<CustomScriptAssembly>();
+
+        public AssemblyGraphBuilder(string projectPath)
+        {
+            _projectPath = projectPath;
+            _globalAssemblyDefinition = new CustomScriptAssembly
+            {
+                Name = "Assembly-CSharp",
+                PathPrefix = projectPath,
+                FilePath = Path.Combine(projectPath, "main.asmdef"),
+                GUID = CreateNewUnityGuid(),
+                IsPredefined = true,
+            };
+
+            _editorAssebmlyDefinition = new CustomScriptAssembly
+            {
+                Name = "Assembly-CSharp-Editor",
+                PathPrefix = Path.Combine(projectPath, "Editor"),
+                FilePath = Path.Combine(projectPath, "Editor/main-editor.asmdef"),
+                GUID = CreateNewUnityGuid(),
+                IsPredefined = true,
+            };
+
+            _globalFirstpassAssemblyDefinition = new CustomScriptAssembly
+            {
+                Name = "Assembly-CSharp-firstpass",
+                PathPrefix = Path.Combine(projectPath, "Plugins"),
+                FilePath = Path.Combine(projectPath, "Plugins/firstpass.asmdef"),
+                GUID = CreateNewUnityGuid(),
+                IsPredefined = true,
+            };
+
+            _editorFirstpassAssemblyDefinition = new CustomScriptAssembly
+            {
+                Name = "Assembly-CSharp-Editor-firstpass",
+                PathPrefix = Path.Combine(projectPath, "Plugins/Editor"),
+                FilePath = Path.Combine(projectPath, "Plugins/Editor/firstpass-editor.asmdef"),
+                GUID = CreateNewUnityGuid(),
+                IsPredefined = true,
+            };
+
+            _globalFirstpassAssemblyReferences = new[]
+            {
+                CustomScriptAssemblyReference.FromPathAndReference(
+                    Path.Combine(projectPath, "standard assets/standard assets.asmref"),
+                    _globalFirstpassAssemblyDefinition.Name),
+                CustomScriptAssemblyReference.FromPathAndReference(
+                    Path.Combine(projectPath, "pro standard assets/pro standard assets.asmref"),
+                    _globalFirstpassAssemblyDefinition.Name),
+                CustomScriptAssemblyReference.FromPathAndReference(
+                    Path.Combine(projectPath, "iphone standard assets/iphone standard assets.asmref"),
+                    _globalFirstpassAssemblyDefinition.Name),
+            };
+        }
+
+        public void Initialize(IReadOnlyCollection<CustomScriptAssembly> assemblies,
+            IReadOnlyCollection<CustomScriptAssemblyReference> customScriptAssemblyReferences)
+        {
+            var assemblyByNameLookup = assemblies.ToDictionary(x => x.Name, x => x);
+            var assemblyByGuidLookup = assemblies.ToDictionary(x => x.GUID, x => x);
+
+            bool rootOverridden = assemblies.Any(x => AssetPath.ComparePaths(x.PathPrefix, _projectPath));
+            if (!rootOverridden)
+            {
+                _npp.Insert(_globalAssemblyDefinition.PathPrefix, _globalAssemblyDefinition);
+                _npp.Insert(_editorAssebmlyDefinition.PathPrefix, _editorAssebmlyDefinition);
+                _npp.Insert(_globalFirstpassAssemblyDefinition.PathPrefix, _globalFirstpassAssemblyDefinition);
+                _npp.Insert(_editorFirstpassAssemblyDefinition.PathPrefix, _editorFirstpassAssemblyDefinition);
+            }
+
+            foreach (var assemblyDef in assemblies)
+            {
+                _npp.Insert(assemblyDef.PathPrefix, assemblyDef);
+            }
+
+            if (!rootOverridden)
+            {
+                foreach (var globalFirstpassAssemblyReference in _globalFirstpassAssemblyReferences)
+                {
+                    _npp.Insert(globalFirstpassAssemblyReference.PathPrefix, _globalFirstpassAssemblyDefinition);
+                }
+            }
+
+            foreach (var assemblyReference in customScriptAssemblyReferences)
+            {
+                CustomScriptAssembly foundAssemblyDef = null;
+                var foundAssemblyDefinition = GUIDReference.IsGUIDReference(assemblyReference.Reference)
+                    ? assemblyByGuidLookup.TryGetValue(GUIDReference.GUIDReferenceToGUID(assemblyReference.Reference),
+                        out foundAssemblyDef)
+                    : assemblyByNameLookup.TryGetValue(assemblyReference.Reference, out foundAssemblyDef);
+
+                if (foundAssemblyDefinition)
+                {
+                    _npp.Insert(assemblyReference.PathPrefix, foundAssemblyDef);
+                }
+                else
+                {
+                    Console.WriteLine(
+                        $"Assembly reference {assemblyReference.FilePath} has no target assembly definition");
+                }
+            }
+        }
+
+        public Dictionary<CustomScriptAssembly, List<string>> Match(
+            IReadOnlyCollection<string> sources)
+        {
+            var assemblyNameSources = new Dictionary<CustomScriptAssembly, List<string>>();
+
+            foreach (var source in sources)
+            {
+                var sourceSpan = source.AsSpan();
+                var currentMatchingAssemblyDefinition = _npp.MatchClosest(sourceSpan);
+                currentMatchingAssemblyDefinition =
+                    CheckAndUpdateEditorSpecialFolder(currentMatchingAssemblyDefinition, sourceSpan);
+
+                if (currentMatchingAssemblyDefinition == null)
+                {
+                    Console.WriteLine(
+                        $"Script '{source}' will not be compiled because it exists outside the Assets folder and does not to belong to any assembly definition file.");
+                    continue;
+                }
+
+                if (!assemblyNameSources.TryGetValue(currentMatchingAssemblyDefinition, out var sourceList))
+                {
+                    sourceList = new List<string>();
+                    assemblyNameSources[currentMatchingAssemblyDefinition] = sourceList;
+                }
+
+                sourceList.Add(source);
+            }
+
+            return assemblyNameSources;
+        }
+
+        internal static string CreateNewUnityGuid()
+        {
+            return Guid.NewGuid().ToString(_guidFormat);
+        }
+
+        private CustomScriptAssembly CheckAndUpdateEditorSpecialFolder(
+            CustomScriptAssembly currentMatchingAssemblyDefinition, ReadOnlySpan<char> sourceSpan)
+        {
+            int offset = currentMatchingAssemblyDefinition == null
+                ? 0
+                : currentMatchingAssemblyDefinition.PathPrefix.Length;
+
+            if (HasEditorSpecialFolder(sourceSpan[offset..]))
+            {
+                if (currentMatchingAssemblyDefinition == null ||
+                    currentMatchingAssemblyDefinition == _globalAssemblyDefinition)
+                {
+                    currentMatchingAssemblyDefinition = _editorAssebmlyDefinition;
+                }
+                else if (currentMatchingAssemblyDefinition == _globalFirstpassAssemblyDefinition)
+                {
+                    currentMatchingAssemblyDefinition = _editorFirstpassAssemblyDefinition;
+                }
+            }
+
+            return currentMatchingAssemblyDefinition;
+        }
+
+        internal static bool HasEditorSpecialFolder(ReadOnlySpan<char> remainingPath)
+        {
+            const string editorLower = "editor";
+            const string editorUpper = "EDITOR";
+
+            if (remainingPath.Length < editorLower.Length)
+            {
+                return false;
+            }
+
+            int matchOffset = 0;
+            for (int i = 0; i < remainingPath.Length; i++)
+            {
+                if (editorLower[matchOffset] == remainingPath[i] || editorUpper[matchOffset] == remainingPath[i])
+                {
+                    matchOffset++;
+                    if (matchOffset < editorLower.Length)
+                    {
+                        continue;
+                    }
+                    else if (i >= remainingPath.Length || Utility.IsPathSeparator(remainingPath[i + 1]))
+                    {
+                        return true;
+                    }
+                }
+
+                // forward to next path separator or end
+                for (; i < remainingPath.Length; i++)
+                {
+                    if (Utility.IsPathSeparator(remainingPath[i]))
+                    {
+                        break;
+                    }
+                }
+
+                matchOffset = 0;
+                if (remainingPath.Length - i < editorLower.Length)
+                {
+                    return false;
+                }
+            }
+
+            return matchOffset == editorLower.Length;
+        }
+    }
+}
diff --git a/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilderFactory.cs b/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilderFactory.cs
new file mode 100644
index 0000000000..18c077ccaa
--- /dev/null
+++ b/Editor/Mono/Scripting/ScriptCompilation/AssemblyGraphBuilderFactory.cs
@@ -0,0 +1,65 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace UnityEditor.Scripting.ScriptCompilation
+{
+    internal static class AssemblyGraphBuilderFactory
+    {
+        class AssemblyGraphBuilderKey
+        {
+            public bool Equals(AssemblyGraphBuilderKey other)
+            {
+                return string.Equals(projectPath, other.projectPath, StringComparison.Ordinal)
+                    && assemblies.SequenceEqual(other.assemblies)
+                    && customScriptAssemblyReferences.SequenceEqual(other.customScriptAssemblyReferences);
+            }
+
+            public override bool Equals(object obj)
+            {
+                if (ReferenceEquals(null, obj)) return false;
+                if (ReferenceEquals(this, obj)) return true;
+                if (obj.GetType() != this.GetType()) return false;
+                return Equals((AssemblyGraphBuilderKey) obj);
+            }
+
+            public override int GetHashCode()
+            {
+                return HashCode.Combine(projectPath, assemblies.Count, customScriptAssemblyReferences.Count);
+            }
+
+            public string projectPath;
+            public IReadOnlyCollection<CustomScriptAssembly> assemblies;
+            public IReadOnlyCollection<CustomScriptAssemblyReference> customScriptAssemblyReferences;
+        }
+
+        private static Dictionary<AssemblyGraphBuilderKey, AssemblyGraphBuilder> m_AlreadyInitializedAssemblyGraphBuilder =
+            new Dictionary<AssemblyGraphBuilderKey, AssemblyGraphBuilder>();
+
+        public static IAssemblyGraphBuilder GetOrCreate(string projectPath,
+            IReadOnlyCollection<CustomScriptAssembly> assemblies,
+            IReadOnlyCollection<CustomScriptAssemblyReference> customScriptAssemblyReferences)
+        {
+            var assemblyGraphBuilderKey = new AssemblyGraphBuilderKey
+            {
+                projectPath = projectPath,
+                assemblies = assemblies,
+                customScriptAssemblyReferences = customScriptAssemblyReferences,
+            };
+
+            if (!m_AlreadyInitializedAssemblyGraphBuilder.TryGetValue(assemblyGraphBuilderKey,
+                    out var assemblyGraphBuilder))
+            {
+                assemblyGraphBuilder = new AssemblyGraphBuilder(projectPath);
+                assemblyGraphBuilder.Initialize(assemblies, customScriptAssemblyReferences);
+                m_AlreadyInitializedAssemblyGraphBuilder[assemblyGraphBuilderKey] = assemblyGraphBuilder;
+            }
+
+            return assemblyGraphBuilder;
+        }
+    }
+}
diff --git a/Editor/Mono/Scripting/ScriptCompilation/AssetPath.cs b/Editor/Mono/Scripting/ScriptCompilation/AssetPath.cs
index f31b68f912..35404b24cd 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/AssetPath.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/AssetPath.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using UnityEditor.Utils;
 using File = System.IO.File;
 using SystemPath = System.IO.Path;
@@ -13,6 +14,42 @@ static class AssetPath
     {
         public static readonly char Separator = '/';
 
+        /// <summary>
+        /// Compares two paths
+        /// type of slashes is ignored, so different path separators is allowed
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <returns></returns>
+        public static bool ComparePaths(string left, string right)
+        {
+            var lengthDiff = left.Length - right.Length;
+            if (lengthDiff > 1 || lengthDiff < -1)
+                return false;
+
+            for (int i = 0; i < left.Length || i < right.Length; i++)
+            {
+                char leftCharLower = ' ';
+                char rightCharLower= ' ';
+                if (i < left.Length)
+                {
+                    leftCharLower = Utility.FastToLower(left[i]);
+                    leftCharLower = Utility.IsPathSeparator(leftCharLower) ? ' ' : leftCharLower;
+                }
+
+                if (i < right.Length)
+                {
+                    rightCharLower = Utility.FastToLower(right[i]);
+                    rightCharLower = Utility.IsPathSeparator(rightCharLower) ? ' ' : rightCharLower;
+                }
+
+                if (leftCharLower != rightCharLower)
+                    return false;
+            }
+
+            return true;
+        }
+
         public static string GetFullPath(string path)
         {
             return ReplaceSeparators(SystemPath.GetFullPath(path.NormalizePath()));
diff --git a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs
index f3b46f0366..f127250406 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/BeeScriptCompilation.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Bee.BeeDriver;
 using NiceIO;
@@ -22,6 +23,7 @@ namespace UnityEditor.Scripting.ScriptCompilation
     internal static class BeeScriptCompilation
     {
         internal static string ExecutableExtension => Application.platform == RuntimePlatform.WindowsEditor ? ".exe" : "";
+        private static string projectPath = Path.GetDirectoryName(Application.dataPath);
 
         public static void AddScriptCompilationData(BeeDriver beeDriver,
             EditorCompilation editorCompilation,
@@ -36,14 +38,6 @@ public static void AddScriptCompilationData(BeeDriver beeDriver,
             // as that acts on the same ScriptAssemblies, and modifies them with different build settings.
             var cachedAssemblies = AssemblyDataFrom(assemblies);
 
-            AssemblyData[] codeGenAssemblies;
-            using (new ProfilerMarker("GetScriptAssembliesForCodeGen").Auto())
-            {
-                codeGenAssemblies = buildingForEditor
-                    ? null
-                    : AssemblyDataFrom(CodeGenAssemblies(CompilationPipeline.GetScriptAssemblies(editorCompilation, AssembliesType.Editor, extraScriptingDefines)));
-            }
-
             var movedFromExtractorPath = EditorApplication.applicationContentsPath + $"/Tools/ScriptUpdater/ApiUpdater.MovedFromExtractor.exe";
             var dotNetSdkRoslynPath = EditorApplication.applicationContentsPath + $"/DotNetSdkRoslyn";
 
@@ -68,7 +62,7 @@ public static void AddScriptCompilationData(BeeDriver beeDriver,
             }
 
             var precompileAssemblies = editorCompilation.PrecompiledAssemblyProvider.GetPrecompiledAssembliesDictionary(
-                buildingForEditor,
+                options,
                 BuildPipeline.GetBuildTargetGroup(buildTarget),
                 buildTarget,
                 extraScriptingDefines);
@@ -92,7 +86,6 @@ public static void AddScriptCompilationData(BeeDriver beeDriver,
                 DotnetRoslynPath = dotNetSdkRoslynPath,
                 MovedFromExtractorPath = movedFromExtractorPath,
                 Assemblies = cachedAssemblies,
-                CodegenAssemblies = codeGenAssemblies,
                 Debug = debug,
                 BuildTarget = buildTarget.ToString(),
                 Localization = localization,
@@ -104,14 +97,6 @@ public static void AddScriptCompilationData(BeeDriver beeDriver,
             });
         }
 
-        private static ScriptAssembly[] CodeGenAssemblies(ScriptAssembly[] assemblies) =>
-            assemblies
-                .Where(assembly => UnityCodeGenHelpers.IsCodeGen(FileUtil.GetPathWithoutExtension(assembly.Filename)))
-                .SelectMany(assembly => assembly.AllRecursiveScripAssemblyReferencesIncludingSelf())
-                .Distinct()
-                .OrderBy(a => a.Filename)
-                .ToArray();
-
         private static AssemblyData[] AssemblyDataFrom(ScriptAssembly[] assemblies)
         {
             Array.Sort(assemblies, (a1, a2) => string.Compare(a1.Filename, a2.Filename, StringComparison.Ordinal));
@@ -127,6 +112,7 @@ private static AssemblyData AssemblyDataFrom(ScriptAssembly a, ScriptAssembly[]
             Array.Sort(a.Files, StringComparer.InvariantCulture);
             var references = a.ScriptAssemblyReferences.Select(r => Array.IndexOf(allAssemblies, r)).ToArray();
             Array.Sort(references);
+
             return new AssemblyData
             {
                 Name = new NPath(a.Filename).FileNameWithoutExtension,
@@ -138,13 +124,27 @@ private static AssemblyData AssemblyDataFrom(ScriptAssembly a, ScriptAssembly[]
                 RuleSet = a.CompilerOptions.RoslynAnalyzerRulesetPath,
                 LanguageVersion = a.CompilerOptions.LanguageVersion,
                 Analyzers = a.CompilerOptions.RoslynAnalyzerDllPaths,
+                AdditionalFiles = a.CompilerOptions.RoslynAdditionalFilePaths,
+                AnalyzerConfigPath = a.CompilerOptions.AnalyzerConfigPath,
                 UseDeterministicCompilation = a.CompilerOptions.UseDeterministicCompilation,
                 SuppressCompilerWarnings = (a.Flags & AssemblyFlags.SuppressCompilerWarnings) != 0,
                 Asmdef = a.AsmDefPath,
                 CustomCompilerOptions = a.CompilerOptions.AdditionalCompilerArguments,
                 BclDirectories = MonoLibraryHelpers.GetSystemReferenceDirectories(a.CompilerOptions.ApiCompatibilityLevel),
                 DebugIndex = index,
-                SkipCodeGen = a.SkipCodeGen
+                SkipCodeGen = a.SkipCodeGen,
+                Path = projectPath,
+            };
+        }
+
+        private static CompilerMessage AsCompilerMessage(BeeDriverResult.Message message)
+        {
+            return new CompilerMessage
+            {
+                message = message.Text,
+                type = message.Kind == BeeDriverResult.MessageKind.Error
+                    ? CompilerMessageType.Error
+                    : CompilerMessageType.Warning,
             };
         }
 
@@ -153,24 +153,33 @@ private static AssemblyData AssemblyDataFrom(ScriptAssembly a, ScriptAssembly[]
         /// We return them as an array of arrays, so on the caller side you're still able to map a compilermessage to the noderesult where it originated from,
         /// which we need when invoking per assembly compilation callbacks.
         /// </summary>
-        public static CompilerMessage[][] ParseAllNodeResultsIntoCompilerMessages(NodeResult[] nodeResults, EditorCompilation editorCompilation)
+        public static CompilerMessage[][] ParseAllResultsIntoCompilerMessages(BeeDriverResult.Message[] beeDriverMessages, NodeResult[] nodeResults, EditorCompilation editorCompilation)
         {
-            var result = new CompilerMessage[nodeResults.Length][];
+            // If there's any messages from the bee driver, we add one additional array to the result which contains all of the driver messages converted and augmented like the nodes messages arrays.
+            bool hasBeeDriverMessages = beeDriverMessages.Length > 0;
+            var result = new CompilerMessage[nodeResults.Length + (hasBeeDriverMessages ? 1 : 0)][];
 
-            int totalErrors = 0;
+            int resultIndex = 0;
+            if (hasBeeDriverMessages)
+            {
+                result[resultIndex] = beeDriverMessages.Select(AsCompilerMessage).ToArray();
+                ++resultIndex;
+            }
             for (int i = 0; i != nodeResults.Length; i++)
             {
-                var compilerMessages = ParseCompilerOutput(nodeResults[i]);
-
-                //To be more kind to performance issues in situations where there are thousands of compiler messages, we're going to assume
-                //that after the first 10 compiler error messages, we get very little benefit from augmenting the rest with higher quality unity specific messaging.
-                if (totalErrors < 10)
-                {
-                    UnitySpecificCompilerMessages.AugmentMessagesInCompilationErrorsWithUnitySpecificAdvice(compilerMessages, editorCompilation);
-                    totalErrors += compilerMessages.Count(m => m.type == CompilerMessageType.Error);
-                }
+                result[resultIndex] = ParseCompilerOutput(nodeResults[i]);
+                ++resultIndex;
+            }
 
-                result[i] = compilerMessages;
+            //To be more kind to performance issues in situations where there are thousands of compiler messages, we're going to assume
+            //that after the first 10 compiler error messages, we get very little benefit from augmenting the rest with higher quality unity specific messaging.
+            int totalErrors = 0;
+            int nextResultToAugment = 0;
+            while (totalErrors < 10 && nextResultToAugment < result.Length)
+            {
+                UnitySpecificCompilerMessages.AugmentMessagesInCompilationErrorsWithUnitySpecificAdvice(result[nextResultToAugment], editorCompilation);
+                totalErrors += result[nextResultToAugment].Count(m => m.type == CompilerMessageType.Error);
+                ++nextResultToAugment;
             }
 
             return result;
diff --git a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityBeeDriver.cs b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityBeeDriver.cs
index 9bc55a836e..211286a372 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityBeeDriver.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/BeeDriver/UnityBeeDriver.cs
@@ -109,13 +109,26 @@ private static void RecreateDagDirectoryIfNeeded(NPath dagDirectory)
             }
         }
 
-        public static BeeDriver Make(RunnableProgram buildProgram, EditorCompilation editorCompilation, string dagName, string dagDirectory = null, bool useScriptUpdater = true)
+        public static BeeDriver Make(RunnableProgram buildProgram, EditorCompilation editorCompilation, string dagName, ILPostProcessingProgram ilpp, string dagDirectory = null, bool useScriptUpdater = true)
         {
-            return Make(buildProgram, dagName, dagDirectory, useScriptUpdater, editorCompilation.projectDirectory);
+            return Make(buildProgram, dagName, dagDirectory, useScriptUpdater, editorCompilation.projectDirectory, ilpp, StdOutModeForScriptCompilation);
         }
 
-        public static BeeDriver Make(RunnableProgram buildProgram, string dagName,
-            string dagDirectory, bool useScriptUpdater, string projectDirectory, ProgressAPI progressAPI = null, RunnableProgram beeBackendProgram = null)
+        public const StdOutMode StdOutModeForScriptCompilation =
+            StdOutMode.LogStartArgumentsAndExitcode | StdOutMode.LogStdOutOnFinish;
+        public const StdOutMode StdOutModeForPlayerBuilds =
+            StdOutMode.LogStartArgumentsAndExitcode | StdOutMode.Stream;
+
+        public static BeeDriver Make(
+            RunnableProgram buildProgram,
+            string dagName,
+            string dagDirectory,
+            bool useScriptUpdater,
+            string projectDirectory,
+            ILPostProcessingProgram ilpp,
+            StdOutMode stdoutMode,
+            ProgressAPI progressAPI = null,
+            RunnableProgram beeBackendProgram = null)
         {
             var sourceFileUpdaters = useScriptUpdater
                 ? new[] {new UnityScriptUpdater(projectDirectory)}
@@ -127,7 +140,7 @@ public static BeeDriver Make(RunnableProgram buildProgram, string dagName,
 
             RecreateDagDirectoryIfNeeded(dagDir);
             NPath profilerOutputFile = UnityBeeDriverProfilerSession.GetTraceEventsOutputForNewBeeDriver() ?? $"{dagDir}/fullprofile.json";
-            var result = new BeeDriver(buildProgram, beeBackendProgram ?? UnityBeeBackendProgram(), projectDirectory, dagName, dagDir.ToString(), sourceFileUpdaters, processSourceFileUpdatersResult, progressAPI ?? new UnityProgressAPI("Script Compilation"), profilerOutputFile: profilerOutputFile.ToString());
+            var result = new BeeDriver(buildProgram, beeBackendProgram ?? UnityBeeBackendProgram(stdoutMode), projectDirectory, dagName, dagDir.ToString(), sourceFileUpdaters, processSourceFileUpdatersResult, progressAPI ?? new UnityProgressAPI("Script Compilation"), profilerOutputFile: profilerOutputFile.ToString());
 
             result.DataForBuildProgram.Add(new ConfigurationData
             {
@@ -143,17 +156,18 @@ public static BeeDriver Make(RunnableProgram buildProgram, string dagName,
                 AdvancedLicense = PlayerSettings.advancedLicense,
                 Batchmode = InternalEditorUtility.inBatchMode,
                 EmitDataForBeeWhy = (Debug.GetDiagnosticSwitch("EmitDataForBeeWhy").value as bool?)?? false,
+                NamedPipeOrUnixSocket = ilpp.NamedPipeOrUnixSocket,
             });
             return result;
         }
 
-        internal static RunnableProgram UnityBeeBackendProgram()
+        internal static RunnableProgram UnityBeeBackendProgram(StdOutMode stdoutMode)
         {
             return new SystemProcessRunnableProgram(BeeBackendExecutable, alwaysEnvironmentVariables: new Dictionary<string, string>()
             {
                 { "BEE_CACHE_BEHAVIOUR", "_"},
                 { "CHROMETRACE_TIMEOFFSET","unixepoch"}
-            }, stdOutMode: StdOutMode.LogStdOutOnFinish | StdOutMode.LogStartArgumentsAndExitcode);
+            }, stdOutMode: stdoutMode);
         }
     }
 }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/CompilationPipeline.cs b/Editor/Mono/Scripting/ScriptCompilation/CompilationPipeline.cs
index 47c3d6c6ba..09ac3ad2d5 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/CompilationPipeline.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/CompilationPipeline.cs
@@ -31,6 +31,8 @@ public class ScriptCompilerOptions
     {
         public string RoslynAnalyzerRulesetPath { get; set; }
         public string[] RoslynAnalyzerDllPaths { get; set; }
+        public string[] RoslynAdditionalFilePaths { get; set; }
+        public string AnalyzerConfigPath {get; set;}
         public bool AllowUnsafeCode { get; set; }
 
         [Obsolete("Use of reference assemblies is always enabled", true)]
@@ -53,6 +55,7 @@ public ScriptCompilerOptions()
             ApiCompatibilityLevel = ApiCompatibilityLevel.NET_Unity_4_8;
             ResponseFiles = new string[0];
             RoslynAnalyzerDllPaths = new string[0];
+            RoslynAdditionalFilePaths = new string[0];
             LanguageVersion = "9.0";
         }
 
@@ -61,6 +64,8 @@ internal ScriptCompilerOptions(ScriptCompilerOptions scriptCompilerOptions)
             ResponseFiles = new List<string>(scriptCompilerOptions.ResponseFiles).ToArray();
             RoslynAnalyzerDllPaths = new List<string>(scriptCompilerOptions.RoslynAnalyzerDllPaths).ToArray();
             RoslynAnalyzerRulesetPath = scriptCompilerOptions.RoslynAnalyzerRulesetPath;
+            AnalyzerConfigPath = scriptCompilerOptions.AnalyzerConfigPath;
+            RoslynAdditionalFilePaths = scriptCompilerOptions.RoslynAdditionalFilePaths;
             UseDeterministicCompilation = scriptCompilerOptions.UseDeterministicCompilation;
             AllowUnsafeCode = scriptCompilerOptions.AllowUnsafeCode;
             CodeOptimization = scriptCompilerOptions.CodeOptimization;
@@ -196,6 +201,7 @@ public static partial class CompilationPipeline
         public static event Action<object> compilationFinished;
         [Obsolete("Use compilationStarted, compilationFinished or assemblyCompilationFinished instead. Note that using any of these functions to do time measurements is a bad idea as they run async to actual compilation.")]
         public static event Action<string> assemblyCompilationStarted;
+        public static event Action<string> assemblyCompilationNotRequired;
         public static event Action<string, CompilerMessage[]> assemblyCompilationFinished;
 
         public static event Action<CodeOptimization> codeOptimizationChanged;
@@ -263,6 +269,18 @@ internal static void SubscribeToEvents(EditorCompilation editorCompilation)
                 }
             };
 
+            editorCompilation.assemblyCompilationNotRequired += (scriptAssembly) =>
+            {
+                try
+                {
+                    assemblyCompilationNotRequired?.Invoke(scriptAssembly.FullPath);
+                }
+                catch (Exception e)
+                {
+                    UnityEngine.Debug.LogException(e);
+                }
+            };
+
             editorCompilation.assemblyCompilationFinished += (scriptAssembly, messages) =>
             {
                 try
@@ -327,7 +345,7 @@ internal static ScriptAssembly[] GetScriptAssemblies(IEditorCompilation editorCo
             var buildingForEditor = (options & EditorScriptCompilationOptions.BuildingForEditor) != 0;
 
             var unityAssemblies = InternalEditorUtility.GetUnityAssemblies(buildingForEditor, @group, target);
-            var precompiledAssemblies = editorCompilation.PrecompiledAssemblyProvider.GetPrecompiledAssembliesDictionary(buildingForEditor, @group, target, extraScriptingDefines);
+            var precompiledAssemblies = editorCompilation.PrecompiledAssemblyProvider.GetPrecompiledAssembliesDictionary(options, @group, target, extraScriptingDefines);
             return editorCompilation.GetAllScriptAssemblies(options, unityAssemblies, precompiledAssemblies, null);
         }
 
@@ -438,7 +456,10 @@ public static string[] GetPrecompiledAssemblyNames()
 
         internal static string[] GetPrecompiledAssemblyNames(PrecompiledAssemblyProviderBase precompiledAssemblyProvider)
         {
-            return precompiledAssemblyProvider.GetPrecompiledAssemblies(true, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget)
+            return precompiledAssemblyProvider.GetPrecompiledAssemblies(
+                EditorScriptCompilationOptions.BuildingForEditor|EditorScriptCompilationOptions.BuildingWithAsserts,
+                EditorUserBuildSettings.activeBuildTargetGroup,
+                EditorUserBuildSettings.activeBuildTarget)
                 .Where(x => (x.Flags & sc.AssemblyFlags.UserAssembly) == sc.AssemblyFlags.UserAssembly)
                 .Select(x => AssetPath.GetFileName(x.Path))
                 .ToArray();
@@ -492,7 +513,10 @@ internal static string[] GetPrecompiledAssemblyPaths(PrecompiledAssemblySources
             if ((precompiledAssemblySources & PrecompiledAssemblySources.UserAssembly) != 0)
                 flags |= sc.AssemblyFlags.UserAssembly;
 
-            var precompiledAssemblies = precompiledAssemblyProvider.GetPrecompiledAssemblies(true, buildTargetGroup, buildTarget)
+            var precompiledAssemblies = precompiledAssemblyProvider.GetPrecompiledAssemblies(
+                EditorScriptCompilationOptions.BuildingForEditor | EditorScriptCompilationOptions.BuildingWithAsserts,
+                buildTargetGroup,
+                buildTarget)
                 .Concat(precompiledAssemblyProvider.GetUnityAssemblies(true, buildTarget));
 
             foreach (var a in precompiledAssemblies.Where(x => (x.Flags & flags) != 0))
@@ -509,7 +533,11 @@ public static string GetPrecompiledAssemblyPathFromAssemblyName(string assemblyN
 
         internal static string GetPrecompiledAssemblyPathFromAssemblyName(string assemblyName, PrecompiledAssemblyProviderBase precompiledAssemblyProvider, string[] extraScriptingDefines = null)
         {
-            var precompiledAssemblies = precompiledAssemblyProvider.GetPrecompiledAssemblies(true, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget, extraScriptingDefines);
+            var precompiledAssemblies = precompiledAssemblyProvider.GetPrecompiledAssemblies(
+                EditorScriptCompilationOptions.BuildingForEditor | EditorScriptCompilationOptions.BuildingWithAsserts,
+                EditorUserBuildSettings.activeBuildTargetGroup,
+                EditorUserBuildSettings.activeBuildTarget,
+                extraScriptingDefines);
 
             foreach (var assembly in precompiledAssemblies)
             {
@@ -624,8 +652,7 @@ internal static string GetAssemblyRootNamespaceFromScriptPath(EditorCompilation
             try
             {
                 var csa = editorCompilation.FindCustomScriptAssemblyFromScriptPath(sourceFilePath);
-                return csa != null ? csa.RootNamespace : projectRootNamespace;
-            }
+                return csa != null ? (csa.RootNamespace ?? projectRootNamespace) : projectRootNamespace;            }
             catch (Exception)
             {
                 return null;
diff --git a/Editor/Mono/Scripting/ScriptCompilation/CompilationSetupErrorsTracker.cs b/Editor/Mono/Scripting/ScriptCompilation/CompilationSetupErrorsTracker.cs
index 04ba48f90d..92b9a68960 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/CompilationSetupErrorsTracker.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/CompilationSetupErrorsTracker.cs
@@ -27,30 +27,13 @@ interface ICompilationSetupWarningTracker
 
     static class CompilationSetupErrorsTrackerExtensions
     {
-        public static void ProcessPrecompiledAssemblyException(this ICompilationSetupErrorsTracker tracker, PrecompiledAssemblyException exception)
-        {
-            tracker.SetCompilationSetupErrors(CompilationSetupErrors.PrecompiledAssemblyError);
-            tracker.LogCompilationSetupErrors(CompilationSetupErrors.PrecompiledAssemblyError, exception.filePaths, exception.Message);
-        }
-
         public static bool ProcessException(this ICompilationSetupErrorsTracker tracker, Exception exception)
         {
             var assemblyDefinitionException = exception as AssemblyDefinitionException;
-            var precompiledAssemblyException = exception as PrecompiledAssemblyException;
 
             if (assemblyDefinitionException != null && assemblyDefinitionException.filePaths.Length > 0)
             {
-                tracker.LogCompilationSetupErrors(
-                    assemblyDefinitionException.errorType == AssemblyDefinitionErrorType.LoadError ?
-                    CompilationSetupErrors.LoadError : CompilationSetupErrors.CyclicReferences,
-                    assemblyDefinitionException.filePaths, assemblyDefinitionException.Message);
-                return true;
-            }
-            else if (precompiledAssemblyException != null)
-            {
-                // PrecompiledAssemblyException was potentially processed earlier at the GetPrecompiledAssemblies call site
-                // if it was called in the context of script compilation within the editor.
-                UnityEngine.Debug.LogException(exception);
+                tracker.LogCompilationSetupErrors(CompilationSetupErrors.LoadError, assemblyDefinitionException.filePaths, assemblyDefinitionException.Message);
                 return true;
             }
 
diff --git a/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs b/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs
index ea31988a90..5254624fd3 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssembly.cs
@@ -249,6 +249,8 @@ class CustomScriptAssembly
 
         private AssemblyFlags assemblyFlags = AssemblyFlags.None;
 
+        public bool IsPredefined { get; set; }
+
         public AssemblyFlags AssemblyFlags
         {
             get
@@ -347,7 +349,9 @@ public bool IsCompatibleWith(BuildTarget buildTarget, EditorScriptCompilationOpt
             }
 
             if (defines != null && defines.Length == 0)
+            {
                 throw new ArgumentException("Defines cannot be empty", nameof(defines));
+            }
 
             // Log invalid define constraints
             if (DefineConstraints != null)
@@ -360,8 +364,10 @@ public bool IsCompatibleWith(BuildTarget buildTarget, EditorScriptCompilationOpt
                     }
                 }
             }
-            var allDefines = ArrayHelper.Merge(defines, ResponseFileDefines);
-            if (!DefineConstraintsHelper.IsDefineConstraintsCompatible(allDefines, DefineConstraints))
+            var allDefines = ResponseFileDefines != null ?
+                (defines != null ? defines.Concat(ResponseFileDefines) : ResponseFileDefines)
+                : defines;
+            if (!DefineConstraintsHelper.IsDefineConstraintsCompatible_Enumerable(allDefines, DefineConstraints))
             {
                 return false;
             }
@@ -373,13 +379,19 @@ public bool IsCompatibleWith(BuildTarget buildTarget, EditorScriptCompilationOpt
 
             // Compatible with editor and all platforms.
             if (IncludePlatforms == null && ExcludePlatforms == null)
+            {
                 return true;
+            }
 
             if (buildingForEditor)
+            {
                 return IsCompatibleWithEditor();
+            }
 
             if (ExcludePlatforms != null)
+            {
                 return ExcludePlatforms.All(p => p.BuildTarget != buildTarget);
+            }
 
             return IncludePlatforms.Any(p => p.BuildTarget == buildTarget);
         }
@@ -489,5 +501,42 @@ public static CustomScriptAssemblyPlatform GetPlatformFromBuildTarget(BuildTarge
 
             throw new System.ArgumentException(string.Format("No CustomScriptAssemblyPlatform setup for BuildTarget '{0}'", buildTarget));
         }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((CustomScriptAssembly) obj);
+        }
+
+        public bool Equals(CustomScriptAssembly other)
+        {
+            return assemblyFlags == other.assemblyFlags
+                   && string.Equals(FilePath, other.FilePath, StringComparison.Ordinal)
+                   && string.Equals(PathPrefix, other.PathPrefix, StringComparison.Ordinal)
+                   && string.Equals(Name, other.Name, StringComparison.Ordinal)
+                   && string.Equals(RootNamespace, other.RootNamespace, StringComparison.Ordinal)
+                   && GUID == other.GUID
+                   && Equals(References, other.References)
+                   && Equals(AdditionalPrefixes, other.AdditionalPrefixes)
+                   && Equals(IncludePlatforms, other.IncludePlatforms)
+                   && Equals(ExcludePlatforms, other.ExcludePlatforms)
+                   && Equals(AssetPathMetaData, other.AssetPathMetaData)
+                   && Equals(CompilerOptions, other.CompilerOptions)
+                   && OverrideReferences == other.OverrideReferences
+                   && Equals(PrecompiledReferences, other.PrecompiledReferences)
+                   && AutoReferenced == other.AutoReferenced
+                   && Equals(DefineConstraints, other.DefineConstraints)
+                   && Equals(VersionDefines, other.VersionDefines)
+                   && Equals(ResponseFileDefines, other.ResponseFileDefines)
+                   && NoEngineReferences == other.NoEngineReferences
+                   && IsPredefined == other.IsPredefined;
+        }
+
+        public override int GetHashCode()
+        {
+            return GUID.GetHashCode();
+        }
     }
 }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssemblyReference.cs b/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssemblyReference.cs
index c0bf4a8f9b..fa676363b5 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssemblyReference.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/CustomScriptAssemblyReference.cs
@@ -32,6 +32,26 @@ public static string ToJson(CustomScriptAssemblyReferenceData data)
 
     class CustomScriptAssemblyReference
     {
+        public bool Equals(CustomScriptAssemblyReference other)
+        {
+            return string.Equals(FilePath, other.FilePath, StringComparison.Ordinal)
+                   && string.Equals(PathPrefix, other.PathPrefix, StringComparison.Ordinal)
+                   && string.Equals(Reference, other.Reference, StringComparison.Ordinal);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != this.GetType()) return false;
+            return Equals((CustomScriptAssemblyReference) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(FilePath, PathPrefix, Reference);
+        }
+
         public string FilePath { get; set; }
         public string PathPrefix { get; set; }
         public string Reference { get; set; } // Name or GUID
@@ -51,6 +71,18 @@ public static CustomScriptAssemblyReference FromCustomScriptAssemblyReferenceDat
             return customScriptAssemblyReference;
         }
 
+        public static CustomScriptAssemblyReference FromPathAndReference(string path, string reference)
+        {
+            var pathPrefix = path.Substring(0, path.Length - AssetPath.GetFileName(path).Length);
+
+            var customScriptAssemblyReference = new CustomScriptAssemblyReference();
+            customScriptAssemblyReference.FilePath = path;
+            customScriptAssemblyReference.PathPrefix = pathPrefix;
+            customScriptAssemblyReference.Reference = reference;
+
+            return customScriptAssemblyReference;
+        }
+
         public CustomScriptAssemblyReferenceData CreateData()
         {
             return new CustomScriptAssemblyReferenceData() { reference = Reference };
diff --git a/Editor/Mono/Scripting/ScriptCompilation/DefineConstraintsHelper.cs b/Editor/Mono/Scripting/ScriptCompilation/DefineConstraintsHelper.cs
index 0b1629c3a3..62530329cc 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/DefineConstraintsHelper.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/DefineConstraintsHelper.cs
@@ -18,7 +18,7 @@ static class DefineConstraintsHelper
         // Characters that we consider valid whitespaces.
         public static readonly char[] k_ValidWhitespaces = { ' ', '\t' };
 
-        static Regex s_SplitAndKeep = new Regex("(\\|\\|)", RegexOptions.Compiled);
+        static Regex s_SplitAndKeep = null;
 
         public enum DefineConstraintStatus
         {
@@ -30,55 +30,60 @@ public enum DefineConstraintStatus
         [RequiredByNativeCode]
         public static bool IsDefineConstraintsCompatible(string[] defines, string[] defineConstraints)
         {
-            if (defines == null && defineConstraints == null || defineConstraints == null || defineConstraints.Length == 0)
-            {
-                return true;
-            }
-
-            GetDefineConstraintsCompatibility(defines, defineConstraints, out bool[] defineConstraintsValidity);
-
-            return defineConstraintsValidity.All(c => c);
+            return IsDefineConstraintsCompatible_Enumerable(defines.AsEnumerable<string>(), defineConstraints.AsEnumerable<string>());
         }
 
-        static void GetDefineConstraintsCompatibility(string[] defines, string[] defineConstraints, out bool[] defineConstraintsValidity)
+        // This is not called IsDefineConstraintsCompatible because the bindings generator does not support overloads
+        public static bool IsDefineConstraintsCompatible_Enumerable(IEnumerable<string> defines, IEnumerable<string> defineConstraints)
         {
-            defineConstraintsValidity = new bool[defineConstraints.Length];
+            if (defines == null && defineConstraints == null || defineConstraints == null || !defineConstraints.Any())
+            {
+                return true;
+            }
 
-            for (int i = 0; i < defineConstraints.Length; ++i)
+            foreach (var constraint in defineConstraints)
             {
-                defineConstraintsValidity[i] = GetDefineConstraintCompatibility(defines, defineConstraints[i]) == DefineConstraintStatus.Compatible;
+                if (GetDefineConstraintCompatibility(defines, constraint) != DefineConstraintStatus.Compatible)
+                {
+                    return false;
+                }
             }
+
+            return true;
         }
 
-        internal static DefineConstraintStatus GetDefineConstraintCompatibility(string[] defines, string defineConstraints)
+        internal static DefineConstraintStatus GetDefineConstraintCompatibility(IEnumerable<string> defines, string defineConstraints)
         {
             if (string.IsNullOrEmpty(defineConstraints))
             {
                 return DefineConstraintStatus.Invalid;
             }
 
+            if (s_SplitAndKeep == null)
+                s_SplitAndKeep = new Regex("(\\|\\|)", RegexOptions.Compiled);
+
             // Split by "||" (OR) and keep it in the resulting array
-            var splitDefines = s_SplitAndKeep.Split(defineConstraints);
+            var splitDefineConstraints = s_SplitAndKeep.Split(defineConstraints);
 
             // Trim what we consider valid space characters
-            for (var i = 0; i < splitDefines.Length; ++i)
+            for (var i = 0; i < splitDefineConstraints.Length; ++i)
             {
-                splitDefines[i] = splitDefines[i].Trim(k_ValidWhitespaces);
+                splitDefineConstraints[i] = splitDefineConstraints[i].Trim(k_ValidWhitespaces);
             }
 
             // Check for consecutive OR
-            for (var i = 0; i < splitDefines.Length; ++i)
+            for (var i = 0; i < splitDefineConstraints.Length; ++i)
             {
-                if (splitDefines[i] == Or && (i < splitDefines.Length - 1 && splitDefines[i + 1] == Or))
+                if (splitDefineConstraints[i] == Or && (i < splitDefineConstraints.Length - 1 && splitDefineConstraints[i + 1] == Or))
                 {
                     return DefineConstraintStatus.Invalid;
                 }
             }
 
-            var notExpectedDefines = new HashSet<string>(splitDefines.Where(x => x.StartsWith(Not, StringComparison.Ordinal) && x != Or).Select(x => x.Substring(1)));
-            var expectedDefines = new HashSet<string>(splitDefines.Where(x => !x.StartsWith(Not, StringComparison.Ordinal) && x != Or));
+            var notExpectedDefines = new HashSet<string>(splitDefineConstraints.Where(x => x.StartsWith(Not, StringComparison.Ordinal) && x != Or).Select(x => x.Substring(1)));
+            var expectedDefines = new HashSet<string>(splitDefineConstraints.Where(x => !x.StartsWith(Not, StringComparison.Ordinal) && x != Or));
 
-            if (defines == null)
+            if (defines == null || !defines.Any())
             {
                 if (expectedDefines.Count > 0)
                 {
diff --git a/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs b/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs
index e59b81c72a..9c046f1afd 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/EditorBuildRules.cs
@@ -32,7 +32,7 @@ public class CompilationAssemblies
             public string[] RoslynAnalyzerDllPaths { get; set; }
         }
 
-        static readonly TargetAssembly[] predefinedTargetAssemblies;
+        public static Dictionary<string, TargetAssembly> predefinedTargetAssemblies { get; private set; }
 
         private static readonly string[] s_CSharpVersionDefines =
         {
@@ -47,12 +47,12 @@ static EditorBuildRules()
 
         public static TargetAssembly[] GetPredefinedTargetAssemblies()
         {
-            return predefinedTargetAssemblies;
+            return predefinedTargetAssemblies.Values.ToArray();
         }
 
         public static string[] PredefinedTargetAssemblyNames
         {
-            get { return predefinedTargetAssemblies.Select(a => AssetPath.GetAssemblyNameWithoutExtension(a.Filename)).ToArray(); }
+            get { return predefinedTargetAssemblies.Select(a => AssetPath.GetAssemblyNameWithoutExtension(a.Key)).ToArray(); }
         }
 
         /// <summary>
@@ -205,23 +205,6 @@ public DirtyTargetAssembly()
             public HashSet<string> SourceFiles { get; set; }
         }
 
-        static bool ShouldUseAnalyzerForScriptAssembly(ScriptAssembly sa, TargetAssembly targetAssemblyOwningAnalyzer)
-        {
-            if (targetAssemblyOwningAnalyzer == null)
-                return true;
-
-            if (sa.Filename == targetAssemblyOwningAnalyzer.Filename)
-                return true;
-
-            foreach (var sar in sa.ScriptAssemblyReferences)
-            {
-                if (ShouldUseAnalyzerForScriptAssembly(sar, targetAssemblyOwningAnalyzer))
-                    return true;
-            }
-
-            return false;
-        }
-
         internal static ScriptAssembly[] ToScriptAssemblies(
             IDictionary<TargetAssembly, DirtyTargetAssembly> targetAssemblies,
             ScriptAssemblySettings settings,
@@ -253,7 +236,16 @@ internal static ScriptAssembly[] ToScriptAssemblies(
                 scriptAssembly.RootNamespace = targetAssembly.Type == TargetAssemblyType.Predefined ? settings.ProjectRootNamespace : targetAssembly.RootNamespace;
 
                 scriptAssembly.OutputDirectory = settings.OutputDirectory;
-                scriptAssembly.Defines = targetAssembly.Defines == null ? s_CSharpVersionDefines : targetAssembly.Defines.Concat(s_CSharpVersionDefines).ToArray();
+
+                var cSharpVersionDefines = targetAssembly.Defines == null ? s_CSharpVersionDefines.ToList() : targetAssembly.Defines.Concat(s_CSharpVersionDefines).ToList();
+
+                //This is used for Source Generation
+                if ((targetAssembly.Flags & AssemblyFlags.EditorOnly) == AssemblyFlags.EditorOnly)
+                {
+                    cSharpVersionDefines.Add("UNITY_EDITOR_ONLY_COMPILATION");
+                }
+
+                scriptAssembly.Defines = cSharpVersionDefines.ToArray();
                 scriptAssembly.Files = dirtyTargetAssembly.SourceFiles.ToArray();
                 scriptAssembly.TargetAssemblyType = targetAssembly.Type;
                 scriptAssembly.AsmDefPath = targetAssembly.AsmDefPath;
@@ -263,8 +255,6 @@ internal static ScriptAssembly[] ToScriptAssemblies(
                 else
                     scriptAssembly.CompilerOptions = targetAssembly.CompilerOptions;
 
-                scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths = new string[0];
-                scriptAssembly.CompilerOptions.RoslynAnalyzerRulesetPath = string.Empty;
                 scriptAssembly.CompilerOptions.AdditionalCompilerArguments = settings.AdditionalCompilerArguments;
 
                 var editorOnlyTargetAssembly = (targetAssembly.Flags & AssemblyFlags.EditorOnly) == AssemblyFlags.EditorOnly;
@@ -315,29 +305,7 @@ internal static ScriptAssembly[] ToScriptAssemblies(
             }
 
             if ((settings.CompilationOptions & EditorScriptCompilationOptions.BuildingWithRoslynAnalysis) != 0)
-            {
-                var analyzers = assemblies.RoslynAnalyzerDllPaths;
-                foreach (var a in analyzers)
-                {
-                    var targetAssemblyOwningAnalyzer = assemblies.CustomTargetAssemblies.Values
-                        .OrderBy(c => c.PathFilter(a)).LastOrDefault();
-
-                    if (targetAssemblyOwningAnalyzer?.PathFilter(a) <= 0)
-                        targetAssemblyOwningAnalyzer = null;
-
-                    foreach (var scriptAssembly in scriptAssemblies)
-                    {
-                        if (ShouldUseAnalyzerForScriptAssembly(scriptAssembly, targetAssemblyOwningAnalyzer))
-                        {
-                            scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths = scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths.Concat(new[] {a}).ToArray();
-                            scriptAssembly.CompilerOptions.RoslynAnalyzerRulesetPath =
-                                scriptAssembly.TargetAssemblyType == TargetAssemblyType.Predefined
-                                ? RuleSetFileCache.GetRuleSetFilePathInRootFolder(Path.ChangeExtension(scriptAssembly.Filename, null))
-                                : RuleSetFileCache.GetPathForAssembly(scriptAssembly.OriginPath);
-                        }
-                    }
-                }
-            }
+                RoslynAnalyzers.SetAnalyzers(scriptAssemblies, assemblies.CustomTargetAssemblies.Values.ToArray(), assemblies.RoslynAnalyzerDllPaths, false);
 
             return scriptAssemblies;
         }
@@ -648,7 +616,7 @@ public static bool IsCompatibleWithPlatformAndDefines(TargetAssembly assembly, B
             return IsCompatibleWithPlatformAndDefines(assembly, settings);
         }
 
-        internal static TargetAssembly[] CreatePredefinedTargetAssemblies()
+        internal static Dictionary<string, TargetAssembly> CreatePredefinedTargetAssemblies()
         {
             var runtimeFirstPassAssemblies = new List<TargetAssembly>();
             var runtimeAssemblies = new List<TargetAssembly>();
@@ -728,7 +696,7 @@ internal static TargetAssembly[] CreatePredefinedTargetAssemblies()
                 assembly.References.AddRange(editorFirstPassAssemblies);
             }
 
-            return assemblies.ToArray();
+            return assemblies.ToDictionary(x => x.Filename);
         }
 
         internal static TargetAssembly[] GetTargetAssembliesWithScripts(
@@ -772,32 +740,15 @@ internal static TargetAssembly GetTargetAssembly(string scriptPath, string assem
         {
             TargetAssembly resultAssembly;
 
-            if (customTargetAssemblies != null &&
+            if (assemblyName != null &&
+                customTargetAssemblies != null &&
                 customTargetAssemblies.Count > 0 &&
                 customTargetAssemblies.TryGetValue(assemblyName, out resultAssembly))
             {
                 return resultAssembly;
             }
 
-            // Do not compile scripts outside the Assets/ folder into predefined assemblies.
-            if (!Utility.IsAssetsPath(scriptPath))
-                return null;
-
-            return GetPredefinedTargetAssembly(scriptPath);
-        }
-
-        internal static TargetAssembly GetTargetAssemblyLinearSearch(string scriptPath, string projectDirectory, IDictionary<string, TargetAssembly> customTargetAssemblies)
-        {
-            TargetAssembly resultAssembly = GetCustomTargetAssembly(scriptPath, projectDirectory, customTargetAssemblies);
-
-            if (resultAssembly != null)
-                return resultAssembly;
-
-            // Do not compile scripts outside the Assets/ folder into predefined assemblies.
-            if (!Utility.IsAssetsPath(scriptPath))
-                return null;
-
-            return GetPredefinedTargetAssembly(scriptPath);
+            return GetPredefinedTargetAssembly(scriptPath, assemblyName);
         }
 
         static string ScriptPathToLowerCase(string scriptPath)
@@ -821,62 +772,33 @@ static string ScriptPathToLowerCase(string scriptPath)
             return new string(chars);
         }
 
-        internal static TargetAssembly GetPredefinedTargetAssembly(string scriptPath)
+        internal static TargetAssembly GetPredefinedTargetAssembly(string scriptPath, string assemblyName = null)
         {
-            TargetAssembly resultAssembly = null;
-
-            var lowerPath = ScriptPathToLowerCase(scriptPath);
-            int highestPathDepth = -1;
-
-            foreach (var assembly in predefinedTargetAssemblies)
+            if (assemblyName == null)
             {
-                var pathFilter = assembly.PathFilter;
-                int pathDepth = -1;
+                TargetAssembly resultAssembly = null;
+                var lowerPath = ScriptPathToLowerCase(scriptPath);
+                int highestPathDepth = -1;
+                foreach (var assembly in predefinedTargetAssemblies.Values)
+                {
+                    var pathDepth = assembly.PathFilter?.Invoke(lowerPath) ?? 0;
+                     if (pathDepth <= highestPathDepth)
 
-                if (pathFilter == null)
-                    pathDepth = 0;
-                else
-                    pathDepth = pathFilter(lowerPath);
+                    {
+                     continue;
 
-                if (pathDepth > highestPathDepth)
-                {
+                    }
                     resultAssembly = assembly;
                     highestPathDepth = pathDepth;
                 }
+                return resultAssembly;
             }
 
-            return resultAssembly;
-        }
-
-        internal static TargetAssembly GetCustomTargetAssembly(string scriptPath, string projectDirectory, IDictionary<string, TargetAssembly> customTargetAssemblies)
-        {
-            if (customTargetAssemblies == null)
-                return null;
-
-            int highestPathDepth = -1;
-            TargetAssembly resultAssembly = null;
-
-            // CustomScriptAssembly paths are absolute, so we convert the scriptPath to an absolute path, if necessary.
-            bool isPathAbsolute = AssetPath.IsPathRooted(scriptPath);
-            var fullPath = isPathAbsolute ? AssetPath.GetFullPath(scriptPath) : AssetPath.Combine(projectDirectory, scriptPath);
-
-            foreach (var entry in customTargetAssemblies)
+            if (predefinedTargetAssemblies.TryGetValue(assemblyName, out var predefined))
             {
-                var assembly = entry.Value;
-
-                if (assembly.MaxPathLength <= highestPathDepth)
-                    continue;
-
-                int pathDepth = assembly.PathFilter(fullPath);
-
-                if (pathDepth <= highestPathDepth)
-                    continue;
-
-                resultAssembly = assembly;
-                highestPathDepth = pathDepth;
+                return predefined;
             }
-
-            return resultAssembly;
+            return null;
         }
 
         static int FilterAssemblyInFirstpassFolder(string pathName)
diff --git a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
index cff92f9917..9b30e9c6ae 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilation.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using NiceIO;
@@ -76,6 +77,8 @@ public struct CustomScriptAssemblyAndReference
         public IVersionDefinesConsoleLogs VersionDefinesConsoleLogs { get; set; } = new VersionDefinesConsoleLogs();
         public ICompilationSetupWarningTracker CompilationSetupWarningTracker { get; set; } = new CompilationSetupWarningTracker();
         public ISafeModeInfo SafeModeInfo { get; set; } = new SafeModeInfo();
+
+
         public bool EnableDiagnostics => (bool)Debug.GetDiagnosticSwitch("EnableDomainReloadTimings").value;
 
         internal string projectDirectory = string.Empty;
@@ -99,6 +102,7 @@ public struct CustomScriptAssemblyAndReference
 
         public event Action<object> compilationStarted;
         public event Action<object> compilationFinished;
+        public event Action<ScriptAssembly> assemblyCompilationNotRequired;
         public event Action<ScriptAssembly, UnityEditor.Compilation.CompilerMessage[]> assemblyCompilationFinished;
 
         class BeeScriptCompilationState
@@ -124,7 +128,7 @@ public Exception[] SetAssetPathsMetaData(AssetPathMetaData[] assetPathMetaDatas)
 
             var versionMetaDataComparer = new VersionMetaDataComparer();
 
-            m_VersionMetaDatas = assetPathMetaDatas ?
+            m_VersionMetaDatas = assetPathMetaDatas?
                 .Where(x => x.VersionMetaData != null)
                 .Select(x => x.VersionMetaData)
                 .Distinct(versionMetaDataComparer)
@@ -155,13 +159,26 @@ public Dictionary<string, VersionMetaData> GetVersionMetaDatas()
             return m_VersionMetaDatas;
         }
 
-        public void SetAllScripts(string[] allScripts, string[] assemblyFilenames)
+        private IAssemblyGraphBuilder GetAssemblyGraphBuilder()
+        {
+            return AssemblyGraphBuilderFactory.GetOrCreate(Path.Combine(projectDirectory, "Assets"),
+                loadingAssemblyDefinition.CustomScriptAssemblies,
+                loadingAssemblyDefinition.CustomScriptAssemblyReferences);
+        }
+
+        public void SetAllScripts(string[] allScripts)
         {
-            this.allScripts = new Dictionary<string, string>();
+            Assert.IsNotNull(customTargetAssemblies);
+            var graphBuilder = GetAssemblyGraphBuilder();
+            var graph = graphBuilder.Match(allScripts);
 
-            for (int i = 0; i < allScripts.Length; ++i)
+            this.allScripts.Clear();
+            foreach (var assemblyScriptsPair in graph)
             {
-                this.allScripts[allScripts[i]] = assemblyFilenames[i];
+                foreach (var scriptPath in assemblyScriptsPair.Value)
+                {
+                    this.allScripts.Add(scriptPath, assemblyScriptsPair.Key.Name  + ".dll");
+                }
             }
         }
 
@@ -210,29 +227,10 @@ public string GetCompileScriptsOutputDirectory()
         //Used by the TestRunner package.
         public PrecompiledAssembly[] GetAllPrecompiledAssemblies()
         {
-            return PrecompiledAssemblyProvider.GetPrecompiledAssemblies(true, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget);
-        }
-
-        Dictionary<string, PrecompiledAssembly> GetPrecompiledAssembliesDictionaryWithSetupErrorsTracking(bool isEditor, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines = null)
-        {
-            Dictionary<string, PrecompiledAssembly> precompiledAssemblies;
-            CompilationSetupErrorsTracker.ClearCompilationSetupErrors(CompilationSetupErrors.PrecompiledAssemblyError); // this will also remove the console errors associated with the setup error flags set in the past
-            try
-            {
-                precompiledAssemblies = PrecompiledAssemblyProvider.GetPrecompiledAssembliesDictionary(isEditor, buildTargetGroup, buildTarget, extraScriptingDefines);
-            }
-            catch (PrecompiledAssemblyException exception)
-            {
-                CompilationSetupErrorsTracker.ProcessPrecompiledAssemblyException(exception);
-                throw;
-            }
-
-            return precompiledAssemblies;
-        }
-
-        public PrecompiledAssembly[] GetPrecompiledAssembliesWithSetupErrorsTracking(bool isEditor, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines = null)
-        {
-            return GetPrecompiledAssembliesDictionaryWithSetupErrorsTracking(isEditor, buildTargetGroup, buildTarget, extraScriptingDefines)?.Values.ToArray();
+            return PrecompiledAssemblyProvider.GetPrecompiledAssemblies(
+                EditorScriptCompilationOptions.BuildingForEditor | EditorScriptCompilationOptions.BuildingWithAsserts,
+                EditorUserBuildSettings.activeBuildTargetGroup,
+                EditorUserBuildSettings.activeBuildTarget);
         }
 
         public void GetAssemblyDefinitionReferencesWithMissingAssemblies(out List<CustomScriptAssemblyReference> referencesWithMissingAssemblies)
@@ -387,105 +385,6 @@ bool VerifyReferencesIsCompiled(
             return removed;
         }
 
-        string[] CustomTargetAssembliesToFilePaths(IEnumerable<TargetAssembly> targetAssemblies)
-        {
-            var customAssemblies = targetAssemblies.Select(FindCustomTargetAssemblyFromTargetAssembly);
-            var filePaths = customAssemblies.Select(a => a.FilePath).ToArray();
-            return filePaths;
-        }
-
-        string CustomTargetAssemblyToFilePath(TargetAssembly targetAssembly)
-        {
-            return FindCustomTargetAssemblyFromTargetAssembly(targetAssembly).FilePath;
-        }
-
-        public struct CheckCyclicAssemblyReferencesFunctions
-        {
-            public Func<TargetAssembly, string> ToFilePathFunc;
-            public Func<IEnumerable<TargetAssembly>, string[]> ToFilePathsFunc;
-        }
-
-        static void CheckCyclicAssemblyReferencesDFS(TargetAssembly visitAssembly,
-            HashSet<TargetAssembly> visited,
-            HashSet<TargetAssembly> recursion,
-            CheckCyclicAssemblyReferencesFunctions functions)
-        {
-            visited.Add(visitAssembly);
-            recursion.Add(visitAssembly);
-
-            foreach (var reference in visitAssembly.References)
-            {
-                if (reference.Filename == visitAssembly.Filename)
-                {
-                    throw new AssemblyDefinitionException("Assembly contains a references to itself",
-                        AssemblyDefinitionErrorType.CyclicReferences, functions.ToFilePathFunc(visitAssembly));
-                }
-
-                if (recursion.Contains(reference))
-                {
-                    throw new AssemblyDefinitionException("Assembly with cyclic references detected",
-                        AssemblyDefinitionErrorType.CyclicReferences, functions.ToFilePathsFunc(recursion));
-                }
-
-                if (!visited.Contains(reference))
-                {
-                    CheckCyclicAssemblyReferencesDFS(reference,
-                        visited,
-                        recursion,
-                        functions);
-                }
-            }
-
-            recursion.Remove(visitAssembly);
-        }
-
-        public static void CheckCyclicAssemblyReferences(IDictionary<string, TargetAssembly> customTargetAssemblies,
-            CheckCyclicAssemblyReferencesFunctions functions)
-        {
-            if (customTargetAssemblies == null || customTargetAssemblies.Count < 1)
-            {
-                return;
-            }
-
-            var visited = new HashSet<TargetAssembly>();
-
-            foreach (var entry in customTargetAssemblies)
-            {
-                var assembly = entry.Value;
-                if (visited.Contains(assembly))
-                {
-                    continue;
-                }
-
-                var recursion = new HashSet<TargetAssembly>();
-                CheckCyclicAssemblyReferencesDFS(assembly,
-                    visited,
-                    recursion,
-                    functions);
-            }
-        }
-
-        void CheckCyclicAssemblyReferences()
-        {
-            try
-            {
-                CheckCyclicAssemblyReferencesFunctions functions;
-
-                functions.ToFilePathFunc = CustomTargetAssemblyToFilePath;
-                functions.ToFilePathsFunc = CustomTargetAssembliesToFilePaths;
-
-                CheckCyclicAssemblyReferences(customTargetAssemblies, functions);
-            }
-            catch (AssemblyDefinitionException e)
-            {
-                if (e.errorType == AssemblyDefinitionErrorType.CyclicReferences)
-                {
-                    CompilationSetupErrorsTracker.SetCompilationSetupErrors(CompilationSetupErrors.CyclicReferences);
-                }
-                throw;
-            }
-        }
-
         public static Exception[] UpdateCustomScriptAssemblies(CustomScriptAssembly[] customScriptAssemblies,
             List<CustomScriptAssemblyReference> customScriptAssemblyReferences,
             AssetPathMetaData[] assetPathsMetaData,
@@ -592,44 +491,42 @@ Exception[] UpdateCustomTargetAssemblies()
             }
 
             customTargetAssemblies = EditorBuildRules.CreateTargetAssemblies(loadingAssemblyDefinition.CustomScriptAssemblies);
-
-            CompilationSetupErrorsTracker.ClearCompilationSetupErrors(CompilationSetupErrors.CyclicReferences);
-
             return exceptions;
         }
 
         public void SkipCustomScriptAssemblyGraphValidation(bool skipChecks)
         {
+            // If we have successfully compiled and reloaded all assemblies, then we can skip asmdef compilation graph checks
+            // for setup errors like cyclic references, self-references, duplicate assembly names, etc.
+            // If there is compilation errors in a Safe Mode domain or a partially loaded domain (when SafeMode is forcefully exited),
+            // then we need to keep the graph validation checks to rediscover potential setup errors in subsequent compilations.
             skipCustomScriptAssemblyGraphValidation = skipChecks;
         }
 
-        public Exception[] SetAllCustomScriptAssemblyReferenceJsons(string[] paths)
+        public IEnumerable<Exception> SetAllCustomScriptAssemblyReferenceJsons(string[] paths)
         {
             return SetAllCustomScriptAssemblyReferenceJsonsContents(paths, null);
         }
 
-        public Exception[] SetAllCustomScriptAssemblyReferenceJsonsContents(string[] paths, string[] contents)
+        public IEnumerable<Exception> SetAllCustomScriptAssemblyReferenceJsonsContents(string[] paths, string[] contents)
         {
             RefreshLoadingAssemblyDefinition();
             loadingAssemblyDefinition.SetAllCustomScriptAssemblyReferenceJsonsContents(paths, contents);
-            return GetLoadingExceptions();
+            var updateExceptions = UpdateCustomTargetAssemblies();
+            return loadingAssemblyDefinition.Exceptions.Concat(updateExceptions);
         }
 
-        public Exception[] SetAllCustomScriptAssemblyJsons(string[] paths, string[] guids)
+        public IEnumerable<Exception> SetAllCustomScriptAssemblyJsons(string[] paths, string[] guids)
         {
             return SetAllCustomScriptAssemblyJsonContents(paths, null, guids);
         }
 
-        public Exception[] SetAllCustomScriptAssemblyJsonContents(string[] paths, string[] contents, string[] guids)
+        public IEnumerable<Exception> SetAllCustomScriptAssemblyJsonContents(string[] paths, string[] contents, string[] guids)
         {
             RefreshLoadingAssemblyDefinition();
             loadingAssemblyDefinition.SetAllCustomScriptAssemblyJsonContents(paths, contents, guids);
-            return GetLoadingExceptions();
-        }
-
-        Exception[] GetLoadingExceptions()
-        {
-            return loadingAssemblyDefinition.Exceptions.Concat(UpdateCustomTargetAssemblies()).ToArray();
+            var updateExceptions = UpdateCustomTargetAssemblies();
+            return loadingAssemblyDefinition.Exceptions.Concat(updateExceptions);
         }
 
         void RefreshLoadingAssemblyDefinition()
@@ -708,7 +605,7 @@ public CustomScriptAssembly FindCustomScriptAssemblyFromAssemblyName(string asse
             }
             else
             {
-                var assemblyNames = loadingAssemblyDefinition.CustomScriptAssemblies.Select(a => a.Name).ToArray();
+                var assemblyNames = loadingAssemblyDefinition.CustomScriptAssemblies.Select(a => a.Name);
                 var assemblyNamesString = string.Join(", ", assemblyNames);
                 exceptionMessage += " Assembly names: " + assemblyNamesString;
             }
@@ -718,22 +615,29 @@ public CustomScriptAssembly FindCustomScriptAssemblyFromAssemblyName(string asse
 
         public bool TryFindCustomScriptAssemblyFromScriptPath(string scriptPath, out CustomScriptAssembly customScriptAssembly)
         {
-            var customTargetAssembly = EditorBuildRules.GetCustomTargetAssembly(scriptPath, projectDirectory, customTargetAssemblies);
-            if (customTargetAssembly != null)
-            {
-                return TryFindCustomScriptAssemblyFromAssemblyName(customTargetAssembly.Filename, out customScriptAssembly);
-            }
+            var fullPath = AssetPath.IsPathRooted(scriptPath)
+                ? AssetPath.GetFullPath(scriptPath)
+                : AssetPath.Combine(projectDirectory, scriptPath);
 
-            customScriptAssembly = null;
-            return false;
+            var assemblyGraphBuilder = GetAssemblyGraphBuilder();
+            var dictionary = assemblyGraphBuilder.Match(new []{fullPath});
+
+            customScriptAssembly = dictionary.Keys.SingleOrDefault();;
+
+            if (customScriptAssembly is {IsPredefined: true})
+                customScriptAssembly = null;
+
+            return customScriptAssembly != null;
         }
 
         public CustomScriptAssembly FindCustomScriptAssemblyFromScriptPath(string scriptPath)
         {
-            var customTargetAssembly = EditorBuildRules.GetCustomTargetAssembly(scriptPath, projectDirectory, customTargetAssemblies);
-            var customScriptAssembly = customTargetAssembly != null ? FindCustomScriptAssemblyFromAssemblyName(customTargetAssembly.Filename) : null;
+            var fullPath = AssetPath.IsPathRooted(scriptPath)
+                ? AssetPath.GetFullPath(scriptPath)
+                : AssetPath.Combine(projectDirectory, scriptPath);
 
-            return customScriptAssembly;
+            var foundCustomScriptAssemblies = GetAssemblyGraphBuilder().Match(new []{fullPath});
+            return foundCustomScriptAssemblies.SingleOrDefault().Key;
         }
 
         public CustomScriptAssembly FindCustomTargetAssemblyFromTargetAssembly(TargetAssembly assembly)
@@ -791,20 +695,7 @@ string[] extraScriptingDefines
             CompileStatus compilationResult;
             using (new ProfilerMarker("Initiating Script Compilation").Auto())
             {
-                try
-                {
-                    compilationResult = CompileScriptsWithSettings(scriptAssemblySettings);
-                }
-                catch (PrecompiledAssemblyException)
-                {
-                    // The setup errors for this exception has already been logged earlier, so there's no need to log the exception.
-                    compilationResult = CompileStatus.CompilationFailed;
-                }
-            }
-
-            if (compilationResult != CompileStatus.Idle)
-            {
-                WarnIfThereAreScriptsThatDoNotBelongToAnyAssembly();
+                compilationResult = CompileScriptsWithSettings(scriptAssemblySettings);
             }
 
             return compilationResult;
@@ -853,14 +744,6 @@ void CancelActiveBuild()
             activeBeeBuild?.Driver.CancelBuild();
         }
 
-        void WarnIfThereAreScriptsThatDoNotBelongToAnyAssembly()
-        {
-            foreach (var script in GetScriptsThatDoNotBelongToAnyAssembly().OrderBy(s => s))
-            {
-                Debug.LogWarning($"Script '{script}' will not be compiled because it exists outside the Assets folder and does not to belong to any assembly definition file.");
-            }
-        }
-
         void WarnIfThereAreAssembliesWithoutAnyScripts(ScriptAssemblySettings scriptAssemblySettings, ScriptAssembly[] scriptAssemblies)
         {
             foreach (var targetAssembly in customTargetAssemblies.Values)
@@ -910,26 +793,14 @@ public CompileStatus CompileScriptsWithSettings(ScriptAssemblySettings scriptAss
                 PlayerSettings.EnableRoslynAnalyzers &&
                 (scriptAssemblySettings.CompilationOptions & EditorScriptCompilationOptions.BuildingWithRoslynAnalysis) != 0;
 
-            // If we have successfully compiled and reloaded all assemblies, then we can
-            // skip checks on the asmdef compilation graph to ensure there no
-            // setup errors like cyclic references, duplicate assembly names, etc.
-            // If there is compilation errors n Safe Mode domain or a partial domain (if SafeMode is forcefully exited),
-            // Then we need to keep the validation checks to rediscover potential setup errors in subsequent compilations.
-            if (!skipCustomScriptAssemblyGraphValidation)
-            {
-                CheckCyclicAssemblyReferences();
-            }
-
             ScriptAssembly[] scriptAssemblies;
-            try
+            if (scriptAssemblySettings.CompilationOptions.HasFlag(EditorScriptCompilationOptions.BuildingSkipCompile))
+                scriptAssemblies = Array.Empty<ScriptAssembly>();
+            else
             {
                 CompilationSetupWarningTracker.ClearAssetWarnings();
-                scriptAssemblies = GetAllScriptAssembliesOfType(scriptAssemblySettings, TargetAssemblyType.Undefined, CompilationSetupWarningTracker);
-            }
-            catch (PrecompiledAssemblyException)
-            {
-                // The setup errors for this exception has already been logged earlier, so there's no need to log the exception.
-                return CompileStatus.Idle;
+                scriptAssemblies = GetAllScriptAssembliesOfType(scriptAssemblySettings,
+                    TargetAssemblyType.Undefined, CompilationSetupWarningTracker);
             }
 
             // Do no start compilation if there is an setup error.
@@ -938,7 +809,8 @@ public CompileStatus CompileScriptsWithSettings(ScriptAssemblySettings scriptAss
                 return CompileStatus.Idle;
             }
 
-            WarnIfThereAreAssembliesWithoutAnyScripts(scriptAssemblySettings, scriptAssemblies);
+            if ((scriptAssemblySettings.CompilationOptions & EditorScriptCompilationOptions.BuildingSkipCompile) == 0)
+                WarnIfThereAreAssembliesWithoutAnyScripts(scriptAssemblySettings, scriptAssemblies);
 
             var debug = scriptAssemblySettings.CodeOptimization == CodeOptimization.Debug;
 
@@ -952,12 +824,12 @@ public CompileStatus CompileScriptsWithSettings(ScriptAssemblySettings scriptAss
                 $"{(scriptAssemblySettings.BuildingForEditor ? "E" : "P")}" +
                 $"{(scriptAssemblySettings.BuildingDevelopmentBuild ? "Dev" : "")}" +
                 $"{(debug ? "Dbg" : "")}" +
-                "";
+                $"{(scriptAssemblySettings.CompilationOptions.HasFlag(EditorScriptCompilationOptions.BuildingSkipCompile) ? "SkipCompile" : "")}";
 
             BuildTarget buildTarget = scriptAssemblySettings.BuildTarget;
             activeBeeBuild = new BeeScriptCompilationState()
             {
-                Driver = UnityBeeDriver.Make(ScriptCompilationBuildProgram, this, $"{(int)buildTarget}{config}", useScriptUpdater: !scriptAssemblySettings.BuildingWithoutScriptUpdater),
+                Driver = UnityBeeDriver.Make(ScriptCompilationBuildProgram, this, $"{(int)buildTarget}{config}", useScriptUpdater: !scriptAssemblySettings.BuildingWithoutScriptUpdater, ilpp: new ILPostProcessingProgram()),
                 settings = scriptAssemblySettings,
                 assemblies = scriptAssemblies,
             };
@@ -988,7 +860,11 @@ public CompileStatus CompileScriptsWithSettings(ScriptAssemblySettings scriptAss
         static SystemProcessRunnableProgram MakeScriptCompilationBuildProgram()
         {
             var buildProgramAssembly = new NPath($"{EditorApplication.applicationContentsPath}/Tools/BuildPipeline/ScriptCompilationBuildProgram.exe");
-            return new SystemProcessRunnableProgram($"{EditorApplication.applicationContentsPath}/Tools/netcorerun/netcorerun{BeeScriptCompilation.ExecutableExtension}", buildProgramAssembly.InQuotes(SlashMode.Native));
+            return new SystemProcessRunnableProgram(
+                $"{EditorApplication.applicationContentsPath}/Tools/netcorerun/netcorerun{BeeScriptCompilation.ExecutableExtension}",
+                new [] { buildProgramAssembly.InQuotes(SlashMode.Native) },
+                new () {{ "DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1" }}
+                );
         }
 
         public void InvokeCompilationStarted(object context)
@@ -1008,12 +884,13 @@ public bool DoesProjectFolderHaveAnyScripts()
 
         public ScriptAssemblySettings CreateScriptAssemblySettings(BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, EditorScriptCompilationOptions options)
         {
-            return CreateScriptAssemblySettings(buildTargetGroup, buildTarget, options, new string[] {});
+            return CreateScriptAssemblySettings(buildTargetGroup, buildTarget, options, new string[] { });
         }
 
         public ScriptAssemblySettings CreateScriptAssemblySettings(BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, EditorScriptCompilationOptions options, string[] extraScriptingDefines)
         {
             var predefinedAssembliesCompilerOptions = new ScriptCompilerOptions();
+            var namedBuildTarget = NamedBuildTarget.FromActiveSettings(buildTarget);
 
             if ((options & EditorScriptCompilationOptions.BuildingPredefinedAssembliesAllowUnsafeCode) == EditorScriptCompilationOptions.BuildingPredefinedAssembliesAllowUnsafeCode)
             {
@@ -1025,7 +902,7 @@ public ScriptAssemblySettings CreateScriptAssemblySettings(BuildTargetGroup buil
                 predefinedAssembliesCompilerOptions.UseDeterministicCompilation = true;
             }
 
-            predefinedAssembliesCompilerOptions.ApiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup));
+            predefinedAssembliesCompilerOptions.ApiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget);
 
             ICompilationExtension compilationExtension = null;
             if ((options & EditorScriptCompilationOptions.BuildingForEditor) == 0)
@@ -1033,8 +910,7 @@ public ScriptAssemblySettings CreateScriptAssemblySettings(BuildTargetGroup buil
                 compilationExtension = ModuleManager.FindPlatformSupportModule(ModuleManager.GetTargetStringFromBuildTarget(buildTarget))?.CreateCompilationExtension();
             }
 
-
-            List<string> additionalCompilationArguments = new List<string>(PlayerSettings.GetAdditionalCompilerArguments(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup)));
+            List<string> additionalCompilationArguments = new List<string>(PlayerSettings.GetAdditionalCompilerArguments(namedBuildTarget));
 
             if (PlayerSettings.suppressCommonWarnings)
             {
@@ -1070,18 +946,6 @@ ScriptAssemblySettings CreateEditorScriptAssemblySettings(EditorScriptCompilatio
         {
             return CreateScriptAssemblySettings(EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget, options);
         }
-
-        static CompilerMessage AsCompilerMessage(BeeDriverResult.Message message)
-        {
-            return new CompilerMessage
-            {
-                message = message.Text,
-                type = message.Kind == BeeDriverResult.MessageKind.Error
-                    ? CompilerMessageType.Error
-                    : CompilerMessageType.Warning,
-            };
-        }
-
         //only used in for tests to peek in.
         public CompilerMessage[] GetCompileMessages() => _currentEditorCompilationCompilerMessages;
 
@@ -1181,14 +1045,13 @@ public CompileStatus TickCompilationPipeline(EditorScriptCompilationOptions opti
                 return CompileStatus.Compiling;
             }
 
-            var messagesForNodeResults = ProcessCompilationResult(activeBeeBuild.assemblies, result, activeBeeBuild.settings.BuildingForEditor, activeBeeBuild);
+            var compilerMessages = ProcessCompilationResult(activeBeeBuild.assemblies, result, activeBeeBuild.settings.BuildingForEditor, activeBeeBuild).SelectMany(m => m).ToArray();
 
             int logIdentifier = activeBeeBuild.settings.BuildingForEditor
                 //these numbers are "randomly picked". they are used to so that when you log a message with a certain identifier, later all messages with that identifier can be cleared.
                 //one means "compilation error for compiling-assemblies-for-editor"  the other means "compilation error for building a player".
                 ? kLogIdentifierFor_EditorMessages
                 : kLogIdentifierFor_PlayerMessages;
-            var compilerMessages = result.BeeDriverMessages.Select(AsCompilerMessage).Concat(messagesForNodeResults.SelectMany(m => m)).ToArray();
 
             if (activeBeeBuild.settings.BuildingForEditor)
             {
@@ -1219,17 +1082,17 @@ public void DisableLoggingEditorCompilerMessages()
 
         public CompilerMessage[][] ProcessCompilationResult(ScriptAssembly[] assemblies, BeeDriverResult result, bool buildingForEditor, object context)
         {
-            var compilerMessagesForNodeResults = BeeScriptCompilation.ParseAllNodeResultsIntoCompilerMessages(result.NodeResults, this);
-            InvokeAssemblyCompilationFinished(assemblies, result, buildingForEditor, compilerMessagesForNodeResults);
+            var compilerMessages = BeeScriptCompilation.ParseAllResultsIntoCompilerMessages(result.BeeDriverMessages, result.NodeResults, this);
+            InvokeAssemblyCompilationFinished(assemblies, result, buildingForEditor, compilerMessages);
             InvokeCompilationFinished(context);
-            return compilerMessagesForNodeResults;
+            return compilerMessages;
         }
 
         void InvokeAssemblyCompilationFinished(ScriptAssembly[] assemblies, BeeDriverResult beeDriverResult, bool buildingForEditor, CompilerMessage[][] compilerMessagesForNodeResults)
         {
             bool Belongs(ScriptAssembly scriptAssembly, NodeResult nodeResult) => new NPath(nodeResult.outputfile).FileName == scriptAssembly.Filename;
 
-            //we want to send callbacks for assemblies that were copied, for assemblies that failed to compile, but not for assemblies that were compiled but not copied (because they ended up identically)
+            // We want to send callbacks for assemblies that were copied, for assemblies that failed to compile, but not for assemblies that were compiled but not copied (because they ended up identical).
             bool RequiresCallbackInvocation(ScriptAssembly scriptAssembly)
             {
                 var relatedNodes = beeDriverResult.NodeResults.Where(nodeResult => Belongs(scriptAssembly, nodeResult));
@@ -1240,6 +1103,8 @@ bool RequiresCallbackInvocation(ScriptAssembly scriptAssembly)
             {
                 if (!RequiresCallbackInvocation(scriptAssembly))
                 {
+                    // Report that an assembly was unchanged as a result of compilation.
+                    assemblyCompilationNotRequired?.Invoke(scriptAssembly);
                     continue;
                 }
 
@@ -1377,7 +1242,25 @@ public PrecompiledAssembly[] GetUnityAssemblies()
 
         public TargetAssemblyInfo GetTargetAssembly(string scriptPath)
         {
-            TargetAssembly targetAssembly = EditorBuildRules.GetTargetAssemblyLinearSearch(scriptPath, projectDirectory, customTargetAssemblies);
+            string path = scriptPath;
+            if (!Path.IsPathRooted(scriptPath))
+            {
+                path = Path.Combine(projectDirectory, scriptPath);
+            }
+
+            var matchedAssembly = GetAssemblyGraphBuilder().Match(new []{path});
+
+            TargetAssembly targetAssembly;
+            var scriptAssembly = matchedAssembly.Single().Key;
+
+            customTargetAssemblies.TryGetValue(scriptAssembly.Name + ".dll", out targetAssembly);
+
+            if (targetAssembly == null)
+            {
+                if (EditorBuildRules.predefinedTargetAssemblies.TryGetValue(scriptAssembly.Name + ".dll",
+                        out var assembly))
+                    targetAssembly = assembly;
+            }
 
             TargetAssemblyInfo targetAssemblyInfo = ToTargetAssemblyInfo(targetAssembly);
             return targetAssemblyInfo;
@@ -1385,7 +1268,8 @@ public TargetAssemblyInfo GetTargetAssembly(string scriptPath)
 
         public TargetAssembly GetTargetAssemblyDetails(string scriptPath)
         {
-            return EditorBuildRules.GetTargetAssemblyLinearSearch(scriptPath, projectDirectory, customTargetAssemblies);
+            var matchedAssembly = GetAssemblyGraphBuilder().Match(new []{scriptPath});
+            return customTargetAssemblies[matchedAssembly.Single().Key.Name];
         }
 
         public ScriptAssembly[] GetAllEditorScriptAssemblies(EditorScriptCompilationOptions additionalOptions)
@@ -1400,9 +1284,8 @@ public ScriptAssembly[] GetAllEditorScriptAssemblies(EditorScriptCompilationOpti
 
         public ScriptAssembly[] GetAllScriptAssemblies(EditorScriptCompilationOptions options, string[] defines)
         {
-            var isForEditor = (options & EditorScriptCompilationOptions.BuildingForEditor) == EditorScriptCompilationOptions.BuildingForEditor;
-            var precompiledAssemblies = GetPrecompiledAssembliesDictionaryWithSetupErrorsTracking(
-                isForEditor, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget, defines);
+            var precompiledAssemblies = PrecompiledAssemblyProvider.GetPrecompiledAssembliesDictionary(
+                options, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget, defines);
             return GetAllScriptAssemblies(options, unityAssemblies, precompiledAssemblies, defines);
         }
 
@@ -1589,7 +1472,7 @@ public ScriptAssembly[] GetAllScriptAssembliesOfType(ScriptAssemblySettings sett
             using (new ProfilerMarker(nameof(GetAllScriptAssembliesOfType)).Auto())
             {
                 var precompiledAssemblies =
-                    GetPrecompiledAssembliesDictionaryWithSetupErrorsTracking(settings.BuildingForEditor,
+                    PrecompiledAssemblyProvider.GetPrecompiledAssembliesDictionary(settings.CompilationOptions,
                         settings.BuildTargetGroup, settings.BuildTarget, settings.ExtraGeneralDefines);
 
                 UpdateAllTargetAssemblyDefines(customTargetAssemblies, EditorBuildRules.GetPredefinedTargetAssemblies(), m_VersionMetaDatas, settings);
@@ -1664,6 +1547,8 @@ static EditorScriptCompilationOptions ToEditorScriptCompilationOptions(AssemblyB
                 options |= EditorScriptCompilationOptions.BuildingForEditor;
             }
 
+            options |= EditorScriptCompilationOptions.BuildingWithRoslynAnalysis;
+
             return options;
         }
 
@@ -1703,11 +1588,11 @@ ScriptAssembly InitializeScriptAssemblyWithoutReferencesAndDefines(AssemblyBuild
                 Files = scriptFiles,
                 Filename = AssetPath.GetFileName(assemblyPath),
                 OutputDirectory = AssetPath.GetDirectoryName(assemblyPath),
-                CompilerOptions = assemblyBuilder.compilerOptions,
+                CompilerOptions = new ScriptCompilerOptions(assemblyBuilder.compilerOptions),
                 ScriptAssemblyReferences = new ScriptAssembly[0],
                 RootNamespace = string.Empty
             };
-            scriptAssembly.CompilerOptions.ApiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(assemblyBuilder.buildTargetGroup);
+            scriptAssembly.CompilerOptions.ApiCompatibilityLevel = PlayerSettings.GetApiCompatibilityLevel(NamedBuildTarget.FromActiveSettings(assemblyBuilder.buildTarget));
 
             return scriptAssembly;
         }
@@ -1741,6 +1626,24 @@ public ScriptAssembly CreateScriptAssembly(AssemblyBuilder assemblyBuilder)
             scriptAssembly.References = references.ToArray();
             scriptAssembly.Defines = defines.ToArray();
 
+            if (options.HasFlag(EditorScriptCompilationOptions.BuildingWithRoslynAnalysis))
+            {
+                RoslynAnalyzers.SetAnalyzers(
+                    new[] { scriptAssembly },
+                    customTargetAssemblies.Values.ToArray(),
+                    PrecompiledAssemblyProvider.GetRoslynAnalyzerPaths(),
+                    true);
+
+                // AssemblyBuilder can explicitly set analyzers and rule set
+                if (assemblyBuilder.compilerOptions.RoslynAnalyzerDllPaths != null)
+                    scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths = assemblyBuilder.compilerOptions.RoslynAnalyzerDllPaths
+                        .Concat(scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths)
+                        .ToArray();
+
+                if (!string.IsNullOrEmpty(assemblyBuilder.compilerOptions.RoslynAnalyzerRulesetPath))
+                    scriptAssembly.CompilerOptions.RoslynAnalyzerRulesetPath = assemblyBuilder.compilerOptions.RoslynAnalyzerRulesetPath;
+            }
+
             return scriptAssembly;
         }
 
@@ -1754,7 +1657,7 @@ string[] GetAssemblyBuilderDefaultReferences(ScriptAssembly scriptAssembly, Edit
 
             var customReferences = EditorBuildRules.GetCompiledCustomAssembliesReferences(scriptAssembly, customTargetAssemblies, GetCompileScriptsOutputDirectory());
 
-            var precompiledAssemblies = GetPrecompiledAssembliesWithSetupErrorsTracking(buildingForEditor, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget);
+            var precompiledAssemblies = PrecompiledAssemblyProvider.GetPrecompiledAssemblies(options, EditorUserBuildSettings.activeBuildTargetGroup, EditorUserBuildSettings.activeBuildTarget);
             // todo split implicit/explicit precompiled references
             var precompiledReferences = EditorBuildRules.GetPrecompiledReferences(scriptAssembly, TargetAssemblyType.Custom, options, EditorCompatibility.CompatibleWithEditor, precompiledAssemblies, null, null);
             var additionalReferences = MonoLibraryHelpers.GetSystemLibraryReferences(scriptAssembly.CompilerOptions.ApiCompatibilityLevel);
diff --git a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilationInterface.cs b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilationInterface.cs
index 813ca9986b..1d8616c039 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/EditorCompilationInterface.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/EditorCompilationInterface.cs
@@ -37,9 +37,9 @@ static void LogException(Exception exception)
             UnityEngine.Debug.LogException(exception);
         }
 
-        static void EmitExceptionsAsErrors(Exception[] exceptions)
+        static void EmitExceptionsAsErrors(IEnumerable<Exception> exceptions)
         {
-            if (exceptions == null || exceptions.Length == 0)
+            if (exceptions == null)
                 return;
 
             foreach (var exception in exceptions)
@@ -78,9 +78,9 @@ public static void SetAdditionalVersionMetaDatas(VersionMetaData[] versionMetaDa
         }
 
         [RequiredByNativeCode]
-        public static void SetAllScripts(string[] allScripts, string[] assemblyFilenames)
+        public static void SetAllScripts(string[] allScripts)
         {
-            Instance.SetAllScripts(allScripts, assemblyFilenames);
+            Instance.SetAllScripts(allScripts);
         }
 
         [RequiredByNativeCode]
@@ -201,6 +201,16 @@ public static bool IsCompilationPending()
             return Instance.IsScriptCompilationRequested();
         }
 
+        [RequiredByNativeCode]
+        // Unlike IsCompiling, this will only return true if compilation has actually started (and not if compilation
+        // is requested but has not started yet). We are using this for the BuildPlayer check (to not allow starting
+        // a player build if script compilation is in progress). We do allow starting a player build if compilation is
+        // requested (with a warning), as a common flow used in user build scripts is "Change defines -> Build Player".
+        public static bool IsCompilationInProgress()
+        {
+            return Instance.IsCompilationTaskCompiling() || Instance.IsAnyAssemblyBuilderCompiling();
+        }
+
         [RequiredByNativeCode]
         public static bool IsCompiling()
         {
diff --git a/Editor/Mono/Scripting/ScriptCompilation/EditorScriptCompilationOptions.cs b/Editor/Mono/Scripting/ScriptCompilation/EditorScriptCompilationOptions.cs
index 6e4b1c3e08..da9e57e3c3 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/EditorScriptCompilationOptions.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/EditorScriptCompilationOptions.cs
@@ -23,5 +23,6 @@ enum EditorScriptCompilationOptions
         BuildingWithRoslynAnalysis = 1 << 10,
         BuildingWithoutScriptUpdater = 1 << 11,
         BuildingExtractTypeDB = 1 << 12,
+        BuildingSkipCompile = 1 << 13,
     }
 }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/ILPostProcessingProgram.cs b/Editor/Mono/Scripting/ScriptCompilation/ILPostProcessingProgram.cs
new file mode 100644
index 0000000000..f90f3d93c4
--- /dev/null
+++ b/Editor/Mono/Scripting/ScriptCompilation/ILPostProcessingProgram.cs
@@ -0,0 +1,37 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using UnityEditor.Scripting.Compilers;
+using UnityEditor.Utils;
+using UnityEngine;
+using UnityEngine.Bindings;
+
+namespace UnityEditor.Scripting.ScriptCompilation
+{
+    class ILPostProcessingProgram
+    {
+        public virtual string NamedPipeOrUnixSocket
+        {
+            get
+            {
+                var name = EnsureRunningAndGetSocketOrNamedPipe();
+                if (string.IsNullOrEmpty(name))
+                {
+                    UnityEngine.Debug.LogWarning("IL Post Processing agent failed to start. Any IL Post Processing task will fail");
+                }
+                return name;
+            }
+        }
+
+        [NativeHeader("Editor/Src/ScriptCompilation/ILPPExternalProcess.h")]
+        [FreeFunction("ILPPExternalProcess::EnsureRunningAndGetSocketOrNamedPipe", IsThreadSafe = true)]
+        private static extern string EnsureRunningAndGetSocketOrNamedPipe();
+    }
+}
diff --git a/Editor/Mono/Scripting/ScriptCompilation/MonoLibraryHelpers.cs b/Editor/Mono/Scripting/ScriptCompilation/MonoLibraryHelpers.cs
index 6dbca5b68c..fec1b754f0 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/MonoLibraryHelpers.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/MonoLibraryHelpers.cs
@@ -7,25 +7,22 @@
 using System.Linq;
 using UnityEditor.Scripting.Compilers;
 using UnityEditor.Utils;
+using UnityEngine.Scripting;
 
 namespace UnityEditor.Scripting.ScriptCompilation
 {
     static class MonoLibraryHelpers
     {
-        class CachedReferences
-        {
-            public ApiCompatibilityLevel ApiCompatibilityLevel;
-            public string[] References;
-        }
-
-        static CachedReferences cachedReferences;
+        static Dictionary<ApiCompatibilityLevel, string[]> cachedApiCompatibilityLevelReferences = new Dictionary<ApiCompatibilityLevel, string[]>();
 
+        [RequiredByNativeCode]
         public static string[] GetSystemLibraryReferences(ApiCompatibilityLevel apiCompatibilityLevel)
         {
             return GetCachedSystemLibraryReferences(apiCompatibilityLevel);
         }
 
-        static string[] FindReferencesInDirectories(this string[] references, string[] directories)
+
+        static string[] FindReferencesInDirectories(this IEnumerable<string> references, string[] directories)
         {
             return (
                 from reference in references
@@ -39,13 +36,13 @@ static string[] GetCachedSystemLibraryReferences(ApiCompatibilityLevel apiCompat
         {
             // We cache the references because they are computed by getting files in directories on disk,
             // which is very slow.
-            if (cachedReferences != null && cachedReferences.ApiCompatibilityLevel == apiCompatibilityLevel)
+            if (cachedApiCompatibilityLevelReferences.TryGetValue(apiCompatibilityLevel, out var cachedReferences))
             {
-                return cachedReferences.References;
+                return cachedReferences;
             }
 
             var references = new List<string>();
-            var monoAssemblyDirectories = GetSystemReferenceDirectories(apiCompatibilityLevel);
+
 
             if (apiCompatibilityLevel == ApiCompatibilityLevel.NET_Standard)
             {
@@ -53,26 +50,21 @@ static string[] GetCachedSystemLibraryReferences(ApiCompatibilityLevel apiCompat
             }
             else if (apiCompatibilityLevel == ApiCompatibilityLevel.NET_Unity_4_8)
             {
-                references.AddRange(GetSystemReferences().FindReferencesInDirectories(monoAssemblyDirectories));
-                references.AddRange(GetNet46SystemReferences().FindReferencesInDirectories(monoAssemblyDirectories));
-
-                // Look in the mono assembly directory for a facade folder and get a list of all the DLL's to be
-                // used later by the language compilers.
+                var monoAssemblyDirectories = GetSystemReferenceDirectories(apiCompatibilityLevel);
+                var referenceFileNames = GetSystemReferences().Concat(GetNet46SystemReferences()).Concat(GetMonoProfileNetstandardFacadeReferences()).Distinct();
+                references.AddRange(referenceFileNames.FindReferencesInDirectories(monoAssemblyDirectories));
                 references.AddRange(Directory.GetFiles(Path.Combine(GetUnityReferenceProfileDirectory(), "Facades"), "*.dll"));
             }
             else
             {
+                var monoAssemblyDirectories = GetSystemReferenceDirectories(apiCompatibilityLevel);
                 references.AddRange(GetSystemReferences().FindReferencesInDirectories(monoAssemblyDirectories));
             }
 
-            cachedReferences = new CachedReferences
-            {
-                ApiCompatibilityLevel = apiCompatibilityLevel,
-                References = references.ToArray()
-            };
-
+            var apiCompatibilityLevelReference = references.ToArray();
+            cachedApiCompatibilityLevelReferences[apiCompatibilityLevel] = apiCompatibilityLevelReference;
 
-            return cachedReferences.References;
+            return apiCompatibilityLevelReference;
         }
 
         static string GetSystemReference(ApiCompatibilityLevel apiCompatibilityLevel)
@@ -158,5 +150,27 @@ static string[] GetNet46SystemReferences()
                 "System.Data.dll",
             };
         }
+
+        static string[] GetMonoProfileNetstandardFacadeReferences()
+        {
+            return new[]
+            {
+                "mscorlib.dll",
+                "System.Core.dll",
+                "System.dll",
+                "System.Data.dll",
+                "System.Data.DataSetExtensions.dll",
+                "System.Drawing.dll",
+                "System.IO.Compression.dll",
+                "System.IO.Compression.FileSystem.dll",
+                "System.ComponentModel.Composition.dll",
+                "System.Net.Http.dll",
+                "System.Numerics.dll",
+                "System.Runtime.Serialization.dll",
+                "System.Transactions.dll",
+                "System.Xml.dll",
+                "System.Xml.Linq.dll",
+            };
+        }
     }
 }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/PathMultidimensionalDivisionTree.cs b/Editor/Mono/Scripting/ScriptCompilation/PathMultidimensionalDivisionTree.cs
new file mode 100644
index 0000000000..bd8eae54a4
--- /dev/null
+++ b/Editor/Mono/Scripting/ScriptCompilation/PathMultidimensionalDivisionTree.cs
@@ -0,0 +1,230 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using UnityEngine.Assertions;
+
+namespace UnityEditor.Scripting.ScriptCompilation
+{
+    internal class PathMultidimensionalDivisionTree<T>
+    {
+        private readonly Node _root;
+
+        public PathMultidimensionalDivisionTree(T defaultValue = default)
+        {
+            _root = new Node(defaultValue, null);
+        }
+
+        public void Insert(string key, T value)
+        {
+            if (string.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+
+            var keyMemory = TrimTrailingPathSeparator(key);
+            _root.SplitInsert(keyMemory, value);
+        }
+
+        public T MatchClosest(ReadOnlySpan<char> span)
+        {
+            return Node.MatchClosest(_root, span).Value;
+        }
+
+        private static bool IsEqualIgnoreCase(char a, char b)
+        {
+            return (Utility.IsPathSeparator(a) && Utility.IsPathSeparator(b)) || Utility.FastToLower(a) == Utility.FastToLower(b);
+        }
+
+        private static ReadOnlyMemory<char> TrimTrailingPathSeparator(string key)
+        {
+            for (int i = key.Length - 1; i >= 0; i--)
+            {
+                if (Utility.IsPathSeparator(key[i]))
+                {
+                    continue;
+                }
+
+                return key.AsMemory(0, i + 1);
+            }
+
+            return ReadOnlyMemory<char>.Empty;
+        }
+
+        private class Node
+        {
+            public T Value { get; }
+            private bool IsLeaf { get; }
+            private ReadOnlyMemory<char> StringSegment { get; }
+            private List<Node> ChildNodes { get; }
+
+            public Node(T value, ReadOnlyMemory<char> segment)
+            {
+                Value = value;
+                StringSegment = segment;
+                IsLeaf = true;
+                ChildNodes = new List<Node>();
+            }
+
+            public Node(T value, ReadOnlyMemory<char> segment, List<Node> nodes)
+            {
+                Value = value;
+                StringSegment = segment;
+                IsLeaf = true;
+                ChildNodes = nodes;
+            }
+
+            private Node(T value, ReadOnlyMemory<char> segment, Node left)
+            {
+                Value = value;
+                StringSegment = segment;
+                IsLeaf = true;
+                ChildNodes = new List<Node>
+                {
+                    left,
+                };
+            }
+
+            private Node(Node node, ReadOnlyMemory<char> segment)
+            {
+                Value = node.Value;
+                StringSegment = segment;
+                IsLeaf = node.IsLeaf;
+                ChildNodes = node.ChildNodes;
+            }
+
+            private Node(ReadOnlyMemory<char> segment, Node left, Node right)
+            {
+                Value = default;
+                StringSegment = segment;
+                IsLeaf = false;
+                ChildNodes = new List<Node>
+                {
+                    left,
+                    right,
+                };
+            }
+
+            private bool IsMatch(ReadOnlySpan<char> span)
+            {
+                if (span.Length < StringSegment.Length)
+                {
+                    return false;
+                }
+
+                var segmentSpan = StringSegment.Span;
+                for (int i = 0; i < StringSegment.Length; i++)
+                {
+                    if (!IsEqualIgnoreCase(span[i], segmentSpan[i]))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            public static Node MatchClosest(Node current, ReadOnlySpan<char> span)
+            {
+                Node currentLeaf = current;
+                Next:
+                if (span.Length == 0)
+                {
+                    return currentLeaf;
+                }
+
+                foreach (var childNode in current.ChildNodes)
+                {
+                    // We can only have 1 candidate
+                    if (childNode.IsCandidate(span[0]))
+                    {
+                        if (childNode.IsMatch(span))
+                        {
+                            span = span[childNode.StringSegment.Length..];
+                            if (childNode.IsLeaf && (span.Length == 0 || Utility.IsPathSeparator(span[0])))
+                            {
+                                current = currentLeaf = childNode;
+                                goto Next;
+                            }
+
+                            current = childNode;
+                            goto Next;
+                        }
+
+                        return currentLeaf;
+                    }
+                }
+
+                return currentLeaf;
+            }
+
+            public void SplitInsert(ReadOnlyMemory<char> currentStringSegment, T value)
+            {
+                Assert.IsTrue(currentStringSegment.Length > 0);
+
+                if (ChildNodes.Count == 0)
+                {
+                    ChildNodes.Add(new Node(value, currentStringSegment));
+                }
+
+                var currentStringSegmentSpan = currentStringSegment.Span;
+
+                for (var childIndex = 0; childIndex < ChildNodes.Count; childIndex++)
+                {
+                    var childNode = ChildNodes[childIndex];
+                    if (childNode.IsCandidate(currentStringSegmentSpan[0]))
+                    {
+                        var childSegmentSpan = childNode.StringSegment.Span;
+                        for (int i = 0; childSegmentSpan.Length > i; i++)
+                        {
+                            if (i >= currentStringSegment.Length ||
+                                !IsEqualIgnoreCase(currentStringSegmentSpan[i], childSegmentSpan[i]))
+                            {
+                                // Split existing node
+                                var childHead = childNode.StringSegment[..i];
+                                var childTail = childNode.StringSegment[i..];
+                                var splitTail = currentStringSegment[i..];
+
+                                if (splitTail.Length > 0)
+                                {
+                                    ChildNodes[childIndex] = new Node(childHead,
+                                        new Node(childNode, childTail),
+                                        new Node(value, splitTail));
+                                    return;
+                                }
+
+                                ChildNodes[childIndex] = new Node(value, childHead,
+                                    new Node(childNode, childTail));
+
+                                return;
+                            }
+                        }
+
+                        var remaining = currentStringSegment[childSegmentSpan.Length..];
+                        if (remaining.Length == 0)
+                        {
+                            // Replace existing value
+                            ChildNodes[childIndex] = new Node(value, childNode.StringSegment, ChildNodes[childIndex].ChildNodes);
+                        }
+                        else
+                        {
+                            childNode.SplitInsert(remaining, value);
+                        }
+
+                        return;
+                    }
+                }
+
+                // No candidates found add new branch to the tree
+                ChildNodes.Add(new Node(value, currentStringSegment));
+            }
+
+            private bool IsCandidate(char firstCharacter)
+            {
+                return IsEqualIgnoreCase(firstCharacter, StringSegment.Span[0]);
+            }
+        }
+    }
+}
diff --git a/Editor/Mono/Scripting/ScriptCompilation/PrecompiledAssembly.cs b/Editor/Mono/Scripting/ScriptCompilation/PrecompiledAssembly.cs
index 801bc0cdb6..cf0354d643 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/PrecompiledAssembly.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/PrecompiledAssembly.cs
@@ -14,6 +14,7 @@ namespace UnityEditor.Scripting.ScriptCompilation
 {
     [DebuggerDisplay("{Path}")]
     [NativeHeader("Editor/Src/ScriptCompilation/ScriptCompilationPipeline.h")]
+    [NativeHeader("Runtime/Scripting/ScriptingTypes.h")]
     [StructLayout(LayoutKind.Sequential)]
     struct PrecompiledAssembly
     {
@@ -21,12 +22,14 @@ struct PrecompiledAssembly
         public string Path;
         [NativeName("flags")]
         public AssemblyFlags Flags;
+        [NativeName("redirected")]
+        public bool Redirected;
     }
 
     abstract class PrecompiledAssemblyProviderBase
     {
-        public abstract PrecompiledAssembly[] GetPrecompiledAssemblies(bool isEditor, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines = null);
-        public abstract Dictionary<string, PrecompiledAssembly> GetPrecompiledAssembliesDictionary(bool isEditor, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines);
+        public abstract PrecompiledAssembly[] GetPrecompiledAssemblies(EditorScriptCompilationOptions compilationOptions, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines = null);
+        public abstract Dictionary<string, PrecompiledAssembly> GetPrecompiledAssembliesDictionary(EditorScriptCompilationOptions compilationOptions, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines);
         public abstract PrecompiledAssembly[] GetUnityAssemblies(bool isEditor, BuildTarget buildTarget);
         public abstract PrecompiledAssembly[] CachedEditorPrecompiledAssemblies { get; }
         public abstract PrecompiledAssembly[] CachedUnityAssemblies { get; }
@@ -38,13 +41,13 @@ protected virtual PrecompiledAssembly[] GetUnityAssembliesInternal(bool isEditor
             return GetUnityAssembliesNative(isEditor, buildTarget);
         }
 
-        protected virtual PrecompiledAssembly[] GetPrecompiledAssembliesInternal(bool buildingForEditor, BuildTargetGroup buildTargetGroup, BuildTarget target, string[] extraScriptingDefines)
+        protected virtual PrecompiledAssembly[] GetPrecompiledAssembliesInternal(EditorScriptCompilationOptions compilationOptions, BuildTargetGroup buildTargetGroup, BuildTarget target, string[] extraScriptingDefines)
         {
-            return GetPrecompiledAssembliesNative(buildingForEditor, buildTargetGroup, target, extraScriptingDefines);
+            return GetPrecompiledAssembliesNative(compilationOptions, buildTargetGroup, target, extraScriptingDefines);
         }
 
         [FreeFunction("GetPrecompiledAssembliesManaged")]
-        protected static extern PrecompiledAssembly[] GetPrecompiledAssembliesNative(bool buildingForEditor, BuildTargetGroup buildTargetGroup, BuildTarget target, string[] extraScriptingDefines);
+        protected static extern PrecompiledAssembly[] GetPrecompiledAssembliesNative(EditorScriptCompilationOptions compilationOptions, BuildTargetGroup buildTargetGroup, BuildTarget target, string[] extraScriptingDefines);
 
         [FreeFunction("GetUnityAssembliesManaged")]
         protected static extern PrecompiledAssembly[] GetUnityAssembliesNative(bool buildingForEditor, BuildTarget target);
@@ -111,9 +114,9 @@ public override PrecompiledAssembly[] GetUnityAssemblies(bool isEditor, BuildTar
             return unityAssembliesInternal;
         }
 
-        public override PrecompiledAssembly[] GetPrecompiledAssemblies(bool isEditor, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines)
+        public override PrecompiledAssembly[] GetPrecompiledAssemblies(EditorScriptCompilationOptions compilationOptions, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines)
         {
-            return GetPrecompiledAssembliesDictionary(isEditor, buildTargetGroup, buildTarget, extraScriptingDefines).Values.ToArray();
+            return GetPrecompiledAssembliesDictionary(compilationOptions, buildTargetGroup, buildTarget, extraScriptingDefines).Values.ToArray();
         }
 
         public override string[] GetRoslynAnalyzerPaths()
@@ -123,15 +126,20 @@ public override string[] GetRoslynAnalyzerPaths()
 
         [FreeFunction] internal static extern string[] GetAllRoslynAnalyzerPaths();
 
-        public override Dictionary<string, PrecompiledAssembly> GetPrecompiledAssembliesDictionary(bool isEditor, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines)
+        static bool IsEditor(EditorScriptCompilationOptions options)
         {
+            return (options & EditorScriptCompilationOptions.BuildingForEditor) == EditorScriptCompilationOptions.BuildingForEditor;
+        }
+        public override Dictionary<string, PrecompiledAssembly> GetPrecompiledAssembliesDictionary(EditorScriptCompilationOptions compilationOptions, BuildTargetGroup buildTargetGroup, BuildTarget buildTarget, string[] extraScriptingDefines)
+        {
+            bool isEditor = IsEditor(compilationOptions);
             if (isEditor && (extraScriptingDefines == null || extraScriptingDefines.Length == 0) && m_EditorPrecompiledAssemblies != null)
             {
                 return m_EditorPrecompiledAssemblies;
             }
 
-            var precompiledAssembliesInternal = GetPrecompiledAssembliesInternal(isEditor, buildTargetGroup, buildTarget, extraScriptingDefines);
-            var fileNameToPrecompiledAssembly = ValidateAndGetNameToPrecompiledAssembly(precompiledAssembliesInternal);
+            var precompiledAssembliesInternal = GetPrecompiledAssembliesInternal(compilationOptions, buildTargetGroup, buildTarget, extraScriptingDefines);
+            var fileNameToPrecompiledAssembly = FilenameToPrecompiledAssembly(precompiledAssembliesInternal);
 
             if (isEditor && (extraScriptingDefines == null || extraScriptingDefines.Length == 0))
             {
@@ -147,46 +155,29 @@ public override void Dirty()
             m_UnityAssemblies = null;
         }
 
-        private static Dictionary<string, PrecompiledAssembly> ValidateAndGetNameToPrecompiledAssembly(PrecompiledAssembly[] precompiledAssemblies)
+        private static Dictionary<string, PrecompiledAssembly> FilenameToPrecompiledAssembly(PrecompiledAssembly[] precompiledAssemblies)
         {
             if (precompiledAssemblies == null)
             {
                 return new Dictionary<string, PrecompiledAssembly>(0);
             }
 
-            Dictionary<string, PrecompiledAssembly> fileNameToUserPrecompiledAssemblies = new Dictionary<string, PrecompiledAssembly>(precompiledAssemblies.Length);
-
-            var sameNamedPrecompiledAssemblies = new Dictionary<string, List<string>>(precompiledAssemblies.Length);
-            for (int i = 0; i < precompiledAssemblies.Length; i++)
+            var dictionary = new Dictionary<string, PrecompiledAssembly>();
+            foreach (var assembly in precompiledAssemblies)
             {
-                var precompiledAssembly = precompiledAssemblies[i];
-
-                var fileName = AssetPath.GetFileName(precompiledAssembly.Path);
-                if (!fileNameToUserPrecompiledAssemblies.ContainsKey(fileName))
+                var filename = AssetPath.GetFileName(assembly.Path);
+                if (!dictionary.TryGetValue(filename, out var existingAssembly))
                 {
-                    fileNameToUserPrecompiledAssemblies.Add(fileName, precompiledAssembly);
+                    dictionary[filename] = assembly;
+                    continue;
                 }
-                else
+
+                if (existingAssembly.Redirected)
                 {
-                    if (!sameNamedPrecompiledAssemblies.ContainsKey(fileName))
-                    {
-                        sameNamedPrecompiledAssemblies.Add(fileName, new List<string>
-                        {
-                            fileNameToUserPrecompiledAssemblies[fileName].Path
-                        });
-                    }
-                    sameNamedPrecompiledAssemblies[fileName].Add(precompiledAssembly.Path);
+                    dictionary[filename] = assembly;
                 }
             }
-
-            foreach (var precompiledAssemblyNameToIndexes in sameNamedPrecompiledAssemblies)
-            {
-                throw new PrecompiledAssemblyException(
-                    $"Multiple precompiled assemblies with the same name {precompiledAssemblyNameToIndexes.Key} included on the current platform. Only one assembly with the same name is allowed per platform.",
-                    precompiledAssemblyNameToIndexes.Value.ToArray());
-            }
-
-            return fileNameToUserPrecompiledAssemblies;
+            return dictionary;
         }
     }
 }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/RoslynAnalyzers.cs b/Editor/Mono/Scripting/ScriptCompilation/RoslynAnalyzers.cs
new file mode 100644
index 0000000000..12d9ca6595
--- /dev/null
+++ b/Editor/Mono/Scripting/ScriptCompilation/RoslynAnalyzers.cs
@@ -0,0 +1,91 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace UnityEditor.Scripting.ScriptCompilation
+{
+    internal static class RoslynAnalyzers
+    {
+        private static readonly string[] Unset = null;
+        private static readonly string[] CyclicDependencies = {};
+
+        private static string[] SetAnalyzers(ScriptAssembly scriptAssembly, IEnumerable<(string scriptAssemblyFileName, string analyzerDll)> allAnalyzers, bool scanPrecompiledReferences)
+        {
+            if (scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths == Unset)
+            {
+                // If this is a cyclic chain we want to detect that and do two iterations
+                // Doing two iterations ensures that all participants in the chain will see all the analyzers of all members involved in the chain.
+                scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths = CyclicDependencies;
+            }
+            else if (scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths == CyclicDependencies)
+            {
+                // On second iteration return an empty array (this will be replaced be actual content of the cyclic chain)
+                scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths = Array.Empty<string>();
+            }
+            else
+            {
+                // Analyzers for this ScriptAssembly has already been setup
+                return scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths;
+            }
+
+            scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths =
+                scriptAssembly.ScriptAssemblyReferences
+                    .SelectMany(sa => SetAnalyzers(sa, allAnalyzers, scanPrecompiledReferences))
+                    .Concat(allAnalyzers
+                        .Where(a => a.scriptAssemblyFileName == null ||
+                                    a.scriptAssemblyFileName == scriptAssembly.Filename ||
+                                    scanPrecompiledReferences && scriptAssembly.References.Select(Path.GetFileName).Contains(a.scriptAssemblyFileName))
+                        .Select(a => a.analyzerDll))
+                    .Distinct()
+                    .ToArray();
+
+            if (scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths.Length > 0)
+            {
+                if(scriptAssembly.TargetAssemblyType == TargetAssemblyType.Predefined)
+                {
+                    var originPath = Path.ChangeExtension(scriptAssembly.Filename, null);
+                    scriptAssembly.CompilerOptions.RoslynAnalyzerRulesetPath = RuleSetFileCache.GetRuleSetFilePathInRootFolder(originPath);
+                    scriptAssembly.CompilerOptions.AnalyzerConfigPath = RoslynAnalyzerConfigFiles.GetAnalyzerConfigRootFolder(originPath);
+                }
+                else
+                {
+                    scriptAssembly.CompilerOptions.RoslynAnalyzerRulesetPath = RuleSetFileCache.GetPathForAssembly(scriptAssembly.OriginPath);
+                    scriptAssembly.CompilerOptions.AnalyzerConfigPath = RoslynAnalyzerConfigFiles.GetAnalyzerConfigForAssembly(scriptAssembly.OriginPath);
+                }
+                scriptAssembly.CompilerOptions.RoslynAdditionalFilePaths = scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths
+                    .SelectMany(a=>RoslynAdditionalFiles.GetAnalyzerAdditionalFilesForTargetAssembly(a, scriptAssembly.OriginPath))
+                    .Distinct()
+                    .ToArray();
+            }
+
+            return scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths;
+        }
+
+        internal static void SetAnalyzers(ScriptAssembly[] scriptAssemblies, TargetAssembly[] potentialAnalyzerOwners, string[] analyzerDlls, bool scanPrecompiledReferences)
+        {
+            // Figure out what assemblies own each analyzer
+            var analyzerAssemblies = analyzerDlls.Select(analyzerDll =>
+            {
+                var potentialAnalyzerOwner = potentialAnalyzerOwners
+                    .Where(targetAssembly => targetAssembly.PathFilter(analyzerDll) > 0)
+                    .OrderBy(targetAssembly => targetAssembly.PathFilter(analyzerDll))
+                    .LastOrDefault();
+
+                return (potentialOwnerOfAnalyzer: potentialAnalyzerOwner?.Filename, dll: analyzerDll);
+
+            }).ToArray();
+
+            // Null out all RoslynAnalyzerDllPaths to indicate they need to be set
+            foreach (var scriptAssembly in scriptAssemblies)
+                scriptAssembly.CompilerOptions.RoslynAnalyzerDllPaths = Unset;
+
+            foreach (var scriptAssembly in scriptAssemblies)
+                SetAnalyzers(scriptAssembly, analyzerAssemblies, scanPrecompiledReferences);
+        }
+    }
+}
diff --git a/Editor/Mono/Scripting/ScriptCompilation/UnitySpecificCompilerMessageProcessor.cs b/Editor/Mono/Scripting/ScriptCompilation/UnitySpecificCompilerMessageProcessor.cs
index 77ca330d49..df61d10fb1 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/UnitySpecificCompilerMessageProcessor.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/UnitySpecificCompilerMessageProcessor.cs
@@ -22,6 +22,7 @@ public static void AugmentMessagesInCompilationErrorsWithUnitySpecificAdvice(Com
                 UnsafeErrorProcessor.PostProcess(ref messages[i], editorCompilation);
                 ModuleReferenceErrorProcessor.PostProcess(ref messages[i]);
                 DeterministicAssemblyVersionErrorProcessor.PostProcess(ref messages[i]);
+                CyclicAssemblyReferencesErrorProcessor.PostProcess(ref messages[i]);
             }
         }
 
@@ -96,5 +97,22 @@ private static CustomScriptAssembly CustomScriptAssemblyFor(CompilerMessage m, E
                     .FirstOrDefault(c => file.IsChildOf(new NPath(c.PathPrefix).MakeAbsolute()));
             }
         }
+        internal static class CyclicAssemblyReferencesErrorProcessor
+        {
+            public static void PostProcess(ref CompilerMessage message)
+            {
+                int cyclickDependencyMessageStart = message.message.IndexOf("One or more cyclic dependencies detected between assemblies");
+                if (cyclickDependencyMessageStart >= 0)
+                {
+                    int cyclickDependencyMessageEnd = message.message.IndexOf(System.Environment.NewLine, cyclickDependencyMessageStart);
+                    if (cyclickDependencyMessageEnd >= 0)
+                        message.message = message.message.Substring(cyclickDependencyMessageStart, cyclickDependencyMessageEnd - cyclickDependencyMessageStart);
+                    else
+                        message.message = message.message.Substring(cyclickDependencyMessageStart);
+                }
+            }
+        }
+
+
     }
 }
diff --git a/Editor/Mono/Scripting/ScriptCompilation/Utility.cs b/Editor/Mono/Scripting/ScriptCompilation/Utility.cs
index 683009f64a..fe4522cd85 100644
--- a/Editor/Mono/Scripting/ScriptCompilation/Utility.cs
+++ b/Editor/Mono/Scripting/ScriptCompilation/Utility.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using UnityEngine;
 
 namespace UnityEditor.Scripting.ScriptCompilation
@@ -139,5 +140,11 @@ public static string FileNameWithoutExtension(string path)
 
             return path.Substring(indexOfSlash, indexOfDot - indexOfSlash);
         }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool IsPathSeparator(char character)
+        {
+            return character == '/' || character == '\\';
+        }
     }
 }
diff --git a/Editor/Mono/Search/ObjectSelectorSearch.cs b/Editor/Mono/Search/ObjectSelectorSearch.cs
index 8a5bc33d2c..72dc85a7a4 100644
--- a/Editor/Mono/Search/ObjectSelectorSearch.cs
+++ b/Editor/Mono/Search/ObjectSelectorSearch.cs
@@ -38,78 +38,93 @@ public interface IObjectSelectorEngine : ISelectorEngine {}
     [InitializeOnLoad]
     public static class ObjectSelectorSearch
     {
-        static readonly SearchApiBaseImp<ObjectSelectorEngineAttribute, IObjectSelectorEngine> k_EngineImp;
+        static SearchApiBaseImp<ObjectSelectorEngineAttribute, IObjectSelectorEngine> s_EngineImp;
+        static SearchApiBaseImp<ObjectSelectorEngineAttribute, IObjectSelectorEngine> engineImp
+        {
+            get
+            {
+                if (s_EngineImp == null)
+                    StaticInit();
+                return s_EngineImp;
+            }
+        }
 
         public const SearchEngineScope EngineScope = SearchEngineScope.ObjectSelector;
 
         static ObjectSelectorSearch()
         {
-            k_EngineImp = new SearchApiBaseImp<ObjectSelectorEngineAttribute, IObjectSelectorEngine>(EngineScope, "Object Selector");
+            EditorApplication.tick += StaticInit;
+        }
+
+        private static void StaticInit()
+        {
+            EditorApplication.tick -= StaticInit;
+            s_EngineImp = s_EngineImp ?? new SearchApiBaseImp<ObjectSelectorEngineAttribute, IObjectSelectorEngine>(EngineScope, "Object Selector");
         }
 
         internal static bool SelectObject(ObjectSelectorSearchContext context, Action<Object, bool> onObjectSelectorClosed, Action<Object> onObjectSelectedUpdated)
         {
-            var activeEngine = k_EngineImp.activeSearchEngine;
+            var activeEngine = engineImp.activeSearchEngine;
             try
             {
                 return activeEngine.SelectObject(context, onObjectSelectorClosed, onObjectSelectedUpdated);
             }
             catch (Exception ex)
             {
-                k_EngineImp.HandleUserException(ex);
+                engineImp.HandleUserException(ex);
                 return false;
             }
         }
 
         internal static void SetSearchFilter(string searchFilter, ObjectSelectorSearchContext context)
         {
-            var activeEngine = k_EngineImp.activeSearchEngine;
+            var activeEngine = engineImp.activeSearchEngine;
             activeEngine.SetSearchFilter(context, searchFilter);
         }
 
         internal static bool HasEngineOverride()
         {
-            return k_EngineImp.HasEngineOverride();
+            return engineImp.HasEngineOverride();
         }
 
         internal static void BeginSession(ObjectSelectorSearchContext context)
         {
-            k_EngineImp.BeginSession(context);
+            engineImp.BeginSession(context);
         }
 
         internal static void EndSession(ObjectSelectorSearchContext context)
         {
-            k_EngineImp.EndSession(context);
+            engineImp.EndSession(context);
         }
 
         internal static void BeginSearch(string query, ObjectSelectorSearchContext context)
         {
-            k_EngineImp.BeginSearch(query, context);
+            engineImp.BeginSearch(query, context);
         }
 
         internal static void EndSearch(ObjectSelectorSearchContext context)
         {
-            k_EngineImp.EndSearch(context);
+            engineImp.EndSearch(context);
         }
 
         internal static IObjectSelectorEngine GetActiveSearchEngine()
         {
-            return k_EngineImp.GetActiveSearchEngine();
+            return engineImp.GetActiveSearchEngine();
         }
 
         internal static void SetActiveSearchEngine(string searchEngineName)
         {
-            k_EngineImp.SetActiveSearchEngine(searchEngineName);
+            engineImp.SetActiveSearchEngine(searchEngineName);
         }
 
         public static void RegisterEngine(IObjectSelectorEngine engine)
         {
-            k_EngineImp.RegisterEngine(engine);
+            engineImp.RegisterEngine(engine);
         }
 
         public static void UnregisterEngine(IObjectSelectorEngine engine)
         {
-            k_EngineImp.UnregisterEngine(engine);
+            engineImp.UnregisterEngine(engine);
         }
     }
 
diff --git a/Editor/Mono/Search/ProjectSearch.cs b/Editor/Mono/Search/ProjectSearch.cs
index cb9f27cbf8..f4d54d6c78 100644
--- a/Editor/Mono/Search/ProjectSearch.cs
+++ b/Editor/Mono/Search/ProjectSearch.cs
@@ -17,6 +17,7 @@ public class ProjectSearchContext : ISearchContext
         public SearchEngineScope engineScope { get; protected set; } = ProjectSearch.EngineScope;
         public IEnumerable<Type> requiredTypes { get; set; }
         public IEnumerable<string> requiredTypeNames { get; set; }
+        internal SearchFilter searchFilter { get; set; }
     }
 
     public interface IProjectSearchEngine : ISearchEngine<string> {}
@@ -24,72 +25,87 @@ public interface IProjectSearchEngine : ISearchEngine<string> {}
     [InitializeOnLoad]
     public static class ProjectSearch
     {
-        static readonly SearchApiBaseImp<ProjectSearchEngineAttribute, IProjectSearchEngine> k_EngineImp;
+        static SearchApiBaseImp<ProjectSearchEngineAttribute, IProjectSearchEngine> s_EngineImp;
+        static SearchApiBaseImp<ProjectSearchEngineAttribute, IProjectSearchEngine> engineImp
+        {
+            get
+            {
+                if (s_EngineImp == null)
+                    StaticInit();
+                return s_EngineImp;
+            }
+        }
 
         public const SearchEngineScope EngineScope = SearchEngineScope.Project;
 
         static ProjectSearch()
         {
-            k_EngineImp = new SearchApiBaseImp<ProjectSearchEngineAttribute, IProjectSearchEngine>(EngineScope, "Project");
+            EditorApplication.tick += StaticInit;
+        }
+
+        private static void StaticInit()
+        {
+            EditorApplication.tick -= StaticInit;
+            s_EngineImp = s_EngineImp ?? new SearchApiBaseImp<ProjectSearchEngineAttribute, IProjectSearchEngine>(EngineScope, "Project");
         }
 
         internal static IEnumerable<string> Search(string query, ProjectSearchContext context, Action<IEnumerable<string>> asyncItemsReceived)
         {
-            var activeEngine = k_EngineImp.activeSearchEngine;
+            var activeEngine = engineImp.activeSearchEngine;
             try
             {
                 return activeEngine.Search(context, query, asyncItemsReceived);
             }
             catch (Exception ex)
             {
-                k_EngineImp.HandleUserException(ex);
+                engineImp.HandleUserException(ex);
                 return null;
             }
         }
 
         internal static bool HasEngineOverride()
         {
-            return k_EngineImp.HasEngineOverride();
+            return engineImp.HasEngineOverride();
         }
 
         internal static void BeginSession(ProjectSearchContext context)
         {
-            k_EngineImp.BeginSession(context);
+            engineImp.BeginSession(context);
         }
 
         internal static void EndSession(ProjectSearchContext context)
         {
-            k_EngineImp.EndSession(context);
+            engineImp.EndSession(context);
         }
 
         internal static void BeginSearch(string query, ProjectSearchContext context)
         {
-            k_EngineImp.BeginSearch(query, context);
+            engineImp.BeginSearch(query, context);
         }
 
         internal static void EndSearch(ProjectSearchContext context)
         {
-            k_EngineImp.EndSearch(context);
+            engineImp.EndSearch(context);
         }
 
         internal static IProjectSearchEngine GetActiveSearchEngine()
         {
-            return k_EngineImp.GetActiveSearchEngine();
+            return engineImp.GetActiveSearchEngine();
         }
 
         internal static void SetActiveSearchEngine(string searchEngineName)
         {
-            k_EngineImp.SetActiveSearchEngine(searchEngineName);
+            engineImp.SetActiveSearchEngine(searchEngineName);
         }
 
         public static void RegisterEngine(IProjectSearchEngine engine)
         {
-            k_EngineImp.RegisterEngine(engine);
+            engineImp.RegisterEngine(engine);
         }
 
         public static void UnregisterEngine(IProjectSearchEngine engine)
         {
-            k_EngineImp.UnregisterEngine(engine);
+            engineImp.UnregisterEngine(engine);
         }
     }
 
diff --git a/Editor/Mono/Search/SceneSearch.cs b/Editor/Mono/Search/SceneSearch.cs
index 33792b54d0..bf8d896c80 100644
--- a/Editor/Mono/Search/SceneSearch.cs
+++ b/Editor/Mono/Search/SceneSearch.cs
@@ -26,72 +26,87 @@ public interface ISceneSearchEngine : IFilterEngine<HierarchyProperty>
     [InitializeOnLoad]
     public static class SceneSearch
     {
-        static readonly SearchApiBaseImp<SceneSearchEngineAttribute, ISceneSearchEngine> k_EngineImp;
+        static SearchApiBaseImp<SceneSearchEngineAttribute, ISceneSearchEngine> s_EngineImp;
+        static SearchApiBaseImp<SceneSearchEngineAttribute, ISceneSearchEngine> engineImp
+        {
+            get
+            {
+                if (s_EngineImp == null)
+                    StaticInit();
+                return s_EngineImp;
+            }
+        }
 
         public const SearchEngineScope EngineScope = SearchEngineScope.Scene;
 
         static SceneSearch()
         {
-            k_EngineImp = new SearchApiBaseImp<SceneSearchEngineAttribute, ISceneSearchEngine>(EngineScope, "Scene");
+            EditorApplication.tick += StaticInit;
+        }
+
+        private static void StaticInit()
+        {
+            EditorApplication.tick -= StaticInit;
+            s_EngineImp = s_EngineImp ?? new SearchApiBaseImp<SceneSearchEngineAttribute, ISceneSearchEngine>(EngineScope, "Scene");
         }
 
         internal static bool Filter(string query, HierarchyProperty objectToFilter, SceneSearchContext context)
         {
-            var activeEngine = k_EngineImp.activeSearchEngine;
+            var activeEngine = engineImp.activeSearchEngine;
             try
             {
                 return activeEngine.Filter(context, query, objectToFilter);
             }
             catch (Exception ex)
             {
-                k_EngineImp.HandleUserException(ex);
+                engineImp.HandleUserException(ex);
                 return false;
             }
         }
 
         internal static bool HasEngineOverride()
         {
-            return k_EngineImp.HasEngineOverride();
+            return engineImp.HasEngineOverride();
         }
 
         internal static void BeginSession(SceneSearchContext context)
         {
-            k_EngineImp.BeginSession(context);
+            engineImp.BeginSession(context);
         }
 
         internal static void EndSession(SceneSearchContext context)
         {
-            k_EngineImp.EndSession(context);
+            engineImp.EndSession(context);
         }
 
         internal static void BeginSearch(string query, SceneSearchContext context)
         {
-            k_EngineImp.BeginSearch(query, context);
+            engineImp.BeginSearch(query, context);
         }
 
         internal static void EndSearch(SceneSearchContext context)
         {
-            k_EngineImp.EndSearch(context);
+            engineImp.EndSearch(context);
         }
 
         internal static ISceneSearchEngine GetActiveSearchEngine()
         {
-            return k_EngineImp.GetActiveSearchEngine();
+            return engineImp.GetActiveSearchEngine();
         }
 
         internal static void SetActiveSearchEngine(string searchEngineName)
         {
-            k_EngineImp.SetActiveSearchEngine(searchEngineName);
+            engineImp.SetActiveSearchEngine(searchEngineName);
         }
 
         public static void RegisterEngine(ISceneSearchEngine engine)
         {
-            k_EngineImp.RegisterEngine(engine);
+            engineImp.RegisterEngine(engine);
         }
 
         public static void UnregisterEngine(ISceneSearchEngine engine)
         {
-            k_EngineImp.UnregisterEngine(engine);
+            engineImp.UnregisterEngine(engine);
         }
     }
 
diff --git a/Editor/Mono/Search/SearchService.cs b/Editor/Mono/Search/SearchService.cs
index 61869d7e85..d8fa52f3e3 100644
--- a/Editor/Mono/Search/SearchService.cs
+++ b/Editor/Mono/Search/SearchService.cs
@@ -107,8 +107,10 @@ public SearchSessionHandler(SearchEngineScope engineScope)
             Init();
         }
 
-        void Init()
+        void Init(bool pullEngines = false)
         {
+            if (pullEngines)
+                PullEngines();
             var index = SearchService.searchApis.FindIndex(api => api.engineScope == m_EngineScope);
             if (index >= 0)
             {
@@ -117,6 +119,20 @@ void Init()
             }
         }
 
+        void PullEngines()
+        {
+            // Calling HasEngineOverride will make sure the engine apis are registered.
+            switch (m_EngineScope)
+            {
+                case SearchEngineScope.Project: ProjectSearch.HasEngineOverride();
+                    break;
+                case SearchEngineScope.Scene: SceneSearch.HasEngineOverride();
+                    break;
+                case SearchEngineScope.ObjectSelector: ObjectSelectorSearch.HasEngineOverride();
+                    break;
+            }
+        }
+
         void OnActiveEngineChanged(string newSearchEngineName)
         {
             EndSession();
@@ -129,7 +145,7 @@ public void BeginSession(Func<ISearchContext> searchContextCreator, SearchSessio
             // Do a lazy initialize if the apis were not available during creation
             if (m_Api == null)
             {
-                Init();
+                Init(true);
                 if (m_Api == null)
                     throw new NullReferenceException("SearchService Apis were not initialized properly.");
             }
@@ -188,6 +204,7 @@ interface ISearchApi
         event Action<string> activeEngineChanged;
     }
 
+    [InitializeOnLoad]
     static class SearchService
     {
         public const string keyPrefix = "searchservice";
@@ -215,6 +232,7 @@ private static void AddSearchServiceBuildDefines(BuildTarget target, HashSet<str
             defines.Add("USE_SEARCH_MODULE");
             defines.Add("USE_PROPERTY_DATABASE");
             defines.Add("USE_QUERY_BUILDER");
+            defines.Add("USE_SEARCH_EXTENSION_API");
         }
 
         public static void NotifySyncSearchChanged(SyncSearchEvent evt, string syncViewId, string searchQuery)
diff --git a/Editor/Mono/Selection.bindings.cs b/Editor/Mono/Selection.bindings.cs
index ea62f71a8d..7ba53a3e57 100644
--- a/Editor/Mono/Selection.bindings.cs
+++ b/Editor/Mono/Selection.bindings.cs
@@ -81,6 +81,13 @@ extern public static Object activeObject
             set;
         }
 
+        [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
+        extern internal static void SetSelectionWithActiveObject(Object[] newSelection, Object activeObject);
+
+        [StaticAccessor("SelectionBindings", StaticAccessorType.DoubleColon)]
+        [NativeThrows]
+        extern internal static void SetSelectionWithActiveInstanceID(int[] newSelection, int activeObject);
+
         // Returns the active context object
         extern public static Object activeContext
         {
diff --git a/Editor/Mono/SerializedObject.bindings.cs b/Editor/Mono/SerializedObject.bindings.cs
index c3e90eaa34..c6baa6d11a 100644
--- a/Editor/Mono/SerializedObject.bindings.cs
+++ b/Editor/Mono/SerializedObject.bindings.cs
@@ -42,6 +42,11 @@ public SerializedObject(Object[] objs, Object context)
             m_NativeObjectPtr = InternalCreate(objs, context);
         }
 
+        internal SerializedObject(IntPtr nativeObjectPtr)
+        {
+            m_NativeObjectPtr = nativeObjectPtr;
+        }
+
         ~SerializedObject() { Dispose(); }
 
         [ThreadAndSerializationSafe()]
@@ -80,6 +85,25 @@ public SerializedProperty FindProperty(string propertyPath)
                 return null;
         }
 
+        /// <summary>
+        /// Given a path of the form "managedReferences[refid].field" this finds the first field
+        /// that references that reference id and returns a serialized property based on that path.
+        /// For example if an object "Foo" with id 1 is referenced by multiple fields "a", "b" and
+        /// "c.nested" on a MonoBehaviour (declared in that order), then calling this method with
+        /// "managedReferences[1].x" would return the SerializedProperty with property path "a.x".
+        /// </summary>
+        internal SerializedProperty FindFirstPropertyFromManagedReferencePath(string propertyPath)
+        {
+            SerializedProperty i = GetIterator_Internal();
+            // This is so the garbage collector won't clean up SerializedObject behind the scenes,
+            // when we are still iterating properties
+            i.m_SerializedObject = this;
+            if (i.FindFirstPropertyFromManagedReferencePathInternal(propertyPath))
+                return i;
+            else
+                return null;
+        }
+
         extern public bool ApplyModifiedProperties();
 
         // Update /hasMultipleDifferentValues/ cache on the next /Update()/ call.
@@ -140,6 +164,9 @@ internal void Cache(int instanceID)
 
         public extern bool ApplyModifiedPropertiesWithoutUndo();
 
+        // Enable/Disable live property feature globally.
+        internal extern static void EnableLivePropertyFeatureGlobally(bool value);
+
         // Copies a value from a SerializedProperty to the same serialized property on this serialized object.
         public void CopyFromSerializedProperty(SerializedProperty prop)
         {
diff --git a/Editor/Mono/SerializedProperty.bindings.cs b/Editor/Mono/SerializedProperty.bindings.cs
index 5edc0d8e2a..e8cadd434b 100644
--- a/Editor/Mono/SerializedProperty.bindings.cs
+++ b/Editor/Mono/SerializedProperty.bindings.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
+using UnityEngine.Serialization;
 
 using UnityObject = UnityEngine.Object;
 using System.Reflection;
@@ -475,6 +476,9 @@ public void ClearArray()
         [NativeName("FindProperty")]
         extern internal bool FindPropertyInternal(string propertyPath);
 
+        [NativeName("FindFirstPropertyFromManagedReferencePath")]
+        extern internal bool FindFirstPropertyFromManagedReferencePathInternal(string managedReferencePath);
+
         [ThreadAndSerializationSafe()]
         public void Dispose()
         {
@@ -751,6 +755,19 @@ internal bool isKey
         [NativeName("IsKey")]
         private extern bool IsKeyInternal();
 
+        [NativeName("IsLiveModified")]
+        private extern bool IsLiveModified();
+
+        // Is this property live modified?
+        internal bool isLiveModified
+        {
+            get
+            {
+                Verify(VerifyFlags.IteratorNotAtEnd);
+                return IsLiveModified();
+            }
+        }
+
         // Is this property expanded in the inspector?
         public bool isExpanded
         {
@@ -848,6 +865,27 @@ internal bool isReferencingAManagedReferenceField
         [NativeName("GetPropertyPathInCurrentManagedTypeTree")]
         internal extern string GetPropertyPathInCurrentManagedTypeTreeInternal();
 
+
+        /// <summary>
+        /// If the current field is on a SerializeReference instance this returns the path
+        /// of the field relative the ManagedReferenceRegistry. managedReferences[refId].field
+        /// </summary>
+        internal string managedReferencePropertyPath
+        {
+            get
+            {
+                Verify(VerifyFlags.IteratorNotAtEnd);
+                return GetManagedReferencePropertyPathInternal();
+            }
+        }
+
+        /// <summary>
+        /// Returns the path of the current field relative to the managed reference registry managedReferences[refId].
+        /// </summary>
+        // Useful in the same context as 'isReferencingAManagedReferenceField'.
+        [NativeName("GetManagedReferencePropertyPath")]
+        internal extern string GetManagedReferencePropertyPathInternal();
+
         // Is property's value different from the prefab it belongs to?
         public bool prefabOverride
         {
@@ -1230,7 +1268,7 @@ public RefId managedReferenceId
             {
                 Verify(VerifyFlags.IteratorNotAtEnd);
                 var referencedObj = LookupInstanceByIdInternal(value);
-                if (value != SerializationUtility.RefIdNull && referencedObj == null)
+                if (value != ManagedReferenceUtility.RefIdNull && referencedObj == null)
                 {
                     throw new System.InvalidOperationException(
                         $"The specified managed reference id cannot be set because it is not currently assigned to an object.");
diff --git a/Editor/Mono/SerializedProperty/SerializedPropertyTreeView.cs b/Editor/Mono/SerializedProperty/SerializedPropertyTreeView.cs
index d174c9c704..df2e07cc22 100644
--- a/Editor/Mono/SerializedProperty/SerializedPropertyTreeView.cs
+++ b/Editor/Mono/SerializedProperty/SerializedPropertyTreeView.cs
@@ -141,8 +141,7 @@ public bool Repopulate(out bool needsReload)
             int elementIndex = 0;
             for (int i = 0; i < objs.Length; i++)
             {
-                // we don't want to list hidden objects
-                if (objs[i] == null || objs[i].hideFlags == HideFlags.HideAndDontSave || objs[i].hideFlags == HideFlags.HideInHierarchy)
+                if (objs[i] == null)
                     continue;
 
                 m_Elements[elementIndex] = new Data(objs[i], m_PropNames);
@@ -164,7 +163,7 @@ private void UpdateActiveObjects(Object[] objs)
 
             for (int i = 0; i < objs.Length; i++)
             {
-                if (objs[i] == null || objs[i].hideFlags == HideFlags.HideAndDontSave || objs[i].hideFlags == HideFlags.HideInHierarchy)
+                if (objs[i] == null)
                     continue;
 
                 if (objs[i] is Component)
diff --git a/Editor/Mono/Settings/Providers/AssetSettingsProvider.cs b/Editor/Mono/Settings/Providers/AssetSettingsProvider.cs
index 5ecc0727a3..e98a065dac 100644
--- a/Editor/Mono/Settings/Providers/AssetSettingsProvider.cs
+++ b/Editor/Mono/Settings/Providers/AssetSettingsProvider.cs
@@ -99,7 +99,7 @@ public override void OnGUI(string searchContext)
                     var remainingRect = GUILayoutUtility.GetRect(GUIContent.none, GUIStyle.none, GUILayout.ExpandHeight(true));
                     if ((Event.current.type == EventType.DragUpdated || Event.current.type == EventType.DragPerform) && remainingRect.Contains(Event.current.mousePosition))
                     {
-                        DragAndDrop.visualMode = DragAndDrop.Drop(DragAndDropWindowTarget.inspector, new[] { settingsEditor.target }, Event.current.type == EventType.DragPerform);
+                        DragAndDrop.visualMode = DragAndDrop.DropOnInspectorWindow(new[] { settingsEditor.target }, Event.current.type == EventType.DragPerform);
                         if (Event.current.type == EventType.DragPerform)
                             DragAndDrop.AcceptDrag();
                     }
diff --git a/Editor/Mono/Settings/SettingsService.cs b/Editor/Mono/Settings/SettingsService.cs
index cbfeb35f42..128b20c8ae 100644
--- a/Editor/Mono/Settings/SettingsService.cs
+++ b/Editor/Mono/Settings/SettingsService.cs
@@ -36,15 +36,71 @@ public static void RepaintAllSettingsWindow()
             repaintAllSettingsWindow?.Invoke();
         }
 
+        internal static IEnumerable<SettingsProvider> FilterAndWarnAgainstDuplicates(IEnumerable<SettingsProvider> settingsProviders, SettingsScope scope)
+        {
+            Dictionary<string, int> settingPaths = new Dictionary<string, int>();
+            foreach (var provider in settingsProviders)
+            {
+                if (provider.scope != scope)
+                {
+                    yield return provider;
+                    continue;
+                }
+
+                if (settingPaths.ContainsKey(provider.settingsPath))
+                {
+                    settingPaths[provider.settingsPath] += 1;
+                    continue;
+                }
+                else
+                {
+                    settingPaths.Add(provider.settingsPath, 1);
+                    yield return provider;
+                }
+            }
+
+            foreach (var settingPath in settingPaths)
+            {
+                if (settingPath.Value > 1)
+                    Debug.LogWarning($"There are {settingPath.Value} settings providers with the same name {settingPath.Key} in {scope} scope.");
+            }
+        }
+
         internal static event Action settingsProviderChanged;
         internal static SettingsProvider[] FetchSettingsProviders()
         {
-            return
+            var settingsProviders =
                 FetchSettingProviderFromAttribute()
                     .Concat(FetchSettingProvidersFromAttribute())
                     .Concat(FetchPreferenceItems())
-                    .Where(provider => provider != null)
-                    .ToArray();
+                    .Where(provider => provider != null);
+
+            settingsProviders = FilterAndWarnAgainstDuplicates(settingsProviders, SettingsScope.Project);
+            return FilterAndWarnAgainstDuplicates(settingsProviders, SettingsScope.User).ToArray();
+        }
+
+        internal static SettingsProvider[] FetchSettingsProviders(SettingsScope scope)
+        {
+            var settingsProviders =
+                FetchSettingProviderFromAttribute()
+                    .Concat(FetchSettingProvidersFromAttribute())
+                    .Concat(FetchPreferenceItems())
+                    .Where(provider => provider != null && provider.scope == scope);
+
+            return FilterAndWarnAgainstDuplicates(settingsProviders, scope).ToArray();
+        }
+
+        public static bool Exists(string settingsPath)
+        {
+            var settingsProviders = FetchSettingsProviders();
+
+            foreach (var provider in settingsProviders)
+            {
+                if (settingsPath.Equals(provider.settingsPath, StringComparison.Ordinal))
+                    return true;
+            }
+
+            return false;
         }
 
         internal static EditorWindow OpenUserPreferenceWindow()
diff --git a/Editor/Mono/Settings/SettingsWindow.cs b/Editor/Mono/Settings/SettingsWindow.cs
index 48b5f29145..6c7d6f0a9a 100644
--- a/Editor/Mono/Settings/SettingsWindow.cs
+++ b/Editor/Mono/Settings/SettingsWindow.cs
@@ -137,7 +137,7 @@ internal void OnDisable()
 
             SettingsService.settingsProviderChanged -= OnSettingsProviderChanged;
             SettingsService.repaintAllSettingsWindow -= OnRepaintAllWindows;
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
         }
 
@@ -154,8 +154,8 @@ internal void InitProviders()
             SettingsService.repaintAllSettingsWindow -= OnRepaintAllWindows;
             SettingsService.repaintAllSettingsWindow += OnRepaintAllWindows;
 
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
 
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
@@ -166,7 +166,7 @@ internal void OnInspectorUpdate()
             m_TreeView?.currentProvider?.OnInspectorUpdate();
         }
 
-        private void OnUndoRedoPerformed()
+        private void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             Repaint();
         }
@@ -230,10 +230,7 @@ private void RestoreSelection()
 
         private void Init()
         {
-            m_Providers = SettingsService.FetchSettingsProviders().Where(p => p.scope == m_Scope).ToArray();
-
-            WarnAgainstDuplicates();
-
+            m_Providers = SettingsService.FetchSettingsProviders(m_Scope);
             foreach (var provider in m_Providers)
             {
                 provider.settingsWindow = this;
@@ -250,16 +247,6 @@ private void Init()
             m_TreeView.currentProviderChanged += ProviderChanged;
         }
 
-        private void WarnAgainstDuplicates()
-        {
-            // Warn for providers with same id (will be supported later)
-            foreach (var g in m_Providers.GroupBy(x => x.settingsPath))
-            {
-                if (g.Count() > 1)
-                    Debug.LogWarning($"There are {g.Count()} settings providers with the same name {g.Key}.");
-            }
-        }
-
         private void ProviderChanged(SettingsProvider lastSelectedProvider, SettingsProvider newlySelectedProvider)
         {
             if (m_SettingsPanel == null)
@@ -498,7 +485,6 @@ static void SendTopMenuProjectSettingsEvent()
             });
         }
 
-
         [Serializable]
         internal struct EditorGameServiceEvent
         {
@@ -509,7 +495,6 @@ internal struct EditorGameServiceEvent
             public string package_ver;
         }
 
-
         internal static SettingsWindow OpenUserPreferences()
         {
             return Show(SettingsScope.User);
diff --git a/Editor/Mono/SettingsWindow/GraphicsSettingsEditors.cs b/Editor/Mono/SettingsWindow/GraphicsSettingsEditors.cs
index 50ff94f9d3..b0239880f8 100644
--- a/Editor/Mono/SettingsWindow/GraphicsSettingsEditors.cs
+++ b/Editor/Mono/SettingsWindow/GraphicsSettingsEditors.cs
@@ -53,7 +53,6 @@ internal class BuiltinShadersEditor : Editor
         {
             BuiltinShaderSettings m_Deferred;
             BuiltinShaderSettings m_DeferredReflections;
-            BuiltinShaderSettings m_LegacyDeferred;
             BuiltinShaderSettings m_ScreenSpaceShadows;
             BuiltinShaderSettings m_DepthNormals;
             BuiltinShaderSettings m_MotionVectors;
@@ -64,7 +63,6 @@ internal class Styles
             {
                 public static GUIContent deferredString = EditorGUIUtility.TrTextContent("Deferred", "Shader used for Deferred Shading.");
                 public static GUIContent deferredReflString = EditorGUIUtility.TrTextContent("Deferred Reflections", "Shader used for Deferred reflection probes.");
-                public static GUIContent legacyDeferredString = EditorGUIUtility.TrTextContent("Legacy Deferred", "Shader used for Legacy (light prepass) Deferred Lighting.");
                 public static GUIContent screenShadowsString = EditorGUIUtility.TrTextContent("Screen Space Shadows", "Shader used for screen-space cascaded shadows.");
                 public static GUIContent depthNormalsString = EditorGUIUtility.TrTextContent("Depth Normals", "Shader used for depth and normals texture when enabled on a Camera.");
                 public static GUIContent motionVectorsString = EditorGUIUtility.TrTextContent("Motion Vectors", "Shader for generation of Motion Vectors when the rendering camera has renderMotionVectors set to true.");
@@ -76,7 +74,6 @@ public void OnEnable()
             {
                 m_Deferred              = new BuiltinShaderSettings(Styles.deferredString, "m_Deferred", serializedObject);
                 m_DeferredReflections   = new BuiltinShaderSettings(Styles.deferredReflString, "m_DeferredReflections", serializedObject);
-                m_LegacyDeferred        = new BuiltinShaderSettings(Styles.legacyDeferredString, "m_LegacyDeferred", serializedObject);
                 m_ScreenSpaceShadows    = new BuiltinShaderSettings(Styles.screenShadowsString, "m_ScreenSpaceShadows", serializedObject);
                 m_DepthNormals          = new BuiltinShaderSettings(Styles.depthNormalsString, "m_DepthNormals", serializedObject);
                 m_MotionVectors         = new BuiltinShaderSettings(Styles.motionVectorsString, "m_MotionVectors", serializedObject);
@@ -97,7 +94,6 @@ public override void OnInspectorGUI()
                 if (EditorGUI.EndChangeCheck())
                     ShaderUtil.ReloadAllShaders();
 
-                m_LegacyDeferred.DoGUI();
                 m_ScreenSpaceShadows.DoGUI();
                 m_DepthNormals.DoGUI();
                 m_MotionVectors.DoGUI();
@@ -446,9 +442,9 @@ internal partial class Styles
                 { (int)ShaderQuality.Low, (int)ShaderQuality.Medium, (int)ShaderQuality.High };
 
                 public static readonly GUIContent[] renderingPathName =
-                { EditorGUIUtility.TrTextContent("Forward"), EditorGUIUtility.TrTextContent("Deferred"), EditorGUIUtility.TrTextContent("Legacy Vertex Lit"), EditorGUIUtility.TrTextContent("Legacy Deferred (light prepass)") };
+                { EditorGUIUtility.TrTextContent("Forward"), EditorGUIUtility.TrTextContent("Deferred"), EditorGUIUtility.TrTextContent("Legacy Vertex Lit") };
                 public static readonly int[] renderingPathValue =
-                { (int)RenderingPath.Forward, (int)RenderingPath.DeferredShading, (int)RenderingPath.VertexLit, (int)RenderingPath.DeferredLighting };
+                { (int)RenderingPath.Forward, (int)RenderingPath.DeferredShading, (int)RenderingPath.VertexLit };
 
                 public static readonly GUIContent[] hdrModeName =
                 { EditorGUIUtility.TrTextContent("FP16"), EditorGUIUtility.TrTextContent("R11G11B10") };
@@ -638,16 +634,16 @@ internal partial class Styles
                 public static readonly GUIContent renderingSettings = EditorGUIUtility.TrTextContent("Rendering");
 
                 public static readonly GUIContent standardShaderQuality = EditorGUIUtility.TrTextContent("Standard Shader Quality");
-                public static readonly GUIContent reflectionProbeBoxProjection = EditorGUIUtility.TrTextContent("Reflection Probes Box Projection");
-                public static readonly GUIContent reflectionProbeBlending = EditorGUIUtility.TrTextContent("Reflection Probes Blending");
-                public static readonly GUIContent detailNormalMap = EditorGUIUtility.TrTextContent("Detail Normal Map");
+                public static readonly GUIContent reflectionProbeBoxProjection = EditorGUIUtility.TrTextContent("Reflection Probes Box Projection", "Enable projection for reflection UV mappings on Reflection Probes.");
+                public static readonly GUIContent reflectionProbeBlending = EditorGUIUtility.TrTextContent("Reflection Probes Blending", "Gradually fade out one probe's cubemap while fading in the other's as the reflective object passes from one zone to the other.");
+                public static readonly GUIContent detailNormalMap = EditorGUIUtility.TrTextContent("Detail Normal Map", "Enable Detail (secondary) Normal Map sampling for up-close viewing, if assigned.");
                 public static readonly GUIContent cascadedShadowMaps = EditorGUIUtility.TrTextContent("Cascaded Shadows");
-                public static readonly GUIContent prefer32BitShadowMaps = EditorGUIUtility.TrTextContent("Prefer 32-bit shadow maps");
+                public static readonly GUIContent prefer32BitShadowMaps = EditorGUIUtility.TrTextContent("Prefer 32-bit shadow maps", "Enable 32-bit float shadow map when you are targeting PS4 or platforms using DX11 or DX12.");
                 public static readonly GUIContent semitransparentShadows = EditorGUIUtility.TrTextContent("Enable Semitransparent Shadows");
-                public static readonly GUIContent enableLPPV = EditorGUIUtility.TrTextContent("Enable Light Probe Proxy Volume");
-                public static readonly GUIContent renderingPath = EditorGUIUtility.TrTextContent("Rendering Path");
-                public static readonly GUIContent useHDR = EditorGUIUtility.TrTextContent("Use HDR");
-                public static readonly GUIContent hdrMode = EditorGUIUtility.TrTextContent("HDR Mode");
+                public static readonly GUIContent enableLPPV = EditorGUIUtility.TrTextContent("Enable Light Probe Proxy Volume", "Enable rendering a 3D grid of interpolated Light Probes inside a Bounding Volume.");
+                public static readonly GUIContent renderingPath = EditorGUIUtility.TrTextContent("Rendering Path", "Choose how Unity should render graphics. Different rendering paths affect the performance of your game, and how lighting and shading are calculated.");
+                public static readonly GUIContent useHDR = EditorGUIUtility.TrTextContent("Use HDR", "Enable High Dynamic Range rendering for this tier.");
+                public static readonly GUIContent hdrMode = EditorGUIUtility.TrTextContent("HDR Mode", "Color render texture format for the HDR buffer to use when HDR is enabled.");
                 public static readonly GUIContent realtimeGICPUUsage = EditorGUIUtility.TrTextContent("Realtime Global Illumination CPU Usage", "How many CPU worker threads to create for Realtime Global Illumination lighting calculations in the Player. Increasing this makes the system react faster to changes in lighting at a cost of using more CPU time. The higher the CPU Usage value, the more worker threads are created for solving Realtime GI.");
             }
         }
diff --git a/Editor/Mono/ShaderUtil.bindings.cs b/Editor/Mono/ShaderUtil.bindings.cs
index 84cb831286..c6e51b7a48 100644
--- a/Editor/Mono/ShaderUtil.bindings.cs
+++ b/Editor/Mono/ShaderUtil.bindings.cs
@@ -245,6 +245,7 @@ internal static void GetShaderVariantEntriesFiltered(Shader shader, int maxEntri
         [FreeFunction] extern internal static int GetShaderSubshaderCount([NotNull] Shader shader);
         [FreeFunction] extern internal static int GetShaderTotalPassCount([NotNull] Shader shader, int subShaderIndex);
         [FreeFunction] extern internal static int GetSubshaderLOD([NotNull] Shader shader, int subShaderIndex);
+        [FreeFunction] extern internal static bool IsGrabPass([NotNull] Shader shader, int subShaderIndex, int passId);
         [FreeFunction("ShaderUtil::FindSubShaderTagValue")] extern internal static int FindSubShaderTagValue([NotNull] Shader shader, int subShaderIndex, int tagName);
         [FreeFunction("ShaderUtil::FindPassTagValue")] extern internal static int FindPassTagValue([NotNull] Shader shader, int subShaderIndex, int passIndex, int tagName);
 
@@ -332,7 +333,7 @@ public static BuiltinShaderDefine[] GetShaderPlatformKeywordsForBuildTarget(Shad
         }
 
         extern internal static ShaderData.VariantCompileInfo CompileShaderVariant([NotNull] Shader shader, int subShaderIndex, int passId,
-            ShaderType shaderType, BuiltinShaderDefine[] platformKeywords, string[] keywords, ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, GraphicsTier tier);
+            ShaderType shaderType, BuiltinShaderDefine[] platformKeywords, string[] keywords, ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, GraphicsTier tier, bool outputForExternalTool);
         extern internal static ShaderData.PreprocessedVariant PreprocessShaderVariant([NotNull] Shader shader, int subShaderIndex, int passId,
             ShaderType shaderType, BuiltinShaderDefine[] platformKeywords, string[] keywords, ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, GraphicsTier tier, bool stripLineDirectives);
 
diff --git a/Editor/Mono/ShaderUtil.cs b/Editor/Mono/ShaderUtil.cs
index 4c16ecbb39..2fd4b81c7f 100644
--- a/Editor/Mono/ShaderUtil.cs
+++ b/Editor/Mono/ShaderUtil.cs
@@ -64,6 +64,7 @@ internal Pass(Subshader subshader, int passIndex)
 
             public string SourceCode { get { return ShaderUtil.GetShaderPassSourceCode(SourceShader, SubshaderIndex, m_PassIndex); } }
             public string Name { get { return ShaderUtil.GetShaderPassName(SourceShader, SubshaderIndex, m_PassIndex); } }
+            public bool IsGrabPass { get { return ShaderUtil.IsGrabPass(SourceShader, SubshaderIndex, m_PassIndex); } }
 
             public UnityEngine.Rendering.ShaderTagId FindTagValue(UnityEngine.Rendering.ShaderTagId tagName)
             {
@@ -80,28 +81,52 @@ public bool HasShaderStage(ShaderType shaderType)
 
             public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
                 ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget)
+            {
+                return CompileVariant(shaderType, keywords, shaderCompilerPlatform, buildTarget, false);
+            }
+
+            public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
+                ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, bool forExternalTool)
             {
                 var platformKeywords = ShaderUtil.GetShaderPlatformKeywordsForBuildTarget(shaderCompilerPlatform, buildTarget, kNoGraphicsTier);
-                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, kNoGraphicsTier);
+                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, kNoGraphicsTier, forExternalTool);
             }
 
             public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
                 ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, GraphicsTier tier)
+            {
+                return CompileVariant(shaderType, keywords, shaderCompilerPlatform, buildTarget, tier, false);
+            }
+
+            public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
+                ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, GraphicsTier tier, bool forExternalTool)
             {
                 var platformKeywords = ShaderUtil.GetShaderPlatformKeywordsForBuildTarget(shaderCompilerPlatform, buildTarget, tier);
-                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, tier);
+                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, tier, forExternalTool);
             }
 
             public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
                 ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, BuiltinShaderDefine[] platformKeywords)
             {
-                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, kNoGraphicsTier);
+                return CompileVariant(shaderType, keywords, shaderCompilerPlatform, buildTarget, platformKeywords, false);
+            }
+
+            public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
+                ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, BuiltinShaderDefine[] platformKeywords, bool forExternalTool)
+            {
+                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, kNoGraphicsTier, forExternalTool);
             }
 
             public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
                 ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, BuiltinShaderDefine[] platformKeywords, GraphicsTier tier)
             {
-                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, tier);
+                return CompileVariant(shaderType, keywords, shaderCompilerPlatform, buildTarget, platformKeywords, tier, false);
+            }
+
+            public VariantCompileInfo CompileVariant(ShaderType shaderType, string[] keywords,
+                ShaderCompilerPlatform shaderCompilerPlatform, BuildTarget buildTarget, BuiltinShaderDefine[] platformKeywords, GraphicsTier tier, bool forExternalTool)
+            {
+                return ShaderUtil.CompileShaderVariant(SourceShader, SubshaderIndex, m_PassIndex, shaderType, platformKeywords, keywords, shaderCompilerPlatform, buildTarget, tier, forExternalTool);
             }
 
             public PreprocessedVariant PreprocessVariant(ShaderType shaderType, string[] keywords,
diff --git a/Editor/Mono/Shaders/MaterialHierarchyPopup.cs b/Editor/Mono/Shaders/MaterialHierarchyPopup.cs
new file mode 100644
index 0000000000..85e3caab73
--- /dev/null
+++ b/Editor/Mono/Shaders/MaterialHierarchyPopup.cs
@@ -0,0 +1,595 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditorInternal;
+using Object = UnityEngine.Object;
+using static UnityEditor.MaterialEditor;
+
+namespace UnityEditor
+{
+    class MaterialHierarchyPopup : PopupWindowContent
+    {
+        const int k_MaxSearchIterationPerFrame = 500;
+        const int k_MaxTableRows = 10;
+        const int k_MinIconSize = 20;
+
+        const float k_MinWindowWidth = 300f, k_MaxWindowWidth = 500f;
+
+        const float k_HeaderHeight = 49f;
+        const float k_EntryHeight = 20f;
+        const float k_SliderWidth = 55f;
+        const float k_SearchHeight = 150f;
+        const float k_ConvertLabelWidth = 150f;
+
+        const float k_Padding = 3f;
+        const float k_OffsetX = 6f;
+        const float k_SplitWidth = 1f;
+
+        readonly float k_MinNameWidth;
+        readonly float k_TitleWidth = k_OffsetX + 50f;
+        readonly float k_LocksWidth = EditorStyles.miniLabel.CalcSize(Styles.locksLabel).x + 2 * k_Padding;
+        readonly float k_OverridesWidth = k_SplitWidth + EditorStyles.miniLabel.CalcSize(Styles.overridesLabel).x + 2 * k_Padding;
+
+        readonly float k_ScrollbarWidth = GUI.skin.verticalScrollbar.fixedWidth + GUI.skin.verticalScrollbar.margin.left;
+        readonly float k_ScrollbarHeight = GUI.skin.horizontalScrollbar.fixedHeight + GUI.skin.horizontalScrollbar.margin.top;
+
+        readonly MaterialEditor materialEditor;
+        readonly Material target;
+        readonly bool enabled;
+        readonly GUID targetGUID;
+        float windowWidth, namesWidth, maxNameWidth, noResultsX, locksX, overridesX;
+        Vector2 scroll = Vector2.zero;
+        int numRows;
+
+        // Children list
+        bool displayChildren;
+        ObjectListArea listArea;
+        ObjectListAreaState m_ListAreaState;
+        SavedInt m_SavedGridSize = new SavedInt("MaterialHierarchyPopup.GridSize", 56);
+
+        // Search
+        readonly Delayer debounce;
+        readonly SearchFilter searchFilter;
+        int[] results = null;
+        string searchFilterString = "";
+        IEnumerator<HierarchyProperty> enumerator = null;
+
+        public static class Colors
+        {
+            static Color header_l = new Color32(0xDF, 0xDF, 0xDF, 0xFF);
+            static Color header_d = new Color(0.5f, 0.5f, 0.5f, 0.2f);
+
+            static Color[] rows_l = new Color[2]
+            {
+                new Color32(0xC8, 0xC8, 0xC8, 0xFF),
+                new Color32(0xCE, 0xCE, 0xCE, 0xFF)
+            };
+
+            static Color[] rows_d = new Color[2]
+            {
+                new Color32(0x38, 0x38, 0x38, 0xFF),
+                new Color32(0x3E, 0x3E, 0x3E, 0xFF)
+            };
+
+            public static Color headerBackground { get { return EditorGUIUtility.isProSkin ? Colors.header_d : Colors.header_l; } }
+            public static Color rowBackground(int i) => EditorGUIUtility.isProSkin ? Colors.rows_d[i % 2] : Colors.rows_l[i % 2];
+        }
+
+        public static class Styles
+        {
+            public static readonly GUIContent rootLabel = EditorGUIUtility.TrTextContent("Root", "The root of the hierarchy.");
+            public static readonly GUIContent selectedLabel = EditorGUIUtility.TrTextContent("Current", "The currently selected Material.");
+
+            public static readonly GUIContent instanceLabel = EditorGUIUtility.TrTextContent("Variant Family of");
+            public static readonly GUIContent ancestorLabel = EditorGUIUtility.TrTextContent("Ancestors");
+            public static readonly GUIContent overridesLabel = EditorGUIUtility.TrTextContent("Overrides");
+            public static readonly GUIContent locksLabel = EditorGUIUtility.TrTextContent("Locks");
+            public static readonly GUIContent childrenLabel = EditorGUIUtility.TrTextContent("Children");
+            public static readonly GUIContent noResultsLabel = EditorGUIUtility.TrTextContent("No results");
+            public static readonly GUIContent noChildrenLabel = EditorGUIUtility.TrTextContent("This Material doesn't have any children.\nMaterial Variants created from this Material\nwill be listed here.");
+
+            public static readonly string[] headerPopupOptions = new string[] { "Material", "Material Variant" };
+            public static readonly GUIContent convertingLabel = EditorGUIUtility.TrTextContent("Converting to Material Variant");
+            public static readonly GUIContent conversionHelpLabel = EditorGUIUtility.TrTextContent("To convert, select a Parent Material");
+
+            public static readonly GUIStyle searchBackground = new GUIStyle("ProjectBrowserIconAreaBg");
+            public static readonly GUIStyle centered = new GUIStyle(EditorStyles.label) { alignment = TextAnchor.MiddleCenter };
+            public static readonly GUIStyle boldRightAligned = new GUIStyle(EditorStyles.boldLabel)
+            {
+                alignment = TextAnchor.MiddleRight,
+                fontSize = (int)(1.1f * EditorStyles.boldLabel.fontSize)
+            };
+            public static readonly GUIStyle boldNumber = new GUIStyle(EditorStyles.boldLabel)
+            {
+                fontSize = (int)(0.9f * EditorStyles.boldLabel.fontSize)
+            };
+
+            public static readonly GUIStyle searchFieldStyle = new GUIStyle(EditorStyles.toolbarSearchField)
+            {
+                margin = new RectOffset(5, 4, 4, 5)
+            };
+        }
+
+        internal MaterialHierarchyPopup(Material target, bool enabled, MaterialEditor materialEditor, Rect activatorRect)
+        {
+            this.enabled = enabled;
+            this.materialEditor = materialEditor;
+            this.target = target;
+            targetGUID = AssetDatabase.GUIDFromAssetPath(AssetDatabase.GetAssetPath(target));
+
+            k_MinNameWidth = k_MinWindowWidth - (k_TitleWidth + k_SplitWidth + k_OverridesWidth + k_LocksWidth);
+
+            searchFilter = new SearchFilter()
+            {
+                classNames = new string[] { "Material" },
+                searchArea = SearchFilter.SearchArea.AllAssets
+            };
+            debounce = Delayer.Debounce(_ =>
+            {
+                SearchFilterChanged();
+                editorWindow.Repaint();
+            });
+
+            Init();
+        }
+
+        void Init()
+        {
+            displayChildren = !target.isVariant;
+
+            numRows = 0;
+            namesWidth = k_MinNameWidth;
+            if (target.isVariant)
+            {
+                Material current = target;
+                while (current != null)
+                {
+                    numRows++;
+                    namesWidth = Mathf.Max(GUI.skin.label.CalcSize(EditorGUIUtility.TempContent(current.name)).x + 23, namesWidth);
+                    current = current.parent;
+                }
+                numRows = Mathf.Max(numRows, 2); // at least this and his parent
+            }
+
+            float scrollBarWidthOffset = numRows >= k_MaxTableRows ? k_ScrollbarWidth : 0;
+            maxNameWidth = k_MaxWindowWidth - (k_TitleWidth + k_SplitWidth + k_OverridesWidth + k_LocksWidth) - scrollBarWidthOffset;
+
+            float prevWidth = windowWidth;
+            if (namesWidth <= k_MinNameWidth)
+                windowWidth = k_MinWindowWidth;
+            else if (namesWidth >= maxNameWidth)
+                windowWidth = k_MaxWindowWidth;
+            else
+                windowWidth = k_TitleWidth + namesWidth + k_SplitWidth + k_OverridesWidth + k_LocksWidth;
+
+            // Prevent window size from getting smaller when changing options
+            windowWidth = Mathf.Max(windowWidth, prevWidth);
+
+            locksX = windowWidth - k_LocksWidth - scrollBarWidthOffset;
+            overridesX = locksX - k_OverridesWidth;
+            noResultsX = (windowWidth - EditorStyles.label.CalcSize(Styles.noResultsLabel).x) * 0.5f;
+        }
+
+        public override void OnClose()
+        {
+            if (listArea != null)
+                listArea.OnDestroy();
+        }
+
+        public override Vector2 GetWindowSize()
+        {
+            var height = k_HeaderHeight;
+
+            if (target.isVariant)
+            {
+                // Horizontal scrollbar
+                if (namesWidth > maxNameWidth)
+                    height += k_ScrollbarHeight;
+
+                // Ancestors table
+                height += Mathf.Min(numRows, k_MaxTableRows) * k_EntryHeight + k_EntryHeight;
+            }
+
+            if (materialEditor.convertState != ConvertAction.Convert)
+            {
+                // Children list
+                height += k_EntryHeight;
+                if (displayChildren)
+                    height += k_SearchHeight;
+            }
+            else
+            {
+                // Conversion panel
+                height += 2 * k_EntryHeight + k_Padding;
+            }
+
+            return new Vector2(windowWidth, height);
+        }
+
+        public override void OnGUI(Rect rect)
+        {
+            // Escape closes the window
+            if (Event.current.type == EventType.KeyDown && Event.current.keyCode == KeyCode.Escape)
+            {
+                editorWindow.Close();
+                GUIUtility.ExitGUI();
+            }
+
+            // Handle undo
+            if (target.parent != null && materialEditor.convertState == ConvertAction.Convert)
+            {
+                materialEditor.convertState = ConvertAction.None;
+                Init();
+            }
+
+            if (!DrawHeader())
+                return;
+
+            float height = k_HeaderHeight;
+            if (target.isVariant)
+                height += DrawVariantHierarchy();
+
+            height += DrawChildrenLabel(height);
+
+            if (displayChildren)
+                DrawChildren(height);
+
+            if (materialEditor.convertState == ConvertAction.Flatten)
+            {
+                materialEditor.convertState = ConvertAction.None;
+                Undo.RecordObject(target, "Flatten Material Variant");
+                target.parent = null;
+                Init();
+            }
+        }
+
+        bool DrawHeader()
+        {
+            Rect headerRect = GUILayoutUtility.GetRect(20, windowWidth, k_HeaderHeight, k_HeaderHeight);
+            EditorGUI.DrawRect(headerRect, Colors.headerBackground);
+
+            float labelSize = Styles.boldRightAligned.CalcSize(Styles.instanceLabel).x;
+
+            Rect labelRect = new Rect(k_OffsetX, headerRect.y + k_Padding, labelSize, EditorGUIUtility.singleLineHeight);
+            Rect contentRect = new Rect(labelRect.x + labelRect.width + k_Padding, labelRect.y, windowWidth, labelRect.height);
+
+            GUI.Label(labelRect, Styles.instanceLabel, Styles.boldRightAligned);
+            DoObjectLabel(contentRect, target, EditorStyles.boldLabel);
+
+            labelRect.y = labelRect.height + 2 * k_Padding;
+            if (materialEditor.convertState == ConvertAction.None)
+            {
+                int result;
+                labelRect.width = k_ConvertLabelWidth;
+                using (new EditorGUI.DisabledScope(!enabled))
+                    result = EditorGUI.Popup(labelRect, target.isVariant ? 1 : 0, Styles.headerPopupOptions);
+                if (result == 0 && target.isVariant)
+                    materialEditor.convertState = ConvertAction.Flatten;
+                if (result == 1 && !target.isVariant)
+                    materialEditor.convertState = ConvertAction.Convert;
+            }
+            else if (materialEditor.convertState == ConvertAction.Convert)
+            {
+                GUI.enabled = false;
+                labelRect.width = 200f;
+                EditorGUI.Button(labelRect, Styles.convertingLabel);
+                GUI.enabled = true;
+
+                // Conversion helper
+                labelRect.y = k_HeaderHeight;
+                labelRect.width = windowWidth;
+                EditorGUI.LabelField(labelRect, Styles.conversionHelpLabel);
+
+                labelRect.x = windowWidth - 14;
+                if (GUI.Button(labelRect, GUIContent.none, EditorStyles.toolbarSearchFieldCancelButton))
+                {
+                    materialEditor.convertState = ConvertAction.None;
+                    materialEditor.Repaint();
+                }
+
+                labelRect.x = k_OffsetX;
+                var oldLabelWidth = EditorGUIUtility.labelWidth;
+                EditorGUIUtility.labelWidth = 70;
+                EditorGUI.BeginChangeCheck();
+                var parent = target.parent;
+                materialEditor.ParentField(new Rect(k_OffsetX, labelRect.yMax + k_Padding, windowWidth - 2 * k_OffsetX, k_EntryHeight));
+                if (EditorGUI.EndChangeCheck() && parent != target.parent)
+                {
+                    materialEditor.convertState = ConvertAction.None;
+                    Init();
+                }
+                EditorGUIUtility.labelWidth = oldLabelWidth;
+                return false;
+            }
+
+            return true;
+        }
+
+        float DrawVariantHierarchy()
+        {
+            // Draw table header
+            Rect entryRect = new Rect(0, k_HeaderHeight, windowWidth, k_EntryHeight);
+            EditorGUI.DrawRect(entryRect, Colors.rowBackground(0));
+
+            var labelRect = entryRect;
+            labelRect.x = k_TitleWidth;
+            GUI.Label(labelRect, Styles.ancestorLabel, EditorStyles.miniLabel);
+
+            labelRect.x = overridesX + k_Padding;
+            GUI.Label(labelRect, Styles.overridesLabel, EditorStyles.miniLabel);
+
+            labelRect.x = locksX + k_Padding;
+            GUI.Label(labelRect, Styles.locksLabel, EditorStyles.miniLabel);
+
+            float tableHeight = Mathf.Min(numRows, k_MaxTableRows) * k_EntryHeight + (namesWidth > maxNameWidth ? k_ScrollbarHeight : 0);
+            float realHeight = numRows * k_EntryHeight + (namesWidth > maxNameWidth ? k_ScrollbarHeight : 0);
+            var tableRect = new Rect(0, k_HeaderHeight + k_EntryHeight, windowWidth - 1, tableHeight);
+            scroll.y = GUI.BeginScrollView(tableRect, scroll, new Rect(tableRect) { width = tableRect.width - k_ScrollbarWidth, height = realHeight }).y;
+
+            // Draw overrides and locks table
+            int i = numRows;
+            Material current = target;
+            while (current != null && i > 0)
+            {
+                entryRect.y = k_HeaderHeight + i * k_EntryHeight;
+                EditorGUI.DrawRect(entryRect, Colors.rowBackground(i--));
+
+                DisplayOverridesAndLocks(entryRect, current);
+                current = current.parent;
+            }
+
+            var scrollRect = new Rect(k_TitleWidth, k_HeaderHeight + k_EntryHeight, Mathf.Min(namesWidth, maxNameWidth), numRows * k_EntryHeight);
+            scroll.x = GUI.BeginScrollView(new Rect(scrollRect) { height = scrollRect.height + k_ScrollbarHeight }, scroll, new Rect(scrollRect) { width = namesWidth }).x;
+
+            // Draw scrollable table
+            i = numRows;
+            current = target;
+            entryRect.x = k_TitleWidth;
+            while (i != 0)
+            {
+                entryRect.y = k_HeaderHeight + i-- * k_EntryHeight;
+
+                if (current == null)
+                {
+                    GUI.Label(entryRect, EditorGUIUtility.TempContent("Missing (Material)"));
+                    break;
+                }
+                DoObjectLabel(entryRect, current);
+                current = current.parent;
+            }
+
+            GUI.EndScrollView();
+
+            float height = tableHeight + k_EntryHeight;
+
+            // Draw selected label
+            labelRect.x = k_OffsetX;
+            labelRect.y = k_HeaderHeight + numRows * k_EntryHeight;
+            labelRect.width = k_TitleWidth - labelRect.x;
+            GUI.Label(labelRect, Styles.selectedLabel);
+
+            // Draw root label
+            if (labelRect.y != k_HeaderHeight + k_EntryHeight)
+            {
+                labelRect.y = k_HeaderHeight + k_EntryHeight;
+                GUI.Label(labelRect, Styles.rootLabel);
+            }
+
+            // Draw vertical splits
+            Rect splitBar = new Rect(overridesX - k_SplitWidth, k_HeaderHeight, k_SplitWidth, (numRows + 1) * k_EntryHeight);
+            EditorGUI.DrawRect(splitBar, Colors.headerBackground);
+            splitBar.x = locksX - k_SplitWidth;
+            EditorGUI.DrawRect(splitBar, Colors.headerBackground);
+
+            GUI.EndScrollView();
+
+            return height;
+        }
+
+        float DrawChildrenLabel(float yMin)
+        {
+            var labelRect = new Rect(k_OffsetX, yMin, 100, k_EntryHeight);
+            if (target.isVariant)
+                displayChildren = EditorGUI.Foldout(labelRect, displayChildren, Styles.childrenLabel, true);
+            else
+                EditorGUI.LabelField(labelRect, Styles.childrenLabel);
+
+            if (displayChildren)
+            {
+                if (listArea == null)
+                    InitListArea();
+
+                labelRect = new Rect(labelRect.x + 58 + (target.isVariant ? 12 : 0), labelRect.y + 2, k_SliderWidth, EditorGUI.kSingleLineHeight);
+                if (results.Length != 0)
+                    EditorGUI.LabelField(labelRect, results.Length.ToString(), Styles.boldNumber);
+
+                EditorGUI.BeginChangeCheck();
+                labelRect.x = windowWidth - k_OffsetX - k_SliderWidth;
+                var newGridSize = (int)GUI.HorizontalSlider(labelRect, listArea.gridSize, listArea.minGridSize, listArea.maxGridSize);
+                if (EditorGUI.EndChangeCheck())
+                    listArea.gridSize = m_SavedGridSize.value = newGridSize;
+            }
+
+            return k_EntryHeight;
+        }
+
+        void DrawChildren(float yMin)
+        {
+            var backgroundRect = new Rect(0, yMin, windowWidth, k_SearchHeight);
+            GUI.Label(backgroundRect, GUIContent.none, Styles.searchBackground);
+
+            EditorGUI.BeginChangeCheck();
+            var searchRect = new Rect(k_OffsetX + k_Padding, backgroundRect.y + k_Padding, windowWidth - 2 * k_OffsetX - k_Padding, Styles.searchFieldStyle.fixedHeight);
+            searchFilterString = EditorGUI.ToolbarSearchField(searchRect, searchFilterString, false);
+            if (EditorGUI.EndChangeCheck())
+                debounce.Execute();
+
+            if (enumerator != null)
+                Search();
+
+            yMin = searchRect.height + (listArea.gridSize < k_MinIconSize ? 11f : 0f);
+            var listRect = new Rect(k_Padding, searchRect.y + yMin, windowWidth - 2 * k_Padding, k_SearchHeight - yMin - k_Padding);
+
+            int listKeyboardControlID = GUIUtility.GetControlID(FocusType.Keyboard);
+            listArea.OnGUI(listRect, listKeyboardControlID);
+
+            if (enumerator == null && results.Length == 0)
+            {
+                var labelRect = new Rect(noResultsX, backgroundRect.y + 69f, windowWidth, EditorGUI.kSingleLineHeight);
+                EditorGUI.LabelField(backgroundRect, searchFilter.nameFilter.Length == 0 ? Styles.noChildrenLabel : Styles.noResultsLabel, Styles.centered);
+            }
+        }
+
+        void InitListArea()
+        {
+            m_ListAreaState = new ObjectListAreaState() { m_GridSize = m_SavedGridSize };
+            listArea = new ObjectListArea(m_ListAreaState, editorWindow, false)
+            {
+                allowDeselection = true,
+                allowMultiSelect = false,
+                allowRenaming = false,
+                allowBuiltinResources = true,
+            };
+
+            listArea.itemSelectedCallback += (bool doubleClicked) =>
+            {
+                if (listArea.GetSelection().Length == 0)
+                    return;
+                var selection = listArea.GetSelection()[0];
+                GUIUtility.keyboardControl = GUIUtility.GetControlID(FocusType.Keyboard);
+                if (doubleClicked)
+                {
+                    Selection.SetActiveObjectWithContext(EditorUtility.InstanceIDToObject(selection), null);
+                    Event.current.Use();
+                    editorWindow.Close();
+                    GUIUtility.ExitGUI();
+                }
+                else
+                {
+                    EditorGUIUtility.PingObject(selection);
+                    Event.current.Use();
+                }
+            };
+
+            SearchFilterChanged();
+        }
+
+        static IEnumerator<HierarchyProperty> FindInAllAssets(SearchFilter searchFilter)
+        {
+            var rootPaths = new List<string>();
+            rootPaths.Add("Assets");
+            foreach (var package in PackageManagerUtilityInternal.GetAllVisiblePackages(false))
+            {
+                if (package.source == PackageManager.PackageSource.Local)
+                    rootPaths.Add(package.assetPath);
+            }
+
+            foreach (var rootPath in rootPaths)
+            {
+                var property = new HierarchyProperty(rootPath, false);
+                property.SetSearchFilter(searchFilter);
+                while (property.Next(null))
+                    yield return property;
+            }
+        }
+
+        void SearchFilterChanged()
+        {
+            searchFilter.nameFilter = searchFilterString;
+
+            var size = GetWindowSize();
+            var rect = new Rect(0, size.y - k_SearchHeight, size.x, k_SearchHeight);
+
+            listArea.Init(rect, HierarchyType.Assets, new SearchFilter(), true, SearchService.SearchSessionOptions.Default);
+            enumerator = FindInAllAssets(searchFilter);
+            results = new int[0];
+        }
+
+        void Search()
+        {
+            var newResults = new List<int>();
+
+            var maxAddCount = k_MaxSearchIterationPerFrame;
+            while (--maxAddCount >= 0)
+            {
+                if (!enumerator.MoveNext())
+                {
+                    enumerator = null;
+                    break;
+                }
+                var child = InternalEditorUtility.GetLoadedObjectFromInstanceID(enumerator.Current.GetInstanceIDIfImported()) as Material;
+                if (!child)
+                {
+                    // First check guid from file to avoid loading material in memory
+                    string path = AssetDatabase.GUIDToAssetPath(enumerator.Current.guid);
+                    if (EditorMaterialUtility.GetMaterialParentFromFile(path) != targetGUID)
+                        continue;
+                    child = AssetDatabase.LoadAssetAtPath<Material>(path);
+                }
+                if (child != null && child.parent == target)
+                    newResults.Add(child.GetInstanceID());
+            }
+
+            int newElements = newResults.Count;
+            int i = results.Length;
+            System.Array.Resize(ref results, results.Length + newElements);
+            for (var j = 0; j < newElements && i < results.Length; ++j, ++i)
+                results[i] = newResults[j];
+
+            listArea.ShowObjectsInList(results);
+        }
+
+        void DisplayOverridesAndLocks(Rect rect, Material entry)
+        {
+            rect.x = overridesX;
+            rect.width = k_OverridesWidth;
+            int overrideCount = entry.overrideCount;
+            GUI.Label(rect, overrideCount == 0 ? "-" : overrideCount.ToString(), Styles.centered);
+
+            rect.x = locksX;
+            rect.width = k_LocksWidth;
+            int lockCount = entry.lockCount;
+            GUI.Label(rect, lockCount == 0 ? "-" : lockCount.ToString(), Styles.centered);
+        }
+
+        void DoObjectLabel(Rect rect, Object entry)
+        {
+            DoObjectLabel(rect, entry, GUI.skin.label);
+        }
+
+        void DoObjectLabel(Rect rect, Object entry, GUIStyle style)
+        {
+            GUI.Label(rect, AssetPreview.GetMiniThumbnail(entry));
+
+            if (Event.current.type == EventType.MouseDown && Event.current.button == 0 && rect.Contains(Event.current.mousePosition))
+            {
+                // One click shows where the referenced object is
+                if (Event.current.clickCount == 1)
+                {
+                    GUIUtility.keyboardControl = GUIUtility.GetControlID(FocusType.Keyboard);
+
+                    EditorGUIUtility.PingObject(entry);
+                    Event.current.Use();
+                }
+                // Double click changes selection to referenced object
+                else if (Event.current.clickCount == 2)
+                {
+                    if (entry)
+                    {
+                        Selection.SetActiveObjectWithContext(entry, null);
+                        Event.current.Use();
+                        editorWindow.Close();
+                        GUIUtility.ExitGUI();
+                    }
+                }
+            }
+
+            rect.x += rect.height;
+            rect.width -= rect.height;
+            GUI.Label(rect, EditorGUIUtility.TempContent(entry.name, entry.name), style);
+        }
+    }
+}
diff --git a/Editor/Mono/SplashScreenLogo.cs b/Editor/Mono/SplashScreenLogo.cs
index ec120bff75..c8fd472ad1 100644
--- a/Editor/Mono/SplashScreenLogo.cs
+++ b/Editor/Mono/SplashScreenLogo.cs
@@ -21,7 +21,7 @@ public partial struct SplashScreenLogo
 
             static SplashScreenLogo()
             {
-                s_UnityLogo = Resources.GetBuiltinResource<Sprite>("UnitySplash-cube.png");
+                s_UnityLogo = AssetDatabase.GetBuiltinExtraResource<Sprite>("SplashScreen/UnitySplash-Light.png");
             }
 
             public Sprite logo
diff --git a/Editor/Mono/SpritePacker.bindings.cs b/Editor/Mono/SpritePacker.bindings.cs
index 54d0163853..2f8e5a2b23 100644
--- a/Editor/Mono/SpritePacker.bindings.cs
+++ b/Editor/Mono/SpritePacker.bindings.cs
@@ -73,25 +73,6 @@ public extern static string[] atlasNames
         [FreeFunction("SpritePacker::GetAlphaTexturesForAtlas")]
         public static extern Texture2D[] GetAlphaTexturesForAtlas(string atlasName);
 
-        [FreeFunction("SpritePacker::RebuildAtlasCacheIfNeededFromScript")]
-        internal static extern void RebuildAtlasCacheIfNeededInternal(BuildTarget target, bool displayProgressBar, Execution execution);
-
-        [Obsolete("Sprite Packing Tags are deprecated. Please use Sprite Atlas asset.")]
-        [FreeFunction("SpritePacker::RebuildAtlasCacheIfNeededFromScript")]
-        public static extern void RebuildAtlasCacheIfNeeded(BuildTarget target, bool displayProgressBar, Execution execution);
-
-        [Obsolete("Sprite Packing Tags are deprecated. Please use Sprite Atlas asset.")]
-        public static void RebuildAtlasCacheIfNeeded(BuildTarget target, bool displayProgressBar)
-        {
-            RebuildAtlasCacheIfNeeded(target, displayProgressBar, Execution.Normal);
-        }
-
-        [Obsolete("Sprite Packing Tags are deprecated. Please use Sprite Atlas asset.")]
-        public static void RebuildAtlasCacheIfNeeded(BuildTarget target)
-        {
-            RebuildAtlasCacheIfNeeded(target, false, Execution.Normal);
-        }
-
         public static void GetAtlasDataForSprite(Sprite sprite, out string atlasName, out Texture2D atlasTexture)
         {
             atlasName = Internal_GetAtlasNameForSprite(sprite);
diff --git a/Editor/Mono/Sprites/DefaultSpritePackerPolicy.cs b/Editor/Mono/Sprites/DefaultSpritePackerPolicy.cs
deleted file mode 100644
index 49e0708dad..0000000000
--- a/Editor/Mono/Sprites/DefaultSpritePackerPolicy.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Linq;
-using UnityEngine;
-using System.Collections.Generic;
-
-namespace UnityEditor.Sprites
-{
-    // DefaultPackerPolicy will pack rectangles no matter what Sprite mesh type is unless their packing tag contains "[TIGHT]".
-    internal class DefaultPackerPolicy : IPackerPolicy
-    {
-        protected class Entry
-        {
-            public Sprite            sprite;
-            public AtlasSettings     settings;
-            public string            atlasName;
-            public SpritePackingMode packingMode;
-            public int               anisoLevel;
-        }
-
-        private const uint kDefaultPaddingPower = 3; // Good for base and two mip levels.
-
-        public virtual int GetVersion() { return 1; }
-        public virtual bool AllowSequentialPacking { get { return false; } }
-
-        protected virtual string TagPrefix { get { return "[TIGHT]"; } }
-        protected virtual bool AllowTightWhenTagged { get { return true; } }
-        protected virtual bool AllowRotationFlipping { get { return false; } }
-
-        public void OnGroupAtlases(BuildTarget target, PackerJob job, int[] textureImporterInstanceIDs)
-        {
-            List<Entry> entries = new List<Entry>();
-
-            string targetName = "";
-            if (target != BuildTarget.NoTarget)
-            {
-                targetName = BuildPipeline.GetBuildTargetName(target);
-            }
-
-            foreach (int instanceID in textureImporterInstanceIDs)
-            {
-                TextureImporter ti = EditorUtility.InstanceIDToObject(instanceID) as TextureImporter;
-
-                TextureFormat desiredFormat;
-                ColorSpace colorSpace;
-                int compressionQuality;
-                ti.ReadTextureImportInstructions(target, out desiredFormat, out colorSpace, out compressionQuality);
-
-                TextureImporterSettings tis = new TextureImporterSettings();
-                ti.ReadTextureSettings(tis);
-
-                bool hasAlphaSplittingForCompression = (targetName != "" && HasPlatformEnabledAlphaSplittingForCompression(targetName, ti));
-
-                Sprite[] sprites = AssetDatabase.LoadAllAssetRepresentationsAtPath(ti.assetPath).Select(x => x as Sprite).Where(x => x != null).ToArray();
-                foreach (Sprite sprite in sprites)
-                {
-                    Entry entry = new Entry();
-                    entry.sprite = sprite;
-                    entry.settings.format = desiredFormat;
-                    entry.settings.colorSpace = colorSpace;
-                    // Use Compression Quality for Grouping later only for Compressed Formats. Otherwise leave it Empty.
-                    entry.settings.compressionQuality = UnityEditor.TextureUtil.IsCompressedTextureFormat(desiredFormat) ? compressionQuality : 0;
-                    entry.settings.filterMode = Enum.IsDefined(typeof(FilterMode), ti.filterMode) ? ti.filterMode : FilterMode.Bilinear;
-                    entry.settings.maxWidth = 2048;
-                    entry.settings.maxHeight = 2048;
-                    entry.settings.generateMipMaps = ti.mipmapEnabled;
-                    entry.settings.enableRotation = AllowRotationFlipping;
-                    entry.settings.allowsAlphaSplitting = TextureImporter.IsTextureFormatETC1Compression(desiredFormat) && hasAlphaSplittingForCompression;
-                    if (ti.mipmapEnabled)
-                        entry.settings.paddingPower = kDefaultPaddingPower;
-                    else
-                        entry.settings.paddingPower = (uint)EditorSettings.spritePackerPaddingPower;
-                    entry.atlasName = ParseAtlasName(ti.spritePackingTag);
-                    entry.packingMode = GetPackingMode(ti.spritePackingTag, tis.spriteMeshType);
-                    entry.anisoLevel = ti.anisoLevel;
-
-                    entries.Add(entry);
-                }
-
-                Resources.UnloadAsset(ti);
-            }
-
-            // First split sprites into groups based on atlas name
-            var atlasGroups =
-                from e in entries
-                group e by e.atlasName;
-            foreach (var atlasGroup in atlasGroups)
-            {
-                int page = 0;
-                // Then split those groups into smaller groups based on texture settings
-                var settingsGroups =
-                    from t in atlasGroup
-                    group t by t.settings;
-                foreach (var settingsGroup in settingsGroups)
-                {
-                    string atlasName = atlasGroup.Key;
-                    if (settingsGroups.Count() > 1)
-                        atlasName += string.Format(" (Group {0})", page);
-
-                    AtlasSettings settings = settingsGroup.Key;
-                    settings.anisoLevel = 1;
-                    // Use the highest aniso level from all entries in this atlas
-                    if (settings.generateMipMaps)
-                        foreach (Entry entry in settingsGroup)
-                            if (entry.anisoLevel > settings.anisoLevel)
-                                settings.anisoLevel = entry.anisoLevel;
-
-                    job.AddAtlas(atlasName, settings);
-                    foreach (Entry entry in settingsGroup)
-                    {
-                        job.AssignToAtlas(atlasName, entry.sprite, entry.packingMode, SpritePackingRotation.None);
-                    }
-
-                    ++page;
-                }
-            }
-        }
-
-        protected bool HasPlatformEnabledAlphaSplittingForCompression(string targetName, TextureImporter ti)
-        {
-            TextureImporterPlatformSettings platformSettings = ti.GetPlatformTextureSettings(targetName);
-            return (platformSettings.overridden && platformSettings.allowsAlphaSplitting);
-        }
-
-        protected bool IsTagPrefixed(string packingTag)
-        {
-            packingTag = packingTag.Trim();
-            if (packingTag.Length < TagPrefix.Length)
-                return false;
-            return (packingTag.Substring(0, TagPrefix.Length) == TagPrefix);
-        }
-
-        private string ParseAtlasName(string packingTag)
-        {
-            string name = packingTag.Trim();
-            if (IsTagPrefixed(name))
-                name = name.Substring(TagPrefix.Length).Trim();
-            return (name.Length == 0) ? "(unnamed)" : name;
-        }
-
-        private SpritePackingMode GetPackingMode(string packingTag, SpriteMeshType meshType)
-        {
-            if (meshType == SpriteMeshType.Tight)
-                if (IsTagPrefixed(packingTag) == AllowTightWhenTagged)
-                    return SpritePackingMode.Tight;
-            return SpritePackingMode.Rectangle;
-        }
-    }
-}
diff --git a/Editor/Mono/Sprites/SpritePacker.cs b/Editor/Mono/Sprites/SpritePacker.cs
deleted file mode 100644
index c61581c27e..0000000000
--- a/Editor/Mono/Sprites/SpritePacker.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Linq;
-using UnityEngine;
-using System.Collections.Generic;
-
-namespace UnityEditor.Sprites
-{
-    public sealed partial class Packer
-    {
-        public enum Execution
-        {
-            Normal = 0,
-            ForceRegroup
-        }
-
-        public static string kDefaultPolicy = typeof(DefaultPackerPolicy).Name;
-
-        private static string[] m_policies = null;
-        public static string[] Policies
-        {
-            get
-            {
-                RegenerateList();
-                return m_policies;
-            }
-        }
-
-        private static string m_selectedPolicy = null;
-        private static void SetSelectedPolicy(string value)
-        {
-            m_selectedPolicy = value;
-            PlayerSettings.spritePackerPolicy = m_selectedPolicy;
-        }
-
-        public static string SelectedPolicy
-        {
-            get
-            {
-                RegenerateList();
-                return m_selectedPolicy;
-            }
-            set
-            {
-                RegenerateList();
-                if (value == null)
-                    throw new ArgumentNullException();
-                if (!m_policies.Contains(value))
-                    throw new ArgumentException("Specified policy {0} is not in the policy list.", value);
-                SetSelectedPolicy(value);
-            }
-        }
-
-        private static Dictionary<string, Type> m_policyTypeCache = null;
-        private static void RegenerateList()
-        {
-            if (m_policies != null)
-                return;
-
-            var types = TypeCache.GetTypesDerivedFrom<IPackerPolicy>();
-
-            m_policies = types.Select(t => t.Name).ToArray();
-
-            m_policyTypeCache = new Dictionary<string, Type>();
-            foreach (var t in types)
-            {
-                if (m_policyTypeCache.ContainsKey(t.Name))
-                {
-                    Type otherT = m_policyTypeCache[t.Name];
-                    Debug.LogError(string.Format("Duplicate Sprite Packer policies found: {0} and {1}. Please rename one.", t.FullName, otherT.FullName));
-                }
-                else
-                    m_policyTypeCache[t.Name] = t;
-            }
-
-            m_selectedPolicy = String.IsNullOrEmpty(PlayerSettings.spritePackerPolicy) ? kDefaultPolicy : PlayerSettings.spritePackerPolicy;
-
-            // Did policies change?
-            if (!m_policies.Contains(m_selectedPolicy))
-                SetSelectedPolicy(kDefaultPolicy);
-        }
-
-        // Called from SpritePacker::GetSelectedPolicyId()
-        internal static string GetSelectedPolicyId()
-        {
-            RegenerateList();
-
-            Type t = m_policyTypeCache[m_selectedPolicy];
-            IPackerPolicy policy = Activator.CreateInstance(t) as IPackerPolicy;
-            string versionString = string.Format("{0}::{1}", t.AssemblyQualifiedName, policy.GetVersion());
-
-            return versionString;
-        }
-
-        internal static bool AllowSequentialPacking()
-        {
-            RegenerateList();
-
-            Type t = m_policyTypeCache[m_selectedPolicy];
-            IPackerPolicy policy = Activator.CreateInstance(t) as IPackerPolicy;
-            return policy.AllowSequentialPacking;
-        }
-
-        internal static void ExecuteSelectedPolicy(BuildTarget target, int[] textureImporterInstanceIDs)
-        {
-            RegenerateList();
-
-            Type t = m_policyTypeCache[m_selectedPolicy];
-            IPackerPolicy policy = Activator.CreateInstance(t) as IPackerPolicy;
-            policy.OnGroupAtlases(target, new PackerJob(), textureImporterInstanceIDs);
-        }
-
-        internal static void SaveUnappliedTextureImporterSettings()
-        {
-            foreach (InspectorWindow i in InspectorWindow.GetAllInspectorWindows())
-            {
-                ActiveEditorTracker activeEditor = i.tracker;
-                foreach (Editor e in activeEditor.activeEditors)
-                {
-                    TextureImporterInspector inspector = e as TextureImporterInspector;
-                    if (inspector == null)
-                        continue;
-                    if (!inspector.HasModified())
-                        continue;
-                    TextureImporter importer = inspector.target as TextureImporter;
-                    if (EditorUtility.DisplayDialog("Unapplied import settings", "Unapplied import settings for \'" + importer.assetPath + "\'", "Apply", "Revert"))
-                    {
-                        inspector.ApplyAndImport(); // No way to apply/revert only some assets. Bug: 564192.
-                    }
-                }
-            }
-        }
-    }
-
-    public interface IPackerPolicy
-    {
-        bool AllowSequentialPacking { get; }
-        void OnGroupAtlases(BuildTarget target, PackerJob job, int[] textureImporterInstanceIDs);
-        int GetVersion();
-    }
-}
diff --git a/Editor/Mono/Sprites/SpritePackerWindow.cs b/Editor/Mono/Sprites/SpritePackerWindow.cs
deleted file mode 100644
index b06110695d..0000000000
--- a/Editor/Mono/Sprites/SpritePackerWindow.cs
+++ /dev/null
@@ -1,383 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Linq;
-using UnityEditorInternal;
-using UnityEngine;
-
-namespace UnityEditor.Sprites
-{
-    internal class PackerWindow : SpriteUtilityWindow
-    {
-        private class PackerWindowStyle
-        {
-            public static readonly GUIContent packLabel = EditorGUIUtility.TrTextContent("Pack");
-            public static readonly GUIContent repackLabel = EditorGUIUtility.TrTextContent("Repack");
-            public static readonly GUIContent viewAtlasLabel = EditorGUIUtility.TrTextContent("View Atlas:");
-            public static readonly GUIContent windowTitle = EditorGUIUtility.TrTextContent("Sprite Packer");
-            public static readonly GUIContent pageContentLabel = EditorGUIUtility.TrTextContent("Page {0}");
-            public static readonly GUIContent packingDisabledLabel = EditorGUIUtility.TrTextContent("Legacy sprite packing is disabled. Enable it in Edit > Project Settings > Editor.");
-            public static readonly GUIContent openProjectSettingButton = EditorGUIUtility.TrTextContent("Open Project Editor Settings");
-        }
-
-        struct Edge
-        {
-            public UInt16 v0;
-            public UInt16 v1;
-            public Edge(UInt16 a, UInt16 b)
-            {
-                v0 = a;
-                v1 = b;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (ReferenceEquals(obj, null))
-                    return false;
-                if (obj.GetType() != GetType())
-                    return false;
-                Edge item = (Edge)obj;
-                return (v0 == item.v0 && v1 == item.v1) || (v0 == item.v1 && v1 == item.v0);
-            }
-
-            public override int GetHashCode()
-            {
-                return (v0 << 16 | v1) ^ (v1 << 16 | v0).GetHashCode();
-            }
-        }
-
-        private static string[] s_AtlasNamesEmpty = new string[1] { "Sprite atlas cache is empty" };
-        private string[] m_AtlasNames = s_AtlasNamesEmpty;
-        private int m_SelectedAtlas = 0;
-
-        private static string[] s_PageNamesEmpty = new string[0];
-        private string[] m_PageNames = s_PageNamesEmpty;
-        private int m_SelectedPage = 0;
-
-        private Sprite m_SelectedSprite = null;
-
-
-        void OnEnable()
-        {
-            minSize = new Vector2(400f, 256f);
-            titleContent = PackerWindowStyle.windowTitle;
-
-            Reset();
-        }
-
-        private void Reset()
-        {
-            RefreshAtlasNameList();
-            RefreshAtlasPageList();
-
-            m_SelectedAtlas = 0;
-            m_SelectedPage = 0;
-            m_SelectedSprite = null;
-        }
-
-        private void RefreshAtlasNameList()
-        {
-            m_AtlasNames = Packer.atlasNames;
-
-            // Validate
-            if (m_SelectedAtlas >= m_AtlasNames.Length)
-                m_SelectedAtlas = 0;
-        }
-
-        private void RefreshAtlasPageList()
-        {
-            if (m_AtlasNames.Length > 0)
-            {
-                string atlas = m_AtlasNames[m_SelectedAtlas];
-                Texture2D[] textures = Packer.GetTexturesForAtlas(atlas);
-                m_PageNames = new string[textures.Length];
-                for (int i = 0; i < textures.Length; ++i)
-                    m_PageNames[i] = string.Format(PackerWindowStyle.pageContentLabel.text, i + 1);
-            }
-            else
-            {
-                m_PageNames = s_PageNamesEmpty;
-            }
-
-            // Validate
-            if (m_SelectedPage >= m_PageNames.Length)
-                m_SelectedPage = 0;
-        }
-
-        private void OnAtlasNameListChanged()
-        {
-            if (m_AtlasNames.Length > 0)
-            {
-                string[] atlasNames = Packer.atlasNames;
-                string curAtlasName = m_AtlasNames[m_SelectedAtlas];
-                string newAtlasName = (atlasNames.Length <= m_SelectedAtlas) ? null : atlasNames[m_SelectedAtlas];
-                if (curAtlasName.Equals(newAtlasName))
-                {
-                    RefreshAtlasNameList();
-                    RefreshAtlasPageList();
-                    m_SelectedSprite = null;
-                    return;
-                }
-            }
-
-            Reset();
-        }
-
-        private bool ValidateIsPackingEnabled()
-        {
-            return true;
-        }
-
-        private Rect DoToolbarGUI()
-        {
-            Rect toolbarRect = new Rect(0 , 0, position.width, k_ToolbarHeight);
-
-            if (Event.current.type == EventType.Repaint)
-            {
-                EditorStyles.toolbar.Draw(toolbarRect, false, false, false, false);
-            }
-
-            bool wasEnabled = GUI.enabled;
-            GUI.enabled = m_AtlasNames.Length > 0;
-            toolbarRect = DoAlphaZoomToolbarGUI(toolbarRect);
-            GUI.enabled = wasEnabled;
-
-            Rect drawRect = new Rect(EditorGUI.kSpacing, 0, 0, k_ToolbarHeight);
-            toolbarRect.width -= drawRect.x;
-
-            using (new EditorGUI.DisabledScope(Application.isPlaying))
-            {
-                drawRect.width = EditorStyles.toolbarButton.CalcSize(PackerWindowStyle.packLabel).x;
-                DrawToolBarWidget(ref drawRect, ref toolbarRect, (adjustedDrawRect) =>
-                {
-                    if (GUI.Button(adjustedDrawRect, PackerWindowStyle.packLabel, EditorStyles.toolbarButton))
-                    {
-                        Packer.RebuildAtlasCacheIfNeededInternal(EditorUserBuildSettings.activeBuildTarget, true, Packer.Execution.Normal);
-                        m_SelectedSprite = null;
-                        RefreshAtlasPageList();
-                        RefreshState();
-                    }
-                });
-
-                using (new EditorGUI.DisabledScope(Packer.SelectedPolicy == Packer.kDefaultPolicy))
-                {
-                    drawRect.x += drawRect.width;
-                    drawRect.width = EditorStyles.toolbarButton.CalcSize(PackerWindowStyle.repackLabel).x;
-                    DrawToolBarWidget(ref drawRect, ref toolbarRect, (adjustedDrawRect) =>
-                    {
-                        if (GUI.Button(adjustedDrawRect, PackerWindowStyle.repackLabel, EditorStyles.toolbarButton))
-                        {
-                            Packer.RebuildAtlasCacheIfNeededInternal(EditorUserBuildSettings.activeBuildTarget, true, Packer.Execution.ForceRegroup);
-                            m_SelectedSprite = null;
-                            RefreshAtlasPageList();
-                            RefreshState();
-                        }
-                    });
-                }
-            }
-
-            const float kAtlasNameWidth = 100;
-            const float kPagesWidth = 70;
-            const float kPolicyWidth = 100;
-
-            float viewAtlasWidth = GUI.skin.label.CalcSize(PackerWindowStyle.viewAtlasLabel).x;
-            float totalWidth = viewAtlasWidth + kAtlasNameWidth + kPagesWidth + kPolicyWidth;
-
-            drawRect.x += EditorGUI.kSpacing; // leave some space from previous control for cosmetic
-            toolbarRect.width -= EditorGUI.kSpacing;
-            float availableWidth = toolbarRect.width;
-
-            using (new EditorGUI.DisabledScope(m_AtlasNames.Length == 0))
-            {
-                drawRect.x += drawRect.width;
-                drawRect.width = viewAtlasWidth / totalWidth * availableWidth;
-                DrawToolBarWidget(ref drawRect, ref toolbarRect, (adjustedDrawArea) =>
-                {
-                    GUI.Label(adjustedDrawArea, PackerWindowStyle.viewAtlasLabel);
-                });
-
-                EditorGUI.BeginChangeCheck();
-                drawRect.x += drawRect.width;
-                drawRect.width = kAtlasNameWidth / totalWidth * availableWidth;
-                DrawToolBarWidget(ref drawRect, ref toolbarRect, (adjustedDrawArea) =>
-                {
-                    m_SelectedAtlas = EditorGUI.Popup(adjustedDrawArea, m_SelectedAtlas, m_AtlasNames, EditorStyles.toolbarPopup);
-                });
-                if (EditorGUI.EndChangeCheck())
-                {
-                    RefreshAtlasPageList();
-                    m_SelectedSprite = null;
-                }
-
-                EditorGUI.BeginChangeCheck();
-                drawRect.x += drawRect.width;
-                drawRect.width = kPagesWidth / totalWidth * availableWidth;
-                DrawToolBarWidget(ref drawRect, ref toolbarRect, (adjustedDrawArea) =>
-                {
-                    m_SelectedPage = EditorGUI.Popup(adjustedDrawArea, m_SelectedPage, m_PageNames, EditorStyles.toolbarPopup);
-                });
-
-                if (EditorGUI.EndChangeCheck())
-                {
-                    m_SelectedSprite = null;
-                }
-            }
-
-            EditorGUI.BeginChangeCheck();
-            string[] policies = Packer.Policies;
-            int selectedPolicy = Array.IndexOf(policies, Packer.SelectedPolicy);
-            drawRect.x += drawRect.width;
-            drawRect.width = kPolicyWidth / totalWidth * availableWidth;
-            DrawToolBarWidget(ref drawRect, ref toolbarRect, (adjustedDrawArea) =>
-            {
-                selectedPolicy = EditorGUI.Popup(adjustedDrawArea, selectedPolicy, policies, EditorStyles.toolbarPopup);
-            });
-
-            if (EditorGUI.EndChangeCheck())
-            {
-                Packer.SelectedPolicy = policies[selectedPolicy];
-            }
-
-            return toolbarRect;
-        }
-
-        void OnSelectionChange()
-        {
-            if (Selection.activeObject == null)
-                return;
-
-            Sprite selectedSprite = Selection.activeObject as Sprite;
-            if (selectedSprite != m_SelectedSprite)
-            {
-                if (selectedSprite != null)
-                {
-                    string selAtlasName;
-                    Texture2D selAtlasTexture;
-                    Packer.GetAtlasDataForSprite(selectedSprite, out selAtlasName, out selAtlasTexture);
-
-                    int selAtlasIndex = m_AtlasNames.ToList().FindIndex(delegate(string s) { return selAtlasName == s; });
-                    if (selAtlasIndex == -1)
-                        return;
-                    int selAtlasPage = Packer.GetTexturesForAtlas(selAtlasName).ToList().FindIndex(delegate(Texture2D t) { return selAtlasTexture == t; });
-                    if (selAtlasPage == -1)
-                        return;
-
-                    m_SelectedAtlas = selAtlasIndex;
-                    m_SelectedPage = selAtlasPage;
-                    RefreshAtlasPageList();
-                }
-
-                m_SelectedSprite = selectedSprite;
-
-                Repaint();
-            }
-        }
-
-        private void RefreshState()
-        {
-            // Check if atlas name list changed
-            string[] atlasNames = Packer.atlasNames;
-            if (!atlasNames.SequenceEqual(m_AtlasNames))
-            {
-                if (atlasNames.Length == 0)
-                {
-                    Reset();
-                    return;
-                }
-                else
-                {
-                    OnAtlasNameListChanged();
-                }
-            }
-
-            if (m_AtlasNames.Length == 0)
-            {
-                SetNewTexture(null);
-                return;
-            }
-
-            // Validate selections
-            if (m_SelectedAtlas >= m_AtlasNames.Length)
-                m_SelectedAtlas = 0;
-            string curAtlasName = m_AtlasNames[m_SelectedAtlas];
-
-            Texture2D[] textures = Packer.GetTexturesForAtlas(curAtlasName);
-            if (m_SelectedPage >= textures.Length)
-                m_SelectedPage = 0;
-
-            SetNewTexture(textures[m_SelectedPage]);
-
-            // check if the atlas has alpha as an external texture (as in ETC1 atlases with alpha)
-            Texture2D[] alphaTextures = Packer.GetAlphaTexturesForAtlas(curAtlasName);
-            Texture2D selectedAlphaTexture = (m_SelectedPage < alphaTextures.Length) ? alphaTextures[m_SelectedPage] : null;
-            SetAlphaTextureOverride(selectedAlphaTexture);
-        }
-
-        public void OnGUI()
-        {
-            if (!ValidateIsPackingEnabled())
-                return;
-
-            Matrix4x4 oldHandlesMatrix = Handles.matrix;
-            InitStyles();
-
-            RefreshState();
-
-            // Top menu bar
-            Rect toolbarRect = DoToolbarGUI();
-
-            if (m_Texture == null)
-                return;
-
-            // Texture view
-            EditorGUILayout.BeginHorizontal();
-            m_TextureViewRect = new Rect(0f, toolbarRect.yMax, position.width - k_ScrollbarMargin, position.height - k_ScrollbarMargin - toolbarRect.height);
-            GUILayout.FlexibleSpace();
-            DoTextureGUI();
-            string info = string.Format("{1}x{2}, {0}", TextureUtil.GetTextureFormatString(m_Texture.format), m_Texture.width, m_Texture.height);
-            EditorGUI.DropShadowLabel(new Rect(m_TextureViewRect.x, m_TextureViewRect.y + 10, m_TextureViewRect.width, 20), info);
-            EditorGUILayout.EndHorizontal();
-
-            Handles.matrix = oldHandlesMatrix;
-        }
-
-        private void DrawLineUtility(Vector2 from, Vector2 to)
-        {
-            SpriteEditorUtility.DrawLine(new Vector3(from.x * m_Texture.width + 1f / m_Zoom, from.y * m_Texture.height + 1f / m_Zoom, 0.0f), new Vector3(to.x * m_Texture.width + 1f / m_Zoom, to.y * m_Texture.height + 1f / m_Zoom, 0.0f));
-        }
-
-        private Edge[] FindUniqueEdges(UInt16[] indices)
-        {
-            Edge[] allEdges = new Edge[indices.Length];
-            int tris = indices.Length / 3;
-            for (int i = 0; i < tris; ++i)
-            {
-                allEdges[i * 3] = new Edge(indices[i * 3], indices[i * 3 + 1]);
-                allEdges[i * 3 + 1] = new Edge(indices[i * 3 + 1], indices[i * 3 + 2]);
-                allEdges[i * 3 + 2] = new Edge(indices[i * 3 + 2], indices[i * 3]);
-            }
-
-            Edge[] uniqueEdges = allEdges.GroupBy(x => x).Where(x => x.Count() == 1).Select(x => x.First()).ToArray();
-            return uniqueEdges;
-        }
-
-        protected override void DrawGizmos()
-        {
-            if (m_SelectedSprite != null && m_Texture != null)
-            {
-                Vector2[] uvs = SpriteUtility.GetSpriteUVs(m_SelectedSprite, true);
-                UInt16[] indices = m_SelectedSprite.triangles;
-                Edge[] uniqueEdges = FindUniqueEdges(indices); // Assumes that our mesh has no duplicate vertices
-
-                SpriteEditorUtility.BeginLines(new Color(0.3921f, 0.5843f, 0.9294f, 0.75f)); // Cornflower blue :)
-                foreach (Edge e in uniqueEdges)
-                    DrawLineUtility(uvs[e.v0], uvs[e.v1]);
-                SpriteEditorUtility.EndLines();
-            }
-        }
-    } // class
-}
diff --git a/Editor/Mono/Sprites/SpriteUtility.cs b/Editor/Mono/Sprites/SpriteUtility.cs
index 616cf7d9ed..1f174c35aa 100644
--- a/Editor/Mono/Sprites/SpriteUtility.cs
+++ b/Editor/Mono/Sprites/SpriteUtility.cs
@@ -570,61 +570,7 @@ public static UnityTexture2D RenderStaticPreview(Sprite sprite, Color color, int
 
         public static UnityTexture2D RenderStaticPreview(Sprite sprite, Color color, int width, int height, Matrix4x4 transform)
         {
-            if (sprite == null)
-                return null;
-
-            PreviewHelpers.AdjustWidthAndHeightForStaticPreview((int)sprite.rect.width, (int)sprite.rect.height, ref width, ref height);
-
-            SavedRenderTargetState savedRTState = new SavedRenderTargetState();
-
-            RenderTexture tmp = RenderTexture.GetTemporary(width, height, 0, SystemInfo.GetGraphicsFormat(DefaultFormat.LDR));
-            RenderTexture.active = tmp;
-            GL.Clear(true, true, new Color(0f, 0f, 0f, 0.1f));
-
-            previewSpriteDefaultMaterial.mainTexture = sprite.texture;
-            previewSpriteDefaultMaterial.SetPass(0);
-
-            RenderSpriteImmediate(sprite, color, transform);
-
-            UnityTexture2D copy = new UnityTexture2D(width, height, TextureFormat.ARGB32, false);
-            copy.hideFlags = HideFlags.HideAndDontSave;
-            copy.ReadPixels(new Rect(0, 0, width, height), 0, 0);
-            copy.Apply();
-            RenderTexture.ReleaseTemporary(tmp);
-
-            savedRTState.Restore();
-            return copy;
-        }
-
-        internal static void RenderSpriteImmediate(Sprite sprite, Color color, Matrix4x4 transform)
-        {
-            float spriteWidth = sprite.rect.width;
-            float spriteHeight = sprite.rect.height;
-
-            float pixelsToUnits = sprite.rect.width / sprite.bounds.size.x;
-            Vector2[] vertices = sprite.vertices;
-            Vector2[] uvs = sprite.uv;
-            ushort[] triangles = sprite.triangles;
-            Vector2 pivot = sprite.pivot;
-
-            GL.PushMatrix();
-            GL.LoadOrtho();
-            GL.Begin(GL.TRIANGLES);
-            for (int i = 0; i < sprite.triangles.Length; ++i)
-            {
-                ushort index = triangles[i];
-                Vector2 spriteVertex = vertices[index];
-                Vector2 uv = uvs[index];
-                Vector3 vertex = new Vector3(spriteVertex.x, spriteVertex.y, 0);
-                vertex = transform.MultiplyPoint(vertex);
-                vertex.x = (vertex.x * pixelsToUnits + pivot.x) / spriteWidth;
-                vertex.y = (vertex.y * pixelsToUnits + pivot.y) / spriteHeight;
-                GL.Color(color);
-                GL.TexCoord(new Vector3(uv.x, uv.y, 0));
-                GL.Vertex3(vertex.x, vertex.y, vertex.z);
-            }
-            GL.End();
-            GL.PopMatrix();
+            return SpriteInspector.BuildPreviewTexture(sprite, previewSpriteDefaultMaterial, false, width, height, color, transform);
         }
 
         public static UnityTexture2D CreateTemporaryDuplicate(UnityTexture2D original, int width, int height)
diff --git a/Editor/Mono/Sprites/TightRotateEnabledSpritePackerPolicy.cs b/Editor/Mono/Sprites/TightRotateEnabledSpritePackerPolicy.cs
deleted file mode 100644
index f0323ebd25..0000000000
--- a/Editor/Mono/Sprites/TightRotateEnabledSpritePackerPolicy.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Linq;
-using UnityEngine;
-using System.Collections.Generic;
-
-namespace UnityEditor.Sprites
-{
-    // TightRotateEnabledSpritePackerPolicy will tightly pack non-rectangle Sprites unless their packing tag contains "[RECT]" with rotation and flipping for optimal packing.
-    internal class TightRotateEnabledSpritePackerPolicy : DefaultPackerPolicy
-    {
-        protected override string TagPrefix { get { return "[RECT]"; } }
-        protected override bool AllowTightWhenTagged { get { return false; } }
-        protected override bool AllowRotationFlipping { get { return true; } }
-    }
-}
diff --git a/Editor/Mono/Sprites/TightSpritePackerPolicy.cs b/Editor/Mono/Sprites/TightSpritePackerPolicy.cs
deleted file mode 100644
index ef78eec698..0000000000
--- a/Editor/Mono/Sprites/TightSpritePackerPolicy.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Linq;
-using UnityEngine;
-using System.Collections.Generic;
-
-namespace UnityEditor.Sprites
-{
-    // TightPackerPolicy will tightly pack non-rectangle Sprites unless their packing tag contains "[RECT]".
-    internal class TightPackerPolicy : DefaultPackerPolicy
-    {
-        protected override string TagPrefix { get { return "[RECT]"; } }
-        protected override bool AllowTightWhenTagged { get { return false; } }
-        protected override bool AllowRotationFlipping { get { return false; } }
-    }
-}
diff --git a/Editor/Mono/TooltipView/TooltipView.cs b/Editor/Mono/TooltipView/TooltipView.cs
index 7de21a33b9..685175b210 100644
--- a/Editor/Mono/TooltipView/TooltipView.cs
+++ b/Editor/Mono/TooltipView/TooltipView.cs
@@ -53,7 +53,7 @@ protected override void OnEnable()
             m_VisualRoot = new VisualElement();
             m_VisualRoot.pseudoStates |= PseudoStates.Root;
             m_VisualRoot.style.overflow = Overflow.Hidden;
-            EditorUIService.instance.AddDefaultEditorStyleSheets(m_VisualRoot);
+            UIElementsEditorUtility.AddDefaultEditorStyleSheets(m_VisualRoot);
             m_VisualRoot.style.flexGrow = 1;
             visualTree.Add(m_VisualRoot);
             EditorApplication.update += Update;
@@ -86,18 +86,13 @@ protected override void OldOnGUI()
                 m_DynamicHintContent.Extended = s_EnableExtendedDynamicHints && (m_HoldingShift || (m_DynamicHintIsBeingDisplayed && DynamicHintAutoExtendTimeReached));
                 m_DynamicHintContent.Update();
                 Size = m_DynamicHintContent.GetContentSize();
+                /* Repainting is an expensive operation (causes CPU/GPU spikes), but
+                 * Dynamic Hints need to be repainted in order to be expanded
+                 * and to play media properly.
+                 */
+                Repaint();
             }
-
-            Repaint();
-
-            if (s_CloseState == CloseState.CloseRequested && !m_HoldingShift)
-            {
-                if (m_DynamicHintContent != null && m_DynamicHintContent.GetRect().Contains(evt.mousePosition))
-                {
-                    return;
-                }
-                s_CloseState = CloseState.CloseApproved;
-            }
+            ValidateCloseRequest(evt, false);
         }
 
         void Setup(string tooltip, Rect rect, GUIView hostView)
@@ -143,7 +138,7 @@ void Setup(string tooltip, Rect rect, GUIView hostView)
                 m_VisualRoot.Query<Button>().ForEach((button) =>
                 {
                     button.clickable.activators.Add(new ManipulatorActivationFilter
-                        { button = MouseButton.LeftMouse, modifiers = EventModifiers.Shift });
+                    { button = MouseButton.LeftMouse, modifiers = EventModifiers.Shift });
                 });
             }
             else
@@ -245,8 +240,33 @@ public static void SetAlpha(float percent)
             s_guiView?.window?.SetAlpha(percent);
         }
 
+        void ValidateCloseRequest(Event currentEvent, bool keepDynamicHintRegardlessOfMousePosition)
+        {
+            if (s_CloseState != CloseState.CloseRequested)
+            {
+                return;
+            }
+
+            if (m_DynamicHintContent != null)
+            {
+                if (keepDynamicHintRegardlessOfMousePosition || m_HoldingShift)
+                {
+                    return;
+                }
+
+                if (currentEvent != null
+                && m_DynamicHintContent.GetRect().Contains(currentEvent.mousePosition))
+                {
+                    return;
+                }
+            }
+
+            s_CloseState = CloseState.CloseApproved;
+        }
+
         void Update()
         {
+            ValidateCloseRequest(Event.current, true);
             if (s_CloseState != CloseState.CloseApproved) { return; }
             ForceClose();
             m_DynamicHintIsBeingDisplayed = false;
diff --git a/ModuleOverrides/com.unity.ui/Editor/BaseLiveReloadAssetTracker.cs b/Editor/Mono/UIElements/BaseLiveReloadAssetTracker.cs
similarity index 91%
rename from ModuleOverrides/com.unity.ui/Editor/BaseLiveReloadAssetTracker.cs
rename to Editor/Mono/UIElements/BaseLiveReloadAssetTracker.cs
index 45beb0cf5a..f893106c6e 100644
--- a/ModuleOverrides/com.unity.ui/Editor/BaseLiveReloadAssetTracker.cs
+++ b/Editor/Mono/UIElements/BaseLiveReloadAssetTracker.cs
@@ -13,6 +13,9 @@ class AssetTracking<T> where T : ScriptableObject
         public T m_Asset;
         public string m_AssetPath;
         public int m_LastDirtyCount;
+        public int m_LastElementCount;
+        public int m_LastInlinePropertiesCount;
+        public int m_LastAttributePropertiesDirtyCount;
         public int m_ReferenceCount;
     }
 
@@ -98,11 +101,15 @@ public bool CheckTrackedAssetsDirty()
             return isTrackedAssetDirty;
         }
 
-        public void UpdateAssetDirtyCount(T asset, int newDirtyCount)
+        public void UpdateAssetTrackerCounts(T asset, int newDirtyCount, int newElementCount, int newInlinePropertiesCount, int newAttributePropertiesDirtyCount)
         {
             if (m_TrackedAssets.TryGetValue(asset.GetInstanceID(), out var assetTracking))
             {
                 assetTracking.m_LastDirtyCount = newDirtyCount;
+                assetTracking.m_LastElementCount = newElementCount;
+                assetTracking.m_LastInlinePropertiesCount = newInlinePropertiesCount;
+                assetTracking.m_LastAttributePropertiesDirtyCount = newAttributePropertiesDirtyCount;
+                assetTracking.m_LastDirtyCount = newDirtyCount;
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingsInterface.cs b/Editor/Mono/UIElements/Bindings/BindingsInterface.cs
similarity index 93%
rename from ModuleOverrides/com.unity.ui/Editor/Bindings/BindingsInterface.cs
rename to Editor/Mono/UIElements/Bindings/BindingsInterface.cs
index 0a371433e0..fe9ce068f9 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingsInterface.cs
+++ b/Editor/Mono/UIElements/Bindings/BindingsInterface.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using UnityEditor.UIElements.Bindings;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -41,10 +40,14 @@ public static class BindingExtensions
         internal static readonly string animationAnimatedUssClassName = "unity-binding--animation-animated";
         internal static readonly string animationRecordedUssClassName = "unity-binding--animation-recorded";
         internal static readonly string animationCandidateUssClassName = "unity-binding--animation-candidate";
+        internal static readonly string livePropertyUssClassName = "unity-binding--live-property";
+        internal static readonly string livePropertyBarName = "unity-binding-live-property-bar";
+        internal static readonly string livePropertyBarContainerName = "unity-live-property-bars-container";
+        internal static readonly string livePropertyBarUssClassName = "unity-binding__live-property-bar";
+
         internal static readonly PropertyName s_DataSourceProperty = new PropertyName("unity-data-source");
 
-        internal static ISerializedObjectBindingImplementation bindingImpl =
-            new DefaultSerializedObjectBindingImplementation();
+        internal static ISerializedObjectBindingImplementation bindingImpl = null;
 
         /// <summary>
         /// Binds a SerializedObject to fields in the element hierarchy.
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/SerializedPropertyBindingEvents.cs b/Editor/Mono/UIElements/Bindings/SerializedPropertyBindingEvents.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Bindings/SerializedPropertyBindingEvents.cs
rename to Editor/Mono/UIElements/Bindings/SerializedPropertyBindingEvents.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/ColorField.cs b/Editor/Mono/UIElements/Controls/ColorField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/ColorField.cs
rename to Editor/Mono/UIElements/Controls/ColorField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/CurveField.cs b/Editor/Mono/UIElements/Controls/CurveField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/CurveField.cs
rename to Editor/Mono/UIElements/Controls/CurveField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/EnumFlagsField.cs b/Editor/Mono/UIElements/Controls/EnumFlagsField.cs
similarity index 84%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/EnumFlagsField.cs
rename to Editor/Mono/UIElements/Controls/EnumFlagsField.cs
index adf2dd0a5c..c03d1c6024 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Controls/EnumFlagsField.cs
+++ b/Editor/Mono/UIElements/Controls/EnumFlagsField.cs
@@ -39,6 +39,22 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                     EnumFlagsField enumField = (EnumFlagsField)ve;
                     enumField.Init(resEnumValue, resIncludeObsoleteValues);
                 }
+                // If we didn't have a valid value, try to set the type.
+                else if (null != resEnumType)
+                {
+                    EnumFlagsField enumField = (EnumFlagsField)ve;
+
+                    enumField.m_EnumType = resEnumType;
+                    if (enumField.m_EnumType != null)
+                        enumField.PopulateDataFromType(enumField.m_EnumType);
+                    enumField.value = null;
+                }
+                else
+                {
+                    var enumField = (EnumFlagsField)ve;
+                    enumField.m_EnumType = null;
+                    enumField.value = null;
+                }
             }
         }
 
@@ -56,8 +72,14 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         public new static readonly string inputUssClassName = ussClassName + "__input";
 
         private Type m_EnumType;
+        private bool m_IncludeObsoleteValues;
         private EnumData m_EnumData;
 
+
+        // These properties exist so that the UIBuilder can read them.
+        internal Type type => m_EnumType;
+        internal bool includeObsoleteValues => m_IncludeObsoleteValues;
+
         /// <summary>
         /// Constructs an EnumFlagsField with a default value, and initializes its underlying type.
         /// </summary>
@@ -113,8 +135,8 @@ public void Init(Enum defaultValue, bool includeObsoleteValues = false)
                 throw new ArgumentNullException(nameof(defaultValue));
             }
 
-            m_EnumType = defaultValue.GetType();
-            m_EnumData = EnumDataUtility.GetCachedEnumData(m_EnumType, !includeObsoleteValues);
+            m_IncludeObsoleteValues = includeObsoleteValues;
+            PopulateDataFromType(defaultValue.GetType());
 
             if (!m_EnumData.flags)
                 Debug.LogWarning("EnumMaskField is not bound to enum type with the [Flags] attribute");
@@ -151,5 +173,10 @@ internal override int ValueToMask(Enum value)
 
             return EnumDataUtility.EnumFlagsToInt(m_EnumData, value);
         }
+        internal void PopulateDataFromType(Type enumType)
+        {
+            m_EnumType = enumType;
+            m_EnumData = EnumDataUtility.GetCachedEnumData(m_EnumType, !includeObsoleteValues);
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/GradientField.cs b/Editor/Mono/UIElements/Controls/GradientField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/GradientField.cs
rename to Editor/Mono/UIElements/Controls/GradientField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/LayerField.cs b/Editor/Mono/UIElements/Controls/LayerField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/LayerField.cs
rename to Editor/Mono/UIElements/Controls/LayerField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/LayerMaskField.cs b/Editor/Mono/UIElements/Controls/LayerMaskField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/LayerMaskField.cs
rename to Editor/Mono/UIElements/Controls/LayerMaskField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/MaskField.cs b/Editor/Mono/UIElements/Controls/MaskField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/MaskField.cs
rename to Editor/Mono/UIElements/Controls/MaskField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/ObjectField.cs b/Editor/Mono/UIElements/Controls/ObjectField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/ObjectField.cs
rename to Editor/Mono/UIElements/Controls/ObjectField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/PropertyControl.cs b/Editor/Mono/UIElements/Controls/PropertyControl.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/PropertyControl.cs
rename to Editor/Mono/UIElements/Controls/PropertyControl.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/PropertyField.cs b/Editor/Mono/UIElements/Controls/PropertyField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/PropertyField.cs
rename to Editor/Mono/UIElements/Controls/PropertyField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Controls/TagField.cs b/Editor/Mono/UIElements/Controls/TagField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Controls/TagField.cs
rename to Editor/Mono/UIElements/Controls/TagField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/IToolbarMenuElement.cs b/Editor/Mono/UIElements/Controls/Toolbar/IToolbarMenuElement.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/IToolbarMenuElement.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/IToolbarMenuElement.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/SearchFieldBase.cs b/Editor/Mono/UIElements/Controls/Toolbar/SearchFieldBase.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/SearchFieldBase.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/SearchFieldBase.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/Toolbar.cs b/Editor/Mono/UIElements/Controls/Toolbar/Toolbar.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/Toolbar.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/Toolbar.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarBreadcrumbs.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarBreadcrumbs.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarBreadcrumbs.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/ToolbarBreadcrumbs.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarButton.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarButton.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarButton.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/ToolbarButton.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarMenu.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarMenu.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarMenu.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/ToolbarMenu.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarPopupSearchField.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarPopupSearchField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarPopupSearchField.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/ToolbarPopupSearchField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarSearchField.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSearchField.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarSearchField.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/ToolbarSearchField.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarSpacer.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarSpacer.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarSpacer.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/ToolbarSpacer.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarToggle.cs b/Editor/Mono/UIElements/Controls/Toolbar/ToolbarToggle.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Toolbar/ToolbarToggle.cs
rename to Editor/Mono/UIElements/Controls/Toolbar/ToolbarToggle.cs
diff --git a/Editor/Mono/UIElements/Controls/VisualSplitter.cs b/Editor/Mono/UIElements/Controls/VisualSplitter.cs
index 30e351f988..7cfb4163a1 100644
--- a/Editor/Mono/UIElements/Controls/VisualSplitter.cs
+++ b/Editor/Mono/UIElements/Controls/VisualSplitter.cs
@@ -60,6 +60,7 @@ protected void OnMouseDown(MouseDownEvent e)
                     }
                     m_AffectedElements = visualSplitter.GetAffectedVisualElements();
 
+                    var shouldUseEvent = false;
                     for (int i = 0; i < m_AffectedElements.Count - 1; ++i)
                     {
                         VisualElement visualElement = m_AffectedElements[i];
@@ -80,12 +81,16 @@ protected void OnMouseDown(MouseDownEvent e)
                                 m_ActiveVisualElementIndex = i;
                                 m_NextVisualElementIndex = i + 1;
                             }
-
-                            m_Active = true;
-                            target.CaptureMouse();
-                            e.StopPropagation();
+                            shouldUseEvent = true;
                         }
                     }
+                    if (shouldUseEvent)
+                    {
+                        m_Active = true;
+                        target.CaptureMouse();
+                        e.StopPropagation();
+                        e.PreventDefault();
+                    }
                 }
             }
 
diff --git a/Modules/UIServiceEditor/EditorToolbar/DefaultMainToolbar.cs b/Editor/Mono/UIElements/DefaultMainToolbar.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/DefaultMainToolbar.cs
rename to Editor/Mono/UIElements/DefaultMainToolbar.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Drawers/Internal/UnityEventItem.cs b/Editor/Mono/UIElements/Drawers/Internal/UnityEventItem.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/Drawers/Internal/UnityEventItem.cs
rename to Editor/Mono/UIElements/Drawers/Internal/UnityEventItem.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/EditorMenuExtensions.cs b/Editor/Mono/UIElements/EditorMenuExtensions.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/EditorMenuExtensions.cs
rename to Editor/Mono/UIElements/EditorMenuExtensions.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/Inspector/EditorElement.cs b/Editor/Mono/UIElements/Inspector/EditorElement.cs
similarity index 99%
rename from ModuleOverrides/com.unity.ui/Editor/Inspector/EditorElement.cs
rename to Editor/Mono/UIElements/Inspector/EditorElement.cs
index e0fa2bd269..08181d1df0 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Inspector/EditorElement.cs
+++ b/Editor/Mono/UIElements/Inspector/EditorElement.cs
@@ -131,7 +131,7 @@ void Init()
             Add(m_Header);
             Add(m_Footer);
 
-            if (EditorUIService.disableInspectorElementThrottling)
+            if (InspectorElement.disabledThrottling)
                 CreateInspectorElement();
         }
 
@@ -148,7 +148,7 @@ InspectorElement BuildInspectorElement()
             {
                 inspectorElementMode = InspectorElement.GetModeFromInspectorMode(inspectorWindow.inspectorMode);
 
-                if (inspectorWindow.useUIElementsDefaultInspector)
+                if (!EditorSettings.inspectorUseIMGUIDefaultInspector)
                     inspectorElementMode &= ~(InspectorElement.Mode.IMGUIDefault);
             }
             else
@@ -613,7 +613,7 @@ void HandleComponentScreenshot(Rect content, Editor editor)
 
         internal bool EditorNeedsVerticalOffset(Editor[] editors, Object target)
         {
-            return m_EditorIndex > 0 && IsEditorValid() && editors[m_EditorIndex - 1].target is GameObject && target is Component;
+            return m_EditorIndex > 0 && IsEditorValid() && editors[m_EditorIndex - 1]?.target is GameObject && target is Component;
         }
 
         internal InspectorElement GetInspectorElementInternal()
diff --git a/ModuleOverrides/com.unity.ui/Editor/Inspector/InspectorElement.cs b/Editor/Mono/UIElements/Inspector/InspectorElement.cs
similarity index 95%
rename from ModuleOverrides/com.unity.ui/Editor/Inspector/InspectorElement.cs
rename to Editor/Mono/UIElements/Inspector/InspectorElement.cs
index befdf5bde5..b81ef9c6be 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Inspector/InspectorElement.cs
+++ b/Editor/Mono/UIElements/Inspector/InspectorElement.cs
@@ -72,6 +72,10 @@ public class InspectorElement : BindableElement
         /// </summary>
         public static readonly string debugInternalVariantUssClassName = ussClassName + "--debug-internal";
 
+        internal static readonly string noScriptErrorContainerName = "unity-inspector-no-script-error-container";
+
+        internal static bool disabledThrottling { get; set; } = false;
+
         /// <summary>
         /// Instantiates a <see cref="InspectorElement"/> using the data read from a UXML file.
         /// </summary>
@@ -136,6 +140,7 @@ private set
         internal SerializedObject boundObject { get; private set; }
 
         internal VisualElement prefabOverrideBlueBarsContainer { get; private set; }
+        internal VisualElement livePropertyYellowBarsContainer { get; private set; }
 
         private bool m_IgnoreOnInspectorGUIErrors;
 
@@ -283,6 +288,11 @@ private void Reset(SerializedObject bindObject)
             prefabOverrideBlueBarsContainer.style.position = Position.Absolute;
             Add(prefabOverrideBlueBarsContainer);
 
+            livePropertyYellowBarsContainer = new VisualElement();
+            livePropertyYellowBarsContainer.name = BindingExtensions.livePropertyBarContainerName;
+            livePropertyYellowBarsContainer.style.position = Position.Absolute;
+            Add(livePropertyYellowBarsContainer);
+
             RemoveFromClassList(iMGUIInspectorVariantUssClassName);
             RemoveFromClassList(uIEInspectorVariantUssClassName);
             RemoveFromClassList(noInspectorFoundVariantUssClassName);
@@ -327,6 +337,18 @@ void CreateInspectorGUI(bool updateBinding)
 
             Clear();
 
+            // Add prefabOverrideBlueBarsContainer again.
+            if (prefabOverrideBlueBarsContainer != null)
+            {
+                Add(prefabOverrideBlueBarsContainer);
+            }
+
+            // Add livePropertyYellowBarsContainer again.
+            if (livePropertyYellowBarsContainer != null)
+            {
+                Add(livePropertyYellowBarsContainer);
+            }
+
             var element = CreateInspectorElementFromEditor(editor, true) ?? CreateDefaultInspector(boundObject);
 
             if (element != null && element != this)
@@ -439,6 +461,11 @@ private VisualElement CreateDefaultInspector(SerializedObject serializedObject)
 
             FillDefaultInspector(this, serializedObject, editor);
 
+            if ((mode & Mode.DebugMod) > 0)
+                AddToClassList(debugVariantUssClassName);
+            else if ((mode & Mode.DebugInternalMod) > 0)
+                AddToClassList(debugInternalVariantUssClassName);
+
             AddToClassList(uIEDefaultVariantUssClassName);
             AddToClassList(uIEInspectorVariantUssClassName);
 
@@ -450,7 +477,9 @@ static bool AddMissingScriptLabel(VisualElement container, SerializedObject seri
             SerializedProperty scriptProperty = serializedObject.FindProperty("m_Script");
             if (scriptProperty != null)
             {
-                container.Add(new IMGUIContainer(() => GenericInspector.ShowScriptNotLoadedWarning(scriptProperty, isPartOfPrefabInstance)));
+                var noScriptErrorContainer = new IMGUIContainer(() => GenericInspector.ShowScriptNotLoadedWarning(scriptProperty, isPartOfPrefabInstance));
+                noScriptErrorContainer.name = noScriptErrorContainerName;
+                container.Add(noScriptErrorContainer);
                 return true;
             }
 
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetEditor.cs b/Editor/Mono/UIElements/StyleSheets/StyleSheetEditor.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetEditor.cs
rename to Editor/Mono/UIElements/StyleSheets/StyleSheetEditor.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImportErrors.cs b/Editor/Mono/UIElements/StyleSheets/StyleSheetImportErrors.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImportErrors.cs
rename to Editor/Mono/UIElements/StyleSheets/StyleSheetImportErrors.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImportGlossary.cs b/Editor/Mono/UIElements/StyleSheets/StyleSheetImportGlossary.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImportGlossary.cs
rename to Editor/Mono/UIElements/StyleSheets/StyleSheetImportGlossary.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImporter.cs b/Editor/Mono/UIElements/StyleSheets/StyleSheetImporter.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImporter.cs
rename to Editor/Mono/UIElements/StyleSheets/StyleSheetImporter.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImporterImpl.cs b/Editor/Mono/UIElements/StyleSheets/StyleSheetImporterImpl.cs
similarity index 99%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImporterImpl.cs
rename to Editor/Mono/UIElements/StyleSheets/StyleSheetImporterImpl.cs
index 7166c317e4..de46dbb7f4 100644
--- a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetImporterImpl.cs
+++ b/Editor/Mono/UIElements/StyleSheets/StyleSheetImporterImpl.cs
@@ -36,7 +36,6 @@ abstract class StyleValueImporter
         protected readonly StyleValidator m_Validator;
         protected string m_AssetPath;
         protected int m_CurrentLine;
-        protected string m_CurrentPropertyName;
 
         public StyleValueImporter(UnityEditor.AssetImporters.AssetImportContext context)
         {
@@ -481,7 +480,7 @@ protected void VisitUrlFunction(PrimitiveTerm term)
 
                     if (!disableValidation)
                     {
-                        var propertyName = new StylePropertyName(m_CurrentPropertyName);
+                        var propertyName = new StylePropertyName(m_Builder.currentProperty.name);
 
                         // Unknown properties (not custom) should beforehand
                         if (propertyName.id == StylePropertyId.Unknown)
@@ -1022,7 +1021,6 @@ void VisitSheet(ParserStyleSheet styleSheet)
                 foreach (Property property in rule.Declarations)
                 {
                     m_CurrentLine = property.Line;
-                    m_CurrentPropertyName = property.Name;
 
                     ValidateProperty(property);
 
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetResourceUtil.cs b/Editor/Mono/UIElements/StyleSheets/StyleSheetResourceUtil.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/StyleSheetResourceUtil.cs
rename to Editor/Mono/UIElements/StyleSheets/StyleSheetResourceUtil.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeAssetDefinitionState.cs b/Editor/Mono/UIElements/StyleSheets/ThemeAssetDefinitionState.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeAssetDefinitionState.cs
rename to Editor/Mono/UIElements/StyleSheets/ThemeAssetDefinitionState.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeRegistry.cs b/Editor/Mono/UIElements/StyleSheets/ThemeRegistry.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeRegistry.cs
rename to Editor/Mono/UIElements/StyleSheets/ThemeRegistry.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeStyleSheetImporter.cs b/Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporter.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeStyleSheetImporter.cs
rename to Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporter.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeStyleSheetImporterEditor.cs b/Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporterEditor.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/ThemeStyleSheetImporterEditor.cs
rename to Editor/Mono/UIElements/StyleSheets/ThemeStyleSheetImporterEditor.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/StyleSheets/URIHelpers.cs b/Editor/Mono/UIElements/StyleSheets/URIHelpers.cs
similarity index 100%
rename from ModuleOverrides/com.unity.ui/Editor/StyleSheets/URIHelpers.cs
rename to Editor/Mono/UIElements/StyleSheets/URIHelpers.cs
diff --git a/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorUtility.cs b/Editor/Mono/UIElements/UIElementsEditorUtility.cs
similarity index 95%
rename from ModuleOverrides/com.unity.ui/Editor/UIElementsEditorUtility.cs
rename to Editor/Mono/UIElements/UIElementsEditorUtility.cs
index 9bc6773671..f17f7947bc 100644
--- a/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorUtility.cs
+++ b/Editor/Mono/UIElements/UIElementsEditorUtility.cs
@@ -10,16 +10,6 @@
 
 namespace UnityEditor.UIElements
 {
-    // This is the required interface to UIElementsEditorUtility for Runtime game components.
-    internal static class UIElementsEditorRuntimeUtility
-    {
-        public static void CreateRuntimePanelDebug(IPanel panel)
-        {
-            var panelDebug = new PanelDebug(panel);
-            (panel as Panel).panelDebug = panelDebug;
-        }
-    }
-
     internal static class UIElementsEditorUtility
     {
         internal static readonly string s_DefaultCommonDarkStyleSheetPath =
diff --git a/Editor/Mono/Undo/Undo.bindings.cs b/Editor/Mono/Undo/Undo.bindings.cs
index 01a218b7bb..2d1ea27e76 100644
--- a/Editor/Mono/Undo/Undo.bindings.cs
+++ b/Editor/Mono/Undo/Undo.bindings.cs
@@ -25,6 +25,18 @@ public struct UndoPropertyModification
         public bool keepPrefabOverride { get { return m_KeepPrefabOverride != 0; } set { m_KeepPrefabOverride = value ? 1 : 0; } }
     }
 
+    [RequiredByNativeCode]
+    public struct UndoRedoInfo
+    {
+        public string undoName;
+        public int undoGroup;
+        [NativeName("isRedo")]
+        int m_IsRedo;
+
+        public bool isRedo { get { return m_IsRedo != 0; } set { m_IsRedo = value ? 1 : 0; } }
+
+    }
+
     internal class AtomicUndoScope : IDisposable
     {
         bool m_Disposed;
@@ -155,6 +167,9 @@ public static T AddComponent<T>(GameObject gameObject) where T : Component
         [FreeFunction("RegisterChildrenOrderUndo")]
         public static extern void RegisterChildrenOrderUndo([NotNull] Object objectToUndo, string name);
 
+        [FreeFunction("RegisterFileChangeUndo_Internal")]
+        internal static extern void RegisterFileChangeUndo(GUID prefabToUndo, [NotNull] byte[] oldFileContent, [NotNull] byte[] newFileContent);
+
         [FreeFunction("RegisterFullObjectHierarchyUndo")]
         public static extern void RegisterFullObjectHierarchyUndo([NotNull] Object objectToUndo, string name);
 
@@ -244,9 +259,19 @@ public static void RegisterUndo(Object[] objectsToUndo, string name)
         // Undo/redo performed
         public delegate void UndoRedoCallback();
 
+        /* TODO_UNDO
+           This can't be properly deprecated until all packages being tested through Katana that use the old callback have been updated to use the new callback.
+        [Obsolete("Use Undo.undoRedoEvent instead which provides Undo Event information", false)] */
         public static UndoRedoCallback undoRedoPerformed;
+        [Obsolete("Use m_UndoRedoEvent instead", false)]
         private static DelegateWithPerformanceTracker<UndoRedoCallback> m_UndoRedoPerformedEvent = new DelegateWithPerformanceTracker<UndoRedoCallback>($"{nameof(Undo)}.{nameof(undoRedoPerformed)}");
 
+        // Undo event
+        public delegate void UndoRedoEventCallback(in UndoRedoInfo undo);
+
+        public static UndoRedoEventCallback undoRedoEvent;
+        private static DelegateWithPerformanceTracker<UndoRedoEventCallback> m_UndoRedoEvent = new DelegateWithPerformanceTracker<UndoRedoEventCallback>($"{nameof(Undo)}.{nameof(undoRedoEvent)}");
+
         // Called when about to flush undo recording
         public delegate void WillFlushUndoRecord();
 
@@ -287,12 +312,19 @@ private static void Internal_CallWillFlushUndoRecord()
                 evt();
         }
 
+        [Obsolete("Use Undo.Internal_CallUndoRedoEvent instead")]
         private static void Internal_CallUndoRedoPerformed()
         {
             foreach (var evt in m_UndoRedoPerformedEvent.UpdateAndInvoke(undoRedoPerformed))
                 evt();
         }
 
+        private static void Internal_CallUndoRedoEvent(UndoRedoInfo undoInfo)
+        {
+            foreach (var evt in m_UndoRedoEvent.UpdateAndInvoke(undoRedoEvent))
+                evt(undoInfo);
+        }
+
         [StaticAccessor("GetUndoManager()", StaticAccessorType.Dot)]
         [NativeMethod("ClearUndoSceneHandle")]
         internal static extern void ClearUndoSceneHandle(UnityEngine.SceneManagement.Scene scene);
diff --git a/Editor/Mono/Undo/UndoHistoryWindow.cs b/Editor/Mono/Undo/UndoHistoryWindow.cs
index e49d5263e8..e03757a032 100644
--- a/Editor/Mono/Undo/UndoHistoryWindow.cs
+++ b/Editor/Mono/Undo/UndoHistoryWindow.cs
@@ -60,7 +60,7 @@ public UndoHistoryWindow()
 
         internal void OnDisable()
         {
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoEvent;
             s_LastClosedTime = System.DateTime.Now.Ticks / System.TimeSpan.TicksPerMillisecond;
         }
 
@@ -85,7 +85,7 @@ public HistoryItem(HistoryType type, string undoName, int index)
             }
         }
 
-        void OnUndoRedoPerformed()
+        void OnUndoRedoEvent(in UndoRedoInfo undo)
         {
             m_UndoRedoPerformed = true;
             Repaint();
@@ -130,7 +130,7 @@ public void OnEnable()
             if (s_Instance == null)
             {
                 this.titleContent = EditorGUIUtility.TrTextContentWithIcon("Undo History", "UnityEditor.HistoryWindow");
-                Undo.undoRedoPerformed += OnUndoRedoPerformed;
+                Undo.undoRedoEvent += OnUndoRedoEvent;
 
                 //root of the editorwindow
                 VisualElement root = rootVisualElement;
@@ -176,7 +176,7 @@ public void OnEnable()
                 m_HistoryListView.itemsSource = m_History;
                 m_HistoryListView.RefreshItems();
 
-                m_HistoryListView.onSelectionChange += OnUndoSelectionChange;
+                m_HistoryListView.selectionChanged += OnUndoSelectionChange;
 
                 m_LastUndos.Clear();
 
diff --git a/Editor/Mono/VersionControl/Common/VCAssetModificationHooks.cs b/Editor/Mono/VersionControl/Common/VCAssetModificationHooks.cs
index a32aeff372..f2d78ed392 100644
--- a/Editor/Mono/VersionControl/Common/VCAssetModificationHooks.cs
+++ b/Editor/Mono/VersionControl/Common/VCAssetModificationHooks.cs
@@ -187,15 +187,25 @@ public static AssetDeleteResult OnWillDeleteAsset(string assetPath, RemoveAssetO
             if (!Provider.PathIsVersioned(assetPath))
                 return AssetDeleteResult.DidNotDelete;
 
-            Task task = Provider.Delete(assetPath);
-            task.SetCompletionAction(CompletionAction.UpdatePendingWindow);
-            task.Wait();
+            Task task = null;
+
+            try
+            {
+                task = Provider.Delete(assetPath);
+                task.SetCompletionAction(CompletionAction.UpdatePendingWindow);
+                task.Wait();
+            }
+            catch (Exception e)
+            {
+                Debug.LogWarningFormat("Cannot delete path '{0}' by version control: {1}", assetPath, e.Message);
+            }
 
-            if (task.success)
+            if (task != null && task.success)
             {
                 // We need to check if the provider deleted the file itself or not.
                 return File.Exists(assetPath) ? AssetDeleteResult.DidNotDelete : AssetDeleteResult.DidDelete;
             }
+
             return AssetDeleteResult.FailedDelete;
         }
 
@@ -211,14 +221,29 @@ public static void OnWillDeleteAssets(string[] assetPaths, AssetDeleteResult[] d
             {
                 var deleteAssetList = new AssetList();
                 for (int i = batchStart; i < batchStart + deletionBatchSize && i < assetPaths.Length; i++)
-                    deleteAssetList.Add(Provider.GetAssetByPath(assetPaths[i]));
+                {
+                    Asset asset = Provider.GetAssetByPath(assetPaths[i]);
+                    deleteAssetList.Add(asset);
 
-                Task task = Provider.Delete(deleteAssetList);
+                    if (asset == null)
+                        Debug.LogWarningFormat("Asset not found in path '{0}', (null) value returned", assetPaths[i]);
+                }
 
-                task.SetCompletionAction(CompletionAction.UpdatePendingWindow);
-                task.Wait();
+                Task task = null;
+
+                try
+                {
+                    task = Provider.Delete(deleteAssetList);
+
+                    task.SetCompletionAction(CompletionAction.UpdatePendingWindow);
+                    task.Wait();
+                }
+                catch (Exception e)
+                {
+                    Debug.LogWarningFormat("Not all files were deleted by version control: {0}", e.Message);
+                }
 
-                if (task.success)
+                if (task != null && task.success)
                 {
                     for (int i = batchStart; i < batchStart + deleteAssetList.Count(); i++)
                         deletionResults[i] = File.Exists(assetPaths[i]) ? AssetDeleteResult.DidNotDelete : AssetDeleteResult.DidDelete;
diff --git a/Editor/Mono/WindowBackendManager.cs b/Editor/Mono/WindowBackendManager.cs
index 6169a05c40..a7d194534f 100644
--- a/Editor/Mono/WindowBackendManager.cs
+++ b/Editor/Mono/WindowBackendManager.cs
@@ -10,6 +10,8 @@
 
 namespace UnityEditor
 {
+    internal delegate IWindowBackend GetDefaultWindowBackendFunction(IWindowModel model);
+
     internal interface IWindowModel
     {
         Vector2 size { get; }
@@ -68,6 +70,8 @@ internal interface IEditorWindowBackendSystem
     }
     internal static class EditorWindowBackendManager
     {
+        internal static GetDefaultWindowBackendFunction defaultWindowBackend { get; set; }
+
         private static List<IEditorWindowBackendSystem> sRegisteredSystems = new List<IEditorWindowBackendSystem>();
 
         static internal void RegisterWindowSystem(IEditorWindowBackendSystem system)
@@ -113,7 +117,7 @@ internal static IWindowBackend GetBackend(IWindowModel model)
                 }
             }
 
-            return EditorUIService.instance.GetDefaultWindowBackend(model);
+            return defaultWindowBackend?.Invoke(model);
         }
     }
 }
diff --git a/External/Bee/BeeAsALibrary/Bee.BeeDriver.dll b/External/Bee/BeeAsALibrary/Bee.BeeDriver.dll
new file mode 100644
index 0000000000..30b75ba8df
Binary files /dev/null and b/External/Bee/BeeAsALibrary/Bee.BeeDriver.dll differ
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs
index f002abcce7..b9296f24b0 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs
@@ -18,6 +18,8 @@ class Builder : BuilderPaneWindow, IBuilderViewportWindow, IHasCustomMenu
         BuilderUssPreview m_UssPreview;
         BuilderHierarchy m_Hierarchy;
 
+        TwoPaneSplitView m_MiddleSplitView;
+
         HighlightOverlayPainter m_HighlightOverlayPainter;
 
         public BuilderSelection selection => m_Selection;
@@ -41,15 +43,13 @@ public bool codePreviewVisible
 
         void UpdatePreviewsVisibility()
         {
-            var codeSplit = rootVisualElement.Q<TwoPaneSplitView>("middle-column");
-
             if (codePreviewVisible)
             {
-                codeSplit.UnCollapse();
+                m_MiddleSplitView.UnCollapse();
             }
             else
             {
-                codeSplit.CollapseChild(1);
+                m_MiddleSplitView.CollapseChild(1);
             }
         }
 
@@ -173,19 +173,17 @@ public override void CreateUI()
             commandHandler.RegisterPane(m_Viewport);
             commandHandler.RegisterToolbar(m_Toolbar);
 
-            var middleSplitView = rootVisualElement.Q<TwoPaneSplitView>("middle-column");
-
-            middleSplitView.RegisterCallback<GeometryChangedEvent>(OnFirstDisplay);
+            m_MiddleSplitView = rootVisualElement.Q<TwoPaneSplitView>("middle-column");
+            m_MiddleSplitView.RegisterCallback<GeometryChangedEvent>(OnFirstDisplay);
 
             OnEnableAfterAllSerialization();
         }
 
         void OnFirstDisplay(GeometryChangedEvent evt)
         {
-            var middleSplitView = rootVisualElement.Q<TwoPaneSplitView>("middle-column");
-
             UpdatePreviewsVisibility();
-            middleSplitView.UnregisterCallback<GeometryChangedEvent>(OnFirstDisplay);
+
+            m_MiddleSplitView.UnregisterCallback<GeometryChangedEvent>(OnFirstDisplay);
         }
 
         public override void OnEnableAfterAllSerialization()
@@ -245,18 +243,21 @@ protected override void OnEnable()
             SetTitleContent(BuilderConstants.BuilderWindowTitle, BuilderConstants.BuilderWindowIcon);
 
             if (rootVisualElement.panel != null)
-                SetStyleUpdaterTraversal();
+                SetupPanel();
             // Sometimes, the panel is not already set
             else
-                rootVisualElement.RegisterCallback<AttachToPanelEvent>(e => SetStyleUpdaterTraversal());
+                rootVisualElement.RegisterCallback<AttachToPanelEvent>(e => SetupPanel());
         }
 
-        void SetStyleUpdaterTraversal()
+        void SetupPanel()
         {
             var panel = rootVisualElement.panel as BaseVisualElementPanel;
             var styleUpdater = panel.GetUpdater(VisualTreeUpdatePhase.Styles) as VisualTreeStyleUpdater;
 
             styleUpdater.traversal = new BuilderVisualTreeStyleUpdaterTraversal(m_Viewport.documentRootElement);
+
+            // We don't want the Builder to live reload anything except text elements.
+            panel.liveReloadSystem.enabledTrackers = LiveReloadTrackers.Text;
         }
 
         [OnOpenAsset(0)]
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderExternalPackages.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderExternalPackages.cs
index e5a9441453..0e0a810b33 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderExternalPackages.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderExternalPackages.cs
@@ -7,14 +7,6 @@ namespace Unity.UI.Builder
 {
     static class BuilderExternalPackages
     {
-        public static bool isVectorGraphicsInstalled
-        {
-            get
-            {
-                return PackageInfo.GetAllRegisteredPackages().Any(x => x.name == "com.unity.vectorgraphics" && x.version == "1.0.0");
-            }
-        }
-
         public static bool is2DSpriteEditorInstalled
         {
             get
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneContent.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneContent.cs
index a0c5313c6a..992cc6614e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneContent.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneContent.cs
@@ -1,7 +1,5 @@
 using UnityEngine.UIElements;
-using System.Linq;
 using System.Collections.Generic;
-using UnityEditor;
 
 namespace Unity.UI.Builder
 {
@@ -31,14 +29,7 @@ protected set
             }
         }
 
-        public BuilderPane pane
-        {
-            get { return m_Pane; }
-        }
-
-        public BuilderPaneContent()
-        {
-        }
+        public BuilderPane pane => m_Pane;
 
         protected void AddFocusable(VisualElement focusable)
         {
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderSelection.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderSelection.cs
index 0f951d6a7c..ecda5947d9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderSelection.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderSelection.cs
@@ -26,9 +26,10 @@ internal enum BuilderHierarchyChangeType
     {
         ChildrenAdded = 1 << 0,
         ChildrenRemoved = 1 << 1,
-        Name = 1 << 2,
+        Attributes = 1 << 2,
         ClassList = 1 << 3,
         InlineStyle = 1 << 4,
+        FullRefresh = 1 << 5, // Skip this flag if you want to avoid expensive refresh during changes (ex. on drag operations)
 
         All = ~0
     }
@@ -247,11 +248,12 @@ public void NotifyOfHierarchyChange(
                 element.UpdateInlineRule(vta.inlineSheet, rule);
 
                 // Need to enforce this specific style is updated.
-                element.IncrementVersion(VersionChangeType.Opacity | VersionChangeType.Overflow);
+                element.IncrementVersion(VersionChangeType.Opacity | VersionChangeType.Overflow | VersionChangeType.StyleSheet);
             }
-
-            if (m_DocumentRootElement != null)
+            else if (m_DocumentRootElement != null)
+            {
                 m_PaneWindow.document.RefreshStyle(m_DocumentRootElement);
+            }
 
             // This is so anyone interested can refresh their use of this UXML with
             // the latest (unsaved to disk) changes.
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocument.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocument.cs
index 77e227bcda..5cf9fda7a6 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocument.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocument.cs
@@ -2,7 +2,6 @@
 using UnityEngine.UIElements;
 using System.Collections.Generic;
 using UnityEditor;
-using UnityEditor.UIElements.StyleSheets;
 using System;
 using System.IO;
 
@@ -35,7 +34,7 @@ public enum CanvasTheme
         //
 
         [SerializeField]
-        ThemeStyleSheet m_CurrentCanvasThemeStyleSheet;
+        LazyLoadReference<ThemeStyleSheet> m_CurrentCanvasThemeStyleSheetReference;
 
         [SerializeField]
         bool m_CodePreviewVisible = true;
@@ -132,12 +131,12 @@ public bool hasUnsavedChanges
         }
 
         public CanvasTheme currentCanvasTheme => m_CurrentCanvasTheme;
-        public ThemeStyleSheet currentCanvasThemeStyleSheet => m_CurrentCanvasThemeStyleSheet;
+        public ThemeStyleSheet currentCanvasThemeStyleSheet => m_CurrentCanvasThemeStyleSheetReference.asset;
 
         public void ChangeDocumentTheme(VisualElement documentElement, CanvasTheme canvasTheme, ThemeStyleSheet themeSheet)
         {
             m_CurrentCanvasTheme = canvasTheme;
-            m_CurrentCanvasThemeStyleSheet = themeSheet;
+            m_CurrentCanvasThemeStyleSheetReference = themeSheet;
 
             if (themeSheet)
             {
@@ -383,7 +382,12 @@ public void GoToRootDocument(VisualElement documentRootElement, BuilderPaneWindo
         //
 
         public void OnPostProcessAsset(string assetPath)
-            => activeOpenUXMLFile.OnPostProcessAsset(assetPath);
+        {
+            activeOpenUXMLFile.OnPostProcessAsset(assetPath);
+            var builderWindow = Builder.ActiveWindow;
+            if (builderWindow != null)
+                builderWindow.toolbar?.InitCanvasTheme();
+        }
 
         //
         // Selection
@@ -430,6 +434,11 @@ void LoadFromDisk()
             var json = File.ReadAllText(path);
             EditorJsonUtility.FromJsonOverwrite(json, this);
 
+            if (currentCanvasThemeStyleSheet == null && m_CurrentCanvasTheme == CanvasTheme.Custom)
+            {
+                m_CurrentCanvasTheme = CanvasTheme.Default;
+            }
+
             // Very important we convert asset references to paths here after a restore.
             foreach (var openUXMLFile in m_OpenUXMLFiles)
                 openUXMLFile.OnAfterLoadFromDisk();
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
index 254beaaa1a..08ca0d21a9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentOpenUXML.cs
@@ -456,6 +456,9 @@ public bool SaveNewDocument(
                 m_DocumentBeingSavedExplicitly = false;
             }
 
+            // Reorder document after reimporting
+            VisualTreeAssetUtilities.ReOrderDocument(m_VisualTreeAsset);
+
             // Check if any USS assets have changed reload them.
             foreach (var openUSSFile in savedUSSFiles)
                 needsFullRefresh |= openUSSFile.PostSaveToDiskChecksAndFixes();
@@ -580,8 +583,10 @@ public bool CheckForUnsavedChanges(bool assetModifiedExternally = false)
                 // what just happened. Adding the ability to save unsaved changes
                 // after a file has been modified externally will require some
                 // major changes to the document flow.
+                var promptTitle = string.Format(BuilderConstants.SaveDialogExternalChangesPromptTitle,
+                    m_Document.uxmlPath);
                 BuilderDialogsUtility.DisplayDialog(
-                    BuilderConstants.SaveDialogExternalChangesPromptTitle,
+                    promptTitle,
                     BuilderConstants.SaveDialogExternalChangesPromptMessage);
 
                 return true;
@@ -688,7 +693,10 @@ public void OnPostProcessAsset(string assetPath)
                 return;
 
             var newVisualTreeAsset = m_VisualTreeAsset;
-            if (assetPath == uxmlOldPath)
+            var isCurrentDocumentBeingProcessed = assetPath == uxmlOldPath;
+            var wasCurrentDocumentRenamed = uxmlPath == assetPath && assetPath != uxmlOldPath;
+
+            if (isCurrentDocumentBeingProcessed || wasCurrentDocumentRenamed)
             {
                 newVisualTreeAsset = BuilderPackageUtilities.LoadAssetAtPath<VisualTreeAsset>(assetPath);
             }
@@ -889,15 +897,6 @@ internal void ResetCanvasDocumentRootElementStyleSheets(VisualElement documentRo
         {
             documentRootElement.styleSheets.Clear();
 
-            // Load stylesheets specific to the document element.
-            var documentSheet = BuilderPackageUtilities.LoadAssetAtPath<StyleSheet>(BuilderConstants.UIBuilderPackagePath + "/Viewport/BuilderDocument.uss");
-            var documentThemeSheet = EditorGUIUtility.isProSkin
-                ? BuilderPackageUtilities.LoadAssetAtPath<StyleSheet>(BuilderConstants.UIBuilderPackagePath + "/Viewport/BuilderDocumentDark.uss")
-                : BuilderPackageUtilities.LoadAssetAtPath<StyleSheet>(BuilderConstants.UIBuilderPackagePath + "/Viewport/BuilderDocumentLight.uss");
-
-            documentRootElement.styleSheets.Add(documentSheet);
-            documentRootElement.styleSheets.Add(documentThemeSheet);
-
             // Restore the active theme stylesheet
             if (documentRootElement.HasProperty(BuilderConstants.ElementLinkedActiveThemeStyleSheetVEPropertyName))
             {
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentSettings.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentSettings.cs
index 92ca2adaee..3655a0d57e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentSettings.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderDocumentSettings.cs
@@ -25,7 +25,7 @@ class BuilderDocumentSettings
 
         public bool EnableCanvasBackground;
         public BuilderCanvasBackgroundMode CanvasBackgroundMode = BuilderCanvasBackgroundMode.Color;
-        public Color CanvasBackgroundColor = new Color(0, 0, 0, 255);
+        public Color CanvasBackgroundColor = new Color(0, 0, 0, 1f);
         public Texture2D CanvasBackgroundImage;
         public ScaleMode CanvasBackgroundImageScaleMode = ScaleMode.ScaleAndCrop;
         public string CanvasBackgroundCameraName;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderUXMLFileSettings.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
index 96b8aa4843..4d101cc1b7 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Document/BuilderUXMLFileSettings.cs
@@ -17,6 +17,9 @@ public bool editorExtensionMode
             {
                 m_EditorExtensionMode = value;
                 m_RootElementAsset?.SetAttributeValue(k_EditorExtensionModeAttributeName, m_EditorExtensionMode.ToString());
+                var builderWindow = Builder.ActiveWindow;
+                if (builderWindow != null)
+                    builderWindow.toolbar?.InitCanvasTheme();
             }
         }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderExplorerDragger.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
index 34a0268cb1..8030503ff9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderExplorerDragger.cs
@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
-using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -66,6 +64,11 @@ protected virtual void ResetDragPreviewElement()
             m_DragPreviewLastParent = null;
         }
 
+        protected virtual IEnumerable<VisualElement> GetSelectedElements()
+        {
+            return selection.selection;
+        }
+
         protected override VisualElement CreateDraggedElement()
         {
             var classPillTemplate = BuilderPackageUtilities.LoadAssetAtPath<VisualTreeAsset>(
@@ -87,20 +90,25 @@ protected override bool StartDrag(VisualElement target, Vector2 mousePosition, V
         {
             m_ElementsToReparent.Clear();
 
-            // Create list of elements to reparent.
-            foreach (var selectedElement in selection.selection)
+            if (!selection.isEmpty)
             {
-                if (!ExplorerCanStartDrag(selectedElement))
-                    continue;
+                var selectedElements = GetSelectedElements();
 
-                var elementToReparent = new ElementToReparent()
+                // Create list of elements to reparent.
+                foreach (var selectedElement in selectedElements)
                 {
-                    element = selectedElement,
-                    oldParent = selectedElement.parent,
-                    oldIndex = selectedElement.parent.IndexOf(selectedElement)
-                };
-
-                m_ElementsToReparent.Add(elementToReparent);
+                    if (!ExplorerCanStartDrag(selectedElement))
+                        continue;
+
+                    var elementToReparent = new ElementToReparent()
+                    {
+                        element = selectedElement,
+                        oldParent = selectedElement.parent,
+                        oldIndex = selectedElement.parent.IndexOf(selectedElement)
+                    };
+
+                    m_ElementsToReparent.Add(elementToReparent);
+                }
             }
 
             // We still need a primary element that is "being dragged" for visualization purporses.
@@ -127,8 +135,6 @@ protected override void PerformDrag(VisualElement target, VisualElement pickedEl
             m_DragPreviewLastParent = pickedElement;
             m_DragPreviewLastIndex = index;
 
-            m_DragPreviewLastParent.HideMinSizeSpecialElement();
-
             FixElementSizeAndPosition(m_DragPreviewLastParent);
 
             ExplorerPerformDrag();
@@ -156,14 +162,15 @@ int ReparentIndividualElement(VisualElement element, VisualElement newParent, in
             if (oldParent != newParent)
             {
                 if (index < 0 || index > newParent.childCount - 1)
+                {
                     newParent.Insert(newParent.childCount, elementToReparent);
+                    return newParent.childCount;
+                }
                 else
+                {
                     newParent.Insert(index, elementToReparent);
-
-                if (index < newParent.childCount)
                     return index + 1;
-                else
-                    return index;
+                }
             }
 
             if (index < 0)
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
index bb22d23b20..e4099fead2 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderHierarchyDragger.cs
@@ -1,6 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
-using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -47,9 +45,6 @@ protected override void PerformAction(VisualElement destination, DestinationPane
 
             m_TargetElementToReparent.RemoveFromClassList(s_DragPreviewElementClassName);
 
-            // Remove temporary min-size element.
-            destination.RemoveMinSizeSpecialElement();
-
             var newParent = destination;
 
             // We already have the correct index from the preview element that is
@@ -136,8 +131,12 @@ protected override void ResetDragPreviewElement()
                 return;
 
             UnfixElementSizeAndPosition(m_DragPreviewLastParent);
-            m_DragPreviewLastParent.UnhideMinSizeSpecialElement();
             m_DragPreviewLastParent = null;
         }
+
+        protected override IEnumerable<VisualElement> GetSelectedElements()
+        {
+            return documentRootElement.FindSelectedElements();
+        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderLibraryDragger.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
index d00e1c003e..4b87e37a41 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Draggers/BuilderLibraryDragger.cs
@@ -94,8 +94,6 @@ protected override void PerformDrag(VisualElement target, VisualElement pickedEl
 
             m_DragPreviewLastParent = pickedElement;
 
-            m_DragPreviewLastParent.HideMinSizeSpecialElement();
-
             FixElementSizeAndPosition(m_DragPreviewLastParent);
 
             var item =
@@ -124,8 +122,6 @@ protected override void PerformAction(VisualElement destination, DestinationPane
                     return;
             }
 
-            destination.RemoveMinSizeSpecialElement();
-
             // Determine if it applies and use Absolute Island insertion.
             if (BuilderProjectSettings.enableAbsolutePositionPlacement && pane == DestinationPane.Viewport && m_DragPreviewLastParent == documentRootElement && index < 0)
                 m_DragPreviewLastParent = BuilderPlacementUtilities.CreateAbsoluteIsland(paneWindow, documentRootElement, localMousePosition);
@@ -223,7 +219,6 @@ void ResetDragPreviewElement()
             if (m_DragPreviewLastParent != null)
             {
                 UnfixElementSizeAndPosition(m_DragPreviewLastParent);
-                m_DragPreviewLastParent.UnhideMinSizeSpecialElement();
                 m_DragPreviewLastParent = null;
             }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorer.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorer.cs
index bbac318276..fb7b99088f 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorer.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderExplorer.cs
@@ -155,6 +155,8 @@ public void UpdateHierarchyAndSelection(bool hasUnsavedChanges)
             }
 
             m_SelectionMadeExternally = false;
+
+            m_ElementHierarchyView.ApplyRegisteredSelectionInternallyIfNeeded();
         }
 
         public virtual void HierarchyChanged(VisualElement element, BuilderHierarchyChangeType changeType)
@@ -162,7 +164,7 @@ public virtual void HierarchyChanged(VisualElement element, BuilderHierarchyChan
             if (element == null ||
                 changeType.HasFlag(BuilderHierarchyChangeType.ChildrenAdded) ||
                 changeType.HasFlag(BuilderHierarchyChangeType.ChildrenRemoved) ||
-                changeType.HasFlag(BuilderHierarchyChangeType.Name) ||
+                changeType.HasFlag(BuilderHierarchyChangeType.Attributes) ||
                 changeType.HasFlag(BuilderHierarchyChangeType.ClassList))
             {
                 UpdateHierarchyAndSelection(m_Selection.hasUnsavedChanges);
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheets.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheets.cs
index a1308f8579..d2746f4b8a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheets.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Explorer/BuilderStyleSheets.cs
@@ -115,15 +115,15 @@ public BuilderStyleSheets(
                 {
                     m_NewSelectorTextField.SelectRange(m_NewSelectorTextField.value.Length, m_NewSelectorTextField.value.Length);
                 });
-                
-                evt.PreventDefault();
-                evt.StopImmediatePropagation();
+
             }, TrickleDown.TrickleDown);
 
             m_NewSelectorTextInputField.RegisterCallback<BlurEvent>((evt) =>
             {
                 var input = evt.target as VisualElement;
                 var field = GetTextFieldParent(input);
+
+                HideTooltip();
                 if (m_ShouldRefocusSelectorFieldOnBlur)
                 {
                     field.schedule.Execute(PostEnterRefocus);
@@ -138,7 +138,6 @@ public BuilderStyleSheets(
                     m_PseudoStatesMenu.SetEnabled(false);
                 }
 
-                HideTooltip();
             }, TrickleDown.TrickleDown);
 
             // Setup New USS Menu.
@@ -157,7 +156,7 @@ public BuilderStyleSheets(
 
             RegisterCallback<GeometryChangedEvent>(e => AdjustPosition());
         }
-        
+
         TextField GetTextFieldParent(VisualElement ve)
         {
             return ve.GetFirstAncestorOfType<TextField>();
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspector.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspector.cs
index 25a91d4f42..bbed60a482 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspector.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspector.cs
@@ -25,14 +25,14 @@ enum Section
         // HACK: So...we want to restore the scroll position of the inspector but
         // lots of events cause it to reset. For example, undo/redo will reset the
         // builder, select nothing, then restore the selection. While nothing is selected,
-        // the ScrolView will rightly reset the scroll position to 0 since it does not
+        // the ScrollView will rightly reset the scroll position to 0 since it does not
         // need a scroller just to display the "Nothing selected" message. Then, when
         // the selection is restored, the scroll position will still be zero.
         //
         // The solution here, which is definitely overkill, is to cache the previous
         // s_MaxCachedScrollPositions m_ScrollView.contentContainer.layout.heights
         // and their associated scroll positions. Then, when we detect a
-        // m_ScrollView.contenContainer GeometryChangeEvent, we look up our
+        // m_ScrollView.contentContainer GeometryChangeEvent, we look up our
         // cache and restore the correct scroll position for this particular content
         // height.
         [Serializable]
@@ -187,7 +187,7 @@ public BuilderInspector(BuilderPaneWindow paneWindow, BuilderSelection selection
 
             // Get the scroll view.
             // HACK: ScrollView is not capable of remembering a scroll position for content that changes often.
-            // The main issue is that we expande/collapse/display/hide different parts of the Inspector
+            // The main issue is that we expand/collapse/display/hide different parts of the Inspector
             // all the time so initially the ScrollView is empty and it restores the scroll position to zero.
             m_ScrollView = this.Q<ScrollView>("inspector-scroll-view");
             m_ScrollView.contentContainer.RegisterCallback<GeometryChangedEvent>(OnScrollViewContentGeometryChange);
@@ -494,7 +494,10 @@ public void OnAfterBuilderDeserialize()
 
         public void HierarchyChanged(VisualElement element, BuilderHierarchyChangeType changeType)
         {
-            m_AttributesSection.Refresh();
+            if (changeType == BuilderHierarchyChangeType.Attributes)
+            {
+                m_AttributesSection.Refresh();
+            }
         }
 
         public void SelectionChanged()
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs
index 8ea2202e21..48eecbcd26 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorAttributes.cs
@@ -6,6 +6,7 @@
 using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEditor.UIElements;
+using UnityEditor.UIElements.StyleSheets;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -146,6 +147,18 @@ BuilderStyleRow CreateAttributeRow(UxmlAttributeDescription attribute)
                         PostAttributeValueChange(uiField, uiField.value.ToString()));
                     fieldElement = uiField;
                 }
+                else if (attribute.name.Equals("value") && currentVisualElement is EnumFlagsField enumFlagsField)
+                {
+                    var uiField = new EnumFlagsField("Value");
+                    uiField.RegisterValueChangedCallback(OnAttributeValueChange);
+                    if (null != enumFlagsField.value)
+                        uiField.Init(enumFlagsField.value, enumFlagsField.includeObsoleteValues);
+                    else
+                        uiField.SetValueWithoutNotify(null);
+                    uiField.RegisterValueChangedCallback(evt =>
+                        PostAttributeValueChange(uiField, uiField.value.ToString()));
+                    fieldElement = uiField;
+                }
                 else if (attribute.name.Equals("value") && currentVisualElement is TagField tagField)
                 {
                     var uiField = new TagField("Value");
@@ -231,6 +244,14 @@ BuilderStyleRow CreateAttributeRow(UxmlAttributeDescription attribute)
                 uiField.RegisterValueChangedCallback(OnAttributeValueChange);
                 fieldElement = uiField;
             }
+            else if (attributeType.IsGenericType && 
+                attributeType.GetGenericTypeDefinition() == typeof(UxmlAssetAttributeDescription<>))
+            {
+                var assetType = attributeType.GetGenericArguments()[0];
+                var uiField = new ObjectField(fieldLabel) { objectType = assetType };
+                uiField.RegisterValueChangedCallback(OnAssetAttributeValueChange);
+                fieldElement = uiField;
+            }
             else if (attributeType.IsGenericType &&
                      !attributeType.GetGenericArguments()[0].IsEnum &&
                      attributeType.GetGenericArguments()[0] is Type)
@@ -294,7 +315,7 @@ BuilderStyleRow CreateAttributeRow(UxmlAttributeDescription attribute)
                 }
                 else
                 {
-                    // Create and initialize the EnumField.
+                    // Create and initialize the EnumFlagsField.
                     var uiField = new EnumFlagsField(fieldLabel);
                     uiField.Init(defaultEnumValue);
 
@@ -402,6 +423,20 @@ void RefreshAttributeField(BindableElement fieldElement)
                     }
                 }
 
+                else if (currentVisualElement is EnumFlagsField defaultEnumFlagsField &&
+                    attribute.name == "value")
+                {
+                    if (defaultEnumFlagsField.type == null)
+                    {
+                        fieldElement.SetEnabled(false);
+                    }
+                    else
+                    {
+                        ((EnumFlagsField)fieldElement).PopulateDataFromType(defaultEnumFlagsField.type);
+                        fieldElement.SetEnabled(true);
+                    }
+                }
+
                 return;
             }
 
@@ -441,6 +476,18 @@ currentVisualElement is LayerMaskField layerMaskField
             {
                 inputLayerMaskField.SetValueWithoutNotify(layerMaskField.value);
             }
+            else if (attribute is UxmlStringAttributeDescription &&
+                attribute.name == "value" &&
+                currentVisualElement is EnumFlagsField enumFlagsField
+                && fieldElement is EnumFlagsField inputEnumFlagsField)
+            {
+                var hasValue = enumFlagsField.value != null;
+                if (hasValue)
+                    inputEnumFlagsField.Init(enumFlagsField.value, enumFlagsField.includeObsoleteValues);
+                else
+                    inputEnumFlagsField.SetValueWithoutNotify(null);
+                inputEnumFlagsField.SetEnabled(hasValue);
+            }
             else if (attribute is UxmlStringAttributeDescription && fieldElement is TextField)
             {
                 (fieldElement as TextField).SetValueWithoutNotify(GetAttributeStringValue(veValueAbstract));
@@ -472,6 +519,12 @@ currentVisualElement is LayerMaskField layerMaskField
             {
                 (fieldElement as ColorField).SetValueWithoutNotify((Color)veValueAbstract);
             }
+            else if (attributeType.IsGenericType && 
+                attributeType.GetGenericTypeDefinition() == typeof(UxmlAssetAttributeDescription<>) && 
+                fieldElement is ObjectField)
+            {
+                (fieldElement as ObjectField).SetValueWithoutNotify((UnityEngine.Object)veValueAbstract);
+            }
             else if (attributeType.IsGenericType &&
                      !attributeType.GetGenericArguments()[0].IsEnum &&
                      attributeType.GetGenericArguments()[0] is Type &&
@@ -613,6 +666,15 @@ void ResetAttributeFieldToDefault(BindableElement fieldElement)
                 else
                     f.SetValueWithoutNotify((Enum)Enum.ToObject(f.type, 0));
             }
+            else if (attribute is UxmlStringAttributeDescription && fieldElement is EnumFlagsField &&
+                     currentVisualElement is EnumFlagsField)
+            {
+                var f = fieldElement as EnumFlagsField;
+                if (null == f.type)
+                    f.SetValueWithoutNotify(null);
+                else
+                    f.SetValueWithoutNotify((Enum)Enum.ToObject(f.type, 0));
+            }
             else if (attribute is UxmlFloatAttributeDescription && fieldElement is FloatField)
             {
                 var a = attribute as UxmlFloatAttributeDescription;
@@ -803,6 +865,13 @@ void UnsetAttributeProperty(DropdownMenuAction action)
                 var valueField = root.Query<EnumField>().Where(f => f.label == "Value").First();
                 UnsetAttributeProperty(valueField);
             }
+            if (currentVisualElement is EnumFlagsField && fieldElement.bindingPath == "type")
+            {
+                // If the current value is not defined in the new enum type, we need to clear the property because
+                // it will otherwise throw an exception.
+                var valueField = root.Query<EnumFlagsField>().Where(f => f.label == "Value").First();
+                UnsetAttributeProperty(valueField);
+            }
         }
 
         void UnsetAttributeProperty(BindableElement fieldElement)
@@ -905,6 +974,13 @@ void OnValidatedTypeAttributeChange(ChangeEvent<string> evt, Type desiredType)
                 var valueField = root.Query<EnumField>().Where(f => f.label == "Value").First();
                 UnsetAttributeProperty(valueField);
             }
+            else if (currentVisualElement is EnumFlagsField)
+            {
+                // If the current value is not defined in the new enum type, we need to clear the property because
+                // it will otherwise throw an exception.
+                var valueField = root.Query<EnumFlagsField>().Where(f => f.label == "Value").First();
+                UnsetAttributeProperty(valueField);
+            }
 
             field.value = fullTypeName;
             PostAttributeValueChange(field, fullTypeName);
@@ -962,6 +1038,29 @@ void OnAttributeValueChange(ChangeEvent<Color> evt)
             PostAttributeValueChange(field, "#" + ColorUtility.ToHtmlStringRGBA(evt.newValue));
         }
 
+        void OnAssetAttributeValueChange(ChangeEvent<UnityEngine.Object> evt)
+        {
+            var field = evt.target as ObjectField;
+
+            var assetPath = AssetDatabase.GetAssetPath(evt.newValue);
+            if (BuilderAssetUtilities.IsBuiltinPath(assetPath))
+            {
+                Builder.ShowWarning(BuilderConstants.BuiltInAssetPathsNotSupportedMessageUxml);
+
+                // Revert the change.
+                field.SetValueWithoutNotify(evt.previousValue);
+                return;
+            }
+
+            var vta = m_Inspector.visualTreeAsset;
+            var uri = URIHelpers.MakeAssetUri(evt.newValue);
+
+            if (!string.IsNullOrEmpty(uri) && !vta.AssetEntryExists(uri, field.objectType))
+                vta.RegisterAssetEntry(uri, field.objectType, evt.newValue);
+
+            PostAttributeValueChange(field, uri);
+        }
+
         void OnAttributeValueChange(ChangeEvent<Enum> evt)
         {
             var field = evt.target as BaseField<Enum>;
@@ -1058,7 +1157,7 @@ void CallInitOnElement()
             if (traits == null)
                 return;
 
-            var context = new CreationContext();
+            var context = new CreationContext(null, null, m_Inspector.visualTreeAsset, currentVisualElement);
             var vea = currentVisualElement.GetVisualElementAsset();
 
             try
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
index 86f8be69c4..730bb4e38d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorInheritedStyles.cs
@@ -1,10 +1,7 @@
 using UnityEngine.UIElements;
-using UnityEditor.UIElements.Debugger;
 using System.Text;
-using UnityEngine.UIElements.StyleSheets;
 using UnityEditor;
 using UnityEngine;
-using System.Text.RegularExpressions;
 using System.Linq;
 
 namespace Unity.UI.Builder
@@ -138,9 +135,6 @@ void PreAddStyleClass(string className)
         {
             m_AddClassField.SetValueWithoutNotify(string.Empty);
 
-            // Remove temporary min-size class on VisualElement.
-            currentVisualElement.RemoveMinSizeSpecialElement();
-
             // Actually add the style class to the element in the canvas.
             currentVisualElement.AddToClassList(className);
         }
@@ -230,9 +224,6 @@ void OnStyleClassDelete(EventBase evt)
             var target = evt.target as VisualElement;
             var className = target.userData as string;
 
-            // Remove temporary min-size class on VisualElement.
-            currentVisualElement.RemoveMinSizeSpecialElement();
-
             // Actually remove the style class from the element in the canvas.
             currentVisualElement.RemoveFromClassList(className);
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
index f04fb57ab2..7945e01ab7 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorLocalStyles.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine.Assertions;
 using UnityEngine.Pool;
 using UnityEngine.UIElements;
@@ -230,7 +229,7 @@ void GenerateTransitionPropertiesContent()
                     if (!string.IsNullOrWhiteSpace(styleName))
                     {
                         var styleId = StyleDebug.GetStylePropertyIdFromName(styleName);
-                        if (!StylePropertyUtil.s_AnimatableProperties.Contains(styleId))
+                        if (!StylePropertyUtil.IsAnimatable(styleId))
                             continue;
 
                         if (!string.IsNullOrWhiteSpace(styleId.ToString()))
@@ -255,7 +254,7 @@ void GenerateTransitionPropertiesContent()
                             if (shortHandId == StylePropertyId.Unknown || !hashSet.Add(shortHandId))
                                 continue;
 
-                            if (!StylePropertyUtil.s_AnimatableProperties.Contains(shortHandId))
+                            if (!StylePropertyUtil.IsAnimatable(shortHandId))
                                 continue;
 
                             if (!string.IsNullOrWhiteSpace(shortHandId.ToString()))
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
index 7d21282176..bb274db02e 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields+Transitions.cs
@@ -103,21 +103,28 @@ static void RefreshTransitionProperty(List<BuilderTransition> transitions, Style
                 var transition = transitions[i];
                 if (isSet)
                 {
-                    var handle = manipulator.GetValueContextAtIndex(i % valueCount);
-                    if (handle.handle.valueType == StyleValueType.Keyword)
-                        transition.property = new UIStyleValue<string>(handle.AsKeyword());
-                    else if (handle.handle.valueType == StyleValueType.Enum)
-                        transition.property = handle.AsEnum();
-                    else if (handle.handle.valueType == StyleValueType.String)
-                        transition.property = handle.AsString();
-                    // Error, use default value
+                    if (i < valueCount)
+                    {
+                        var handle = manipulator.GetValueContextAtIndex(i % valueCount);
+                        if (handle.handle.valueType == StyleValueType.Keyword)
+                            transition.property = new UIStyleValue<string>(handle.AsKeyword());
+                        else if (handle.handle.valueType == StyleValueType.Enum)
+                            transition.property = handle.AsEnum();
+                        else if (handle.handle.valueType == StyleValueType.String)
+                            transition.property = handle.AsString();
+                        // Error, use default value
+                        else
+                            transition.property = BuilderTransition.IgnoredProperty;
+                    }
                     else
+                    {
                         transition.property = BuilderTransition.IgnoredProperty;
+                    }
                 }
                 else
                 {
                     transition.property = i < valueCount
-                        ? computedData[i].ToString()
+                        ? computedData[i].ToString() ?? BuilderTransition.IgnoredProperty
                         : BuilderTransition.IgnoredProperty;
                 }
                 transitions[i] = transition;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
index e4e35b4a94..dd3e836f0f 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Inspector/BuilderInspectorStyleFields.cs
@@ -7,7 +7,6 @@
 using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.Assertions;
-using UnityEngine.Pool;
 using UnityEngine.TextCore.Text;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
@@ -16,6 +15,12 @@ namespace Unity.UI.Builder
 {
     internal partial class BuilderInspectorStyleFields
     {
+        public enum NotifyType
+        {
+            Default,
+            RefreshOnly,
+        };
+
         BuilderInspector m_Inspector;
         BuilderSelection m_Selection;
 
@@ -228,8 +233,6 @@ public void BindStyleField(BuilderStyleRow styleRow, string styleName, VisualEle
             else if (IsComputedStyleBackground(val) && fieldElement is ImageStyleField imageStyleField)
             {
                 imageStyleField.RegisterValueChangedCallback(e => OnFieldValueChange(e, styleName));
-                if (BuilderExternalPackages.isVectorGraphicsInstalled)
-                    imageStyleField.TryEnableVectorGraphicTypeSupport();
             }
             else if (IsComputedStyleCursor(val) && fieldElement is ObjectField)
             {
@@ -545,8 +548,6 @@ public void RefreshStyleField(string styleName, VisualElement fieldElement)
                 var value = GetComputedStyleTextShadowValue(val);
                 if (useStyleProperty)
                     value = styleSheet.GetTextShadow(styleProperty);
-                else
-                    value.color.a = 255.0f; // When no specific style value defined, we will use default alpha = 255 instead of 0.
 
                 uiField.SetValueWithoutNotify(value);
             }
@@ -751,8 +752,6 @@ public void RefreshStyleField(string styleName, VisualElement fieldElement)
                 var value = GetComputedStyleColorValue(val);
                 if (useStyleProperty)
                     value = styleSheet.GetColor(styleProperty.values[0]);
-                else
-                    value.a = 255.0f; // When no specific style value defined, we will use default alpha = 255 instead of 0.
 
                 uiField.SetValueWithoutNotify(value);
             }
@@ -815,10 +814,34 @@ public void RefreshStyleField(string styleName, VisualElement fieldElement)
             {
                 var uiField = fieldElement as ObjectField;
                 var value = GetComputedStyleCursorValue(val);
-                if (useStyleProperty)
-                    value.texture = styleSheet.GetAsset(styleProperty.values[0]) as Texture2D;
 
-                uiField.SetValueWithoutNotify(value.texture);
+                if (useStyleProperty)
+                {
+                    switch (styleProperty.values[0].valueType)
+                    {
+                        case StyleValueType.AssetReference:
+                        case StyleValueType.ResourcePath:
+                        case StyleValueType.ScalableImage:
+                            value.texture = styleSheet.GetAsset(styleProperty.values[0]) as Texture2D;
+                            uiField.SetValueWithoutNotify(value.texture);
+                            break;
+                        case StyleValueType.MissingAssetReference:
+                            uiField.SetValueWithoutNotify(null);
+                            break;
+                        case StyleValueType.Enum:
+                            // TODO: Add support for using the predefined list from the MouseCursor enum.
+                            // This is only available in the editor.
+                            uiField.SetValueWithoutNotify(null);
+                            break;
+                        default:
+                            uiField.SetValueWithoutNotify(null);
+                            break;
+                    }
+                }
+                else
+                {
+                    uiField.SetValueWithoutNotify(null);
+                }
             }
             else if (IsComputedStyleEnum(val, valType))
             {
@@ -1082,10 +1105,6 @@ void RefreshStyleFoldoutColorField(FoldoutColorField foldoutElement)
                     var style = (StyleColor)val;
                     var value = style.value;
 
-                    // We keep falling into the alpha==0 trap. This patches the issue a little.
-                    if (value.a < 0.1f)
-                        value.a = 255.0f;
-
                     if (styleProperty != null && !styleProperty.IsVariable())
                     {
                         isDirty = true;
@@ -1199,13 +1218,13 @@ bool OnFieldVariableChangeImplInBatch(string newValue, string styleName, int ind
             }
         }
 
-        public void OnFieldVariableChange(string newValue, VisualElement target, string styleName, int index)
+        public void OnFieldVariableChange(string newValue, VisualElement target, string styleName, int index, NotifyType notifyType = NotifyType.Default)
         {
             if (newValue.Length <= BuilderConstants.UssVariablePrefix.Length)
                 return;
 
             bool isNewValue = OnFieldVariableChangeImplInBatch(newValue, styleName, index);
-            PostStyleFieldSteps(target, styleName, isNewValue, true);
+            PostStyleFieldSteps(target, styleName, isNewValue, true, notifyType);
         }
 
         public DropdownMenuAction.Status UnsetAllActionStatus(DropdownMenuAction action)
@@ -1405,20 +1424,33 @@ public void UnsetStyleProperties(IEnumerable<VisualElement> fields)
                     styleSheet.RemoveProperty(currentRule, TransitionConstants.Delay);
                 }
             }
+
             NotifyStyleChanges(null, true);
         }
 
-        void NotifyStyleChanges(List<string> styles = null, bool selfNotify = false)
+        void NotifyStyleChanges(List<string> styles = null, bool selfNotify = false, NotifyType notifyType = NotifyType.Default)
         {
+            BuilderStylingChangeType styleChangeType;
+            var hierarchyChangeType = BuilderHierarchyChangeType.InlineStyle;
+            if (notifyType == NotifyType.RefreshOnly)
+            {
+                styleChangeType = BuilderStylingChangeType.RefreshOnly;
+            }
+            else
+            {
+                styleChangeType = BuilderStylingChangeType.Default;
+                hierarchyChangeType |= BuilderHierarchyChangeType.FullRefresh;
+            }
+
             if (BuilderSharedStyles.IsSelectorElement(currentVisualElement))
             {
-                m_Selection.NotifyOfStylingChange(selfNotify ? null : m_Inspector, styles);
+                m_Selection.NotifyOfStylingChange(selfNotify ? null : m_Inspector, styles, styleChangeType);
                 currentVisualElement.IncrementVersion((VersionChangeType)(-1));
             }
             else
             {
-                m_Selection.NotifyOfStylingChange(selfNotify ? null : m_Inspector, styles);
-                m_Selection.NotifyOfHierarchyChange(m_Inspector, currentVisualElement, BuilderHierarchyChangeType.InlineStyle);
+                m_Selection.NotifyOfStylingChange(selfNotify ? null : m_Inspector, styles, styleChangeType);
+                m_Selection.NotifyOfHierarchyChange(m_Inspector, currentVisualElement, hierarchyChangeType);
             }
         }
 
@@ -1433,7 +1465,7 @@ StyleProperty GetOrCreateStylePropertyByStyleName(string styleName)
             return styleProperty;
         }
 
-        void PostStyleFieldSteps(VisualElement target, string styleName, bool isNewValue, bool isVariable = false)
+        void PostStyleFieldSteps(VisualElement target, string styleName, bool isNewValue, bool isVariable = false, NotifyType notifyType = NotifyType.Default)
         {
             if (isVariable)
             {
@@ -1451,9 +1483,6 @@ void PostStyleFieldSteps(VisualElement target, string styleName, bool isNewValue
                 var styleRow = target.GetProperty(BuilderConstants.InspectorLinkedStyleRowVEPropertyName) as BuilderStyleRow;
                 styleRow.AddToClassList(BuilderConstants.InspectorLocalStyleOverrideClassName);
 
-                // Remove temporary min-size class on VisualElement.
-                currentVisualElement.RemoveMinSizeSpecialElement();
-
                 var styleFields = styleRow.Query<BindableElement>().ToList();
 
                 var bindableElement = target as BindableElement;
@@ -1475,7 +1504,7 @@ void PostStyleFieldSteps(VisualElement target, string styleName, bool isNewValue
 
             s_StyleChangeList.Clear();
             s_StyleChangeList.Add(styleName);
-            NotifyStyleChanges(s_StyleChangeList, isVariable);
+            NotifyStyleChanges(s_StyleChangeList, isVariable, notifyType);
 
             if (isNewValue && updateStyleCategoryFoldoutOverrides != null)
                 updateStyleCategoryFoldoutOverrides();
@@ -1499,7 +1528,7 @@ bool IsNewValue(StyleProperty styleProperty, params StyleValueType[] supportedVa
             return isNewValue;
         }
 
-        void OnFieldKeywordChange(StyleValueKeyword keyword, VisualElement target, string styleName)
+        void OnFieldKeywordChange(StyleValueKeyword keyword, VisualElement target, string styleName, NotifyType notifyType = NotifyType.Default)
         {
             var styleProperty = GetOrCreateStylePropertyByStyleName(styleName);
             var isNewValue = IsNewValue(styleProperty, StyleValueType.Keyword);
@@ -1522,7 +1551,7 @@ void OnFieldKeywordChange(StyleValueKeyword keyword, VisualElement target, strin
                 styleProperty.values[0] = styleValue;
             }
 
-            PostStyleFieldSteps(target, styleName, isNewValue);
+            PostStyleFieldSteps(target, styleName, isNewValue, false, notifyType);
         }
 
         bool OnFieldDimensionChangeImplBatch(float newValue, Dimension.Unit newUnit, VisualElement target, string styleName)
@@ -1552,11 +1581,11 @@ bool OnFieldDimensionChangeImplBatch(float newValue, Dimension.Unit newUnit, Vis
             return isNewValue;
         }
 
-        void OnFieldDimensionChangeImpl(float newValue, Dimension.Unit newUnit, VisualElement target, string styleName)
+        void OnFieldDimensionChangeImpl(float newValue, Dimension.Unit newUnit, VisualElement target, string styleName, NotifyType notifyType = NotifyType.Default)
         {
             bool isNewValue = OnFieldDimensionChangeImplBatch(newValue, newUnit, target, styleName);
 
-            PostStyleFieldSteps(target, styleName, isNewValue);
+            PostStyleFieldSteps(target, styleName, isNewValue, false, notifyType);
         }
 
         void OnFieldDimensionChange(ChangeEvent<int> e, string styleName)
@@ -1567,18 +1596,32 @@ void OnFieldDimensionChange(ChangeEvent<int> e, string styleName)
         void OnDimensionStyleFieldValueChange(ChangeEvent<string> e, string styleName)
         {
             var dimensionStyleField = e.target as DimensionStyleField;
-            bool isVar = e.newValue.Trim().StartsWith(BuilderConstants.UssVariablePrefix);
+            var notifyType = dimensionStyleField.isUsingLabelDragger ? NotifyType.RefreshOnly : NotifyType.Default;
 
-            if (isVar && BuilderSharedStyles.IsSelectorElement(currentVisualElement))
+            if (!dimensionStyleField.isUsingLabelDragger && BuilderSharedStyles.IsSelectorElement(currentVisualElement))
             {
-                OnFieldVariableChange(StyleSheetUtilities.GetCleanVariableName(e.newValue), dimensionStyleField, styleName, 0);
+                var startsWithUssVariablePrefix = e.newValue.Trim().StartsWith(BuilderConstants.UssVariablePrefix);
+
+                if (startsWithUssVariablePrefix)
+                {
+                    OnFieldVariableChange(
+                        StyleSheetUtilities.GetCleanVariableName(e.newValue),
+                        dimensionStyleField,
+                        styleName,
+                        0,
+                        notifyType);
+
+                    return;
+                }
             }
-            else if (dimensionStyleField.isKeyword)
+
+            if (dimensionStyleField.isKeyword)
             {
                 OnFieldKeywordChange(
                     dimensionStyleField.keyword,
                     dimensionStyleField,
-                    styleName);
+                    styleName,
+                    notifyType);
             }
             else
             {
@@ -1586,7 +1629,8 @@ void OnDimensionStyleFieldValueChange(ChangeEvent<string> e, string styleName)
                     dimensionStyleField.length,
                     dimensionStyleField.unit,
                     dimensionStyleField,
-                    styleName);
+                    styleName,
+                    notifyType);
             }
         }
 
@@ -1856,32 +1900,6 @@ void OnFieldObjectValueChange(IEventHandler target, Object newValue, Object prev
                 }
             }
 
-            if (styleName == "background-image")
-            {
-                if (currentVisualElement.GetMinSizeSpecialElement() != null)
-                {
-                    var newSize = Vector2.negativeInfinity;
-
-                    if (newValue is Texture texture)
-                        newSize = new Vector2(texture.width, texture.height);
-                    else if (newValue is Sprite sprite)
-                        newSize = new Vector2(sprite.rect.width, sprite.rect.height);
-
-                    if (newSize != Vector2.negativeInfinity)
-                    {
-                        var widthFieldsForName = GetFieldListForStyleName("width");
-                        Assert.AreEqual(1, widthFieldsForName.Count);
-                        var widthField = (DimensionStyleField)widthFieldsForName[0];
-                        widthField.value = $"{newSize.x}px";
-
-                        var heightFieldsForName = GetFieldListForStyleName("height");
-                        Assert.AreEqual(1, heightFieldsForName.Count);
-                        var heightField = (DimensionStyleField)heightFieldsForName[0];
-                        heightField.value = $"{newSize.y}px";
-                    }
-                }
-            }
-
             if (isNewValue)
                 styleSheet.AddValue(styleProperty, newValue);
             else // TODO: Assume only one value.
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs
index 6aa2a37f75..837b8c8c54 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryContent.cs
@@ -73,6 +73,9 @@ public void OnPostProcessAsset()
         public static List<TreeViewItem> projectContentTree { get; private set; }
         public static List<TreeViewItem> projectContentTreeNoPackages { get; private set; }
 
+        static readonly int k_DefaultVisualElementFlexGrow = 1;
+        static readonly Color k_DefaultVisualElementBackgroundColor = new (0, 0, 0, 0);
+
         static BuilderLibraryContent()
         {
             RegenerateLibraryContent();
@@ -92,8 +95,7 @@ public static void RegenerateLibraryContent()
         {
             standardControlsTree = GenerateControlsItemsTree();
             standardControlsTreeNoEditor = new List<TreeViewItem>();
-            var controlsItemsTree = GenerateControlsItemsTree();
-            foreach (var item in controlsItemsTree)
+            foreach (var item in standardControlsTree)
             {
                 var builderLibraryTreeItem = item.data;
                 if (builderLibraryTreeItem.isEditorOnly)
@@ -222,24 +224,24 @@ static List<TreeViewItem> GenerateControlsItemsTree()
             var controlsTree = new List<TreeViewItem>();
             IList<TreeViewItem> containersItemList = new List<TreeViewItem>
             {
-                CreateItem("VisualElement", "VisualElement", typeof(VisualElement), () =>
-                {
-                    var ve = new VisualElement();
-                    var veMinSizeChild = new VisualElement();
-                    veMinSizeChild.name = BuilderConstants.SpecialVisualElementInitialMinSizeName;
-                    veMinSizeChild.AddToClassList(BuilderConstants.SpecialVisualElementInitialMinSizeClassName);
-                    ve.Add(veMinSizeChild);
-                    return ve;
-                },
+                CreateItem("VisualElement", "VisualElement", typeof(VisualElement),
+                    () => new VisualElement(),
                     (inVta, inParent, ve) =>
                     {
                         var vea = new VisualElementAsset(typeof(VisualElement).ToString());
                         VisualTreeAssetUtilities.InitializeElement(vea);
+
+                        BuilderStyleUtilities.SetInlineStyleValue(inVta, vea, ve, "flex-grow",
+                            k_DefaultVisualElementFlexGrow);
+                        BuilderStyleUtilities.SetInlineStyleValue(inVta, vea, ve, "background-color",
+                            k_DefaultVisualElementBackgroundColor);
+                        
                         inVta.AddElement(inParent, vea);
                         return vea;
                     }),
                 CreateItem("ScrollView", "ScrollView", typeof(ScrollView), () => new ScrollView()),
                 CreateItem("ListView", "ListView", typeof(ListView), () => new ListView()),
+                CreateItem("TreeView", "TreeView", typeof(TreeView), () => new TreeView()),
                 CreateItem("GroupBox", "VisualElement", typeof(GroupBox), () => new GroupBox()),
             };
             containersItem.AddChildren(containersItemList);
@@ -315,7 +317,8 @@ static List<TreeViewItem> GenerateControlsItemsTree()
                 CreateItem("Tag", nameof(TagField), typeof(TagField), () => new TagField("Tag", "Player")),
                 CreateItem("Mask", nameof(MaskField), typeof(MaskField), () => new MaskField("Mask")),
                 CreateItem("Layer", nameof(LayerField), typeof(LayerField), () => new LayerField("Layer")),
-                CreateItem("LayerMask", nameof(LayerMaskField), typeof(LayerMaskField), () => new LayerMaskField("LayerMask"))
+                CreateItem("LayerMask", nameof(LayerMaskField), typeof(LayerMaskField), () => new LayerMaskField("LayerMask")),
+                CreateItem("EnumFlags", nameof(EnumFlagsField), typeof(EnumFlagsField), () => new EnumFlagsField("EnumFlags", UsageHints.DynamicTransform))
             }, isEditorOnly: true, isHeader: true);
 
             var toolbar = CreateItem("Toolbar", null, null, null, null, new List<TreeViewItemData<BuilderLibraryTreeItem>>
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeView.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeView.cs
index d9cc8230ff..1beddbecfa 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeView.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryTreeView.cs
@@ -40,7 +40,7 @@ public BuilderLibraryTreeView(IList<TreeViewItem> items)
             m_TreeView.SetRootItems(items);
             m_TreeView.makeItem = MakeItem;
             m_TreeView.bindItem = BindItem;
-            m_TreeView.onItemsChosen += OnItemsChosen;
+            m_TreeView.itemsChosen += OnItemsChosen;
             m_TreeView.Rebuild();
 
             m_TreeView.ExpandRootItems();
@@ -160,7 +160,7 @@ void BindItem(VisualElement element, int index)
 
             // Set open button visibility.
             var openButton = element.Q<Button>(k_OpenButtonName);
-            openButton.userData = item;
+            openButton.userData = item.data;
             var enableTreeViewItemWithButton = builderItem.sourceAsset != null && builderItem.sourceAsset != m_PaneWindow.document.visualTreeAsset;
             element.EnableInClassList(k_TreeViewItemWithButtonClassName, enableTreeViewItemWithButton);
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryView.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryView.cs
index 510abfb416..3ba20b43a2 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryView.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Library/BuilderLibraryView.cs
@@ -93,13 +93,8 @@ protected void AddItemToTheDocument(BuilderLibraryTreeItem item)
                 BuilderAssetUtilities.AddElementToAsset(
                     m_PaneWindow.document, newElement, item.makeElementAssetCallback);
 
-            // TODO: ListView bug. Does not refresh selection pseudo states after a
-            // call to Refresh().
-            m_Selection.NotifyOfHierarchyChange();
-            schedule.Execute(() =>
-            {
-                m_Selection.Select(null, newElement);
-            }).ExecuteLater(200);
+            m_Selection.NotifyOfHierarchyChange(); 
+            m_Selection.Select(null, newElement); 
         }
 
         void OnItemMouseEnter(MouseEnterEvent evt)
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderAnchorer.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderAnchorer.cs
index 8ef4f76119..6b2070bb30 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderAnchorer.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderAnchorer.cs
@@ -113,7 +113,7 @@ void OnAnchorClick(TrackedStyle primaryStyle, TrackedStyle oppositeStyle, Tracke
                 SetAnchorHandleState(primaryStyle, true);
 
                 m_Selection.NotifyOfStylingChange(this, changeList);
-                m_Selection.NotifyOfHierarchyChange(this, m_Target, BuilderHierarchyChangeType.InlineStyle);
+                m_Selection.NotifyOfHierarchyChange(this, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             }
             else if (oppositeIsSet)
             {
@@ -124,7 +124,7 @@ void OnAnchorClick(TrackedStyle primaryStyle, TrackedStyle oppositeStyle, Tracke
                 SetAnchorHandleState(primaryStyle, false);
 
                 m_Selection.NotifyOfStylingChange(this, changeList);
-                m_Selection.NotifyOfHierarchyChange(this, m_Target, BuilderHierarchyChangeType.InlineStyle);
+                m_Selection.NotifyOfHierarchyChange(this, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             }
         }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderManipulator.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderManipulator.cs
index da97168c59..bb5ab4d1e7 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderManipulator.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderManipulator.cs
@@ -243,9 +243,6 @@ protected void SetStyleSheetValue(TrackedStyle trackedStyle, float value)
 
         protected void SetStyleSheetValue(string styleName, float value)
         {
-            // Remove temporary min-size element.
-            m_Target.RemoveMinSizeSpecialElement();
-
             BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, styleName, Mathf.Round(value));
         }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderMover.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderMover.cs
index 25b3eb7680..a47f0a9de4 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderMover.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderMover.cs
@@ -46,20 +46,17 @@ protected override void SetStylesFromTargetStyles()
         {
             base.OnStartDrag(handle);
 
-            if (parentTracker == null)
-                return;
-
-            parentTracker.Activate(m_Target.parent);
+            parentTracker?.Activate(m_Target.parent);
         }
 
         new void OnEndDrag()
         {
             base.OnEndDrag();
 
-            if (parentTracker == null)
-                return;
+            parentTracker?.Deactivate();
 
-            parentTracker.Deactivate();
+            m_Selection.NotifyOfStylingChange(this, m_ScratchChangeList);
+            m_Selection.NotifyOfHierarchyChange(this, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
         }
 
         void OnMove(
@@ -95,7 +92,7 @@ void OnMove(Vector2 diff)
             style.left = Mathf.Round(m_ThisRectOnStartDrag.x + diff.x);
             style.top = Mathf.Round(m_ThisRectOnStartDrag.y + diff.y);
 
-            m_Selection.NotifyOfStylingChange(this, m_ScratchChangeList);
+            m_Selection.NotifyOfStylingChange(this, m_ScratchChangeList, BuilderStylingChangeType.RefreshOnly);
             m_Selection.NotifyOfHierarchyChange(this, m_Target, BuilderHierarchyChangeType.InlineStyle);
         }
     }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderResizer.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderResizer.cs
index 0808a310ae..250d6235fb 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderResizer.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderResizer.cs
@@ -38,16 +38,16 @@ public BuilderResizer()
             m_HandleElements.Add("bottom-left-handle", this.Q("bottom-left-handle"));
             m_HandleElements.Add("bottom-right-handle", this.Q("bottom-right-handle"));
 
-            m_HandleElements["top-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragTop));
-            m_HandleElements["left-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragLeft));
-            m_HandleElements["bottom-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragBottom));
-            m_HandleElements["right-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragRight));
+            m_HandleElements["top-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragTop));
+            m_HandleElements["left-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragLeft));
+            m_HandleElements["bottom-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragBottom));
+            m_HandleElements["right-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragRight));
 
-            m_HandleElements["top-left-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragTopLeft));
-            m_HandleElements["top-right-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragTopRight));
+            m_HandleElements["top-left-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragTopLeft));
+            m_HandleElements["top-right-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragTopRight));
 
-            m_HandleElements["bottom-left-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragBottomLeft));
-            m_HandleElements["bottom-right-handle"].AddManipulator(new Manipulator(base.OnStartDrag, base.OnEndDrag, OnDragBottomRight));
+            m_HandleElements["bottom-left-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragBottomLeft));
+            m_HandleElements["bottom-right-handle"].AddManipulator(new Manipulator(OnStartDrag, OnEndDrag, OnDragBottomRight));
 
             base.m_AbsoluteOnlyHandleElements.Add(m_HandleElements["top-handle"]);
             base.m_AbsoluteOnlyHandleElements.Add(m_HandleElements["left-handle"]);
@@ -108,6 +108,12 @@ void OnDrag(
             }
         }
 
+        protected override void OnEndDrag()
+        {
+            base.OnEndDrag();
+            NotifySelection(false);
+        }
+
         void OnDragTop(Vector2 diff, List<string> changeList)
         {
             OnDrag(
@@ -158,10 +164,15 @@ void OnDragRight(Vector2 diff, List<string> changeList)
             style.width = Mathf.Round(m_ThisRectOnStartDrag.width + diff.x);
         }
 
-        void NotifySelection()
+        void NotifySelection(bool refreshOnly = true)
         {
-            m_Selection.NotifyOfStylingChange(this, m_ScratchChangeList);
-            m_Selection.NotifyOfHierarchyChange(this, m_Target, BuilderHierarchyChangeType.InlineStyle);
+            var styleChangeType = refreshOnly ? BuilderStylingChangeType.RefreshOnly : BuilderStylingChangeType.Default;
+            var hierarchyChangeType = refreshOnly ?
+                BuilderHierarchyChangeType.InlineStyle :
+                BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh;
+
+            m_Selection.NotifyOfStylingChange(this, m_ScratchChangeList, styleChangeType);
+            m_Selection.NotifyOfHierarchyChange(this, m_Target, hierarchyChangeType);
         }
 
         void OnDragTop(Vector2 diff)
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTransformer.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTransformer.cs
index 51abc725df..43c0070c96 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTransformer.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Manipulators/BuilderTransformer.cs
@@ -76,7 +76,7 @@ protected void OnStartDrag(VisualElement handle)
             m_DragHoverCoverLayer.style.cursor = handle.computedStyle.cursor;
         }
 
-        protected void OnEndDrag()
+        protected virtual void OnEndDrag()
         {
             m_DragHoverCoverLayer.style.display = DisplayStyle.None;
             m_DragHoverCoverLayer.RemoveFromClassList(s_ActiveClassName);
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderCodePreview.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderCodePreview.cs
index 89aa1b291d..31cdc989e9 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderCodePreview.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderCodePreview.cs
@@ -19,6 +19,8 @@ internal abstract class BuilderCodePreview : BuilderPaneContent
         static readonly string s_CodeCodeContainerClassName = "unity-builder-code__code_container";
         static readonly string s_CodeOpenSourceFileClassName = "unity-builder-code__open-source-file-button";
 
+        static readonly string s_TruncatedPreviewTextMessage = BuilderConstants.EllipsisText + $"\n({BuilderConstants.CodePreviewTruncatedTextMessage})";
+
         ScrollView m_ScrollView;
 
         VisualElement m_Container;
@@ -27,6 +29,8 @@ internal abstract class BuilderCodePreview : BuilderPaneContent
         TextField m_Code;
         Label m_LineNumbers;
 
+        bool m_NeedsRefreshOnResize;
+
         private Button m_OpenTargetAssetSourceButton;
         ScriptableObject m_TargetAsset;
         BuilderPaneWindow m_PaneWindow;
@@ -34,9 +38,10 @@ internal abstract class BuilderCodePreview : BuilderPaneContent
         public BuilderCodePreview(BuilderPaneWindow paneWindow)
         {
             m_PaneWindow = paneWindow;
-            
+
             m_ScrollView = new ScrollView(ScrollViewMode.VerticalAndHorizontal);
             m_ScrollView.AddToClassList(s_CodeScrollViewClassName);
+            m_ScrollView.RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
             Add(m_ScrollView);
 
             AddToClassList(s_UssClassName);
@@ -51,11 +56,13 @@ public BuilderCodePreview(BuilderPaneWindow paneWindow)
             m_LineNumbers.AddToClassList(s_CodeInputClassName);
 
             m_Code = new TextField(TextField.kMaxLengthNone, true, false, char.MinValue);
+            m_Code.textSelection.isSelectable = true;
             m_Code.isReadOnly = true;
             m_Code.name = s_CodeName;
             m_Code.RemoveFromClassList(TextField.ussClassName);
             m_Code.AddToClassList(s_CodeClassName);
             m_Code.AddToClassList(s_CodeTextClassName);
+            m_Code.AddToClassList(disabledUssClassName);
             var codeInput = m_Code.Q(className: TextField.inputUssClassName);
             codeInput.AddToClassList(s_CodeInputClassName);
 
@@ -92,8 +99,36 @@ protected override void OnAttachToPanelDefaultAction()
                 m_OpenTargetAssetSourceButton.AddToClassList(s_CodeOpenSourceFileClassName);
                 pane.toolbar.Add(m_OpenTargetAssetSourceButton);
             }
+
+            RefreshPreviewIfVisible();
         }
 
+        void OnGeometryChanged(GeometryChangedEvent evt)
+        {
+            if (!m_NeedsRefreshOnResize)
+                return;
+
+            RefreshPreview();
+            m_NeedsRefreshOnResize = false;
+        }
+
+        protected void RefreshPreviewIfVisible()
+        {
+            RefreshHeader();
+
+            if (m_ScrollView.contentViewport.resolvedStyle.height <= 0 ||
+                m_ScrollView.contentViewport.resolvedStyle.width <= 0)
+            {
+                m_NeedsRefreshOnResize = true;
+                return;
+            }
+
+            RefreshPreview();
+        }
+
+        protected abstract void RefreshPreview();
+        protected abstract void RefreshHeader();
+
         protected abstract string previewAssetExtension { get; }
 
         string targetAssetPath
@@ -116,7 +151,7 @@ void OnOpenSourceFileButtonClick()
             if(!isTargetAssetAvailableOnDisk)
                 return;
 
-            AssetDatabase.OpenAsset(m_TargetAsset);
+            AssetDatabase.OpenAsset(m_TargetAsset, BuilderConstants.OpenInIDELineNumber);
         }
 
         void BlockEvent(KeyUpEvent evt)
@@ -156,12 +191,13 @@ internal static string GetClampedText(string text, out bool truncated)
 
             truncated = false;
 
+            var maxTextPrintableCharCount = BuilderConstants.MaxTextPrintableCharCount;
             foreach (var c in text)
             {
                 if (!char.IsControl(c))
                     printableCharCount++;
 
-                if (printableCharCount > BuilderConstants.MaxTextPrintableCharCount)
+                if (printableCharCount > maxTextPrintableCharCount)
                 {
                     truncated = true;
                     break;
@@ -187,6 +223,9 @@ protected void SetText(string text)
             }
 
             var clampedText = GetClampedText(text, out var truncated);
+            if (truncated)
+                clampedText = clampedText.Substring(0, clampedText.Length - s_TruncatedPreviewTextMessage.Length);
+
             var lineCount = clampedText.Count(x => x == '\n') + 1;
             string lineNumbersText = "";
             for (int i = 1; i <= lineCount; ++i)
@@ -200,7 +239,8 @@ protected void SetText(string text)
             m_LineNumbers.text = lineNumbersText;
 
             if (truncated)
-                 clampedText += BuilderConstants.EllipsisText + $"\n{BuilderConstants.EllipsisText}\n({BuilderConstants.CodePreviewTruncatedTextMessage})";
+                clampedText += s_TruncatedPreviewTextMessage;
+
             m_Code.value = clampedText;
         }
     }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreview.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreview.cs
index 161ba16152..af26a3ccf2 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreview.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUssPreview.cs
@@ -13,13 +13,25 @@ public BuilderUssPreview(BuilderPaneWindow paneWindow, BuilderSelection selectio
             m_Selection = selection;
         }
 
-        protected override void OnAttachToPanelDefaultAction()
+        protected override void RefreshPreview()
         {
-            base.OnAttachToPanelDefaultAction();
-            RefreshUSS();
+            SetText(GetTargetStylesheet()?.GenerateUSS() ?? string.Empty);
         }
 
-        void RefreshUSS()
+        protected override void RefreshHeader()
+        {
+            var styleSheet = GetTargetStylesheet();
+            if (styleSheet != null)
+            {
+                SetTargetAsset(styleSheet, document.hasUnsavedChanges);
+            }
+            else
+            {
+                SetTargetAsset(null, false);
+            }
+        }
+
+        StyleSheet GetTargetStylesheet()
         {
             if (hasDocument && document.firstStyleSheet != null)
             {
@@ -34,29 +46,29 @@ void RefreshUSS()
                         styleSheet = selectedElement.GetClosestStyleSheet();
                 }
 
-                SetText(styleSheet.GenerateUSS());
-                SetTargetAsset(styleSheet, document.hasUnsavedChanges);
-            }
-            else
-            {
-                SetText(string.Empty);
-                SetTargetAsset(null, false);
+                return styleSheet;
             }
+
+            return null;
         }
 
         public void HierarchyChanged(VisualElement element, BuilderHierarchyChangeType changeType)
         {
-            RefreshUSS();
+            RefreshHeader();
         }
 
         public void SelectionChanged()
         {
-            RefreshUSS();
+            RefreshHeader();
+            RefreshPreviewIfVisible();
         }
 
         public void StylingChanged(List<string> styles, BuilderStylingChangeType changeType)
         {
-            RefreshUSS();
+            if (changeType == BuilderStylingChangeType.Default)
+            {
+                RefreshPreviewIfVisible();
+            }
         }
 
         protected override string previewAssetExtension => BuilderConstants.UssExtension;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreview.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreview.cs
index ea77b96430..6860cdfc6d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreview.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Previews/BuilderUxmlPreview.cs
@@ -9,12 +9,6 @@ public BuilderUxmlPreview(BuilderPaneWindow paneWindow) : base(paneWindow)
         {
         }
 
-        protected override void OnAttachToPanelDefaultAction()
-        {
-            base.OnAttachToPanelDefaultAction();
-            RefreshUXML();
-        }
-
         string GenerateUXMLText()
         {
             bool writingToFile = true; // Set this to false to see the special selection elements and attributes.
@@ -22,33 +16,39 @@ string GenerateUXMLText()
             return uxmlText;
         }
 
-        void RefreshUXML()
+        protected override void RefreshPreview()
+        {
+            SetText(hasDocument ? GenerateUXMLText() : string.Empty);
+        }
+
+        protected override void RefreshHeader()
         {
             if (hasDocument)
             {
-                SetText(GenerateUXMLText());
                 SetTargetAsset(document.visualTreeAsset, document.hasUnsavedChanges);
             }
             else
             {
-                SetText(string.Empty);
                 SetTargetAsset(null, false);
             }
         }
 
         public void HierarchyChanged(VisualElement element, BuilderHierarchyChangeType changeType)
         {
-            RefreshUXML();
+            if (changeType.HasFlag(BuilderHierarchyChangeType.FullRefresh))
+            {
+                RefreshPreviewIfVisible();
+            }
         }
 
         public void SelectionChanged()
         {
-            RefreshUXML();
+            RefreshPreviewIfVisible();
         }
 
         public void StylingChanged(List<string> styles, BuilderStylingChangeType changeType)
         {
-            RefreshUXML();
+            RefreshHeader();
         }
 
         protected override string previewAssetExtension => BuilderConstants.UxmlExtension;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Toolbar/BuilderToolbar.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Toolbar/BuilderToolbar.cs
index 0b3dcf8ad1..56848b567a 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Toolbar/BuilderToolbar.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Toolbar/BuilderToolbar.cs
@@ -4,10 +4,9 @@
 using UnityEngine;
 using UnityEngine.UIElements;
 using UnityEditor;
+using UnityEditor.ProjectWindowCallback;
 using UnityEditor.UIElements;
 using UnityEditor.UIElements.StyleSheets;
-using Object = UnityEngine.Object;
-using PackageInfo = UnityEditor.PackageManager.PackageInfo;
 using Toolbar = UnityEditor.UIElements.Toolbar;
 
 namespace Unity.UI.Builder
@@ -33,15 +32,13 @@ internal class BuilderToolbar : VisualElement, IBuilderAssetModificationProcesso
         ToolbarMenu m_CanvasThemeMenu;
         ToolbarMenu m_SettingsMenu;
         Toolbar m_BreadcrumbsToolbar;
-        ToolbarBreadcrumbs m_Breadcrumbs = new ToolbarBreadcrumbs();
+        ToolbarBreadcrumbs m_Breadcrumbs;
 
         ThemeStyleSheetManager m_ThemeManager;
         ThemeStyleSheet m_LastCustomTheme;
 
         string m_LastSavePath = "Assets";
 
-        string m_BuilderPackageVersion;
-
         public BuilderDocument document
         {
             get { return m_PaneWindow.document; }
@@ -91,50 +88,84 @@ public BuilderToolbar(
             m_Viewport.SetPreviewMode(false);
 
             m_CanvasThemeMenu = this.Q<ToolbarMenu>("canvas-theme-menu");
-            SetUpCanvasThemeMenu();
 
+            InitCanvasTheme();
+            
+            SetViewportSubTitle();
+
+            // Track unsaved changes state change.
+            UpdateHasUnsavedChanges();
+
+            m_SettingsMenu = this.Q<ToolbarMenu>("settings-menu");
+            SetupSettingsMenu();
+
+            // Breadcrumbs & BreadCrumbs Toolbar
+            m_BreadcrumbsToolbar = this.Q<Toolbar>(BreadcrumbsToolbarName);
+            m_Breadcrumbs = this.Q<ToolbarBreadcrumbs>(BreadcrumbsName);
+            SetToolbarBreadCrumbs();
+
+            RegisterCallback<AttachToPanelEvent>(RegisterCallbacks);
+        }
+
+        public void InitCanvasTheme()
+        {
             var currentTheme = document.currentCanvasTheme;
             var currentThemeSheet = document.currentCanvasThemeStyleSheet;
 
-            // If the canvas theme is the obsolete Runtime enum then search for the unity default runtime theme in the current project.
-            // Otherwise, fallback to the current editor theme
+            // If canvas theme is editor-only without Editor Extensions mode enabled, treat this as a Runtime theme
+            if (!document.fileSettings.editorExtensionMode && IsEditorCanvasTheme(currentTheme))
+                currentTheme = BuilderDocument.CanvasTheme.Runtime;
+
+            // If canvas theme is equal to the obsolete Runtime enum, search for the Unity default runtime theme
+            // in the current project.  If that can't be found, try one of the custom themes, otherwise
+            // fallback to default Editor theme
             if (currentTheme == BuilderDocument.CanvasTheme.Runtime)
             {
                 var defaultTssAsset = EditorGUIUtility.Load(ThemeRegistry.kUnityRuntimeThemePath) as ThemeStyleSheet;
-                if (defaultTssAsset != null)
+                if (defaultTssAsset == null)
                 {
+                    // Try to load or create the default runtime asset for the user
+                    var pathName = $"Assets/{ThemeRegistry.kUnityRuntimeThemeFileName}";
+                    defaultTssAsset = EditorGUIUtility.Load(pathName) as ThemeStyleSheet;
+
+                    if (defaultTssAsset == null)
+                    {
+                        var action = ScriptableObject.CreateInstance<DoCreateAssetWithContent>();
+                        action.filecontent = "@import url(\"" + ThemeRegistry.kThemeScheme +
+                                             "://default\");\nVisualElement {}";
+
+                        var instanceId = ProjectBrowser.kAssetCreationInstanceID_ForNonExistingAssets;
+                        action.Action(instanceId, pathName, null);
+                        action.CleanUp();
+
+                        defaultTssAsset = EditorGUIUtility.Load(pathName) as ThemeStyleSheet;
+                    }
+                }
+
+                if (defaultTssAsset != null)
+                {   
                     currentTheme = BuilderDocument.CanvasTheme.Custom;
                     currentThemeSheet = defaultTssAsset;
                 }
                 else
                 {
-                    currentTheme = BuilderDocument.CanvasTheme.Default;
+                    // Fall back on first custom theme we find or default editor theme
+                    if (m_ThemeManager != null && m_ThemeManager.themeFiles.Count > 0)
+                    {
+                        var customThemeFile = m_ThemeManager.themeFiles[0];
+                        currentTheme = BuilderDocument.CanvasTheme.Custom;
+                        currentThemeSheet = AssetDatabase.LoadAssetAtPath<ThemeStyleSheet>(customThemeFile);
+                    }
+                    else
+                    {
+                        currentTheme = BuilderDocument.CanvasTheme.Default;
+                        currentThemeSheet = null;
+                    }
                 }
             }
 
             ChangeCanvasTheme(currentTheme, currentThemeSheet);
             UpdateCanvasThemeMenuStatus();
-            SetViewportSubTitle();
-
-            // Track unsaved changes state change.
-            UpdateHasUnsavedChanges();
-
-            m_SettingsMenu = this.Q<ToolbarMenu>("settings-menu");
-            SetupSettingsMenu();
-
-            // Breadcrumbs & BreadCrumbs Toolbar
-            m_BreadcrumbsToolbar = this.Q<Toolbar>(BreadcrumbsToolbarName);
-            m_Breadcrumbs = this.Q<ToolbarBreadcrumbs>(BreadcrumbsName);
-            SetToolbarBreadCrumbs();
-
-            // Get Builder package version.
-            var packageInfo = PackageInfo.FindForAssetPath("Packages/" + BuilderConstants.BuilderPackageName);
-            if (packageInfo == null)
-                m_BuilderPackageVersion = null;
-            else
-                m_BuilderPackageVersion = packageInfo.version;
-
-            RegisterCallback<AttachToPanelEvent>(RegisterCallbacks);
         }
 
         void RegisterCallbacks(AttachToPanelEvent evt)
@@ -339,6 +370,8 @@ internal void SaveDocument(bool isSaveAs)
             if (viewportWindow == null)
                 return;
 
+            m_Explorer.elementHierarchyView.RegisterTreeState();
+
             // Set asset.
             var userConfirmed = document.SaveNewDocument(viewportWindow.documentRootElement, isSaveAs, out var needFullRefresh);
             if (!userConfirmed)
@@ -478,7 +511,7 @@ void SetUpFileMenu()
 
         static string GetTextForZoomScale(float scale)
         {
-            return (int)(scale * 100) + "%";
+            return $"{scale*100f}%";
         }
 
         void UpdateZoomMenuText()
@@ -488,16 +521,18 @@ void UpdateZoomMenuText()
 
         void SetUpZoomMenu()
         {
-            foreach (var zoomScale in m_Viewport.zoomer.zoomScaleValues)
+            foreach (var zoomScale in m_Viewport.zoomer.zoomMenuScaleValues)
             {
-                m_ZoomMenu.menu.AppendAction(GetTextForZoomScale(zoomScale), a => { m_Viewport.zoomScale = zoomScale; }
-                    , a => (m_Viewport.zoomScale == zoomScale) ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal);
+                m_ZoomMenu.menu.AppendAction(GetTextForZoomScale(zoomScale),
+                    a => { m_Viewport.zoomScale = zoomScale; },
+                    a => Mathf.Approximately(m_Viewport.zoomScale, zoomScale) ?
+                        DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal);
             }
             m_Viewport.canvas.RegisterCallback<GeometryChangedEvent>(e => UpdateZoomMenuText());
             UpdateZoomMenuText();
         }
 
-        static string GetEditorThemeText(BuilderDocument.CanvasTheme theme)
+        internal static string GetEditorThemeText(BuilderDocument.CanvasTheme theme)
         {
             switch (theme)
             {
@@ -513,39 +548,37 @@ static string GetEditorThemeText(BuilderDocument.CanvasTheme theme)
 
         void SetUpCanvasThemeMenu()
         {
-            var count = m_CanvasThemeMenu.menu.MenuItems().Count;
+            m_CanvasThemeMenu.menu.ClearItems();
 
-            for (var i = 0; i < count; i++)
+            if (document.fileSettings.editorExtensionMode)
             {
-                m_CanvasThemeMenu.menu.RemoveItemAt(0);
-            }
+                m_CanvasThemeMenu.menu.AppendAction(GetEditorThemeText(BuilderDocument.CanvasTheme.Default), a =>
+                    {
+                        ChangeCanvasTheme(BuilderDocument.CanvasTheme.Default, null);
+                        UpdateCanvasThemeMenuStatus();
+                    },
+                    a => document.currentCanvasTheme == BuilderDocument.CanvasTheme.Default
+                        ? DropdownMenuAction.Status.Checked
+                        : DropdownMenuAction.Status.Normal);
 
-            m_CanvasThemeMenu.menu.AppendAction(GetEditorThemeText(BuilderDocument.CanvasTheme.Default), a =>
-            {
-                ChangeCanvasTheme(BuilderDocument.CanvasTheme.Default, null);
-                UpdateCanvasThemeMenuStatus();
-            },
-                a => document.currentCanvasTheme == BuilderDocument.CanvasTheme.Default
-                ? DropdownMenuAction.Status.Checked
-                : DropdownMenuAction.Status.Normal);
-
-            m_CanvasThemeMenu.menu.AppendAction(GetEditorThemeText(BuilderDocument.CanvasTheme.Dark), a =>
-            {
-                ChangeCanvasTheme(BuilderDocument.CanvasTheme.Dark);
-                UpdateCanvasThemeMenuStatus();
-            },
-                a => document.currentCanvasTheme == BuilderDocument.CanvasTheme.Dark
-                ? DropdownMenuAction.Status.Checked
-                : DropdownMenuAction.Status.Normal);
-
-            m_CanvasThemeMenu.menu.AppendAction(GetEditorThemeText(BuilderDocument.CanvasTheme.Light), a =>
-            {
-                ChangeCanvasTheme(BuilderDocument.CanvasTheme.Light);
-                UpdateCanvasThemeMenuStatus();
-            },
-                a => document.currentCanvasTheme == BuilderDocument.CanvasTheme.Light
-                ? DropdownMenuAction.Status.Checked
-                : DropdownMenuAction.Status.Normal);
+                m_CanvasThemeMenu.menu.AppendAction(GetEditorThemeText(BuilderDocument.CanvasTheme.Dark), a =>
+                    {
+                        ChangeCanvasTheme(BuilderDocument.CanvasTheme.Dark);
+                        UpdateCanvasThemeMenuStatus();
+                    },
+                    a => document.currentCanvasTheme == BuilderDocument.CanvasTheme.Dark
+                        ? DropdownMenuAction.Status.Checked
+                        : DropdownMenuAction.Status.Normal);
+
+                m_CanvasThemeMenu.menu.AppendAction(GetEditorThemeText(BuilderDocument.CanvasTheme.Light), a =>
+                    {
+                        ChangeCanvasTheme(BuilderDocument.CanvasTheme.Light);
+                        UpdateCanvasThemeMenuStatus();
+                    },
+                    a => document.currentCanvasTheme == BuilderDocument.CanvasTheme.Light
+                        ? DropdownMenuAction.Status.Checked
+                        : DropdownMenuAction.Status.Normal);
+            }
 
             if (m_ThemeManager != null && m_ThemeManager.themeFiles.Count > 0)
             {
@@ -569,6 +602,11 @@ void SetUpCanvasThemeMenu()
             }
         }
 
+        bool IsEditorCanvasTheme(BuilderDocument.CanvasTheme theme)
+        {
+            return theme is BuilderDocument.CanvasTheme.Default or BuilderDocument.CanvasTheme.Dark or BuilderDocument.CanvasTheme.Light;
+        }
+
         public void ChangeCanvasTheme(BuilderDocument.CanvasTheme theme, ThemeStyleSheet themeStyleSheet = null)
         {
             ApplyCanvasTheme(m_Viewport.sharedStylesAndDocumentElement, theme, themeStyleSheet);
@@ -690,6 +728,17 @@ void UpdateCanvasThemeMenuStatus()
         {
             SetUpCanvasThemeMenu();
 
+            if (m_CanvasThemeMenu.menu.MenuItems().Count == 0)
+            {
+                m_CanvasThemeMenu.tooltip = BuilderConstants.ToolbarCanvasThemeMenuEmptyTooltip;
+                m_CanvasThemeMenu.text = GetEditorThemeText(BuilderDocument.CanvasTheme.Default);
+                return;
+            }
+
+            m_CanvasThemeMenu.tooltip = document.fileSettings.editorExtensionMode ? 
+                BuilderConstants.ToolbarCanvasThemeMenuEditorTooltip :
+                BuilderConstants.ToolbarCanvasThemeMenuTooltip;
+
             foreach (var item in m_CanvasThemeMenu.menu.MenuItems())
             {
                 var action = item as DropdownMenuAction;
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
index f307d08fa4..d9af778dba 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetModificationProcessor.cs
@@ -1,5 +1,7 @@
 using UnityEditor;
 using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
 
 namespace Unity.UI.Builder
 {
@@ -73,8 +75,19 @@ static AssetMoveResult OnWillMoveAsset(string sourcePath, string destinationPath
 
         static string[] OnWillSaveAssets(string[] paths)
         {
-            // On a duplication, this function is called with ZERO
-            // paths. Because, of course.
+            // On a duplication, this function is called with no paths. Same for Save and Save Project commands.
+            // However if we want to save assets on Save/Save Project commands, we have no real choice here but
+            // to also check if we're here because of the Duplicate command.  Ideal situation would be to have
+            // the Duplicate command trigger its own callback and not OnWillSaveAssets.
+            var evt = Event.current;
+            if ((evt == null || evt.commandName != EventCommandNames.Duplicate) &&
+                (paths.Length == 0 || !paths.Any(x => x.Contains(".uxml"))))
+            {
+                var builder = Builder.ActiveWindow;
+                if (builder != null && builder.document.hasUnsavedChanges)
+                    builder.SaveChanges();
+            }
+
             foreach (var modificationProcessor in m_ModificationProcessors)
                 modificationProcessor.OnAssetChange();
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetUtilities.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
index c0afabd95a..4bb3cac3bf 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderAssetUtilities.cs
@@ -47,7 +47,7 @@ public static bool ValidateAsset(VisualTreeAsset asset, string path)
             string errorMessage = null;
 
             string errorTitle = null;
-            
+
             if (asset == null)
             {
                 if (string.IsNullOrEmpty(path))
@@ -406,6 +406,7 @@ public static void AddElementToSelectionInAsset(BuilderDocument document, Visual
             }
             else if (ve.GetVisualElementAsset() != null)
             {
+                Undo.IncrementCurrentGroup();
                 Undo.RegisterCompleteObjectUndo(
                     document.visualTreeAsset, BuilderConstants.ChangeSelectionUndoMessage);
 
@@ -443,6 +444,7 @@ public static void RemoveElementFromSelectionInAsset(BuilderDocument document, V
             }
             else if (ve.GetVisualElementAsset() != null)
             {
+                Undo.IncrementCurrentGroup();
                 Undo.RegisterCompleteObjectUndo(
                     document.visualTreeAsset, BuilderConstants.ChangeSelectionUndoMessage);
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderCommandHandler.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderCommandHandler.cs
index 6358d24828..5ff295af28 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderCommandHandler.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderCommandHandler.cs
@@ -1,9 +1,6 @@
-using System;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEditor.UIElements;
-using UnityEditor.StyleSheets;
 using System.Linq;
 using System.Collections.Generic;
 using System.Text;
@@ -20,9 +17,6 @@ internal class BuilderCommandHandler
 
         List<BuilderPaneContent> m_Panes = new List<BuilderPaneContent>();
 
-        bool m_ControlWasPressed;
-        IVisualElementScheduledItem m_ControlUnpressScheduleItem;
-
         public BuilderCommandHandler(
             BuilderPaneWindow paneWindow,
             BuilderSelection selection)
@@ -46,12 +40,8 @@ public void OnEnable()
                 pane.primaryFocusable.RegisterCallback<KeyDownEvent>(OnDelete);
             }
 
-            // Ctrl+S to save.
-            m_PaneWindow.rootVisualElement.RegisterCallback<KeyUpEvent>(OnSaveDocument);
-            m_ControlUnpressScheduleItem = m_PaneWindow.rootVisualElement.schedule.Execute(UnsetControlFlag);
-
             // Undo/Redo
-            Undo.undoRedoPerformed += OnUndoRedo;
+            Undo.undoRedoEvent += OnUndoRedo;
         }
 
         public void OnDisable()
@@ -64,10 +54,8 @@ public void OnDisable()
                 pane.primaryFocusable.UnregisterCallback<KeyDownEvent>(OnDelete);
             }
 
-            m_PaneWindow.rootVisualElement.UnregisterCallback<KeyUpEvent>(OnSaveDocument);
-
             // Undo/Redo
-            Undo.undoRedoPerformed -= OnUndoRedo;
+            Undo.undoRedoEvent -= OnUndoRedo;
         }
 
         public void RegisterPane(BuilderPaneContent paneContent)
@@ -108,47 +96,11 @@ public void OnCommandExecute(ExecuteCommandEvent evt)
             }
         }
 
-        void OnUndoRedo()
+        void OnUndoRedo(in UndoRedoInfo info)
         {
             m_PaneWindow.OnEnableAfterAllSerialization();
         }
 
-        void UnsetControlFlag()
-        {
-            m_ControlWasPressed = false;
-            m_ControlUnpressScheduleItem.Pause();
-        }
-
-        void OnSaveDocument(KeyUpEvent evt)
-        {
-            if (m_Toolbar == null)
-                return;
-
-            if (evt.keyCode == KeyCode.LeftCommand ||
-                evt.keyCode == KeyCode.RightCommand ||
-                evt.keyCode == KeyCode.LeftControl ||
-                evt.keyCode == KeyCode.RightControl)
-            {
-                m_ControlUnpressScheduleItem.ExecuteLater(100);
-                m_ControlWasPressed = true;
-                return;
-            }
-
-            if (evt.keyCode != KeyCode.S)
-                return;
-
-            if (!evt.modifiers.HasFlag(EventModifiers.Control) &&
-                !evt.modifiers.HasFlag(EventModifiers.Command) &&
-                !m_ControlWasPressed)
-                return;
-
-            m_ControlWasPressed = false;
-
-            m_Toolbar.SaveDocument(false);
-
-            evt.StopPropagation();
-        }
-
         void OnDelete(KeyDownEvent evt)
         {
             // HACK: This must be a bug. TextField leaks its key events to everyone!
@@ -416,7 +368,7 @@ bool DeleteElementFromVisualTreeAsset(VisualElement element)
 
             return true;
         }
-        
+
         public void CreateTemplateFromHierarchy(VisualElement ve, VisualTreeAsset vta, string path = "")
         {
             var veas = new List<VisualElementAsset>();
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderConstants.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderConstants.cs
index 507643398a..15092ecd40 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderConstants.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderConstants.cs
@@ -209,7 +209,7 @@ internal static class BuilderConstants
         public static readonly string ExplorerInExplorerNewClassSelectorInfoMessage = "Add new selector...";
 
         // Code Preview Messages
-        public static readonly string CodePreviewTruncatedTextMessage = "The content is truncated because it is too long.";
+        public static readonly string CodePreviewTruncatedTextMessage = "The content is truncated because it is too long";
 
         //
         // Library
@@ -256,8 +256,6 @@ internal static class BuilderConstants
         public static readonly string CanvasContainerDarkStyleClassName = "unity-builder-canvas__container--dark";
         public static readonly string CanvasContainerLightStyleClassName = "unity-builder-canvas__container--light";
         public static readonly string CanvasContainerRuntimeStyleClassName = "unity-builder-canvas__container--runtime";
-        public static readonly string SpecialVisualElementInitialMinSizeName = "__unity-builder-canvas__special-visual-element-initial-size";
-        public static readonly string SpecialVisualElementInitialMinSizeClassName = "unity-builder-canvas__special-visual-element-initial-size";
 
         // Canvas Messages
         public static readonly string CannotManipulateResizedOrScaledItemMessage = "The selected item is rotated or scaled.\nTransforming it from the viewport is not properly supported yet.";
@@ -274,6 +272,11 @@ internal static class BuilderConstants
         public static readonly string ToolbarUnsavedFileDisplayText = "<unsaved file>";
         public static readonly string ToolbarUnsavedFileDisplayMessage = ToolbarUnsavedFileDisplayText + ToolbarUnsavedFileSuffix;
 
+        // Toolbar tooltips
+        public static readonly string ToolbarCanvasThemeMenuEmptyTooltip = "Preview theme list is empty.\n\nYou can create new themes or a default Runtime theme from the \"Assets/Create/UI Toolkit\" menu.";
+        public static readonly string ToolbarCanvasThemeMenuEditorTooltip = "Select a preview theme for the viewport.\n\nNote: List contains some themes available only with the Editor Extensions Authoring mode.";
+        public static readonly string ToolbarCanvasThemeMenuTooltip = "Select a preview theme for the viewport.";
+
         //
         // Undo/Redo
         //
@@ -312,8 +315,11 @@ internal static class BuilderConstants
         public static readonly string SaveDialogChooseUssPathDialogTitle = "Choose USS File Location";
         public static readonly string SaveDialogSaveChangesPromptTitle = "UI Builder - Unsaved Changes Detected";
         public static readonly string SaveDialogSaveChangesPromptMessage = "Do you want to save changes you made?";
-        public static readonly string SaveDialogExternalChangesPromptTitle = "UI Builder - Document has been modified in an external editor";
-        public static readonly string SaveDialogExternalChangesPromptMessage = "Unsaved changes in the UI Builder will be lost.\nPlease avoid changing files externally while they are open in the Builder.";
+        public static readonly string SaveDialogExternalChangesPromptTitle = "The document, {0}, has been changed outside of the UI Builder";
+        public static readonly string SaveDialogExternalChangesPromptMessage =
+            "The UI Builder will now apply the changes made outside of the UI Builder. This overwrites any unsaved changes you made in the UI Builder.\n\n" +
+            "Note: To avoid conflicting changes, make sure to save any changes you make in the UI Builder before editing a file in an external editor or " +
+            "in a dedicated editor inside Unity (this includes resource files like Font and Sprite assets which have their own editor).";
         public static readonly string SaveDialogInvalidPathMessage = "Can only save in the 'Assets/' or 'Packages/' folders.";
         public static readonly string SaveDialogReplaceWithNewTemplateMessage = "Changes to your template affect this file. In order to replace this template, we need to save your current file.";
 
@@ -354,6 +360,7 @@ internal static class BuilderConstants
         public static readonly string TypeAttributeInvalidTypeMessage = "{0} attribute is an invalid type. Make sure to include assembly name.";
         public static readonly string TypeAttributeMustDeriveFromMessage = "{0} attribute type must derive from {1}";
         public static readonly string BuiltInAssetPathsNotSupportedMessage = "Built-in resource paths are not supported in USS.";
+        public static readonly string BuiltInAssetPathsNotSupportedMessageUxml = "Built-in resource paths are not supported in UXML.";
         public static readonly string DocumentMatchGameViewModeDisabled = "Match Game View mode disabled.";
 
         // Settings
@@ -376,7 +383,7 @@ internal static class BuilderConstants
         // UXML
         public static readonly string UxmlOpenTagSymbol = "<";
         public static readonly string UxmlCloseTagSymbol = ">";
-        public static readonly string UxmlEndTagSymbol = "/" + UxmlCloseTagSymbol;
+        public static readonly string UxmlEndTagSymbol = " /" + UxmlCloseTagSymbol;
         public static readonly string UxmlTemplateClassTag = "Template";
         public static readonly string UxmlNameAttr = "name";
         public static readonly string UxmlHeader = "<ui:UXML xmlns:ui=\"UnityEngine.UIElements\" xmlns:uie=\"UnityEditor.UIElements\"";
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
index 7699f5cf40..3e91542654 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderPlacementUtilities.cs
@@ -54,7 +54,7 @@ public static VisualElement CreateAbsoluteIsland(BuilderPaneWindow paneWindow, V
             }
 
             // Need to explicitly update inline styles from asset.
-            selection.NotifyOfHierarchyChange(null, absoluteIslandContainer, BuilderHierarchyChangeType.InlineStyle);
+            selection.NotifyOfHierarchyChange(null, absoluteIslandContainer, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
 
             return absoluteIslandContainer;
         }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderStyleUtilities.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
index f373bb3373..3d3203f6c1 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Utilities/BuilderStyleUtilities.cs
@@ -1,5 +1,6 @@
 using UnityEngine.UIElements;
 using System;
+using UnityEngine;
 using UnityEngine.UIElements.StyleSheets;
 
 namespace Unity.UI.Builder
@@ -15,6 +16,13 @@ static void GetInlineStyleSheetAndRule(VisualTreeAsset vta, VisualElement elemen
             styleRule = vta.GetOrCreateInlineStyleRule(vea);
         }
 
+        static void GetInlineStyleSheetAndRule(VisualTreeAsset vta, VisualElementAsset vea,
+            out StyleSheet styleSheet, out StyleRule styleRule)
+        {
+            styleSheet = vta.GetOrCreateInlineStyleSheet();
+            styleRule = vta.GetOrCreateInlineStyleRule(vea);
+        }
+
         static StyleProperty GetOrCreateStylePropertyByStyleName(StyleSheet styleSheet, StyleRule styleRule, string styleName)
         {
             var styleProperty = styleSheet.FindLastProperty(styleRule, styleName);
@@ -26,21 +34,48 @@ static StyleProperty GetOrCreateStylePropertyByStyleName(StyleSheet styleSheet,
 
         // Inline StyleSheet Value Setters
 
-        static public void SetInlineStyleValue(VisualTreeAsset vta, VisualElement element, string styleName, float value)
+        public static void SetInlineStyleValue(VisualTreeAsset vta, VisualElement element, string styleName, float value)
         {
             GetInlineStyleSheetAndRule(vta, element, out StyleSheet styleSheet, out StyleRule styleRule);
+            SetStyleSheetRuleValueAsDimension(styleSheet, styleRule, styleName, value);
+            element?.UpdateInlineRule(styleSheet, styleRule);
+        }
+
+        public static void SetInlineStyleValue(VisualTreeAsset vta, VisualElementAsset vea, VisualElement element, string styleName, float value)
+        {
+            GetInlineStyleSheetAndRule(vta, vea, out StyleSheet styleSheet, out StyleRule styleRule);
             SetStyleSheetRuleValue(styleSheet, styleRule, styleName, value);
+            element?.UpdateInlineRule(styleSheet, styleRule);
         }
 
-        static public void SetInlineStyleValue(VisualTreeAsset vta, VisualElement element, string styleName, Enum value)
+        public static void SetInlineStyleValue(VisualTreeAsset vta, VisualElement element, string styleName, Enum value)
         {
             GetInlineStyleSheetAndRule(vta, element, out StyleSheet styleSheet, out StyleRule styleRule);
             SetStyleSheetRuleValue(styleSheet, styleRule, styleName, value);
+            element?.UpdateInlineRule(styleSheet, styleRule);
+        }
+
+        public static void SetInlineStyleValue(VisualTreeAsset vta, VisualElementAsset vea, VisualElement element, string styleName, Color value)
+        {
+            GetInlineStyleSheetAndRule(vta, vea, out StyleSheet styleSheet, out StyleRule styleRule);
+            SetStyleSheetRuleValue(styleSheet, styleRule, styleName, value);
+            element?.UpdateInlineRule(styleSheet, styleRule);
         }
 
         // StyleSheet Value Setters
 
-        static public void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule styleRule, string styleName, float value)
+        static void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule styleRule, string styleName, float value)
+        {
+            var styleProperty = GetOrCreateStylePropertyByStyleName(styleSheet, styleRule, styleName);
+            var isNewValue = styleProperty.values.Length == 0;
+
+            if (isNewValue)
+                styleSheet.AddValue(styleProperty, value);
+            else // TODO: Assume only one value.
+                styleSheet.SetValue(styleProperty.values[0], value);
+        }
+
+        static void SetStyleSheetRuleValueAsDimension(StyleSheet styleSheet, StyleRule styleRule, string styleName, float value)
         {
             var styleProperty = GetOrCreateStylePropertyByStyleName(styleSheet, styleRule, styleName);
             var isNewValue = styleProperty.values.Length == 0;
@@ -50,7 +85,7 @@ static public void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule style
             // it here as a dimension to create final proper uss.
             if (!isNewValue && styleProperty.values[0].valueType != StyleValueType.Dimension)
             {
-                styleProperty.values = new StyleValueHandle[0];
+                styleProperty.values = Array.Empty<StyleValueHandle>();
                 isNewValue = true;
             }
 
@@ -64,14 +99,14 @@ static public void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule style
                 styleSheet.SetValue(styleProperty.values[0], dimension);
         }
 
-        static public void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule styleRule, string styleName, Enum value)
+        static void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule styleRule, string styleName, Enum value)
         {
             var styleProperty = GetOrCreateStylePropertyByStyleName(styleSheet, styleRule, styleName);
             var isNewValue = styleProperty.values.Length == 0;
 
             if (!isNewValue && styleProperty.IsVariable())
             {
-                styleProperty.values = new StyleValueHandle[0];
+                styleProperty.values = Array.Empty<StyleValueHandle>();
                 isNewValue = true;
             }
 
@@ -80,5 +115,22 @@ static public void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule style
             else // TODO: Assume only one value.
                 styleSheet.SetValue(styleProperty.values[0], value);
         }
+
+        static void SetStyleSheetRuleValue(StyleSheet styleSheet, StyleRule styleRule, string styleName, Color value)
+        {
+            var styleProperty = GetOrCreateStylePropertyByStyleName(styleSheet, styleRule, styleName);
+            var isNewValue = styleProperty.values.Length == 0;
+            
+            if (!isNewValue && styleProperty.IsVariable())
+            {
+                styleProperty.values = Array.Empty<StyleValueHandle>();
+                isNewValue = true;
+            }
+            
+            if (isNewValue)
+                styleSheet.AddValue(styleProperty, value);
+            else // TODO: Assume only one value.
+                styleSheet.SetValue(styleProperty.values[0], value);
+        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
index 168b44bfe2..c4bab8ef8d 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderCanvasStyleControls.cs
@@ -13,6 +13,7 @@ internal class BuilderCanvasStyleControls : VisualElement
         const string k_AlignItemsName = "align-items";
         const string k_JustifyContentName = "justify-content";
         const string k_TextAlignName = "-unity-text-align";
+        const string k_TextOverflowName = "text-overflow";
         const string k_TextWrapName = "white-space";
 
         public const string k_FlexDirectionButtonName = "flex-direction-button";
@@ -21,7 +22,8 @@ internal class BuilderCanvasStyleControls : VisualElement
         public const string k_HorizontalTextAlignButtonName = "horizontal-text-align-button";
         public const string k_VerticalTextAlignButtonName = "vertical-text-align-button";
         public const string k_TextWrapButtonName = "text-wrap-button";
-
+        public const string k_TextOverflowButtonName = "text-overflow-button";
+        
         // Buttons
         List<Button> m_AllButtons = new List<Button>();
         List<Button> m_FlexAlignButtons = new List<Button>();
@@ -31,6 +33,7 @@ internal class BuilderCanvasStyleControls : VisualElement
         Button m_HorizontalTextAlignButton;
         Button m_VerticalTextAlignButton;
         Button m_TextWrapButton;
+        Button m_TextOverflowButton;
 
         BuilderSelection m_Selection;
         VisualTreeAsset m_VisualTreeAsset;
@@ -59,6 +62,7 @@ public BuilderCanvasStyleControls()
             m_HorizontalTextAlignButton = QueryAndBindButton(k_HorizontalTextAlignButtonName, HorizontalTextAlignOnToggle);
             m_VerticalTextAlignButton = QueryAndBindButton(k_VerticalTextAlignButtonName, VerticalTextAlignOnToggle);
             m_TextWrapButton = QueryAndBindButton(k_TextWrapButtonName, TextWrapOnToggle);
+            m_TextOverflowButton = QueryAndBindButton(k_TextOverflowButtonName, TextOverflowOnToggle);
 
             // Group special buttons.
             m_FlexAlignButtons.Add(m_FlexDirectionButton);
@@ -125,6 +129,9 @@ void ActivateInner()
 
                 m_TextWrapButton.style.display = DisplayStyle.Flex;
                 TextWrapUpdateToggleIcon();
+
+                m_TextOverflowButton.style.display = DisplayStyle.Flex;
+                TextOverflowUpdateToggleIcon();
             }
         }
 
@@ -148,6 +155,7 @@ public void UpdateButtonIcons(List<string> styles)
                         HorizontalTextAlignUpdateToggleIcon();
                         VerticalTextAlignUpdateToggleIcon();
                         break;
+                    case k_TextOverflowName: TextOverflowUpdateToggleIcon(); break;
                     case k_TextWrapName: TextWrapUpdateToggleIcon(); break;
                 }
             }
@@ -205,7 +213,7 @@ void FlexDirectionOnToggle()
             }
             FlexDirectionUpdateToggleIcon(result);
             BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, k_FlexDirectionName, result);
-            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle);
+            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             m_Selection.NotifyOfStylingChange(null, new List<string>() { k_FlexDirectionName });
         }
 
@@ -251,7 +259,7 @@ void AlignItemsOnToggle()
             }
             AlignItemsUpdateToggleIcon(result);
             BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, k_AlignItemsName, result);
-            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle);
+            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             m_Selection.NotifyOfStylingChange(null, new List<string>() { k_AlignItemsName });
         }
 
@@ -297,7 +305,7 @@ void JustifyContentOnToggle()
             }
             JustifyContentUpdateToggleIcon(result);
             BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, k_JustifyContentName, result);
-            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle);
+            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             m_Selection.NotifyOfStylingChange(null, new List<string>() { k_JustifyContentName });
         }
 
@@ -349,7 +357,7 @@ void HorizontalTextAlignOnToggle()
             }
             HorizontalTextAlignUpdateToggleIcon(result);
             BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, k_TextAlignName, result);
-            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle);
+            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             m_Selection.NotifyOfStylingChange(null, new List<string>() { k_TextAlignName });
         }
 
@@ -401,10 +409,21 @@ void VerticalTextAlignOnToggle()
             }
             VerticalTextAlignUpdateToggleIcon(result);
             BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, k_TextAlignName, result);
-            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle);
+            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             m_Selection.NotifyOfStylingChange(null, new List<string>() { k_TextAlignName });
         }
 
+        void TextOverflowUpdateToggleIcon()
+        {
+            TextOverflowUpdateToggleIcon(m_Target.resolvedStyle.textOverflow);
+        }
+
+        void TextOverflowUpdateToggleIcon(TextOverflow resolveStyle)
+        {
+            m_TextOverflowButton.EnableInClassList("clip", resolveStyle == TextOverflow.Clip);
+            m_TextOverflowButton.EnableInClassList("ellipsis", resolveStyle == TextOverflow.Ellipsis);
+        }
+
         //
         // Text Wrap
         //
@@ -428,6 +447,20 @@ void TextWrapUpdateToggleIcon(WhiteSpace resolveStyle)
             }
         }
 
+        void TextOverflowOnToggle()
+        {
+            var result = TextOverflow.Clip;
+            switch (m_Target.resolvedStyle.textOverflow)
+            {
+                case TextOverflow.Clip: result = TextOverflow.Ellipsis; break;
+                case TextOverflow.Ellipsis: result = TextOverflow.Clip; break;
+            }
+            TextOverflowUpdateToggleIcon(result);
+            BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, k_TextOverflowName, result);
+            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
+            m_Selection.NotifyOfStylingChange(null, new List<string>() { k_TextOverflowName });
+        }
+
         void TextWrapOnToggle()
         {
             var result = WhiteSpace.NoWrap;
@@ -438,7 +471,7 @@ void TextWrapOnToggle()
             }
             TextWrapUpdateToggleIcon(result);
             BuilderStyleUtilities.SetInlineStyleValue(m_VisualTreeAsset, m_Target, k_TextWrapName, result);
-            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle);
+            m_Selection.NotifyOfHierarchyChange(null, m_Target, BuilderHierarchyChangeType.InlineStyle | BuilderHierarchyChangeType.FullRefresh);
             m_Selection.NotifyOfStylingChange(null, new List<string>() { k_TextWrapName });
         }
     }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderPanner.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderPanner.cs
index 5e07c172ab..fe2934ace0 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderPanner.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderPanner.cs
@@ -3,9 +3,9 @@
 
 namespace Unity.UI.Builder
 {
-    internal class BuilderPanner : MouseManipulator
+    internal class BuilderPanner : PointerManipulator
     {
-        private BuilderViewport m_Viewport;
+        private readonly BuilderViewport m_Viewport;
         private bool m_Panning;
         private int m_ActivatingButton;
 
@@ -19,19 +19,19 @@ public BuilderPanner(BuilderViewport viewport)
 
         protected override void RegisterCallbacksOnTarget()
         {
-            target.RegisterCallback<MouseDownEvent>(OnMouseDown);
-            target.RegisterCallback<MouseMoveEvent>(OnMouseMove);
-            target.RegisterCallback<MouseUpEvent>(OnMouseUp);
+            target.RegisterCallback<PointerDownEvent>(OnPointerDown);
+            target.RegisterCallback<PointerMoveEvent>(OnPointerMove);
+            target.RegisterCallback<PointerUpEvent>(OnPointerUp);
         }
 
         protected override void UnregisterCallbacksFromTarget()
         {
-            target.UnregisterCallback<MouseDownEvent>(OnMouseDown);
-            target.UnregisterCallback<MouseMoveEvent>(OnMouseMove);
-            target.UnregisterCallback<MouseUpEvent>(OnMouseUp);
+            target.UnregisterCallback<PointerDownEvent>(OnPointerDown);
+            target.UnregisterCallback<PointerMoveEvent>(OnPointerMove);
+            target.UnregisterCallback<PointerUpEvent>(OnPointerUp);
         }
 
-        void OnMouseDown(MouseDownEvent evt)
+        void OnPointerDown(PointerDownEvent evt)
         {
             if (CanStartManipulation(evt))
             {
@@ -42,7 +42,7 @@ void OnMouseDown(MouseDownEvent evt)
             }
         }
 
-        void OnMouseUp(MouseUpEvent evt)
+        void OnPointerUp(PointerUpEvent evt)
         {
             if (m_ActivatingButton != evt.button || !CanStopManipulation(evt))
                 return;
@@ -52,12 +52,13 @@ void OnMouseUp(MouseUpEvent evt)
             evt.StopPropagation();
         }
 
-        void OnMouseMove(MouseMoveEvent evt)
+        void OnPointerMove(PointerMoveEvent evt)
         {
             if (!m_Panning)
                 return;
 
-            m_Viewport.contentOffset += evt.mouseDelta;
+            Vector2 deltaPosition = evt.deltaPosition;
+            m_Viewport.contentOffset += deltaPosition;
             evt.StopPropagation();
         }
     }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderZoomer.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderZoomer.cs
index cd71f9a6cc..8c60092c01 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderZoomer.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Viewport/BuilderZoomer.cs
@@ -1,20 +1,45 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
 {
-    internal class BuilderZoomer : MouseManipulator
+    internal class BuilderZoomer : PointerManipulator
     {
-        public static readonly float DefaultScale = 1;
-        public static readonly float ZoomStepDistance = 10;
+        private const int MinScaleStart = 25;           // This is the minimum scale (25%), increment in small steps
+        private const int MaxScaleStart = 150;          // At 150%, let's increment in larger steps
+        private const int MaxScaleEnd = 500;            // until we reach the max scale (500%)
+        private const int LowScaleIncrement = 5;        // Low scale increment step (5%)
+        private const int HighScaleIncrement = 25;      // High scale increment step (25%)
+        private List<float> m_ZoomScaleValues;
+        private const float DefaultScale = 1;
+        private const float ZoomStepDistance = 10;
+
+        // Full zoom scale list available with the Zoomer manipulator
+        public List<float> zoomScaleValues
+        {
+            get
+            {
+                if (m_ZoomScaleValues == null)
+                {
+                    m_ZoomScaleValues = new List<float>();
+                    for (var val = MinScaleStart; val < MaxScaleStart; val += LowScaleIncrement)
+                        m_ZoomScaleValues.Add((float)Math.Round(val/100.0, 2));
+                    for (var val = MaxScaleStart; val <= MaxScaleEnd; val += HighScaleIncrement)
+                        m_ZoomScaleValues.Add((float)Math.Round(val/100.0, 2));
+                }
+                return m_ZoomScaleValues;
+            }
+        }
 
-        public List<float> zoomScaleValues { get; set; } = new List<float>() { 0.25f, 0.5f, 0.75f, DefaultScale, 1.25f, 1.5f, 1.75f, 2f, 2.5f, 4f, 5f };
+        // Short list of zoom scales for the Zoom menu
+        public List<float> zoomMenuScaleValues { get; } = new() { 0.25f, 0.5f, 0.75f, 1f, 1.25f, 1.5f, 1.75f, 2f, 2.5f, 4f, 5f };
 
-        private bool m_Zooming = false;
-        private Vector2 m_PressPos;
-        private Vector2 m_LastZoomPos;
-        private BuilderViewport m_Viewport;
+        bool m_Zooming;
+        Vector2 m_PressPos;
+        Vector2 m_LastZoomPos;
+        readonly BuilderViewport m_Viewport;
 
         public BuilderZoomer(BuilderViewport viewport)
         {
@@ -25,23 +50,23 @@ public BuilderZoomer(BuilderViewport viewport)
 
         protected override void RegisterCallbacksOnTarget()
         {
-            target.RegisterCallback<MouseDownEvent>(OnMouseDown);
-            target.RegisterCallback<MouseMoveEvent>(OnMouseMove);
-            target.RegisterCallback<MouseUpEvent>(OnMouseUp);
+            target.RegisterCallback<PointerDownEvent>(OnPointerDown);
+            target.RegisterCallback<PointerMoveEvent>(OnPointerMove);
+            target.RegisterCallback<PointerUpEvent>(OnPointerUp);
             target.RegisterCallback<WheelEvent>(OnWheel);
         }
 
         protected override void UnregisterCallbacksFromTarget()
         {
-            target.UnregisterCallback<MouseDownEvent>(OnMouseDown);
-            target.UnregisterCallback<MouseMoveEvent>(OnMouseMove);
-            target.UnregisterCallback<MouseUpEvent>(OnMouseUp);
+            target.UnregisterCallback<PointerDownEvent>(OnPointerDown);
+            target.UnregisterCallback<PointerMoveEvent>(OnPointerMove);
+            target.UnregisterCallback<PointerUpEvent>(OnPointerUp);
             target.UnregisterCallback<WheelEvent>(OnWheel);
         }
 
         private static float CalculateNewZoom(float currentZoom, float wheelDelta, List<float> zoomValues)
         {
-            currentZoom = Mathf.Clamp(currentZoom, zoomValues[0], zoomValues[zoomValues.Count - 1]);
+            currentZoom = Mathf.Clamp(currentZoom, zoomValues[0], zoomValues[^1]);
 
             if (Mathf.Approximately(wheelDelta, 0))
             {
@@ -54,29 +79,27 @@ private static float CalculateNewZoom(float currentZoom, float wheelDelta, List<
             {
                 return DefaultScale;
             }
-            else
-            {
-                currentZoomIndex =
-                    Mathf.Clamp(currentZoomIndex + ((wheelDelta > 0) ? 1 : -1), 0, zoomValues.Count - 1);
-                return zoomValues[currentZoomIndex];
-            }
+
+            currentZoomIndex =
+                Mathf.Clamp(currentZoomIndex + ((wheelDelta > 0) ? 1 : -1), 0, zoomValues.Count - 1);
+            return zoomValues[currentZoomIndex];
         }
 
-        void OnMouseDown(MouseDownEvent evt)
+        void OnPointerDown(PointerDownEvent evt)
         {
             if (CanStartManipulation(evt))
             {
                 m_Zooming = true;
-                m_PressPos = evt.localMousePosition;
+                m_PressPos = evt.localPosition;
                 m_LastZoomPos = m_PressPos;
                 target.CaptureMouse();
                 evt.StopImmediatePropagation();
             }
         }
 
-        void OnMouseUp(MouseUpEvent evt)
+        void OnPointerUp(PointerUpEvent evt)
         {
-            if (!m_Zooming && !CanStopManipulation(evt))
+            if (!m_Zooming || !CanStopManipulation(evt))
                 return;
 
             m_Zooming = false;
@@ -84,13 +107,13 @@ void OnMouseUp(MouseUpEvent evt)
             evt.StopPropagation();
         }
 
-        void OnMouseMove(MouseMoveEvent evt)
+        void OnPointerMove(PointerMoveEvent evt)
         {
-            if (!m_Zooming || Mathf.Abs(evt.localMousePosition.x - m_LastZoomPos.x) < ZoomStepDistance)
+            if (!m_Zooming || Mathf.Abs(evt.localPosition.y - m_LastZoomPos.y) < ZoomStepDistance)
                 return;
 
-            Zoom(evt.mouseDelta.x, m_PressPos);
-            m_LastZoomPos = evt.localMousePosition;
+            Zoom(evt.deltaPosition.y, m_PressPos);
+            m_LastZoomPos = evt.localPosition;
             evt.StopPropagation();
         }
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
index 144891c7f9..2e28704096 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/ElementHierarchyView/ElementHierarchyView.cs
@@ -8,10 +8,16 @@
 using UnityEngine.UIElements;
 
 using TreeViewItem = UnityEngine.UIElements.TreeViewItemData<UnityEngine.UIElements.VisualElement>;
-using TreeViewItemVE = UnityEngine.UIElements.TreeViewItemData<UnityEngine.UIElements.VisualElement>;
 
 namespace Unity.UI.Builder
 {
+    struct PreSaveState
+    {
+        public List<int> expandedIndices;
+        public List<int> selectedIndices;
+        public Vector2 scrollOffset;
+    }
+
     internal class ElementHierarchyView : VisualElement
     {
         public const string k_PillName = "unity-builder-tree-class-pill";
@@ -40,6 +46,7 @@ public IEnumerable<TreeViewItemData<VisualElement>> treeItems
 
         IList<TreeViewItem> m_TreeRootItems;
         TreeView m_TreeView;
+        PreSaveState m_RegisteredState;
         HighlightOverlayPainter m_TreeViewHoverOverlay;
 
         VisualElement m_Container;
@@ -117,7 +124,8 @@ public ElementHierarchyView(
             m_TreeView.selectionType = SelectionType.Multiple;
             m_TreeView.viewDataKey = "unity-builder-explorer-tree";
             m_TreeView.style.flexGrow = 1;
-            m_TreeView.onSelectedIndicesChange += OnSelectionChange;
+            m_TreeView.selectedIndicesChanged += OnSelectionChange;
+            m_TreeView.horizontalScrollingEnabled = true;
 
             m_TreeView.RegisterCallback<MouseDownEvent>(OnLeakedMouseClick);
             m_Container.Add(m_TreeView);
@@ -189,7 +197,6 @@ void FillItem(VisualElement element, int index)
                 var isPartOfParentDocument = !string.IsNullOrEmpty(owningUxmlPath);
 
                 var styleSheetAsset = documentElement.GetStyleSheet();
-                var styleSheetFileName = AssetDatabase.GetAssetPath(styleSheetAsset);
                 var styleSheetAssetName = BuilderAssetUtilities.GetStyleSheetAssetName(styleSheetAsset, hasUnsavedChanges && !isPartOfParentDocument);
                 var ssLabel = new Label(styleSheetAssetName);
                 ssLabel.AddToClassList(BuilderConstants.ExplorerItemLabelClassName);
@@ -514,6 +521,7 @@ public void RebuildTree(VisualElement rootVisualElement, bool includeParent = tr
             {
                 m_TreeView.ClearSelection();
                 m_TreeView.SetRootItems(m_TreeRootItems);
+                ApplyRegisteredExpandedIndices();
                 m_TreeView.Rebuild();
 
                 // Restore focus state.
@@ -524,6 +532,47 @@ public void RebuildTree(VisualElement rootVisualElement, bool includeParent = tr
             hierarchyHasChanged = false;
         }
 
+        public void RegisterTreeState()
+        {
+            if (m_TreeView != null)
+            {
+                m_RegisteredState.expandedIndices = m_TreeView.expandedItemIds.Select(id => m_TreeView.viewController.GetIndexForId(id)).Where(index => index != -1).ToList();
+                m_RegisteredState.expandedIndices.Sort();
+                m_RegisteredState.selectedIndices = m_TreeView.selectedIndices.ToList();
+                m_RegisteredState.scrollOffset = m_TreeView.m_ScrollOffset;
+            }
+        }
+
+        void ApplyRegisteredExpandedIndices()
+        {
+            if (m_RegisteredState.expandedIndices == null)
+                return;
+
+            m_TreeView.CollapseAll();
+            foreach (var index in m_RegisteredState.expandedIndices)
+            {
+                var id = m_TreeView.viewController.GetIdForIndex(index);
+                if (id != TreeItem.invalidId)
+                    m_TreeView.ExpandItem(id);
+            }
+
+            m_RegisteredState.expandedIndices.Clear();
+            m_RegisteredState.expandedIndices = null;
+        }
+
+        public void ApplyRegisteredSelectionInternallyIfNeeded()
+        {
+            if (m_RegisteredState.selectedIndices == null)
+                return;
+
+            m_TreeView.SetSelection(m_RegisteredState.selectedIndices);
+            m_TreeView.m_ScrollOffset = m_RegisteredState.scrollOffset;
+            m_TreeView.RefreshItems();
+
+            m_RegisteredState.selectedIndices.Clear();
+            m_RegisteredState.selectedIndices = null;
+        }
+
         public void ExpandRootItems()
         {
             // Auto-expand root items on load.
@@ -653,7 +702,7 @@ VisualElement MakeItem()
             return element;
         }
 
-        TreeViewItemVE FindElement(IEnumerable<TreeViewItem> list, VisualElement element)
+        TreeViewItem FindElement(IEnumerable<TreeViewItem> list, VisualElement element)
         {
             if (list == null)
                 return default;
@@ -725,7 +774,7 @@ IList<TreeViewItem> GetTreeItemsFromVisualTreeIncludingParent(VisualElement pare
             var id = nextId;
             nextId++;
 
-            var item = new TreeViewItemVE(id, parent);
+            var item = new TreeViewItem(id, parent);
             items.Add(item);
 
             var childItems = GetTreeItemsFromVisualTree(parent, ref nextId);
@@ -752,9 +801,6 @@ IList<TreeViewItem> GetTreeItemsFromVisualTree(VisualElement parent, ref int nex
             {
                 var element = parent.hierarchy[i];
 
-                if (element.name == BuilderConstants.SpecialVisualElementInitialMinSizeName)
-                    continue;
-
                 if (items == null)
                     items = new List<TreeViewItem>();
 
@@ -770,7 +816,7 @@ IList<TreeViewItem> GetTreeItemsFromVisualTree(VisualElement parent, ref int nex
                     nextId++;
                 }
 
-                var item = new TreeViewItemVE(id, element);
+                var item = new TreeViewItem(id, element);
                 items.Add(item);
 
                 var childItems = GetTreeItemsFromVisualTree(element, ref nextId);
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/DimensionStyleField.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/DimensionStyleField.cs
index 699df8f70a..ea98071e28 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/DimensionStyleField.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/DimensionStyleField.cs
@@ -80,6 +80,8 @@ public Dimension.Unit unit
 
         public Func<float, Dimension.Unit, Dimension.Unit, float> valueConverter { get; set; }
 
+        public bool isUsingLabelDragger { get; private set; }
+
         public DimensionStyleField() : this(string.Empty) { }
 
         public DimensionStyleField(string label) : base(label)
@@ -88,12 +90,29 @@ public DimensionStyleField(string label) : base(label)
             m_DraggerIntegerField.name = "dragger-integer-field";
             m_DraggerIntegerField.AddToClassList(k_DraggerFieldUssClassName);
             m_DraggerIntegerField.RegisterValueChangedCallback(OnDraggerFieldUpdate);
+            m_DraggerIntegerField.labelElement.RegisterCallback<PointerUpEvent>(OnDraggerPointerUp);
             Insert(0, m_DraggerIntegerField);
             option = defaultUnit;
 
             RefreshChildFields();
         }
 
+        void OnDraggerPointerUp(PointerUpEvent evt)
+        {
+            if (!isUsingLabelDragger)
+                return;
+
+            isUsingLabelDragger = false;
+
+            // Sending change event on release after we reset the isUsingLabelDragger, so that we can trigger a full update.
+            // The value didn't change but the state of this control in regards to the value did.
+            using (var e = ChangeEvent<string>.GetPooled(value, value))
+            {
+                e.target = this;
+                SendEvent(e);
+            }
+        }
+
         bool FindUnitInExpression(Expression expression, DataType dataType)
         {
             if (expression.type == ExpressionType.Data && expression.dataType == dataType)
@@ -217,6 +236,8 @@ void UpdateDragger()
 
         void OnDraggerFieldUpdate(ChangeEvent<int> evt)
         {
+            isUsingLabelDragger = true;
+
             if (isKeyword)
                 option = defaultUnit;
 
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldSearchCompleter.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
index 42ea24094c..ad131001ee 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/FieldSearchCompleter.cs
@@ -131,7 +131,7 @@ public TData selectedData
             }
         }
 
-        public event Action<TData> onSelectionChange;
+        public event Action<TData> selectionChanged;
 
         public int itemHeight
         {
@@ -220,12 +220,12 @@ public FieldSearchCompleterPopup popup
                             m_Popup.Add(detailsContent);
                         m_Builder.rootVisualElement.Add(m_Popup);
                         m_Popup.Hide();
-                        m_Popup.onElementChosen += (index) =>
+                        m_Popup.elementChosen += (index) =>
                         {
                             textField.value = GetTextFromData(results[index]);
                             textField.Q(TextField.textInputUssName).Blur();
                         };
-                        m_Popup.onSelectionChange += (index) => onSelectionChange?.Invoke(index != -1 ? results[index] : default(TData));
+                        m_Popup.selectionChanged += (index) => selectionChanged?.Invoke(index != -1 ? results[index] : default(TData));
                         UpdatePopup();
                     }
                 }
@@ -479,8 +479,8 @@ class FieldSearchCompleterPopup : StyleFieldPopup
 
         Label m_ResultLabel;
 
-        public Action<int> onElementChosen;
-        public Action<int> onSelectionChange;
+        public Action<int> elementChosen;
+        public Action<int> selectionChanged;
 
         public ListView listView { get; private set; }
 
@@ -493,14 +493,14 @@ public FieldSearchCompleterPopup()
             sv.style.flexGrow = 0;
             sv.style.flexShrink = 1;
             listView.Q<ScrollView>().horizontalScrollerVisibility = ScrollerVisibility.Hidden;
-            listView.onItemsChosen += (obj) =>
+            listView.itemsChosen += (obj) =>
             {
-                onElementChosen?.Invoke(listView.selectedIndex);
+                elementChosen?.Invoke(listView.selectedIndex);
             };
 
-            listView.onSelectionChange += (obj) =>
+            listView.selectionChanged += (obj) =>
             {
-                onSelectionChange?.Invoke(listView.selectedIndex);
+                selectionChanged?.Invoke(listView.selectedIndex);
             };
 
             Add(listView);
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ImageStyleField.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ImageStyleField.cs
index 9b12bbbccd..d0e60b0583 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ImageStyleField.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/ImageStyleField.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Threading;
 using UnityEditor.PackageManager;
-using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -79,6 +78,7 @@ public ImageStyleField(string label) : base(label)
             };
 
             AddType(typeof(Sprite), "Sprite");
+            AddType(typeof(VectorImage), "Vector");
         }
 
         private void OnEnterEditButton(PointerEnterEvent evt)
@@ -135,10 +135,5 @@ bool Install2DSpriteEditorPackage()
 
             return addRequest.Result != null;
         }
-
-        public void TryEnableVectorGraphicTypeSupport()
-        {
-            AddType(typeof(VectorImage), "Vector");
-        }
     }
 }
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/IntegerStyleField.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/IntegerStyleField.cs
index f715f59651..f5268b23a1 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/IntegerStyleField.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/IntegerStyleField.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using UnityEditor;
 using UnityEditor.UIElements;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace Unity.UI.Builder
@@ -40,6 +41,13 @@ public IntegerStyleField(string label) : base(label)
             RefreshChildFields();
         }
 
+        protected override void RefreshChildFields()
+        {
+            base.RefreshChildFields();
+
+            m_DraggerIntegerField.SetValueWithoutNotify(Mathf.RoundToInt(innerValue));
+        }
+
         protected override List<string> GenerateAdditionalOptions(string binding)
         {
             return new List<string>() { s_NoOptionString };
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableCompleter.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableCompleter.cs
index e8a72f6fbf..f833198a19 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableCompleter.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleField/VariableCompleter.cs
@@ -55,7 +55,7 @@ public VariableCompleter(VariableEditingHandler handler)
             m_DetailsView = new VariableInfoView();
             m_DetailsView.AddToClassList(BuilderConstants.HiddenStyleClassName);
             detailsContent = m_DetailsView;
-            onSelectionChange += data =>
+            selectionChanged += data =>
             {
                 m_DetailsView.SetInfo(data);
                 if (data.IsValid())
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
index f2ea883ea6..46bb204107 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/StyleSheetExtensions/StyleSheetToUss.cs
@@ -196,17 +196,12 @@ public static void ToUssString(StyleSheet sheet, UssExportOptions options, Style
         {
             if (property.name == "cursor" && property.values.Length > 1 && !property.IsVariable())
             {
-                int i;
-                string propertyValueStr;
-                for (i = 0; i < property.values.Length - 1; i++)
+                for (var i = 0; i < property.values.Length; i++)
                 {
-                    propertyValueStr = ValueHandleToUssString(sheet, options, property.name, property.values[i]);
+                    var propertyValueStr = ValueHandleToUssString(sheet, options, property.name, property.values[i]);
                     sb.Append(" ");
                     sb.Append(propertyValueStr);
                 }
-                sb.Append(", ");
-                propertyValueStr = ValueHandleToUssString(sheet, options, property.name, property.values[i]);
-                sb.Append(propertyValueStr);
             }
             else
             {
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
index 70c04426f6..fc15b83b83 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualElementExtensions/VisualElementExtensions.cs
@@ -26,12 +26,18 @@ public static List<UxmlAttributeDescription> GetAttributeDescriptions(this Visua
 
             foreach (IUxmlFactory f in factoryList)
             {
-                foreach (var a in f.uxmlAttributesDescription)
+                // For user created types, they may return null for uxmlAttributeDescription, so we need to check in order not to crash.
+                if (f.uxmlAttributesDescription != null)
                 {
-                    if (s_SkippedAttributeNames.Contains(a.name))
-                        continue;
+                    foreach (var a in f.uxmlAttributesDescription)
+                    {
+                        // For user created types, they may `yield return null` which would create an array with a null, so we need
+                        // to check in order not to crash.
+                        if (a == null || s_SkippedAttributeNames.Contains(a.name))
+                            continue;
 
-                    attributeList.Add(a);
+                        attributeList.Add(a);
+                    }
                 }
             }
 
@@ -95,7 +101,7 @@ public static Dictionary<string, string> GetOverriddenAttributes(this VisualElem
                 // This is a special patch that allows to search for built-in elements' attribute specifically
                 // without needing to add to the public API.
                 // Allowing to search for internal/private properties in all cases could lead to unforeseen issues.
-                else if (ve is EnumField && camel == "type")
+                else if (ve is EnumField or EnumFlagsField && camel == "type")
                 {
                     fieldInfo = veType.GetProperty(camel, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
                     var veValueAbstract = fieldInfo.GetValue(ve, null);
@@ -362,48 +368,6 @@ public static bool HasAncestor(this VisualElement element, VisualElement ancesto
             return element.parent.HasAncestor(ancestor);
         }
 
-        public static VisualElement GetMinSizeSpecialElement(this VisualElement element)
-        {
-            foreach (var child in element.Children())
-                if (child.name == BuilderConstants.SpecialVisualElementInitialMinSizeName)
-                    return child;
-
-            return null;
-        }
-
-        public static void HideMinSizeSpecialElement(this VisualElement element)
-        {
-            var minSizeSpecialElement = element.GetMinSizeSpecialElement();
-            if (minSizeSpecialElement == null)
-                return;
-
-            minSizeSpecialElement.style.display = DisplayStyle.None;
-        }
-
-        public static void UnhideMinSizeSpecialElement(this VisualElement element)
-        {
-            var minSizeSpecialElement = element.GetMinSizeSpecialElement();
-            if (minSizeSpecialElement == null)
-                return;
-
-            minSizeSpecialElement.style.display = DisplayStyle.Flex;
-        }
-
-        public static void RemoveMinSizeSpecialElement(this VisualElement element)
-        {
-            var minSizeSpecialElement = element.GetMinSizeSpecialElement();
-            if (minSizeSpecialElement == null)
-                return;
-
-            minSizeSpecialElement.RemoveFromHierarchy();
-
-            // HACK - Since recent changes in UITK, computed style is updated only when its matchingRuleHash has changed.
-            // This causes an issue where the height of a newly dropped VisualElement remains 100px even after added a child.
-            // Resetting ComputedStyle.matchingRulesHash is a workaround to force the VisualElement.computedStyle's yogaNode 
-            // to be updated even when the matchingRulesHash has not changed. see VisualElement.SetComputedStyle in VisualElement.cs.
-            element.computedStyle.matchingRulesHash = -1;
-        }
-
         public static VisualElement GetFirstAncestorWithClass(this VisualElement element, string className)
         {
             if (element == null)
diff --git a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
index 17fe5d5cbd..4ef086faeb 100644
--- a/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
+++ b/External/MirroredPackageSources/com.unity.ui.builder/Editor/Utilities/VisualTreeAssetExtensions/VisualTreeAssetToUXML.cs
@@ -176,7 +176,7 @@ static void AppendTemplateRegistrations(
                 {
                     Debug.LogError("UI Builder: VisualTreeAsset.m_Usings field has not been found! Update the reflection code!");
                 }
-                stringBuilder.Append(" " + BuilderConstants.UxmlEndTagSymbol);
+                stringBuilder.Append(BuilderConstants.UxmlEndTagSymbol);
                 stringBuilder.Append(BuilderConstants.newlineCharFromEditorSettings);
             }
 
@@ -246,7 +246,7 @@ static void ProcessStyleSheetPath(
                 styleSheetPath = GetProcessedPathForSrcAttribute(styleSheet, vtaPath, styleSheetPath);
                 AppendElementAttribute("src", styleSheetPath, stringBuilder);
             }
-            stringBuilder.Append(" " + BuilderConstants.UxmlEndTagSymbol);
+            stringBuilder.Append(BuilderConstants.UxmlEndTagSymbol);
             stringBuilder.Append(BuilderConstants.newlineCharFromEditorSettings);
 
             hasChildTags = true;
@@ -361,7 +361,7 @@ static void GenerateUXMLRecursive(
                     foreach (var attributeOverride in overrides)
                         AppendElementAttribute(attributeOverride.m_AttributeName, attributeOverride.m_Value, stringBuilder);
 
-                    stringBuilder.Append(" " + BuilderConstants.UxmlCloseTagSymbol);
+                    stringBuilder.Append(BuilderConstants.UxmlEndTagSymbol);
                     stringBuilder.Append(BuilderConstants.newlineCharFromEditorSettings);
                 }
 
@@ -387,7 +387,7 @@ static void GenerateUXMLRecursive(
 
                 hasChildTags = true;
             }
-            
+
             // Iterate through Uxml Objects
             var entry = vta.GetUxmlObjectEntry(root.id);
             if (entry.uxmlObjectAssets != null && entry.uxmlObjectAssets.Count > 0)
@@ -397,7 +397,7 @@ static void GenerateUXMLRecursive(
                     stringBuilder.Append(BuilderConstants.UxmlCloseTagSymbol);
                     stringBuilder.Append(BuilderConstants.newlineCharFromEditorSettings);
                 }
-                
+
                 foreach (var childVea in entry.uxmlObjectAssets)
                     GenerateUXMLRecursive(
                         vta, vtaPath, childVea, idToChildren, stringBuilder,
@@ -416,7 +416,7 @@ static void GenerateUXMLRecursive(
             }
             else
             {
-                stringBuilder.Append(" " + BuilderConstants.UxmlEndTagSymbol);
+                stringBuilder.Append(BuilderConstants.UxmlEndTagSymbol);
                 stringBuilder.Append(BuilderConstants.newlineCharFromEditorSettings);
             }
         }
diff --git a/External/TinyProfiler/TraceMaker.cs b/External/TinyProfiler/TraceMaker.cs
index 81151ed64d..96ae7f8f62 100644
--- a/External/TinyProfiler/TraceMaker.cs
+++ b/External/TinyProfiler/TraceMaker.cs
@@ -52,9 +52,11 @@ public static void EmitRawTraceEvents(List<TinyProfiler.ThreadContext> threadCon
                 if (!externalFile.FileExists())
                     continue;
 
-                using (var stream = File.OpenRead(externalFile.ToString(SlashMode.Native)))
+                // Important: need to read this file as text mode, to avoid copying byte-order-marks.
+                using (var stream = File.OpenText(externalFile.ToString(SlashMode.Native)))
                 {
-                    stream.CopyTo(textWriter.BaseStream);
+                    while (!stream.EndOfStream)
+                        textWriter.WriteLine(stream.ReadLine());
                 }
             }
         }
diff --git a/External/Yoga/csharp/Facebook.Yoga/YogaNative.bindings.cs b/External/Yoga/csharp/Facebook.Yoga/YogaNative.bindings.cs
index 1ea429402b..8f67ddf0ce 100644
--- a/External/Yoga/csharp/Facebook.Yoga/YogaNative.bindings.cs
+++ b/External/Yoga/csharp/Facebook.Yoga/YogaNative.bindings.cs
@@ -53,7 +53,7 @@ public static void YGNodeFree(IntPtr ygNode)
         [FreeFunction]
         public static extern void YGNodeSetConfig(IntPtr ygNode, IntPtr config);
 
-        [FreeFunction]
+        [FreeFunction(IsThreadSafe = true)]
         public static extern IntPtr YGConfigGetDefault();
 
         [FreeFunction]
diff --git a/ModuleOverrides/com.unity.ui/Core/Clickable.cs b/ModuleOverrides/com.unity.ui/Core/Clickable.cs
index d845632898..bcda2cd266 100644
--- a/ModuleOverrides/com.unity.ui/Core/Clickable.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Clickable.cs
@@ -120,14 +120,14 @@ protected override void RegisterCallbacksOnTarget()
         {
             target.RegisterCallback<MouseDownEvent>(OnMouseDown, invokePolicy);
             target.RegisterCallback<MouseMoveEvent>(OnMouseMove, invokePolicy);
-            target.RegisterCallback<MouseUpEvent>(OnMouseUp, invokePolicy);
-            target.RegisterCallback<MouseCaptureOutEvent>(OnMouseCaptureOut, invokePolicy);
+            target.RegisterCallback<MouseUpEvent>(OnMouseUp, InvokePolicy.IncludeDisabled);
+            target.RegisterCallback<MouseCaptureOutEvent>(OnMouseCaptureOut, InvokePolicy.IncludeDisabled);
 
             target.RegisterCallback<PointerDownEvent>(OnPointerDown, invokePolicy);
             target.RegisterCallback<PointerMoveEvent>(OnPointerMove, invokePolicy);
-            target.RegisterCallback<PointerUpEvent>(OnPointerUp, invokePolicy);
-            target.RegisterCallback<PointerCancelEvent>(OnPointerCancel, invokePolicy);
-            target.RegisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOut, invokePolicy);
+            target.RegisterCallback<PointerUpEvent>(OnPointerUp, InvokePolicy.IncludeDisabled);
+            target.RegisterCallback<PointerCancelEvent>(OnPointerCancel, InvokePolicy.IncludeDisabled);
+            target.RegisterCallback<PointerCaptureOutEvent>(OnPointerCaptureOut, InvokePolicy.IncludeDisabled);
         }
 
         /// <summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs
index 425fb6efc5..9ab997b18b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Controllers/TreeViewController.cs
@@ -40,7 +40,7 @@ protected override void BindItem(VisualElement element, int index)
                     throw new NotImplementedException("You must specify bindItem if makeItem is specified.");
 
                 var label = (Label)element;
-                var item = treeView.itemsSource[index];
+                var item = GetItemForIndex(index);
                 label.text = item?.ToString() ?? "null";
                 return;
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs
index a883bc3239..7e473f91ef 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/CollectionVirtualizationController.cs
@@ -25,6 +25,8 @@ protected CollectionVirtualizationController(ScrollView scrollView)
         public abstract void OnScroll(Vector2 offset);
         public abstract int GetIndexFromPosition(Vector2 position);
         public abstract float GetItemHeight(int index);
+        public abstract void OnFocus(VisualElement leafTarget);
+        public abstract void OnBlur(VisualElement willFocus);
         public abstract void UpdateBackground();
 
         public abstract IEnumerable<ReusableCollectionItem> activeItems { get; }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs
index a36327be47..a12531f365 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/DynamicHeightVirtualizationController.cs
@@ -33,19 +33,20 @@ public DynamicHeightVirtualizationController(BaseVerticalCollectionView collecti
             m_FillCallback = Fill;
             m_GeometryChangedCallback = OnRecycledItemGeometryChanged;
             m_IndexOutOfBoundsPredicate = IsIndexOutOfBounds;
+            m_ScrollView.contentViewport.RegisterCallback<GeometryChangedEvent>(OnViewportGeometryChanged);
         }
 
         public override void Refresh(bool rebuild)
         {
             base.Refresh(rebuild);
 
-            m_WaitingCache.RemoveWhere(m_IndexOutOfBoundsPredicate);
+            if (rebuild)
+                m_WaitingCache.Clear();
+            else
+                m_WaitingCache.RemoveWhere(m_IndexOutOfBoundsPredicate);
 
             if (m_CollectionView.HasValidDataAndBindings())
             {
-                if (m_WaitingCache.Count == 0)
-                    ApplyScrollViewUpdate();
-
                 m_ScheduledItem ??= m_CollectionView.schedule.Execute(m_FillCallback);
             }
         }
@@ -61,7 +62,8 @@ public override void ScrollToItem(int index)
             if (index == -1)
             {
                 // Scroll to last item
-                m_ForcedFirstVisibleItem = m_CollectionView.viewController.itemsSource.Count - 1;
+                m_ForcedLastVisibleItem = itemsCount - 1;
+                m_StickToBottom = true;
                 m_ScrollView.scrollOffset = new Vector2(0, viewportHeight >= currentContentHeight ? 0 : currentContentHeight);
             }
             else if (m_FirstVisibleIndex >= index)
@@ -127,8 +129,18 @@ public override void OnScroll(Vector2 scrollOffset)
             var offset = scrollOffset.y;
             var contentHeight = GetContentHeight();
             var maxOffset = Mathf.Max(0, contentHeight - m_ScrollView.contentViewport.layout.height);
+            var scrollableHeight = m_ScrollView.contentContainer.boundingBox.height - m_ScrollView.contentViewport.layout.height;
             m_CollectionView.m_ScrollOffset.y = Mathf.Min(offset, maxOffset);
 
+            if (scrollOffset.y == 0)
+            {
+                m_ForcedFirstVisibleItem = 0;
+            }
+            else
+            {
+                m_StickToBottom = scrollableHeight > 0 && Math.Abs(scrollOffset.y - m_ScrollView.verticalScroller.highValue) < float.Epsilon;
+            }
+
             var firstIndex = m_ForcedFirstVisibleItem != -1 ? m_ForcedFirstVisibleItem : GetFirstVisibleItem(m_CollectionView.m_ScrollOffset.y);
             var firstVisiblePadding = GetContentHeightForIndex(firstIndex - 1);
             m_ForcedFirstVisibleItem = -1;
@@ -151,7 +163,7 @@ public override void OnScroll(Vector2 scrollOffset)
 
                         var inserting = m_ScrollInsertionList;
 
-                        for (int i = 0; i < count && m_ActiveItems.Count > 0; ++i)
+                        for (var i = 0; i < count && m_ActiveItems.Count > 0; ++i)
                         {
                             var last = m_ActiveItems[m_ActiveItems.Count - 1];
                             if (last.rootElement.layout.y < m_CollectionView.m_ScrollOffset.y + m_ScrollView.contentViewport.layout.height)
@@ -169,11 +181,11 @@ public override void OnScroll(Vector2 scrollOffset)
                     else // down
                     {
                         var currentLastVisibleItem = lastVisibleItem;
-                        if (m_FirstVisibleIndex < currentLastVisibleItem.index && currentLastVisibleItem.index < m_CollectionView.itemsSource.Count - 1)
+                        if (m_FirstVisibleIndex < currentLastVisibleItem.index && currentLastVisibleItem.index < itemsCount - 1)
                         {
                             var inserting = m_ScrollInsertionList;
 
-                            int checkIndex = 0;
+                            var checkIndex = 0;
                             while (m_FirstVisibleIndex > m_ActiveItems[checkIndex].index)
                             {
                                 var first = m_ActiveItems[checkIndex];
@@ -196,7 +208,7 @@ public override void OnScroll(Vector2 scrollOffset)
                     {
                         var index = m_FirstVisibleIndex + i;
 
-                        if (index >= m_CollectionView.itemsSource.Count)
+                        if (index >= itemsCount)
                         {
                             m_StickToBottom = true;
                             m_ForcedLastVisibleItem = -1;
@@ -204,16 +216,18 @@ public override void OnScroll(Vector2 scrollOffset)
                             continue;
                         }
 
-                        var isItemInViewport = itemContentOffset - m_CollectionView.m_ScrollOffset.y < m_ScrollView.contentViewport.layout.height;
+                        var isItemInViewport = itemContentOffset - m_CollectionView.m_ScrollOffset.y <= m_ScrollView.contentViewport.layout.height;
                         var previousIndex = m_ActiveItems[i].index;
                         m_WaitingCache.Remove(previousIndex);
 
-                        Setup(m_ActiveItems[i], index, !isItemInViewport);
+                        Setup(m_ActiveItems[i], index);
 
                         if (isItemInViewport)
                         {
                             if (index != previousIndex)
+                            {
                                 m_WaitingCache.Add(index);
+                            }
                         }
                         else
                         {
@@ -238,7 +252,7 @@ bool NeedsFill()
             if (padding > m_CollectionView.m_ScrollOffset.y)
                 return true;
 
-            for (var i = m_FirstVisibleIndex; i < m_CollectionView.itemsSource.Count; i++)
+            for (var i = m_FirstVisibleIndex; i < itemsCount; i++)
             {
                 if (padding - m_CollectionView.m_ScrollOffset.y > m_ScrollView.contentViewport.layout.height)
                     break;
@@ -268,7 +282,7 @@ void Fill()
                 padding -= dragger.draggedItem.rootElement.style.height.value.value;
             }
 
-            for (var i = m_FirstVisibleIndex; i < m_CollectionView.itemsSource.Count; i++)
+            for (var i = m_FirstVisibleIndex; i < itemsCount; i++)
             {
                 if (padding - m_CollectionView.m_ScrollOffset.y > m_ScrollView.contentViewport.layout.height)
                     break;
@@ -399,13 +413,9 @@ void ApplyScrollViewUpdate()
 
             if (!NeedsFill())
             {
-                m_StickToBottom = false;
-                m_ForcedLastVisibleItem = -1;
-                m_ScheduledItem?.Pause();
-                m_ScheduledItem = null;
-
                 // Clear extra items.
                 var itemContentOffset = m_StoredPadding;
+                var previousFirstVisibleIndex = m_FirstVisibleIndex;
 
                 for (var i = 0; i < m_ActiveItems.Count; i++)
                 {
@@ -414,12 +424,22 @@ void ApplyScrollViewUpdate()
 
                     if (!isItemInViewport)
                     {
-                        m_CollectionView.viewController.InvokeUnbindItem(m_ActiveItems[i], index);
-                        ReleaseItem(i--);
+                        if (m_FirstVisibleIndex == index)
+                            m_FirstVisibleIndex = index + 1;
                     }
 
                     itemContentOffset += GetItemHeight(index);
                 }
+
+                if (m_FirstVisibleIndex != previousFirstVisibleIndex)
+                {
+                    m_StoredPadding = GetContentHeightForIndex(m_FirstVisibleIndex - 1);
+                }
+
+                m_StickToBottom = false;
+                m_ForcedLastVisibleItem = -1;
+                m_ScheduledItem?.Pause();
+                m_ScheduledItem = null;
             }
             else
             {
@@ -427,10 +447,17 @@ void ApplyScrollViewUpdate()
             }
         }
 
+        void OnViewportGeometryChanged(GeometryChangedEvent evt)
+        {
+            if (evt.oldRect.size == evt.newRect.size)
+                return;
+
+            m_ScrollView.UpdateScrollers(m_ScrollView.needsHorizontal, m_ScrollView.needsVertical);
+        }
+
         float GetContentHeight()
         {
-            var itemCount = m_CollectionView.viewController.itemsSource.Count;
-            return GetContentHeightForIndex(itemCount - 1);
+            return GetContentHeightForIndex(itemsCount - 1);
         }
 
         // TODO [GR] optim this.
@@ -483,7 +510,7 @@ void UnregisterItemHeight(int index, float height)
         void OnRecycledItemGeometryChanged(ReusableCollectionItem item)
         {
             var rItem = item;
-            if (rItem.index == ReusableCollectionItem.UndefinedIndex || rItem.rootElement.layout.height == 0)
+            if (rItem.index == ReusableCollectionItem.UndefinedIndex || float.IsNaN(rItem.rootElement.layout.height) || rItem.rootElement.layout.height == 0)
                 return;
 
             if (rItem.animator != null && rItem.animator.isRunning)
@@ -501,10 +528,6 @@ void OnRecycledItemGeometryChanged(ReusableCollectionItem item)
                     ApplyScrollViewUpdate();
                 }
             }
-            else
-            {
-                UpdateScrollViewContainer(rItem.index, previousHeight, previousHeight);
-            }
 
             if (m_WaitingCache.Remove(rItem.index) && m_WaitingCache.Count == 0)
             {
@@ -534,18 +557,18 @@ public override void ReplaceActiveItem(int index)
             }
         }
 
-        void ReleaseItem(int index)
+        internal override void ReleaseItem(int activeItemsIndex)
         {
-            var item = m_ActiveItems[index];
+            var item = m_ActiveItems[activeItemsIndex];
             item.onGeometryChanged -= m_GeometryChangedCallback;
-            m_Pool.Release(item);
-            m_ActiveItems.RemoveAt(index);
+            var index = item.index;
+            base.ReleaseItem(activeItemsIndex);
             m_WaitingCache.Remove(index);
         }
 
         bool IsIndexOutOfBounds(int i)
         {
-            return m_CollectionView.itemsSource == null || i >= m_CollectionView.itemsSource.Count;
+            return m_CollectionView.itemsSource == null || i >= itemsCount;
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/FixedHeightVirtualizationController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/FixedHeightVirtualizationController.cs
index 946b9169ad..4cf15881f7 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/FixedHeightVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/FixedHeightVirtualizationController.cs
@@ -36,10 +36,10 @@ public override void ScrollToItem(int index)
             {
                 // Scroll to last item
                 int actualCount = (int)(lastHeight / pixelAlignedItemHeight);
-                if (m_CollectionView.itemsSource.Count < actualCount)
+                if (itemsCount < actualCount)
                     m_ScrollView.scrollOffset = new Vector2(0, 0);
                 else
-                    m_ScrollView.scrollOffset = new Vector2(0, (m_CollectionView.itemsSource.Count + 1) * pixelAlignedItemHeight);
+                    m_ScrollView.scrollOffset = new Vector2(0, (itemsCount + 1) * pixelAlignedItemHeight);
             }
             else if (m_FirstVisibleIndex >= index)
             {
@@ -62,7 +62,7 @@ public override void ScrollToItem(int index)
         public override void Resize(Vector2 size, int layoutPass)
         {
             var pixelAlignedItemHeight = resolvedItemHeight;
-            var contentHeight = m_CollectionView.itemsSource.Count * pixelAlignedItemHeight;
+            var contentHeight = itemsCount * pixelAlignedItemHeight;
             m_ScrollView.contentContainer.style.height = contentHeight;
 
             // Restore scroll offset and preemptively update the highValue
@@ -79,7 +79,7 @@ public override void Resize(Vector2 size, int layoutPass)
             if (itemCountFromHeight > 0)
                 itemCountFromHeight += k_ExtraVisibleItems;
 
-            var itemCount = Mathf.Min(itemCountFromHeight, m_CollectionView.itemsSource.Count);
+            var itemCount = Mathf.Min(itemCountFromHeight, itemsCount);
 
             if (visibleItemCount != itemCount)
             {
@@ -91,11 +91,7 @@ public override void Resize(Vector2 size, int layoutPass)
                     for (var i = 0; i < removeCount; i++)
                     {
                         var lastIndex = m_ActiveItems.Count - 1;
-
-                        var recycledItem = m_ActiveItems[lastIndex];
-                        m_CollectionView.viewController.InvokeUnbindItem(recycledItem, recycledItem.index);
-                        m_Pool.Release(recycledItem);
-                        m_ActiveItems.RemoveAt(lastIndex);
+                        ReleaseItem(lastIndex);
                     }
                 }
                 else
@@ -124,7 +120,7 @@ public override void OnScroll(Vector2 scrollOffset)
             var firstVisibleItemIndex = (int)(offset / pixelAlignedItemHeight);
 
             m_ScrollView.contentContainer.style.paddingTop = firstVisibleItemIndex * pixelAlignedItemHeight;
-            m_ScrollView.contentContainer.style.height = m_CollectionView.itemsSource.Count * pixelAlignedItemHeight;
+            m_ScrollView.contentContainer.style.height = itemsCount * pixelAlignedItemHeight;
             m_CollectionView.m_ScrollOffset.y = scrollOffset.y;
 
             if (firstVisibleItemIndex != m_FirstVisibleIndex)
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs
index 37bddcfeca..05099eaaad 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/ReusableTreeViewItem.cs
@@ -60,6 +60,8 @@ protected void InitExpandHierarchy(VisualElement root, VisualElement item)
             m_Toggle = new Toggle { name = BaseTreeView.itemToggleUssClassName };
             m_Toggle.userData = this;
             m_Toggle.AddToClassList(Foldout.toggleUssClassName);
+            m_Toggle.visualInput.AddToClassList(Foldout.inputUssClassName);
+            m_Toggle.visualInput.Q(className: Toggle.checkmarkUssClassName).AddToClassList(Foldout.checkmarkUssClassName);
             m_Container.hierarchy.Add(m_Toggle);
 
             m_BindableContainer = new VisualElement()
diff --git a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs
index a2d4c6f64b..7baa1399a2 100644
--- a/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Collections/Virtualization/VerticalVirtualizationController.cs
@@ -19,10 +19,18 @@ namespace UnityEngine.UIElements
 
         public override IEnumerable<ReusableCollectionItem> activeItems => m_ActiveItems as IEnumerable<ReusableCollectionItem>;
 
+        int m_LastFocusedElementIndex = -1;
+        List<int> m_LastFocusedElementTreeChildIndexes = new List<int>();
+
         protected int m_FirstVisibleIndex;
 
         Func<T, bool> m_VisibleItemPredicateDelegate;
 
+        internal int itemsCount =>
+            m_CollectionView.sourceIncludesArraySize
+                ? m_CollectionView.itemsSource.Count - 1
+                : m_CollectionView.itemsSource.Count;
+
         protected virtual bool VisibleItemPredicate(T i)
         {
             var isBeingDragged = false;
@@ -79,7 +87,7 @@ public override void Refresh(bool rebuild)
                     continue;
                 }
 
-                if (m_CollectionView.itemsSource != null && index >= 0 && index < m_CollectionView.itemsSource.Count)
+                if (m_CollectionView.itemsSource != null && index >= 0 && index < itemsCount)
                 {
                     if (hasValidBindings && isVisible)
                     {
@@ -90,8 +98,7 @@ public override void Refresh(bool rebuild)
                 }
                 else if (isVisible)
                 {
-                    m_Pool.Release(recycledItem);
-                    m_ActiveItems.RemoveAt(i--);
+                    ReleaseItem(i--);
                 }
             }
 
@@ -103,17 +110,17 @@ public override void Refresh(bool rebuild)
             }
         }
 
-        protected void Setup(T recycledItem, int newIndex, bool forceHide = false)
+        protected void Setup(T recycledItem, int newIndex)
         {
             // We want to skip the item that is being reordered with the animated dragger.
             if (m_CollectionView.dragger is ListViewDraggerAnimated dragger)
                 if (dragger.isDragging && (dragger.draggedItem.index == newIndex || dragger.draggedItem == recycledItem))
                     return;
 
-            if (newIndex >= m_CollectionView.itemsSource.Count || forceHide)
+            if (newIndex >= itemsCount)
             {
                 recycledItem.rootElement.style.display = DisplayStyle.None;
-                if (recycledItem.index >= 0 && recycledItem.index < m_CollectionView.itemsSource.Count)
+                if (recycledItem.index >= 0 && recycledItem.index < itemsCount)
                 {
                     m_CollectionView.viewController.InvokeUnbindItem(recycledItem, recycledItem.index);
                     recycledItem.index = ReusableCollectionItem.UndefinedIndex;
@@ -121,13 +128,15 @@ protected void Setup(T recycledItem, int newIndex, bool forceHide = false)
                 return;
             }
 
-            var newId = m_CollectionView.viewController.GetIdForIndex(newIndex);
             recycledItem.rootElement.style.display = DisplayStyle.Flex;
             if (recycledItem.index == newIndex) return;
 
             var useAlternateUss = m_CollectionView.showAlternatingRowBackgrounds != AlternatingRowBackground.None && newIndex % 2 == 1;
             recycledItem.rootElement.EnableInClassList(BaseVerticalCollectionView.itemAlternativeBackgroundUssClassName, useAlternateUss);
 
+            var previousIndex = recycledItem.index;
+            var newId = m_CollectionView.viewController.GetIdForIndex(newIndex);
+
             if (recycledItem.index != ReusableCollectionItem.UndefinedIndex)
                 m_CollectionView.viewController.InvokeUnbindItem(recycledItem, recycledItem.index);
 
@@ -151,7 +160,57 @@ protected void Setup(T recycledItem, int newIndex, bool forceHide = false)
             m_CollectionView.viewController.InvokeBindItem(recycledItem, newIndex);
 
             // Handle focus cycling
-            m_CollectionView.HandleFocus(recycledItem);
+            HandleFocus(recycledItem, previousIndex);
+        }
+
+        public override void OnFocus(VisualElement leafTarget)
+        {
+            if (leafTarget == m_ScrollView.contentContainer)
+                return;
+
+            m_LastFocusedElementTreeChildIndexes.Clear();
+
+            if (m_ScrollView.contentContainer.FindElementInTree(leafTarget, m_LastFocusedElementTreeChildIndexes))
+            {
+                var recycledElement = m_ScrollView.contentContainer[m_LastFocusedElementTreeChildIndexes[0]];
+                foreach (var recycledItem in activeItems)
+                {
+                    if (recycledItem.rootElement == recycledElement)
+                    {
+                        m_LastFocusedElementIndex = recycledItem.index;
+                        break;
+                    }
+                }
+
+                m_LastFocusedElementTreeChildIndexes.RemoveAt(0);
+            }
+            else
+            {
+                m_LastFocusedElementIndex = -1;
+            }
+        }
+
+        public override void OnBlur(VisualElement willFocus)
+        {
+            // Focus lost and the about-to-be-focused VisualElement is not part of the VerticalVirtualizationController.
+            if (willFocus == null || willFocus != m_ScrollView.contentContainer)
+            {
+                m_LastFocusedElementTreeChildIndexes.Clear();
+                m_LastFocusedElementIndex = -1;
+            }
+        }
+
+        void HandleFocus(ReusableCollectionItem recycledItem, int previousIndex)
+        {
+            if (m_LastFocusedElementIndex == -1)
+                return;
+
+            if (m_LastFocusedElementIndex == recycledItem.index)
+                recycledItem.rootElement.ElementAtTreePath(m_LastFocusedElementTreeChildIndexes)?.Focus();
+            else if (m_LastFocusedElementIndex != previousIndex)
+                recycledItem.rootElement.ElementAtTreePath(m_LastFocusedElementTreeChildIndexes)?.Blur();
+            else
+                m_ScrollView.contentContainer.Focus();
         }
 
         public override void UpdateBackground()
@@ -236,5 +295,19 @@ internal virtual T GetOrMakeItem()
 
             return item;
         }
+
+        internal virtual void ReleaseItem(int activeItemsIndex)
+        {
+            var item = m_ActiveItems[activeItemsIndex];
+            var index = item.index;
+
+            if (index >= 0 && index < itemsCount)
+            {
+                m_CollectionView.viewController.InvokeUnbindItem(item, index);
+            }
+
+            m_Pool.Release(item);
+            m_ActiveItems.RemoveAt(activeItemsIndex);
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs
index 13f11cda6d..3992330ea3 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs
@@ -36,7 +36,6 @@ public BaseBoolField(string label)
             this.AddManipulator(m_Clickable = new Clickable(OnClickEvent));
 
             RegisterCallback<NavigationSubmitEvent>(OnNavigationSubmit);
-            RegisterCallback<KeyDownEvent>(OnKeyDown);
         }
 
         private void OnNavigationSubmit(NavigationSubmitEvent evt)
@@ -45,19 +44,6 @@ private void OnNavigationSubmit(NavigationSubmitEvent evt)
             evt.StopPropagation();
         }
 
-        private void OnKeyDown(KeyDownEvent evt)
-        {
-            if (panel?.contextType != ContextType.Editor)
-                return;
-
-            // KeyCodes are hardcoded in the Editor, but in runtime we should use the more versatile NavigationSubmit.
-            if (evt.keyCode == KeyCode.KeypadEnter || evt.keyCode == KeyCode.Return || evt.keyCode == KeyCode.Space)
-            {
-                ToggleValue();
-                evt.StopPropagation();
-            }
-        }
-
         private string m_OriginalText;
 
         /// <summary>
@@ -98,10 +84,7 @@ public string text
         /// </remarks>
         protected virtual void InitLabel()
         {
-            m_Label = new Label
-            {
-                pickingMode = PickingMode.Ignore
-            };
+            m_Label = new Label();
             visualInput.Add(m_Label);
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs
index 7993eb86df..ff073810d0 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseCompositeField.cs
@@ -19,12 +19,6 @@ internal delegate void RegisterSerializedPropertyBindCallback<TValueType, TField
     public abstract class BaseCompositeField<TValueType, TField, TFieldValue> : BaseField<TValueType>
         where TField : TextValueField<TFieldValue>, new()
     {
-        /// <summary>
-        /// Test.
-        /// </summary>
-        /// <param name="compositeField">.</param>
-        /// <param name="field">.</param>
-        internal static RegisterSerializedPropertyBindCallback<TValueType, TField, TFieldValue> s_SerializedPropertyBindCallback;
         internal struct FieldDescription
         {
             public delegate void WriteDelegate(ref TValueType val, TFieldValue fieldValue);
@@ -168,8 +162,6 @@ protected BaseCompositeField(string label, int fieldsByLine)
 
                     field.label = desc.name;
 
-                    s_SerializedPropertyBindCallback?.Invoke(this, field);
-
                     field.onValidateValue += newValue =>
                     {
                         TValueType cur = value;
@@ -265,6 +257,14 @@ public override void SetValueWithoutNotify(TValueType newValue)
             m_ForceUpdateDisplay = false;
         }
 
+        internal override void OnViewDataReady()
+        {
+            // Should the composite field be reloaded, ensure that the value saved in memory is actually displayed when a data key is used.
+            m_ForceUpdateDisplay = true;
+
+            base.OnViewDataReady();
+        }
+
         protected override void UpdateMixedValueContent()
         {
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs
index d57720f5ad..5e01c0ca73 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseListView.cs
@@ -174,9 +174,6 @@ void SetupArraySizeField()
             m_ArraySizeField.focusable = true;
             hierarchy.Add(m_ArraySizeField);
 
-            //m_ArraySizeField.tabIndex = 1;
-            //m_Foldout.contentContainer.tabIndex = 2;
-
             UpdateArraySizeField();
         }
 
@@ -419,9 +416,8 @@ void OnItemsRemoved(IEnumerable<int> indices)
 
         void OnItemsSourceSizeChanged()
         {
-            if (itemsSource.IsFixedSize)
-                Rebuild();
-            else
+            // When bound, the ListViewBinding class takes care of refreshing when the array size is updated.
+            if (!(binding is IInternalListViewBinding))
                 RefreshItems();
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs
index 8b28dca6a2..85b1096a14 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BasePopupField.cs
@@ -134,6 +134,7 @@ internal BasePopupField(string label)
                 if (e.button == (int)MouseButton.LeftMouse)
                     e.StopPropagation();
             });
+            RegisterCallback<NavigationSubmitEvent>(OnNavigationSubmit);
         }
 
         void OnPointerDownEvent(PointerDownEvent evt)
@@ -153,11 +154,17 @@ void OnPointerMoveEvent(PointerMoveEvent evt)
             }
         }
 
+        bool ContainsPointer(int pointerId)
+        {
+            var elementUnderPointer = elementPanel.GetTopElementUnderPointer(pointerId);
+            return this == elementUnderPointer || visualInput == elementUnderPointer;
+        }
+
         void ProcessPointerDown<T>(PointerEventBase<T> evt) where T : PointerEventBase<T>, new()
         {
             if (evt.button == (int)MouseButton.LeftMouse)
             {
-                if (visualInput.ContainsPoint(visualInput.WorldToLocal(evt.originalMousePosition)))
+                if (ContainsPointer(evt.pointerId))
                 {
                     ShowMenu();
                     evt.StopPropagation();
@@ -165,27 +172,10 @@ void OnPointerMoveEvent(PointerMoveEvent evt)
             }
         }
 
-        [EventInterest(typeof(KeyDownEvent))]
-        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
+        void OnNavigationSubmit(NavigationSubmitEvent evt)
         {
-            base.ExecuteDefaultActionAtTarget(evt);
-
-            if (evt == null)
-            {
-                return;
-            }
-
-            KeyDownEvent kde = (evt as KeyDownEvent);
-            if (kde != null)
-            {
-                if ((kde.keyCode == KeyCode.Space) ||
-                    (kde.keyCode == KeyCode.KeypadEnter) ||
-                    (kde.keyCode == KeyCode.Return))
-                {
-                    ShowMenu();
-                    evt.StopPropagation();
-                }
-            }
+            ShowMenu();
+            evt.StopPropagation();
         }
 
         private void ShowMenu()
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs
index 147cd7438c..70e376e6b0 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseSlider.cs
@@ -26,11 +26,12 @@ public enum SliderDirection
     /// <summary>
     /// This is a base class for the Slider fields.
     /// </summary>
-    public abstract class BaseSlider<TValueType> : BaseField<TValueType>
+    public abstract class BaseSlider<TValueType> : BaseField<TValueType>, IValueField<TValueType>
         where TValueType : System.IComparable<TValueType>
     {
         internal VisualElement dragContainer { get; private set; }
         internal VisualElement dragElement { get; private set; }
+        internal VisualElement trackElement { get; private set; }
         internal VisualElement dragBorderElement { get; private set; }
         internal TextField inputTextField { get; private set; }
 
@@ -172,6 +173,24 @@ public override TValueType value
             }
         }
 
+        /// <summary>
+        /// Called when the user is dragging the label to update the value contained in the field.
+        /// </summary>
+        /// <param name="delta">Delta on the move.</param>
+        /// <param name="speed">Speed of the move.</param>
+        /// <param name="startValue">Starting value.</param>
+        public virtual void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, TValueType startValue) {}
+
+        /// <summary>
+        /// Method called by the application when the label of the field is started to be dragged to change the value of it.
+        /// </summary>
+        void IValueField<TValueType>.StartDragging() {}
+
+        /// <summary>
+        /// Method called by the application when the label of the field is stopped to be dragged to change the value of it.
+        /// </summary>
+        void IValueField<TValueType>.StopDragging() {}
+
         public override void SetValueWithoutNotify(TValueType newValue)
         {
             // Clamp the value around the real lowest and highest range values.
@@ -289,7 +308,7 @@ internal BaseSlider(string label, TValueType start, TValueType end, SliderDirect
             dragContainer.AddToClassList(dragContainerUssClassName);
             visualInput.Add(dragContainer);
 
-            var trackElement = new VisualElement() { name = "unity-tracker" };
+            trackElement = new VisualElement() { name = "unity-tracker", usageHints = UsageHints.DynamicColor };
             trackElement.AddToClassList(trackerUssClassName);
             dragContainer.Add(trackElement);
 
@@ -297,7 +316,7 @@ internal BaseSlider(string label, TValueType start, TValueType end, SliderDirect
             dragBorderElement.AddToClassList(draggerBorderUssClassName);
             dragContainer.Add(dragBorderElement);
 
-            dragElement = new VisualElement() { name = "unity-dragger" };
+            dragElement = new VisualElement() { name = "unity-dragger", usageHints = UsageHints.DynamicTransform };
             dragElement.RegisterCallback<GeometryChangedEvent>(UpdateDragElementPosition);
             dragElement.AddToClassList(draggerUssClassName);
             dragContainer.Add(dragElement);
@@ -307,8 +326,13 @@ internal BaseSlider(string label, TValueType start, TValueType end, SliderDirect
             dragContainer.AddManipulator(clampedDragger);
 
             RegisterCallback<KeyDownEvent>(OnKeyDown);
+            RegisterCallback<NavigationMoveEvent>(OnNavigationMove);
 
             UpdateTextFieldVisibility();
+
+            var mouseDragger = new FieldMouseDragger<TValueType>(this);
+            mouseDragger.SetDragZone(labelElement);
+            labelElement.AddToClassList(labelDraggerVariantUssClassName);
         }
 
         /// <undoc/>
@@ -402,10 +426,32 @@ void SetSliderValueFromClick()
                 if (Mathf.Approximately(pageSize, 0.0f))
                 {
                     // Jump drag element to current mouse position when user clicks on slider and pageSize == 0
-                    var x = (direction == SliderDirection.Horizontal)
-                        ? clampedDragger.startMousePosition.x - (dragElement.resolvedStyle.width / 2f)
-                        : dragElement.transform.position.x;
-                    var y = (direction == SliderDirection.Horizontal) ? dragElement.transform.position.y : clampedDragger.startMousePosition.y - (dragElement.resolvedStyle.height / 2f);
+                    float x, y, sliderLength, dragElementLength, dragElementStartPos;
+
+                    if (direction == SliderDirection.Horizontal)
+                    {
+                        sliderLength = dragContainer.resolvedStyle.width;
+                        dragElementLength = dragElement.resolvedStyle.width;
+
+                        var totalRange = sliderLength - dragElementLength;
+                        var targetXPos = clampedDragger.startMousePosition.x - (dragElementLength / 2f);
+
+                        x = Mathf.Max(0f, Mathf.Min(targetXPos, totalRange));
+                        y = dragElement.transform.position.y;
+                        dragElementStartPos = x;
+                    }
+                    else
+                    {
+                        sliderLength = dragContainer.resolvedStyle.height;
+                        dragElementLength = dragElement.resolvedStyle.height;
+
+                        var totalRange = sliderLength - dragElementLength;
+                        var targetYPos = clampedDragger.startMousePosition.y - (dragElementLength / 2f);
+
+                        x = dragElement.transform.position.x;
+                        y = Mathf.Max(0f, Mathf.Min(targetYPos, totalRange));
+                        dragElementStartPos = y;
+                    }
 
                     var pos = new Vector3(x, y, 0);
 
@@ -415,10 +461,7 @@ void SetSliderValueFromClick()
 
                     // Manipulation becomes a free form drag
                     clampedDragger.dragDirection = ClampedDragger<TValueType>.DragDirection.Free;
-                    if (direction == SliderDirection.Horizontal)
-                        ComputeValueAndDirectionFromDrag(dragContainer.resolvedStyle.width, dragElement.resolvedStyle.width, m_DragElementStartPos.x);
-                    else
-                        ComputeValueAndDirectionFromDrag(dragContainer.resolvedStyle.height, dragElement.resolvedStyle.height, m_DragElementStartPos.y);
+                    ComputeValueAndDirectionFromDrag(sliderLength, dragElementLength, dragElementStartPos);
                     return;
                 }
 
@@ -444,9 +487,22 @@ void OnKeyDown(KeyDownEvent evt)
                 sliderKey = inverted ? SliderKey.HigherPage : SliderKey.LowerPage;
             else if (isHorizontal && evt.keyCode == KeyCode.PageDown || !isHorizontal && evt.keyCode == KeyCode.PageUp)
                 sliderKey = inverted ? SliderKey.LowerPage : SliderKey.HigherPage;
-            else if (isHorizontal && evt.keyCode == KeyCode.LeftArrow || !isHorizontal && evt.keyCode == KeyCode.DownArrow)
+
+            if (sliderKey == SliderKey.None)
+                return;
+
+            ComputeValueFromKey(sliderKey, evt.shiftKey);
+            evt.StopPropagation();
+        }
+
+        void OnNavigationMove(NavigationMoveEvent evt)
+        {
+            SliderKey sliderKey = SliderKey.None;
+            bool isHorizontal = direction == SliderDirection.Horizontal;
+
+            if (evt.direction == (isHorizontal ? NavigationMoveEvent.Direction.Left : NavigationMoveEvent.Direction.Down))
                 sliderKey = inverted ? SliderKey.Higher : SliderKey.Lower;
-            else if (isHorizontal && evt.keyCode == KeyCode.RightArrow || !isHorizontal && evt.keyCode == KeyCode.UpArrow)
+            else if (evt.direction == (isHorizontal ? NavigationMoveEvent.Direction.Right : NavigationMoveEvent.Direction.Up))
                 sliderKey = inverted ? SliderKey.Lower : SliderKey.Higher;
 
             if (sliderKey == SliderKey.None)
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs
index c01acab894..3e32a16268 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs
@@ -213,11 +213,10 @@ public BaseTreeView(int itemHeight) : base(null, itemHeight)
         {
             m_ExpandedItemIds = new List<int>();
 
-            name = ussClassName;
             viewDataKey = ussClassName;
             AddToClassList(ussClassName);
 
-            scrollView.contentContainer.RegisterCallback<KeyDownEvent>(OnScrollViewKeyDown);
+            scrollView.contentContainer.RegisterCallback<NavigationMoveEvent>(OnScrollViewNavigationMove);
 
             RegisterCallback<MouseUpEvent>(OnTreeViewMouseUp, TrickleDown.TrickleDown);
         }
@@ -328,8 +327,11 @@ public bool TryRemoveItem(int id)
         internal override void OnViewDataReady()
         {
             base.OnViewDataReady();
-            viewController.RebuildTree();
-            RefreshItems();
+            if (viewController != null)
+            {
+                viewController.RebuildTree();
+                RefreshItems();
+            }
         }
 
         private void OnScrollViewKeyDown(KeyDownEvent evt)
@@ -357,6 +359,31 @@ private void OnScrollViewKeyDown(KeyDownEvent evt)
                 evt.StopPropagation();
         }
 
+        private void OnScrollViewNavigationMove(NavigationMoveEvent evt)
+        {
+            var index = selectedIndex;
+
+            bool shouldStopPropagation = true;
+
+            switch (evt.direction)
+            {
+                case NavigationMoveEvent.Direction.Right:
+                    if (evt.altKey || !IsExpandedByIndex(index))
+                        ExpandItemByIndex(index, evt.altKey);
+                    break;
+                case NavigationMoveEvent.Direction.Left:
+                    if (evt.altKey || IsExpandedByIndex(index))
+                        CollapseItemByIndex(index, evt.altKey);
+                    break;
+                default:
+                    shouldStopPropagation = false;
+                    break;
+            }
+
+            if (shouldStopPropagation)
+                evt.StopPropagation();
+        }
+
         /// <summary>
         /// Sets the currently selected item by id.
         /// </summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs
index 496ac10011..692ff52179 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/BaseVerticalCollectionView.cs
@@ -6,6 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.Profiling;
 
 namespace UnityEngine.UIElements
 {
@@ -106,34 +107,59 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         }
 
         /// <summary>
-        /// Callback triggered when a user double-clicks an item to activate it. This is different from selecting the item.
+        /// Callback triggered when the user acts on a selection of one or more items, for example by double-clicking or pressing Enter.
         /// </summary>
-        [Obsolete("onItemChosen is deprecated, use onItemsChosen instead", true)]
-#pragma warning disable 67
-        public event Action<object> onItemChosen;
-#pragma warning restore 67
+        /// <remarks>
+        /// This callback receives an enumerable that contains the item or items chosen.
+        /// </remarks>
+        [Obsolete("onItemsChosen is deprecated, use itemsChosen instead", false)]
+        public event Action<IEnumerable<object>> onItemsChosen
+        {
+            add => itemsChosen += value;
+            remove => itemsChosen -= value;
+        }
+
         /// <summary>
         /// Callback triggered when the user acts on a selection of one or more items, for example by double-clicking or pressing Enter.
         /// </summary>
         /// <remarks>
         /// This callback receives an enumerable that contains the item or items chosen.
         /// </remarks>
-        public event Action<IEnumerable<object>> onItemsChosen;
+        public event Action<IEnumerable<object>> itemsChosen;
 
         /// <summary>
         /// Callback triggered when the selection changes.
         /// </summary>
-        [Obsolete("onSelectionChanged is deprecated, use onSelectionChange instead", true)]
-#pragma warning disable 67
-        public event Action<List<object>> onSelectionChanged;
-#pragma warning restore 67
+        /// <remarks>
+        /// This callback receives an enumerable that contains the item or items selected.
+        /// </remarks>
+        [Obsolete("onSelectionChange is deprecated, use selectionChanged instead", false)]
+        public event Action<IEnumerable<object>> onSelectionChange
+        {
+            add => selectionChanged += value;
+            remove => selectionChanged -= value;
+        }
+
         /// <summary>
         /// Callback triggered when the selection changes.
         /// </summary>
         /// <remarks>
         /// This callback receives an enumerable that contains the item or items selected.
         /// </remarks>
-        public event Action<IEnumerable<object>> onSelectionChange;
+        public event Action<IEnumerable<object>> selectionChanged;
+
+        /// <summary>
+        /// Callback triggered when the selection changes.
+        /// </summary>
+        /// <remarks>
+        /// This callback receives an enumerable that contains the item index or item indices selected.
+        /// </remarks>
+        [Obsolete("onSelectedIndicesChange is deprecated, use selectedIndicesChanged instead", false)]
+        public event Action<IEnumerable<int>> onSelectedIndicesChange
+        {
+            add => selectedIndicesChanged += value;
+            remove => selectedIndicesChanged -= value;
+        }
 
         /// <summary>
         /// Callback triggered when the selection changes.
@@ -141,7 +167,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <remarks>
         /// This callback receives an enumerable that contains the item index or item indices selected.
         /// </remarks>
-        public event Action<IEnumerable<int>> onSelectedIndicesChange;
+        public event Action<IEnumerable<int>> selectedIndicesChanged;
 
         /// <summary>
         /// Called when an item is moved in the itemsSource.
@@ -778,7 +804,7 @@ internal virtual bool HasValidDataAndBindings()
         void OnItemIndexChanged(int srcIndex, int dstIndex)
         {
             itemIndexChanged?.Invoke(srcIndex, dstIndex);
-            if (binding == null)
+            if (!(binding is IInternalListViewBinding))
                 RefreshItems();
             else
                 schedule.Execute(RefreshItems).ExecuteLater(100);
@@ -813,12 +839,15 @@ public void RefreshItem(int index)
         /// </remarks>
         public void RefreshItems()
         {
-            if (m_ViewController == null)
-                return;
+            using (new ProfilerMarker("BaseVerticalCollectionView.RefreshItems").Auto())
+            {
+                if (m_ViewController == null)
+                    return;
 
-            RefreshSelection();
-            virtualizationController.Refresh(false);
-            PostRefresh();
+                RefreshSelection();
+                virtualizationController.Refresh(false);
+                PostRefresh();
+            }
         }
 
         [Obsolete("Refresh() has been deprecated. Use Rebuild() instead. (UnityUpgradable) -> Rebuild()", false)]
@@ -835,12 +864,15 @@ public void Refresh()
         /// </remarks>
         public void Rebuild()
         {
-            if (m_ViewController == null)
-                return;
+            using (new ProfilerMarker("BaseVerticalCollectionView.Rebuild").Auto())
+            {
+                if (m_ViewController == null)
+                    return;
 
-            RefreshSelection();
-            virtualizationController.Refresh(true);
-            PostRefresh();
+                RefreshSelection();
+                virtualizationController.Refresh(true);
+                PostRefresh();
+            }
         }
 
         private void RefreshSelection()
@@ -964,8 +996,8 @@ private void OnDetachFromPanel(DetachFromPanelEvent evt)
         }
 
         // TODO: make private. This doesn't need to be in the public API. Unit tests can be implemented with SendEvent.
-        // Obsoleted for 2021.2. We can obsolete completely in the next version.
-        [Obsolete("OnKeyDown is obsolete and will be removed from ListView. Use the event system instead, i.e. SendEvent(EventBase e).", false)]
+        // Obsoleted as error for 2022.2. We can remove completely in the next version.
+        [Obsolete("OnKeyDown is obsolete and will be removed from ListView. Use the event system instead, i.e. SendEvent(EventBase e).", true)]
         public void OnKeyDown(KeyDownEvent evt)
         {
             m_NavigationManipulator.OnKeyDown(evt);
@@ -973,7 +1005,7 @@ public void OnKeyDown(KeyDownEvent evt)
 
         private bool Apply(KeyboardNavigationOperation op, bool shiftKey)
         {
-            if (!HasValidDataAndBindings())
+            if (selectionType == SelectionType.None || !HasValidDataAndBindings())
             {
                 return false;
             }
@@ -1004,7 +1036,7 @@ void HandleSelectionAndScroll(int index)
                     ClearSelection();
                     return true;
                 case KeyboardNavigationOperation.Submit:
-                    onItemsChosen?.Invoke(m_SelectedItems);
+                    itemsChosen?.Invoke(m_SelectedItems);
                     ScrollToItem(selectedIndex);
                     return true;
                 case KeyboardNavigationOperation.Previous:
@@ -1048,7 +1080,8 @@ void HandleSelectionAndScroll(int index)
 
         private void Apply(KeyboardNavigationOperation op, EventBase sourceEvent)
         {
-            var shiftKey = (sourceEvent as KeyDownEvent)?.shiftKey ?? false;
+            var shiftKey = sourceEvent is KeyDownEvent kde && kde.shiftKey ||
+                           sourceEvent is INavigationEvent ne && ne.shiftKey;
             if (Apply(op, shiftKey))
             {
                 sourceEvent.StopPropagation();
@@ -1170,13 +1203,13 @@ private void DoSelect(Vector2 localPosition, int clickCount, bool actionKey, boo
             if (clickedIndex > viewController.itemsSource.Count - 1)
                 return;
 
+            if (selectionType == SelectionType.None)
+                return;
+
             var clickedItemId = viewController.GetIdForIndex(clickedIndex);
             switch (clickCount)
             {
                 case 1:
-                    if (selectionType == SelectionType.None)
-                        return;
-
                     if (selectionType == SelectionType.Multiple && actionKey)
                     {
                         // Add/remove single clicked element
@@ -1208,12 +1241,12 @@ private void DoSelect(Vector2 localPosition, int clickCount, bool actionKey, boo
 
                     break;
                 case 2:
-                    if (onItemsChosen != null)
+                    if (itemsChosen != null)
                     {
                         ProcessSingleClick(clickedIndex);
                     }
 
-                    onItemsChosen?.Invoke(m_SelectedItems);
+                    itemsChosen?.Invoke(m_SelectedItems);
                     break;
             }
         }
@@ -1401,8 +1434,8 @@ private void NotifyOfSelectionChange()
             if (!HasValidDataAndBindings())
                 return;
 
-            onSelectionChange?.Invoke(m_SelectedItems);
-            onSelectedIndicesChange?.Invoke(m_SelectedIndices);
+            selectionChanged?.Invoke(m_SelectedItems);
+            selectedIndicesChanged?.Invoke(m_SelectedIndices);
         }
 
         /// <summary>
@@ -1435,7 +1468,7 @@ internal override void OnViewDataReady()
             OverwriteFromViewData(this, key);
         }
 
-        [EventInterest(typeof(PointerUpEvent), typeof(FocusEvent), typeof(NavigationSubmitEvent))]
+        [EventInterest(typeof(PointerUpEvent), typeof(FocusEvent), typeof(NavigationSubmitEvent), typeof(BlurEvent))]
         protected override void ExecuteDefaultAction(EventBase evt)
         {
             base.ExecuteDefaultAction(evt);
@@ -1452,27 +1485,12 @@ protected override void ExecuteDefaultAction(EventBase evt)
             // and set it back in Setup().
             else if (evt.eventTypeId == FocusEvent.TypeId())
             {
-                m_LastFocusedElementTreeChildIndexes.Clear();
-                var target = evt.leafTarget as VisualElement;
-
-                if (m_ScrollView.contentContainer.FindElementInTree(target, m_LastFocusedElementTreeChildIndexes))
-                {
-                    var recycledElement = m_ScrollView.contentContainer[m_LastFocusedElementTreeChildIndexes[0]];
-                    foreach (var recycledItem in activeItems)
-                    {
-                        if (recycledItem.rootElement == recycledElement)
-                        {
-                            m_LastFocusedElementIndex = recycledItem.index;
-                            break;
-                        }
-                    }
-
-                    m_LastFocusedElementTreeChildIndexes.RemoveAt(0);
-                }
-                else
-                {
-                    m_LastFocusedElementIndex = -1;
-                }
+                m_VirtualizationController?.OnFocus(evt.leafTarget as VisualElement);
+            }
+            else if (evt.eventTypeId == BlurEvent.TypeId())
+            {
+                BlurEvent e = evt as BlurEvent;
+                m_VirtualizationController.OnBlur(e?.relatedTarget as VisualElement);
             }
             else if (evt.eventTypeId == NavigationSubmitEvent.TypeId())
             {
@@ -1483,21 +1501,6 @@ protected override void ExecuteDefaultAction(EventBase evt)
             }
         }
 
-        // Used to store the focused element to enable scrolling without losing it.
-        int m_LastFocusedElementIndex = -1;
-        List<int> m_LastFocusedElementTreeChildIndexes = new List<int>();
-
-        internal void HandleFocus(ReusableCollectionItem recycledItem)
-        {
-            if (m_LastFocusedElementIndex == -1)
-                return;
-
-            if (m_LastFocusedElementIndex == recycledItem.index)
-                recycledItem.rootElement.ElementAtTreePath(m_LastFocusedElementTreeChildIndexes)?.Focus();
-            else
-                recycledItem.rootElement.ElementAtTreePath(m_LastFocusedElementTreeChildIndexes)?.Blur();
-        }
-
         private void OnSizeChanged(GeometryChangedEvent evt)
         {
             if (!HasValidDataAndBindings())
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs
index 86e5c3f8f9..106e77fa2f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Binding.cs
@@ -53,4 +53,6 @@ public static bool IsBound(this IBindable control)
             return control?.binding != null;
         }
     }
+
+    internal interface IInternalListViewBinding { }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs
index a4ce540bf0..2d25ef4e02 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Button.cs
@@ -163,7 +163,6 @@ public Button(Action clickEvent)
             focusable = true;
 
             RegisterCallback<NavigationSubmitEvent>(OnNavigationSubmit);
-            RegisterCallback<KeyDownEvent>(OnKeyDown);
         }
 
         private void OnNavigationSubmit(NavigationSubmitEvent evt)
@@ -172,19 +171,6 @@ private void OnNavigationSubmit(NavigationSubmitEvent evt)
             evt.StopPropagation();
         }
 
-        private void OnKeyDown(KeyDownEvent evt)
-        {
-            if (panel?.contextType != ContextType.Editor)
-                return;
-
-            // KeyCodes are hardcoded in the Editor, but in runtime we should use the more versatile NavigationSubmit.
-            if (evt.keyCode == KeyCode.KeypadEnter || evt.keyCode == KeyCode.Return || evt.keyCode == KeyCode.Space)
-            {
-                clickable?.SimulateSingleClick(evt);
-                evt.StopPropagation();
-            }
-        }
-
         private static readonly string NonEmptyString = " ";
         protected internal override Vector2 DoMeasure(float desiredWidth, MeasureMode widthMode, float desiredHeight,
             MeasureMode heightMode)
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs
index 97ac6d8748..7c980a7270 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/EnumField.cs
@@ -26,13 +26,14 @@ internal static bool ExtractValue(IUxmlAttributes bag, CreationContext cc, out T
             }
 
             string specifiedValue = null;
-            if (value.TryGetValueFromBag(bag, cc, ref specifiedValue) && !Enum.IsDefined(resEnumType, specifiedValue))
+            object resEnumValueObject = null;
+            if (value.TryGetValueFromBag(bag, cc, ref specifiedValue) && !Enum.TryParse(resEnumType, specifiedValue, false, out resEnumValueObject))
             {
                 Debug.LogErrorFormat("EnumField: Could not parse value of '{0}', because it isn't defined in the {1} enum.", specifiedValue, resEnumType.FullName);
                 return false;
             }
 
-            resEnumValue = specifiedValue != null ? (Enum)Enum.Parse(resEnumType, specifiedValue) : (Enum)Enum.ToObject(resEnumType, 0);
+            resEnumValue = specifiedValue != null && resEnumValueObject != null ? (Enum)resEnumValueObject : (Enum)Enum.ToObject(resEnumType, 0);
             resIncludeObsoleteValues = includeObsoleteValues.GetValueFromBag(bag, cc);
 
             return true;
@@ -86,6 +87,12 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                         enumField.PopulateDataFromType(enumField.m_EnumType);
                     enumField.value = null;
                 }
+                else
+                {
+                    var enumField = (EnumField)ve;
+                    enumField.m_EnumType = null;
+                    enumField.value = null;
+                }
             }
         }
 
@@ -180,6 +187,7 @@ public EnumField(string label, Enum defaultValue = null)
                 if (e.button == (int)MouseButton.LeftMouse)
                     e.StopPropagation();
             });
+            RegisterCallback<NavigationSubmitEvent>(OnNavigationSubmit);
         }
 
         /// <summary>
@@ -254,11 +262,17 @@ void OnPointerMoveEvent(PointerMoveEvent evt)
             }
         }
 
+        bool ContainsPointer(int pointerId)
+        {
+            var elementUnderPointer = elementPanel.GetTopElementUnderPointer(pointerId);
+            return this == elementUnderPointer || visualInput == elementUnderPointer;
+        }
+
         void ProcessPointerDown<T>(PointerEventBase<T> evt) where T : PointerEventBase<T>, new()
         {
             if (evt.button == (int)MouseButton.LeftMouse)
             {
-                if (visualInput.ContainsPoint(visualInput.WorldToLocal(evt.originalMousePosition)))
+                if (ContainsPointer(evt.pointerId))
                 {
                     ShowMenu();
                     evt.StopPropagation();
@@ -266,27 +280,10 @@ void OnPointerMoveEvent(PointerMoveEvent evt)
             }
         }
 
-        [EventInterest(typeof(KeyDownEvent))]
-        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
+        void OnNavigationSubmit(NavigationSubmitEvent evt)
         {
-            base.ExecuteDefaultActionAtTarget(evt);
-
-            if (evt == null)
-            {
-                return;
-            }
-
-            KeyDownEvent kde = (evt as KeyDownEvent);
-            if (kde != null)
-            {
-                if ((kde.keyCode == KeyCode.Space) ||
-                    (kde.keyCode == KeyCode.KeypadEnter) ||
-                    (kde.keyCode == KeyCode.Return))
-                {
-                    ShowMenu();
-                    evt.StopPropagation();
-                }
-            }
+            ShowMenu();
+            evt.StopPropagation();
         }
 
         private void ShowMenu()
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs
index f590b47a2f..f3b1d04063 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Foldout.cs
@@ -59,26 +59,18 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// <summary>
         /// This element contains the elements that are shown or hidden when you toggle the <see cref="Foldout"/>.
         /// </summary>
-        public override VisualElement contentContainer
-        {
-            get
-            {
-                return m_Container;
-            }
-        }
+        public override VisualElement contentContainer => m_Container;
 
         /// <summary>
         /// This is the text of the toggle's label.
         /// </summary>
         public string text
         {
-            get
-            {
-                return m_Toggle.text;
-            }
+            get => m_Toggle.text;
             set
             {
                 m_Toggle.text = value;
+                m_Toggle.visualInput.Q(className: Toggle.textUssClassName)?.AddToClassList(textUssClassName);
             }
         }
 
@@ -91,10 +83,7 @@ public string text
         /// </summary>
         public bool value
         {
-            get
-            {
-                return m_Value;
-            }
+            get => m_Value;
             set
             {
                 if (m_Value == value)
@@ -152,6 +141,32 @@ public void SetValueWithoutNotify(bool newValue)
         /// below the stylesheet in the visual tree.
         /// </remarks>
         public static readonly string contentUssClassName = ussClassName + "__content";
+        /// <summary>
+        /// The USS class name for the Label element in a Foldout.
+        /// </summary>
+        /// <remarks>
+        /// Unity adds this USS class to the <see cref="VisualElement"/> that contains the <see cref="Toggle"/> input elements.
+        /// Any styling applied to this class affects every foldout container located beside, or below the stylesheet in the visual tree.
+        /// </remarks>
+        public static readonly string inputUssClassName = ussClassName + "__input";
+        /// <summary>
+        /// The USS class name for the Label element in a Foldout.
+        /// </summary>
+        /// <remarks>
+        /// Unity adds this USS class to the <see cref="VisualElement"/> that represents the checkmark of the
+        /// <see cref="Toggle"/> sub-element of every <see cref="Foldout"/>. Any styling applied to this class affects
+        /// every foldout container located beside, or below the stylesheet in the visual tree.
+        /// </remarks>
+        public static readonly string checkmarkUssClassName = ussClassName + "__checkmark";
+        /// <summary>
+        /// The USS class name for the Label element in a Foldout.
+        /// </summary>
+        /// <remarks>
+        /// Unity adds this USS class to the <see cref="Label"/> in the <see cref="Toggle"/> sub-element of every
+        /// <see cref="Foldout"/>. Any styling applied to this class affects every foldout container located beside, or
+        /// below the stylesheet in the visual tree.
+        /// </remarks>
+        public static readonly string textUssClassName = ussClassName + "__text";
 
         internal static readonly string toggleInspectorUssClassName = toggleUssClassName + "--inspector";
         internal static readonly string ussFoldoutDepthClassName = ussClassName + "--depth-";
@@ -186,6 +201,8 @@ public Foldout()
                 evt.StopPropagation();
             });
             m_Toggle.AddToClassList(toggleUssClassName);
+            m_Toggle.visualInput.AddToClassList(inputUssClassName);
+            m_Toggle.visualInput.Q(className: Toggle.checkmarkUssClassName).AddToClassList(checkmarkUssClassName);
             hierarchy.Add(m_Toggle);
 
             m_Container = new VisualElement()
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs b/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs
index f87fc9f987..093129cf1e 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/GenericDropdownMenu.cs
@@ -132,12 +132,17 @@ void OnDetachFromPanel(DetachFromPanelEvent evt)
             m_ScrollView.UnregisterCallback<FocusOutEvent>(OnFocusOut);
         }
 
-        void Hide()
+        void Hide(bool giveFocusBack = false)
         {
             m_MenuContainer.RemoveFromHierarchy();
 
             if (m_TargetElement != null)
+            {
                 m_TargetElement.pseudoStates ^= PseudoStates.Active;
+                if (giveFocusBack)
+                    m_TargetElement.Focus();
+            }
+
             m_TargetElement = null;
         }
 
@@ -185,7 +190,7 @@ void UpdateSelectionUp(int newIndex)
             switch (op)
             {
                 case KeyboardNavigationOperation.Cancel:
-                    Hide();
+                    Hide(true);
                     return true;
                 case KeyboardNavigationOperation.Submit:
                     var item = m_Items[selectedIndex];
@@ -195,7 +200,7 @@ void UpdateSelectionUp(int newIndex)
                         item.actionUserData?.Invoke(item.element.userData);
                     }
 
-                    Hide();
+                    Hide(true);
                     return true;
                 case KeyboardNavigationOperation.Previous:
                     UpdateSelectionUp(selectedIndex < 0 ? m_Items.Count - 1 : selectedIndex - 1);
@@ -253,7 +258,7 @@ void OnPointerUp(PointerUpEvent evt)
                 item.action?.Invoke();
                 item.actionUserData?.Invoke(item.element.userData);
 
-                Hide();
+                Hide(true);
             }
 
             if (evt.pointerId != PointerId.mousePointerId)
@@ -279,7 +284,7 @@ void OnFocusOut(FocusOutEvent evt)
 
         void OnParentResized(GeometryChangedEvent evt)
         {
-            Hide();
+            Hide(true);
         }
 
         void UpdateSelection(VisualElement target)
@@ -478,6 +483,9 @@ public void DropDown(Rect position, VisualElement targetElement = null, bool anc
             m_MenuContainer.style.top = m_PanelRootVisualContainer.layout.y;
             m_MenuContainer.style.width = m_PanelRootVisualContainer.layout.width;
             m_MenuContainer.style.height = m_PanelRootVisualContainer.layout.height;
+            m_MenuContainer.style.fontSize = m_TargetElement.computedStyle.fontSize;
+            m_MenuContainer.style.unityFont = m_TargetElement.computedStyle.unityFont;
+            m_MenuContainer.style.unityFontDefinition = m_TargetElement.computedStyle.unityFontDefinition;
 
             var local = m_PanelRootVisualContainer.WorldToLocal(position);
             m_OuterContainer.style.left = local.x - m_PanelRootVisualContainer.layout.x;
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Hash128Field.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Hash128Field.cs
index 908d534490..2156b7d6f5 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Hash128Field.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Hash128Field.cs
@@ -81,6 +81,26 @@ public override Hash128 value
             }
         }
 
+        internal override void UpdateValueFromText()
+        {
+            // Prevent text from changing when the value change
+            // This allow expression (2+2) or string like 00123 to remain as typed in the TextField until enter is pressed
+            m_UpdateTextFromValue = false;
+            try
+            {
+                value = StringToValue(text);
+            }
+            finally
+            {
+                m_UpdateTextFromValue = true;
+            }
+        }
+
+        internal override void UpdateTextFromValue()
+        {
+            text = ValueToString(rawValue);
+        }
+
         public override void SetValueWithoutNotify(Hash128 newValue)
         {
             base.SetValueWithoutNotify(newValue);
@@ -99,69 +119,16 @@ protected override string ValueToString(Hash128 value)
 
         protected override Hash128 StringToValue(string str)
         {
-            return Hash128.Parse(str);
+            return Hash128Input.Parse(str);
         }
 
-        [EventInterest(typeof(KeyDownEvent), typeof(ExecuteCommandEvent))]
-        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
-        {
-            base.ExecuteDefaultActionAtTarget(evt);
-
-            bool hasChanged = false;
-            if (evt.eventTypeId == KeyDownEvent.TypeId())
-            {
-                KeyDownEvent kde = evt as KeyDownEvent;
-
-                if ((kde?.character == 3) ||     // KeyCode.KeypadEnter
-                    (kde?.character == '\n'))    // KeyCode.Return
-                {
-                    if (textEdition.hasFocus)
-                        Focus();
-                    else
-                        textInputBase.textElement.Focus();
-                    evt.StopPropagation();
-                    evt.PreventDefault();
-                }
-                else if (!isReadOnly)
-                {
-                    hasChanged = true;
-                }
-            }
-            else if (!isReadOnly && evt.eventTypeId == ExecuteCommandEvent.TypeId())
-            {
-                ExecuteCommandEvent commandEvt = evt as ExecuteCommandEvent;
-                string cmdName = commandEvt.commandName;
-                if (cmdName == EventCommandNames.Paste || cmdName == EventCommandNames.Cut)
-                {
-                    hasChanged = true;
-                }
-            }
-
-            if (!isDelayed && hasChanged)
-            {
-                // Prevent text from changing when the value change
-                // This allow expression (2+2) or string like 00123 to remain as typed in the TextField until enter is pressed
-                m_UpdateTextFromValue = false;
-                try
-                {
-                    textInputBase.UpdateValueFromText();
-                }
-                finally
-                {
-                    m_UpdateTextFromValue = true;
-                }
-            }
-        }
-
-            [EventInterest(typeof(BlurEvent))]
+        [EventInterest(typeof(BlurEvent))]
         protected override void ExecuteDefaultAction(EventBase evt)
         {
             base.ExecuteDefaultAction(evt);
 
-            if (evt == null)
-            {
+            if (evt == null || textEdition.isReadOnly)
                 return;
-            }
 
             if (evt.eventTypeId == BlurEvent.TypeId())
             {
@@ -173,6 +140,7 @@ protected override void ExecuteDefaultAction(EventBase evt)
                 else
                 {
                     textInputBase.UpdateValueFromText();
+                    textInputBase.UpdateTextFromValue();
                 }
             }
         }
@@ -200,6 +168,11 @@ protected string ValueToString(Hash128 value)
             }
 
             protected override Hash128 StringToValue(string str)
+            {
+                return Parse(str);
+            }
+
+            internal static Hash128 Parse(string str)
             {
                 // Hash128.Parse does not accept strings of Length == 1, but works well with Length in the range [2, 32]
                 if (str.Length == 1 && ulong.TryParse(str, out var val))
@@ -207,7 +180,6 @@ protected override Hash128 StringToValue(string str)
 
                 return Hash128.Parse(str);
             }
-
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs
index b904dec716..fe4b8ef536 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Image.cs
@@ -225,7 +225,10 @@ private Vector2 GetTextureDisplaySize(Sprite sprite)
         {
             var result = Vector2.zero;
             if (sprite != null)
-                result = (Vector2)(sprite.bounds.size * sprite.pixelsPerUnit);
+            {
+                float scale = UIElementsUtility.PixelsPerUnitScaleForElement(this, sprite);
+                result = (Vector2)(sprite.bounds.size * sprite.pixelsPerUnit) * scale;
+            }
             return result;
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs
index e4bc536c1b..d01c3266e7 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs
@@ -281,6 +281,7 @@ internal BaseField(string label)
             }
 
             RegisterCallback<AttachToPanelEvent>(OnAttachToPanel);
+            RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
 
             m_VisualInput = null;
         }
@@ -308,6 +309,7 @@ private void OnAttachToPanel(AttachToPanelEvent e)
                     m_CachedInspectorElement = currentElement;
                     m_CachedListAndFoldoutDepth = this.GetListAndFoldoutDepth();
                     RegisterCallback<GeometryChangedEvent>(OnInspectorFieldGeometryChanged);
+                    RegisterCallback<TooltipEvent>(evt => OnTooltip(evt));
                     break;
                 }
 
@@ -315,6 +317,11 @@ private void OnAttachToPanel(AttachToPanelEvent e)
             }
         }
 
+        private void OnDetachFromPanel(DetachFromPanelEvent e)
+        {
+            onValidateValue = null;
+        }
+
         private void OnCustomStyleResolved(CustomStyleResolvedEvent evt)
         {
             if (evt.customStyle.TryGetValue(s_LabelWidthRatioProperty, out var labelWidthRatio))
@@ -457,14 +464,27 @@ internal override void OnViewDataReady()
         [EventInterest(typeof(TooltipEvent))]
         protected override void ExecuteDefaultAction(EventBase evt)
         {
-            base.ExecuteDefaultAction(evt);
-
             if (evt.eventTypeId == TooltipEvent.TypeId())
             {
-                TooltipEvent e = (TooltipEvent)evt;
+                TooltipEvent e = (TooltipEvent) evt;
+                if (evt.currentTarget is VisualElement element && !string.IsNullOrEmpty(element.tooltip))
+                {
+                    // When a label is present, set the tooltip position centered on the label, otherwise center it on the entire field.
+                    e.rect = !string.IsNullOrEmpty(label) ? labelElement.worldBound : worldBound;
+                }
+                evt.StopImmediatePropagation();
+                return;
+            }
 
-                e.rect = !string.IsNullOrEmpty(label) ? labelElement.worldBound : worldBound;
+            base.ExecuteDefaultAction(evt);
+        }
 
+        void OnTooltip(TooltipEvent e)
+        {
+            if (e.currentTarget is VisualElement element && !string.IsNullOrEmpty(element.tooltip))
+            {
+                // When a label is present, set the tooltip position centered on the label, otherwise center it on the entire field.
+                e.rect = !string.IsNullOrEmpty(label) ? labelElement.worldBound : worldBound;
                 e.tooltip = tooltip;
                 e.StopImmediatePropagation();
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs
index 6487ea297e..0e552299a0 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/KeyboardTextEditor.cs
@@ -46,6 +46,16 @@ public override void ExecuteDefaultActionAtTarget(EventBase evt)
                 case ExecuteCommandEvent ece:
                     OnExecuteCommandEvent(ece);
                     break;
+
+                case NavigationMoveEvent ne:
+                    OnNavigationEvent(ne);
+                    break;
+                case NavigationSubmitEvent ne:
+                    OnNavigationEvent(ne);
+                    break;
+                case NavigationCancelEvent ne:
+                    OnNavigationEvent(ne);
+                    break;
             }
         }
 
@@ -67,12 +77,6 @@ void OnKeyDown(KeyDownEvent evt)
 
             m_Changed = false;
 
-            if (evt.keyCode == KeyCode.Escape)
-            {
-                textElement.edition.RestoreValueAndText();
-                textElement.parent.Focus();
-            }
-
             evt.GetEquivalentImguiEvent(m_ImguiEvent);
             if (editingUtilities.HandleKeyEvent(m_ImguiEvent, false))
             {
@@ -90,23 +94,41 @@ void OnKeyDown(KeyDownEvent evt)
                 if (evt.actionKey && !(evt.altKey && c != '\0'))
                     return;
 
-                // Ignore tab & shift-tab in single-line text fields
-                if (!textElement.edition.multiline && (evt.keyCode == KeyCode.Tab || c == '\t'))
-                    return;
+                if (!textElement.edition.multiline && (evt.keyCode == KeyCode.KeypadEnter || evt.keyCode == KeyCode.Return))
+                    textElement.edition.UpdateValueFromText?.Invoke();
 
-                // Ignore modifier+tab in multiline text fields
-                if ((evt.keyCode == KeyCode.Tab || c == '\t') && evt.modifiers != EventModifiers.None)
+                // Ignore tab & shift-tab in single-line text fields, modifier+tab in multiline text fields
+                if ((evt.keyCode == KeyCode.Tab || c == '\t') &&
+                    (!textElement.edition.multiline || evt.modifiers != EventModifiers.None))
+                {
+                    // Do the navigation manually since NavigationTabEvent doesn't pass through
+                    if (c == '\t')
+                    {
+                        textElement.focusController.FocusNextInDirection(evt.shiftKey
+                            ? VisualElementFocusChangeDirection.left
+                            : VisualElementFocusChangeDirection.right);
+                    }
                     return;
+                }
 
                 evt.StopPropagation();
 
-                if ((c == '\n' || c == '\r' || c == k_LineFeed) && !textElement.edition.multiline && !evt.altKey)
-                    return;
-
                 // When the newline character is sent, we have to check if the shift key is down also...
                 // In the multiline case, this is like a return on a single line
-                if (c == '\n' && textElement.edition.multiline && evt.shiftKey)
+                if (textElement.edition.multiline
+                    ? c == '\n' && evt.shiftKey
+                    : (c == '\n' || c == '\r' || c == k_LineFeed) && !evt.altKey)
+                {
+                    textElement.edition.MoveFocusToCompositeRoot?.Invoke();
                     return;
+                }
+
+                if (evt.keyCode == KeyCode.Escape)
+                {
+                    textElement.edition.RestoreValueAndText();
+                    textElement.edition.UpdateValueFromText?.Invoke();
+                    textElement.edition.MoveFocusToCompositeRoot?.Invoke();
+                }
 
                 if (!textElement.edition.AcceptCharacter(c))
                     return;
@@ -130,6 +152,9 @@ void OnKeyDown(KeyDownEvent evt)
                 UpdateLabel();
                 // UpdateScrollOffset needs the new geometry of the text to compute the new scrollOffset.
                 textElement.uitkTextHandle.Update();
+
+                if (!textElement.edition.isDelayed)
+                    textElement.edition.UpdateValueFromText?.Invoke();
             }
 
             // Scroll offset might need to be updated
@@ -145,8 +170,8 @@ void UpdateLabel()
                 editingUtilities.SetImeWindowPosition(new Vector2(textElement.worldBound.x, textElement.worldBound.y));
 
             var fullText = editingUtilities.GeneratePreviewString(textElement.enableRichText);
-            fullText = textElement.edition.CullString(fullText);
-            textElement.edition.UpdateText(fullText);
+            editingUtilities.text = textElement.edition.CullString(fullText);
+            textElement.edition.UpdateText(editingUtilities.text);
 
             if (imeEnabled)
             {
@@ -234,6 +259,19 @@ void OnExecuteCommandEvent(ExecuteCommandEvent evt)
 
                 // Scroll offset might need to be updated
                 textElement.edition.UpdateScrollOffset?.Invoke();
+
+                if (!textElement.edition.isDelayed)
+                    textElement.edition.UpdateValueFromText();
+            }
+        }
+
+        void OnNavigationEvent<TEvent>(NavigationEventBase<TEvent> evt) where TEvent : NavigationEventBase<TEvent>, new()
+        {
+            // Prevent navigation events, since we're consuming KeyDownEvents directly
+            if (evt.deviceType == NavigationDeviceType.Keyboard || evt.deviceType == NavigationDeviceType.Unknown)
+            {
+                evt.StopPropagation();
+                evt.PreventDefault();
             }
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs
index 799c3afa44..fb9ee44924 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextField.cs
@@ -24,6 +24,15 @@ public class TextField : TextInputBaseField<string>
         /// </summary>
         public new class UxmlTraits : TextInputBaseField<string>.UxmlTraits
         {
+            // Using a static attribute here because we want to override the behaviour of an
+            // attribute from a base trait class, without the attribute appearing twice in the
+            // UI Builder.
+            static readonly UxmlStringAttributeDescription k_Value = new UxmlStringAttributeDescription
+            {
+                name = "value",
+                obsoleteNames = new [] { "text" }
+            };
+
             UxmlBoolAttributeDescription m_Multiline = new UxmlBoolAttributeDescription { name = "multiline" };
 
             /// <summary>
@@ -37,6 +46,15 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 TextField field = ((TextField)ve);
                 field.multiline = m_Multiline.GetValueFromBag(bag, cc);
                 base.Init(ve, bag, cc);
+
+                // Re-defining the value to account for the "obsolete" text property.
+                // We are doing it here because TextField binds the value to the text and this
+                // is not the case in the base class.
+                var value = string.Empty;
+                if (k_Value.TryGetValueFromBag(bag, cc, ref value))
+                {
+                    field.SetValueWithoutNotify(value);
+                }
             }
         }
 
@@ -126,64 +144,6 @@ public override void SetValueWithoutNotify(string newValue)
             textEdition.UpdateText(rawValue);
         }
 
-        [EventInterest(typeof(KeyDownEvent), typeof(ExecuteCommandEvent),
-                typeof(NavigationSubmitEvent), typeof(NavigationCancelEvent), typeof(NavigationMoveEvent))]
-        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
-        {
-            base.ExecuteDefaultActionAtTarget(evt);
-
-            if (evt is KeyDownEvent kde)
-            {
-                if (!isDelayed || (!multiline && ((kde?.keyCode == KeyCode.KeypadEnter) || (kde?.keyCode == KeyCode.Return))))
-                {
-                    value = text;
-                }
-
-                if (multiline)
-                {
-                    // For multiline text fields, make sure tab doesn't trigger a focus change.
-                    if (hasFocus && (kde?.keyCode == KeyCode.Tab || kde?.character == '\t'))
-                    {
-                        evt.StopPropagation();
-                        evt.PreventDefault();
-                    }
-                    else if (((kde?.character == 3) && (kde?.shiftKey == true)) || // KeyCode.KeypadEnter
-                             ((kde?.character == '\n') && (kde?.shiftKey == true))) // KeyCode.Return
-                    {
-                        Focus();
-                        evt.StopPropagation();
-                        evt.PreventDefault();
-                    }
-                }
-                else if ((kde?.character == 3) ||     // KeyCode.KeypadEnter
-                        (kde?.character == '\n'))    // KeyCode.Return
-                {
-                    if (hasFocus)
-                        Focus();
-                    else
-                        textInput.textElement.Focus();
-                    evt.StopPropagation();
-                    evt.PreventDefault();
-                }
-            }
-            else if (evt is ExecuteCommandEvent commandEvt)
-            {
-                string cmdName = commandEvt.commandName;
-                if (!isDelayed && (cmdName == EventCommandNames.Paste || cmdName == EventCommandNames.Cut))
-                {
-                    value = text;
-                }
-            }
-            // Prevent duplicated navigation events, since we're observing KeyDownEvents instead
-            else if (evt.eventTypeId == NavigationSubmitEvent.TypeId() ||
-                     evt.eventTypeId == NavigationCancelEvent.TypeId() ||
-                     evt.eventTypeId == NavigationMoveEvent.TypeId())
-            {
-                evt.StopPropagation();
-                evt.PreventDefault();
-            }
-        }
-
         [EventInterest(typeof(BlurEvent))]
         protected override void ExecuteDefaultAction(EventBase evt)
         {
@@ -220,24 +180,17 @@ public bool multiline
                 get { return textEdition.multiline; }
                 set
                 {
+                    if (textEdition.multiline == value)
+                        return;
+
                     textEdition.multiline = value;
-                    if (!value)
+                    if (value)
+                        SetMultiline();
+                    else
+                    {
                         text = text.Replace("\n", "");
-                    SetTextAlign();
-                }
-            }
-
-            private void SetTextAlign()
-            {
-                if (multiline)
-                {
-                    RemoveFromClassList(singleLineInputUssClassName);
-                    AddToClassList(multilineInputUssClassName);
-                }
-                else
-                {
-                    RemoveFromClassList(multilineInputUssClassName);
-                    AddToClassList(singleLineInputUssClassName);
+                        SetSingleLine();
+                    }
                 }
             }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextInputFieldBase.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextInputFieldBase.cs
index 68a5c540e7..7c62ff9a04 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextInputFieldBase.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TextInputFieldBase.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEngine.TextCore.Text;
 
 namespace UnityEngine.UIElements
 {
@@ -25,7 +26,6 @@ public abstract class TextInputBaseField<TValueType> : BaseField<TValueType>
             UxmlIntAttributeDescription m_MaxLength = new UxmlIntAttributeDescription { name = "max-length", obsoleteNames = new[] { "maxLength" }, defaultValue = kMaxLengthNone };
             UxmlBoolAttributeDescription m_Password = new UxmlBoolAttributeDescription { name = "password" };
             UxmlStringAttributeDescription m_MaskCharacter = new UxmlStringAttributeDescription { name = "mask-character", obsoleteNames = new[] { "maskCharacter" }, defaultValue = kMaskCharDefault.ToString()};
-            UxmlStringAttributeDescription m_Text = new UxmlStringAttributeDescription { name = "text" };
             UxmlBoolAttributeDescription m_IsReadOnly = new UxmlBoolAttributeDescription { name = "readonly" };
             UxmlBoolAttributeDescription m_IsDelayed = new UxmlBoolAttributeDescription {name = "is-delayed"};
 
@@ -40,7 +40,6 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                 base.Init(ve, bag, cc);
 
                 var field = ((TextInputBaseField<TValueType>)ve);
-                field.text = m_Text.GetValueFromBag(bag, cc);
                 field.maxLength = m_MaxLength.GetValueFromBag(bag, cc);
                 field.isPasswordField = m_Password.GetValueFromBag(bag, cc);
                 field.isReadOnly = m_IsReadOnly.GetValueFromBag(bag, cc);
@@ -75,6 +74,10 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// </summary>
         public new static readonly string inputUssClassName = ussClassName + "__input";
         /// <summary>
+        /// USS class name of the multiline container.
+        /// </summary>
+        internal static readonly string multilineContainerClassName = ussClassName + "__multiline-container";
+        /// <summary>
         /// USS class name of single line input elements in elements of this type.
         /// </summary>
         public static readonly string singleLineInputUssClassName = inputUssClassName + "--single-line";
@@ -83,6 +86,10 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// USS class name of multiline input elements in elements of this type.
         /// </summary>
         public static readonly string multilineInputUssClassName = inputUssClassName + "--multiline";
+        /// <summary>
+        /// USS class name of multiline input elements with no scroll view.
+        /// </summary>
+        internal static readonly string multilineInputWithScrollViewUssClassName = multilineInputUssClassName + "--scroll-view";
 
         /// <summary>
         /// USS class name of input elements in elements of this type.
@@ -108,10 +115,10 @@ public string text
         /// </summary>
         public bool isReadOnly
         {
-            get => m_TextInputBase.isReadOnly;
+            get => textEdition.isReadOnly;
             set
             {
-                m_TextInputBase.isReadOnly = value;
+                textEdition.isReadOnly = value;
                 onIsReadOnlyChanged?.Invoke(value);
             }
         }
@@ -143,7 +150,7 @@ public bool isPasswordField
         /// </summary>
         public ITextEdition textEdition => m_TextInputBase.textElement.edition;
 
-        // TODO: Obsolete all of these belolw and use the exposed TextSelection above
+        // TODO: Obsolete all of these below and use the exposed TextSelection above
 
         /// <summary>
         /// Background color of selected text.
@@ -335,22 +342,17 @@ private void OnFieldCustomStyleResolved(CustomStyleResolvedEvent e)
             m_TextInputBase.OnInputCustomStyleResolved(e);
         }
 
-        [EventInterest(typeof(KeyDownEvent), typeof(FocusInEvent), typeof(FocusEvent), typeof(BlurEvent))]
+        [EventInterest(typeof(NavigationSubmitEvent), typeof(FocusInEvent), typeof(FocusEvent), typeof(BlurEvent))]
         protected override void ExecuteDefaultActionAtTarget(EventBase evt)
         {
             base.ExecuteDefaultActionAtTarget(evt);
 
-            if (evt.eventTypeId == KeyDownEvent.TypeId())
-            {
-                KeyDownEvent keyDownEvt = evt as KeyDownEvent;
+            if (textEdition.isReadOnly)
+                return;
 
-                // We must handle the ETX (char 3) or the \n instead of the KeypadEnter or Return because the focus will
-                //     have the drawback of having the second event to be handled by the focused field.
-                if ((keyDownEvt?.character == 3) ||     // KeyCode.KeypadEnter
-                    (keyDownEvt?.character == '\n'))    // KeyCode.Return
-                {
-                    textInputBase.textElement.Focus();
-                }
+            if (evt.eventTypeId == NavigationSubmitEvent.TypeId() && evt.leafTarget != textInputBase.textElement)
+            {
+                textInputBase.textElement.Focus();
             }
 
             // The following code is to help achieve the following behaviour:
@@ -403,6 +405,19 @@ protected override void UpdateMixedValueContent()
             }
         }
 
+        // UpdateValueFromText and UpdateTextFromValue are overriden by TextValueField and potentially other
+        // TextInputFieldBase derived classes when the text content of the TextElement needs to be synchronized with
+        // some numerical value. Some TextEditor operations like pressing Enter will update the text to match a
+        // canonical form of the underlying value, while other operations force the value to be updated from text.
+        internal virtual void UpdateValueFromText()
+        {
+            value = StringToValue(text);
+        }
+        internal virtual void UpdateTextFromValue()
+        {
+            // Do nothing. Value-based fields will override this if appropriate.
+        }
+
         /// <summary>
         /// This is the input text base class visual representation.
         /// </summary>
@@ -410,7 +425,7 @@ protected internal abstract class TextInputBase : VisualElement
         {
             internal TextElement textElement { get; private set; }
             internal ScrollView scrollView;
-
+            internal VisualElement multilineContainer;
 
             /// <summary>
             /// Modifier name of the inner components
@@ -422,6 +437,11 @@ protected internal abstract class TextInputBase : VisualElement
             /// </summary>
             public static readonly string innerTextElementUssClassName = TextElement.ussClassName + innerComponentsModifierName;
 
+            /// <summary>
+            /// USS class name of the inner TextElement
+            /// </summary>
+            internal static readonly string innerTextElementWithScrollViewUssClassName = TextElement.ussClassName + innerComponentsModifierName + "--scroll-view";
+
             /// <summary>
             /// USS class name that's added when the inner TextElement if in horizontal.
             /// </summary>
@@ -485,9 +505,20 @@ protected virtual TValueType StringToValue(string str)
 
             internal void UpdateValueFromText()
             {
-                var newValue = StringToValue(text);
                 TextInputBaseField<TValueType> parentTextField = (TextInputBaseField<TValueType>)parent;
-                parentTextField.value = newValue;
+                parentTextField.UpdateValueFromText();
+            }
+
+            internal void UpdateTextFromValue()
+            {
+                TextInputBaseField<TValueType> parentTextField = (TextInputBaseField<TValueType>)parent;
+                parentTextField.UpdateTextFromValue();
+            }
+
+            internal void MoveFocusToCompositeRoot()
+            {
+                TextInputBaseField<TValueType> parentTextField = (TextInputBaseField<TValueType>)parent;
+                parentTextField.Focus();
             }
 
             /// <summary>
@@ -613,45 +644,111 @@ internal TextInputBase()
                 delegatesFocus = true;
 
                 textElement = new TextElement();
-                textElement.focusable = true;
-                textElement.enableRichText = false;
+                textElement.selection.isSelectable = true;
                 textEdition.isReadOnly = false;
+                textSelection.isSelectable = true;
+                textElement.enableRichText = false;
                 textSelection.selectAllOnFocus = true;
                 textSelection.selectAllOnMouseUp = true;
+                textElement.tabIndex = 0;
+
                 textEdition.AcceptCharacter += AcceptCharacter;
                 textEdition.UpdateScrollOffset += UpdateScrollOffset;
                 textEdition.UpdateValueFromText += UpdateValueFromText;
-
-                scrollView = new ScrollView();
-                SetScrollViewMode();
-                scrollView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
-                scrollView.verticalScrollerVisibility = ScrollerVisibility.Hidden;
-
-                scrollView.Add(textElement);
-                Add(scrollView);
+                textEdition.UpdateTextFromValue += UpdateTextFromValue;
+                textEdition.MoveFocusToCompositeRoot += MoveFocusToCompositeRoot;
 
                 AddToClassList(inputUssClassName);
-                AddToClassList(singleLineInputUssClassName);
                 name = TextField.textInputUssName;
 
-                textElement.AddToClassList(innerTextElementUssClassName);
-                scrollView.AddToClassList(innerScrollviewUssClassName);
-                scrollView.contentViewport.AddToClassList(innerViewportUssClassName);
-                scrollView.contentContainer.AddToClassList(innerContentContainerUssClassName);
+                SetSingleLine();
 
                 RegisterCallback<CustomStyleResolvedEvent>(OnInputCustomStyleResolved);
-                scrollView.contentContainer.RegisterCallback<GeometryChangedEvent>(ScrollViewOnGeometryChangedEvent);
+
+                // The ScrollView's slider can send ChangeEvent<float>. This makes sure these do not leak.
+                RegisterCallback<ChangeEvent<float>>((evt =>
+                {
+                    if(evt.target.GetType() != typeof(TextElement))
+                        evt.StopPropagation();
+
+                }), TrickleDown.TrickleDown);
 
                 tabIndex = -1;
             }
 
+            internal void SetSingleLine()
+            {
+                hierarchy.Clear();
+                RemoveMultilineComponents();
+
+                Add(textElement);
+                AddToClassList(singleLineInputUssClassName);
+                textElement.AddToClassList(innerTextElementUssClassName);
+
+                textElement.RegisterCallback<GeometryChangedEvent>(TextElementOnGeometryChangedEvent);
+
+                // Make sure we reinitialize the vertical scrollOffset but keep the horizontal scrollOffset.
+                if (scrollOffset != Vector2.zero)
+                {
+                   scrollOffset.y = 0;
+                   UpdateScrollOffset();
+                }
+            }
+
+            internal void SetMultiline()
+            {
+                if (!textEdition.multiline)
+                    return;
+
+                RemoveSingleLineComponents();
+                RemoveMultilineComponents();
+
+                if (m_VerticalScrollerVisibility != ScrollerVisibility.Hidden && scrollView == null)
+                {
+                    scrollView = new ScrollView();
+                    scrollView.Add(textElement);
+                    Add(scrollView);
+
+                    SetScrollViewMode();
+                    scrollView.horizontalScrollerVisibility = ScrollerVisibility.Hidden;
+                    scrollView.verticalScrollerVisibility = m_VerticalScrollerVisibility;
+
+                    scrollView.AddToClassList(innerScrollviewUssClassName);
+                    scrollView.contentViewport.AddToClassList(innerViewportUssClassName);
+                    scrollView.contentContainer.AddToClassList(innerContentContainerUssClassName);
+                    scrollView.contentContainer.RegisterCallback<GeometryChangedEvent>(ScrollViewOnGeometryChangedEvent);
+
+                    AddToClassList(multilineInputWithScrollViewUssClassName);
+                    textElement.AddToClassList(innerTextElementWithScrollViewUssClassName);
+                }
+                else if (multilineContainer == null)
+                {
+                    textElement.RegisterCallback<GeometryChangedEvent>(TextElementOnGeometryChangedEvent);
+                    multilineContainer = new VisualElement() { classList = { multilineContainerClassName } };
+
+                    multilineContainer.Add(textElement);
+                    Add(multilineContainer);
+                    SetMultilineContainerStyle();
+
+                    AddToClassList(multilineInputUssClassName);
+                    textElement.AddToClassList(innerTextElementUssClassName);
+                }
+            }
+
             internal void ScrollViewOnGeometryChangedEvent(GeometryChangedEvent e)
             {
-                if (e.oldRect.size == e.newRect.size || !m_DelayedUpdateScrollOffset)
+                if (e.oldRect.size == e.newRect.size)
+                    return;
+
+                UpdateScrollOffset();
+            }
+
+            internal void TextElementOnGeometryChangedEvent(GeometryChangedEvent e)
+            {
+                if (e.oldRect.size == e.newRect.size)
                     return;
 
-                m_DelayedUpdateScrollOffset = false;
-                scrollView.scrollOffset = scrollOffset;
+                UpdateScrollOffset();
             }
 
             internal void OnInputCustomStyleResolved(CustomStyleResolvedEvent e)
@@ -669,6 +766,7 @@ internal void OnInputCustomStyleResolved(CustomStyleResolvedEvent e)
                     textSelection.cursorColor = cursorValue;
 
                 SetScrollViewMode();
+                SetMultilineContainerStyle();
             }
 
             internal virtual bool AcceptCharacter(char c)
@@ -679,40 +777,69 @@ internal virtual bool AcceptCharacter(char c)
 
             // scrollOffset and m_DelayedUpdateScrollOffset are used in automated tests
             internal Vector2 scrollOffset = Vector2.zero;
-            bool m_DelayedUpdateScrollOffset;
             internal void UpdateScrollOffset()
             {
                 var selection = textSelection;
                 if (selection.cursorIndex < 0)
                     return;
 
-                var cursorPos = selection.cursorPosition;
-                var cursorWidth = selection.cursorWidth;
-                var xOffset = scrollView.scrollOffset.x;
-                var yOffset = scrollView.scrollOffset.y;
-                var contentViewportWidth = scrollView.contentViewport.layout.width;
+                if (scrollView != null)
+                {
+                    scrollOffset = GetScrollOffset(scrollView.scrollOffset.x, scrollView.scrollOffset.y, scrollView.contentViewport.layout.width);
+                    scrollView.scrollOffset = scrollOffset;
+                }
+                else
+                {
+                    var t = textElement.transform.position;
+
+                    scrollOffset = GetScrollOffset(scrollOffset.x, scrollOffset.y, contentRect.width);
+
+                    t.y = -Mathf.Min(scrollOffset.y, Math.Abs(textElement.contentRect.height - contentRect.height));
+                    t.x = -scrollOffset.x;
+
+                    if (!t.Equals(textElement.transform.position))
+                        textElement.transform.position = t;
+                }
+            }
+
+            Vector2 GetScrollOffset(float xOffset, float yOffset, float contentViewportWidth)
+            {
+                var cursorPos = textSelection.cursorPosition;
+                var cursorWidth = textSelection.cursorWidth;
+
+                var newXOffset = xOffset;
+                var newYOffset = yOffset;
 
-                if ((cursorPos.x + cursorWidth - scrollView.scrollOffset.x) > contentViewportWidth)
-                    xOffset = cursorPos.x + cursorWidth - contentViewportWidth;
-                else if (cursorPos.x - cursorWidth - scrollView.scrollOffset.x < 0 && scrollView.scrollOffset.x > 0)
-                    xOffset = cursorPos.x - cursorWidth;
+                const int leftScrollOffsetPadding = 5;
 
-                if ((cursorPos.y - scrollView.scrollOffset.y) > contentRect.height)
-                    yOffset = cursorPos.y - contentRect.height;
-                else if (cursorPos.y - selection.cursorLineHeight - scrollView.scrollOffset.y < 0)
-                    yOffset = cursorPos.y - selection.cursorLineHeight;
+                // Update scrollOffset when cursor moves right.
+                if ((cursorPos.x + cursorWidth - xOffset) > contentViewportWidth)
+                    newXOffset = cursorPos.x + cursorWidth - contentViewportWidth;
+                // Update scrollOffset when cursor moves left.
+                else if (cursorPos.x - xOffset - leftScrollOffsetPadding < contentViewportWidth && xOffset > 0)
+                    newXOffset = Mathf.Max(cursorPos.x - contentViewportWidth + leftScrollOffsetPadding, 0);
 
-                if (xOffset != scrollView.scrollOffset.x || yOffset != scrollView.scrollOffset.y)
+                if (textEdition.multiline)
                 {
-                    scrollOffset = new Vector2(xOffset, yOffset);
-                    if (scrollView.verticalScroller.highValue < yOffset || scrollView.horizontalScroller.highValue < xOffset)
-                        m_DelayedUpdateScrollOffset = true;
-                    scrollView.scrollOffset = new Vector2(xOffset, yOffset);
+                    // Update scrollOffset when cursor moves down.
+                    if ((cursorPos.y - yOffset) > contentRect.height)
+                        newYOffset = cursorPos.y - contentRect.height;
+                    // Update scrollOffset when cursor moves up.
+                    else if (cursorPos.y - textSelection.cursorLineHeight - yOffset < 0)
+                        newYOffset = cursorPos.y - textSelection.cursorLineHeight;
                 }
+
+                if (xOffset != newXOffset || yOffset != newYOffset)
+                    return new Vector2(newXOffset, newYOffset);
+
+                return scrollOffset;
             }
 
-            void SetScrollViewMode()
+            internal void SetScrollViewMode()
             {
+                if (scrollView == null)
+                    return;
+
                 textElement.RemoveFromClassList(verticalVariantInnerTextElementUssClassName);
                 textElement.RemoveFromClassList(verticalHorizontalVariantInnerTextElementUssClassName);
                 textElement.RemoveFromClassList(horizontalVariantInnerTextElementUssClassName);
@@ -734,13 +861,68 @@ void SetScrollViewMode()
                 }
             }
 
+            void SetMultilineContainerStyle()
+            {
+                if (multilineContainer != null)
+                {
+                    if (computedStyle.whiteSpace == WhiteSpace.Normal)
+                        style.overflow = Overflow.Hidden;
+                    else
+                        style.overflow = (Overflow)OverflowInternal.Scroll;
+                }
+            }
+
+            void RemoveSingleLineComponents()
+            {
+                RemoveFromClassList(singleLineInputUssClassName);
+                textElement.RemoveFromClassList(innerTextElementUssClassName);
+                textElement.RemoveFromHierarchy();
+                textElement.UnregisterCallback<GeometryChangedEvent>(TextElementOnGeometryChangedEvent);
+            }
+
+            void RemoveMultilineComponents()
+            {
+                if (scrollView != null)
+                {
+                    scrollView.RemoveFromHierarchy();
+                    scrollView.contentContainer.UnregisterCallback<GeometryChangedEvent>(ScrollViewOnGeometryChangedEvent);
+                    scrollView = null;
+
+                    textElement.RemoveFromClassList(verticalVariantInnerTextElementUssClassName);
+                    textElement.RemoveFromClassList(verticalHorizontalVariantInnerTextElementUssClassName);
+                    textElement.RemoveFromClassList(horizontalVariantInnerTextElementUssClassName);
+
+                    RemoveFromClassList(multilineInputWithScrollViewUssClassName);
+                    textElement.RemoveFromClassList(innerTextElementWithScrollViewUssClassName);
+                }
+
+                if (multilineContainer != null)
+                {
+                    // Make sure we reset the transform
+                    textElement.transform.position = Vector3.zero;
+
+                    multilineContainer.RemoveFromHierarchy();
+                    textElement.UnregisterCallback<GeometryChangedEvent>(TextElementOnGeometryChangedEvent);
+                    multilineContainer = null;
+
+                    RemoveFromClassList(multilineInputUssClassName);
+                }
+            }
+
+            ScrollerVisibility m_VerticalScrollerVisibility = ScrollerVisibility.Hidden;
             internal bool SetVerticalScrollerVisibility(ScrollerVisibility sv)
             {
                 if (textEdition.multiline)
                 {
-                    scrollView.verticalScrollerVisibility = sv;
+                    m_VerticalScrollerVisibility = sv;
+                    if (scrollView == null)
+                        SetMultiline();
+                    else
+                        scrollView.verticalScrollerVisibility = m_VerticalScrollerVisibility;
+
                     return true;
                 }
+                Debug.LogWarning("Can't SetVerticalScrollerVisibility as the field isn't multiline.");
                 return false;
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs
index 435989de58..970e6dcbf7 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/TouchScreenTextEditor.cs
@@ -48,6 +48,9 @@ void DoPollTouchScreenKeyboard()
 
                         if (edition.isDelayed)
                             edition.UpdateValueFromText?.Invoke();
+                        edition.UpdateTextFromValue?.Invoke();
+
+                        textElement.edition.MoveFocusToCompositeRoot?.Invoke();
                     }
                 }
             }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs
index f8b57485e4..233812fcd4 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/ListView.cs
@@ -93,8 +93,8 @@ namespace UnityEngine.UIElements
     ///
     ///         listView.selectionType = SelectionType.Multiple;
     ///
-    ///         listView.onItemsChosen += objects => Debug.Log(objects);
-    ///         listView.onSelectionChange += objects => Debug.Log(objects);
+    ///         listView.itemsChosen += objects => Debug.Log(objects);
+    ///         listView.selectionChanged += objects => Debug.Log(objects);
     ///
     ///         listView.style.flexGrow = 1.0f;
     ///
@@ -142,11 +142,19 @@ public class ListView : BaseListView
             get => m_MakeItem;
             set
             {
-                m_MakeItem = value;
-                Rebuild();
+                if (value != m_MakeItem)
+                {
+                    m_MakeItem = value;
+                    Rebuild();
+                }
             }
         }
 
+        internal void SetMakeItemWithoutNotify(Func<VisualElement> func)
+        {
+            m_MakeItem = func;
+        }
+
         private Action<VisualElement, int> m_BindItem;
 
         /// <summary>
@@ -164,11 +172,19 @@ public class ListView : BaseListView
             get => m_BindItem;
             set
             {
-                m_BindItem = value;
-                RefreshItems();
+                if (value != m_BindItem)
+                {
+                    m_BindItem = value;
+                    RefreshItems();
+                }
             }
         }
 
+        internal void SetBindItemWithoutNotify(Action<VisualElement, int> callback)
+        {
+            m_BindItem = callback;
+        }
+
         /// <summary>
         /// Callback for unbinding a data item from the VisualElement.
         /// </summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs
index a8ee8bd1e3..9837f8619a 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/ScrollView.cs
@@ -114,6 +114,9 @@ public class ScrollView : VisualElement
             UxmlEnumAttributeDescription<ScrollViewMode> m_ScrollViewMode = new UxmlEnumAttributeDescription<ScrollViewMode>
             { name = "mode", defaultValue = ScrollViewMode.Vertical };
 
+            UxmlEnumAttributeDescription<NestedInteractionKind> m_NestedInteractionKind = new UxmlEnumAttributeDescription<NestedInteractionKind>
+            { name = "nested-interaction-kind", defaultValue = NestedInteractionKind.Default };
+
             UxmlBoolAttributeDescription m_ShowHorizontal = new UxmlBoolAttributeDescription
             { name = "show-horizontal-scroller" };
 
@@ -170,6 +173,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                     scrollView.showVertical = m_ShowVertical.GetValueFromBag(bag, cc);
 #pragma warning restore 618
 
+                scrollView.nestedInteractionKind = m_NestedInteractionKind.GetValueFromBag(bag, cc);
                 scrollView.horizontalPageSize = m_HorizontalPageSize.GetValueFromBag(bag, cc);
                 scrollView.verticalPageSize = m_VerticalPageSize.GetValueFromBag(bag, cc);
                 scrollView.scrollDecelerationRate = m_ScrollDecelerationRate.GetValueFromBag(bag, cc);
@@ -400,6 +404,38 @@ public TouchScrollBehavior touchScrollBehavior
             }
         }
 
+        /// <summary>
+        /// Options for controlling how nested <see cref="ScrollView"/> handles scrolling when reaching
+        /// the limits of the scrollable area.
+        /// </summary>
+        public enum NestedInteractionKind
+        {
+            /// <summary>
+            /// Automatically selects the behavior according to the context in which the UI runs. For touch input, typically mobile devices,
+            /// NestedInteractionKind.StopScrolling is used. For scroll wheel input, NestedInteractionKind.ForwardScrolling is used.
+            /// </summary>
+            Default,
+            /// <summary>
+            /// Scrolling capture will remain in the scroll view if it initiated the drag.
+            /// </summary>
+            StopScrolling,
+            /// <summary>
+            /// Scrolling will continue to the parent when no movement is possible in the scrolled direction.
+            /// </summary>
+            ForwardScrolling
+        }
+
+        NestedInteractionKind m_NestedInteractionKind;
+
+        /// <summary>
+        /// The behavior to use when scrolling reaches limits of a nested <see cref="ScrollView"/>.
+        /// </summary>
+        public NestedInteractionKind nestedInteractionKind
+        {
+            get => m_NestedInteractionKind;
+            set => m_NestedInteractionKind = value;
+        }
+
         void OnHorizontalScrollDragElementChanged(GeometryChangedEvent evt)
         {
             if (evt.oldRect.size == evt.newRect.size)
@@ -862,6 +898,7 @@ void OnPointerCapture(PointerCaptureEvent evt)
             if (m_CapturedTarget == null)
                 return;
 
+            m_ScrollingPointerId = evt.pointerId;
             m_CapturedTarget.RegisterCallback(m_CapturedTargetPointerMoveCallback);
             m_CapturedTarget.RegisterCallback(m_CapturedTargetPointerUpCallback);
         }
@@ -904,7 +941,7 @@ private void OnGeometryChanged(GeometryChangedEvent evt)
 
         private int m_ScrollingPointerId = PointerId.invalidPointerId;
         private const float k_VelocityLerpTimeFactor = 10;
-        internal const float ScrollThresholdSquared = 25;
+        internal const float ScrollThresholdSquared = 100;
         private Vector2 m_StartPosition;
         private Vector2 m_PointerStartPosition;
         private Vector2 m_Velocity;
@@ -913,6 +950,7 @@ private void OnGeometryChanged(GeometryChangedEvent evt)
         private Vector2 m_HighBounds;
         private float m_LastVelocityLerpTime;
         private bool m_StartedMoving;
+        private bool m_TouchStoppedVelocity;
         VisualElement m_CapturedTarget;
         EventCallback<PointerMoveEvent> m_CapturedTargetPointerMoveCallback;
         EventCallback<PointerUpEvent> m_CapturedTargetPointerUpCallback;
@@ -1147,24 +1185,15 @@ void OnPointerDown(PointerDownEvent evt)
                 var touchStopsVelocityOnly = Mathf.Abs(m_Velocity.x) > 10 || Mathf.Abs(m_Velocity.y) > 10;
 
                 m_ScrollingPointerId = evt.pointerId;
-                m_PointerStartPosition = evt.position;
-                m_StartPosition = scrollOffset;
                 m_StartedMoving = false;
-                m_Velocity = Vector2.zero;
-                m_SpringBackVelocity = Vector2.zero;
-
-                m_LowBounds = new Vector2(
-                    Mathf.Min(horizontalScroller.lowValue, horizontalScroller.highValue),
-                    Mathf.Min(verticalScroller.lowValue, verticalScroller.highValue));
-                m_HighBounds = new Vector2(
-                    Mathf.Max(horizontalScroller.lowValue, horizontalScroller.highValue),
-                    Mathf.Max(verticalScroller.lowValue, verticalScroller.highValue));
+                InitTouchScrolling(evt.position);
 
                 if (touchStopsVelocityOnly)
                 {
                     contentContainer.CapturePointer(evt.pointerId);
                     contentContainer.panel.PreventCompatibilityMouseEvents(evt.pointerId);
                     evt.StopPropagation();
+                    m_TouchStoppedVelocity = true;
                 }
             }
         }
@@ -1177,25 +1206,88 @@ void OnPointerMove(PointerMoveEvent evt)
             if (evt.isHandledByDraggable)
             {
                 m_PointerStartPosition = evt.position;
+                m_StartPosition = scrollOffset;
                 return;
             }
 
             Vector2 position = evt.position;
-            if (!m_StartedMoving && (position - m_PointerStartPosition).sqrMagnitude < ScrollThresholdSquared)
+            var delta = position - m_PointerStartPosition;
+            if (mode == ScrollViewMode.Horizontal)
+                delta.y = 0;
+            else if (mode == ScrollViewMode.Vertical)
+                delta.x = 0;
+
+            if (!m_TouchStoppedVelocity && !m_StartedMoving && delta.sqrMagnitude < ScrollThresholdSquared)
                 return;
 
-            m_StartedMoving = true;
+            var scrollResult = ComputeTouchScrolling(evt.position);
+
+            if (scrollResult != TouchScrollingResult.Forward)
+            {
+                evt.isHandledByDraggable = true;
+                evt.StopPropagation();
+
+                if (!contentContainer.HasPointerCapture(evt.pointerId))
+                    contentContainer.CapturePointer(evt.pointerId);
+            }
+            else
+            {
+                m_Velocity = Vector2.zero;
+            }
+        }
+
+        void OnPointerCancel(PointerCancelEvent evt)
+        {
+            ReleaseScrolling(evt.pointerId, evt.target);
+        }
+
+        void OnPointerUp(PointerUpEvent evt)
+        {
+            if (ReleaseScrolling(evt.pointerId, evt.target))
+            {
+                contentContainer.panel.PreventCompatibilityMouseEvents(evt.pointerId);
+                evt.StopPropagation();
+            }
+        }
+
+        // Internal for tests.
+        internal enum TouchScrollingResult
+        {
+            Apply,
+            Forward,
+            Block
+        }
+
+        // Internal for tests.
+        internal void InitTouchScrolling(Vector2 position)
+        {
+            m_PointerStartPosition = position;
+            m_StartPosition = scrollOffset;
+            m_Velocity = Vector2.zero;
+            m_SpringBackVelocity = Vector2.zero;
+
+            m_LowBounds = new Vector2(
+                Mathf.Min(horizontalScroller.lowValue, horizontalScroller.highValue),
+                Mathf.Min(verticalScroller.lowValue, verticalScroller.highValue));
+            m_HighBounds = new Vector2(
+                Mathf.Max(horizontalScroller.lowValue, horizontalScroller.highValue),
+                Mathf.Max(verticalScroller.lowValue, verticalScroller.highValue));
+        }
 
+        // Internal for tests.
+        internal TouchScrollingResult ComputeTouchScrolling(Vector2 position)
+        {
+            // Calculate offset based on touch scroll behavior.
             Vector2 newScrollOffset;
             if (touchScrollBehavior == TouchScrollBehavior.Clamped)
             {
-                newScrollOffset = m_StartPosition - (new Vector2(evt.position.x, evt.position.y) - m_PointerStartPosition);
+                newScrollOffset = m_StartPosition - (position - m_PointerStartPosition);
                 newScrollOffset = Vector2.Max(newScrollOffset, m_LowBounds);
                 newScrollOffset = Vector2.Min(newScrollOffset, m_HighBounds);
             }
             else if (touchScrollBehavior == TouchScrollBehavior.Elastic)
             {
-                Vector2 deltaPointer = new Vector2(evt.position.x, evt.position.y) - m_PointerStartPosition;
+                Vector2 deltaPointer = position - m_PointerStartPosition;
                 newScrollOffset.x = ComputeElasticOffset(deltaPointer.x, m_StartPosition.x,
                     m_LowBounds.x, m_LowBounds.x - contentViewport.resolvedStyle.width,
                     m_HighBounds.x, m_HighBounds.x + contentViewport.resolvedStyle.width);
@@ -1205,9 +1297,33 @@ void OnPointerMove(PointerMoveEvent evt)
             }
             else
             {
-                newScrollOffset = m_StartPosition - (new Vector2(evt.position.x, evt.position.y) - m_PointerStartPosition);
+                newScrollOffset = m_StartPosition - (position - m_PointerStartPosition);
             }
 
+            // Cancel opposite axis if mode is set to only a single direction.
+            if (mode == ScrollViewMode.Vertical)
+                newScrollOffset.x = m_LowBounds.x;
+            else if (mode == ScrollViewMode.Horizontal)
+                newScrollOffset.y = m_LowBounds.y;
+
+            var shouldScrollOffsetChange = scrollOffset != newScrollOffset;
+            if (shouldScrollOffsetChange)
+            {
+                ApplyTouchScrolling(newScrollOffset);
+                return TouchScrollingResult.Apply;
+            }
+
+            var shouldBlock = m_StartedMoving && nestedInteractionKind != NestedInteractionKind.ForwardScrolling;
+            if (shouldBlock)
+                return TouchScrollingResult.Block;
+
+            return TouchScrollingResult.Forward;
+        }
+
+        void ApplyTouchScrolling(Vector2 newScrollOffset)
+        {
+            m_StartedMoving = true;
+
             if (hasInertia)
             {
                 // Reset velocity if we reached bounds.
@@ -1215,7 +1331,7 @@ void OnPointerMove(PointerMoveEvent evt)
                 {
                     m_Velocity = Vector2.zero;
                     scrollOffset = newScrollOffset;
-                    return; // We don't want to stop propagation, to allow nested draggables to respond.
+                    return;
                 }
 
                 // Account for idle pointer time.
@@ -1232,33 +1348,7 @@ void OnPointerMove(PointerMoveEvent evt)
                 m_Velocity = Vector2.Lerp(m_Velocity, newVelocity, deltaTime * k_VelocityLerpTimeFactor);
             }
 
-            var scrollOffsetChanged = scrollOffset != newScrollOffset;
             scrollOffset = newScrollOffset;
-
-            if (scrollOffsetChanged)
-            {
-                evt.isHandledByDraggable = true;
-                contentContainer.CapturePointer(evt.pointerId);
-                evt.StopPropagation();
-            }
-            else
-            {
-                m_Velocity = Vector2.zero;
-            }
-        }
-
-        void OnPointerCancel(PointerCancelEvent evt)
-        {
-            ReleaseScrolling(evt.pointerId, evt.target);
-        }
-
-        void OnPointerUp(PointerUpEvent evt)
-        {
-            if (ReleaseScrolling(evt.pointerId, evt.target))
-            {
-                contentContainer.panel.PreventCompatibilityMouseEvents(evt.pointerId);
-                evt.StopPropagation();
-            }
         }
 
         bool ReleaseScrolling(int pointerId, IEventHandler target)
@@ -1268,6 +1358,9 @@ bool ReleaseScrolling(int pointerId, IEventHandler target)
 
             m_ScrollingPointerId = PointerId.invalidPointerId;
 
+            m_TouchStoppedVelocity = false;
+            m_StartedMoving = false;
+
             if (target != contentContainer || !contentContainer.HasPointerCapture(pointerId))
                 return false;
 
@@ -1303,7 +1396,7 @@ void AdjustScrollers()
             verticalScroller.Adjust(verticalFactor);
         }
 
-        void UpdateScrollers(bool displayHorizontal, bool displayVertical)
+        internal void UpdateScrollers(bool displayHorizontal, bool displayVertical)
         {
             AdjustScrollers();
 
@@ -1374,7 +1467,7 @@ void OnScrollWheel(WheelEvent evt)
                 var oldVerticalValue = verticalScroller.value;
                 verticalScroller.value += evt.delta.y * (verticalScroller.lowValue < verticalScroller.highValue ? 1f : -1f) * m_SingleLineHeight;
 
-                if (verticalScroller.value != oldVerticalValue)
+                if (nestedInteractionKind == NestedInteractionKind.StopScrolling || !Mathf.Approximately(verticalScroller.value, oldVerticalValue))
                 {
                     evt.StopPropagation();
                     updateContentViewTransform = true;
@@ -1386,7 +1479,7 @@ void OnScrollWheel(WheelEvent evt)
                 var oldHorizontalValue = horizontalScroller.value;
                 horizontalScroller.value += horizontalScrollDelta * (horizontalScroller.lowValue < horizontalScroller.highValue ? 1f : -1f) * m_SingleLineHeight;
 
-                if (horizontalScroller.value != oldHorizontalValue)
+                if (nestedInteractionKind == NestedInteractionKind.StopScrolling || !Mathf.Approximately(horizontalScroller.value, oldHorizontalValue))
                 {
                     evt.StopPropagation();
                     updateContentViewTransform = true;
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs
index fe671b5668..aa4e97430f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Slider.cs
@@ -88,6 +88,17 @@ public Slider(string label, float start = 0, float end = kDefaultHighValue, Slid
             visualInput.AddToClassList(inputUssClassName);
         }
 
+        /// <inheritdoc />
+        public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, float startValue)
+        {
+            double sensitivity = NumericFieldDraggerUtility.CalculateFloatDragSensitivity(startValue, lowValue, highValue);
+            float acceleration = NumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+            double v = value;
+
+            v += NumericFieldDraggerUtility.NiceDelta(delta, acceleration) * sensitivity;
+            value = (float)v;
+        }
+
         internal override float SliderLerpUnclamped(float a, float b, float interpolant)
         {
             var newValue = Mathf.LerpUnclamped(a, b, interpolant);
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs b/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs
index b48a1335bf..a140d2bcc5 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/SliderInt.cs
@@ -108,6 +108,17 @@ public override float pageSize
             set { base.pageSize = Mathf.RoundToInt(value); }
         }
 
+        /// <inheritdoc />
+        public override void ApplyInputDeviceDelta(Vector3 delta, DeltaSpeed speed, int startValue)
+        {
+            double sensitivity = NumericFieldDraggerUtility.CalculateIntDragSensitivity(startValue, lowValue, highValue);
+            float acceleration = NumericFieldDraggerUtility.Acceleration(speed == DeltaSpeed.Fast, speed == DeltaSpeed.Slow);
+            long v = value;
+
+            v += (long)Math.Round(NumericFieldDraggerUtility.NiceDelta(delta, acceleration) * sensitivity);
+            value = (int)v;
+        }
+
         internal override int SliderLerpUnclamped(int a, int b, float interpolant)
         {
             return Mathf.RoundToInt(Mathf.LerpUnclamped((float)a, (float)b, interpolant));
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs
index 31a9152252..eea85a6347 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TextValueField.cs
@@ -135,6 +135,26 @@ public override TValueType value
             }
         }
 
+        internal override void UpdateValueFromText()
+        {
+            // Prevent text from changing when the value change
+            // This allow expression (2+2) or string like 00123 to remain as typed in the TextField until enter is pressed
+            m_UpdateTextFromValue = false;
+            try
+            {
+                value = StringToValue(text);
+            }
+            finally
+            {
+                m_UpdateTextFromValue = true;
+            }
+        }
+
+        internal override void UpdateTextFromValue()
+        {
+            text = ValueToString(rawValue);
+        }
+
         private void OnIsReadOnlyChanged(bool newValue)
         {
             EnableLabelDragger(!newValue);
@@ -176,56 +196,6 @@ public override void SetValueWithoutNotify(TValueType newValue)
             }
         }
 
-        [EventInterest(typeof(KeyDownEvent), typeof(ExecuteCommandEvent))]
-        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
-        {
-            base.ExecuteDefaultActionAtTarget(evt);
-
-            bool hasChanged = false;
-            if (evt.eventTypeId == KeyDownEvent.TypeId())
-            {
-                KeyDownEvent kde = evt as KeyDownEvent;
-
-                if ((kde?.character == 3) ||     // KeyCode.KeypadEnter
-                    (kde?.character == '\n'))    // KeyCode.Return
-                {
-                    if (textEdition.hasFocus)
-                        Focus();
-                    else
-                        textValueInput.textElement.Focus();
-                    evt.StopPropagation();
-                    evt.PreventDefault();
-                }
-                else if (!isReadOnly)
-                {
-                    hasChanged = true;
-                }
-            }
-            else if (!isReadOnly && evt.eventTypeId == ExecuteCommandEvent.TypeId())
-            {
-                ExecuteCommandEvent commandEvt = evt as ExecuteCommandEvent;
-                string cmdName = commandEvt.commandName;
-                if (cmdName == EventCommandNames.Paste || cmdName == EventCommandNames.Cut)
-                {
-                    hasChanged = true;
-                }
-            }
-
-            if (!isDelayed && hasChanged)
-            {
-                // Prevent text from changing when the value change
-                // This allow expression (2+2) or string like 00123 to remain as typed in the TextField until enter is pressed
-                m_UpdateTextFromValue = false;
-                try
-                {
-                    textInputBase.UpdateValueFromText();
-                }
-                finally
-                {
-                    m_UpdateTextFromValue = true;
-                }
-            }
-        }
 
         [EventInterest(typeof(BlurEvent), typeof(FocusEvent))]
         protected override void ExecuteDefaultAction(EventBase evt)
@@ -247,6 +217,7 @@ protected override void ExecuteDefaultAction(EventBase evt)
                 else
                 {
                     textInputBase.UpdateValueFromText();
+                    textInputBase.UpdateTextFromValue();
                 }
             }
             else if (evt.eventTypeId == FocusEvent.TypeId())
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs b/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs
index ab309cdf37..9cc3ba8a53 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/Toggle.cs
@@ -93,6 +93,13 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
         /// Unity adds this USS class to Text sub-elements of the <see cref="Toggle"/>.
         /// </remarks>
         public static readonly string textUssClassName = ussClassName + "__text";
+        /// <summary>
+        /// USS class name of Toggle elements that have mixed values
+        /// </summary>
+        /// <remarks>
+        /// Unity adds this USS class to checkmark of the <see cref="Toggle"/> when it has mixed values.
+        /// </remarks>
+        public static readonly string mixedValuesUssClassName = ussClassName + "__mixed-values";
 
         /// <summary>
         /// Creates a <see cref="Toggle"/> with no label.
@@ -123,5 +130,30 @@ protected override void InitLabel()
             base.InitLabel();
             m_Label.AddToClassList(textUssClassName);
         }
+
+        protected override void UpdateMixedValueContent()
+        {
+            if (showMixedValue)
+            {
+                visualInput.pseudoStates &= ~PseudoStates.Checked;
+                pseudoStates &= ~PseudoStates.Checked;
+                m_CheckMark.AddToClassList(mixedValuesUssClassName);
+            }
+            else
+            {
+                m_CheckMark.RemoveFromClassList(mixedValuesUssClassName);
+
+                if (value)
+                {
+                    visualInput.pseudoStates |= PseudoStates.Checked;
+                    pseudoStates |= PseudoStates.Checked;
+                }
+                else
+                {
+                    visualInput.pseudoStates &= ~PseudoStates.Checked;
+                    pseudoStates &= ~PseudoStates.Checked;
+                }
+            }
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs
index 2e410781b2..c758a3d26e 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TreeView.cs
@@ -70,8 +70,11 @@ public class TreeView : BaseTreeView
             get => m_MakeItem;
             set
             {
-                m_MakeItem = value;
-                Rebuild();
+                if (value != m_MakeItem)
+                {
+                    m_MakeItem = value;
+                    Rebuild();
+                }
             }
         }
 
@@ -92,8 +95,12 @@ public class TreeView : BaseTreeView
             get => m_BindItem;
             set
             {
-                m_BindItem = value;
-                RefreshItems();
+                if (value != m_BindItem)
+                {
+                    m_BindItem = value;
+                    RefreshItems();
+                }
+
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs
index 02b595eaf3..85a9c881b3 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitView.cs
@@ -215,6 +215,16 @@ public void UnCollapse()
             if (m_LeftPane == null)
                 return;
 
+            VisualElement collapsedPane = null;
+
+            if (m_LeftPane.style.display == DisplayStyle.None)
+                collapsedPane = m_LeftPane;
+            else if (m_RightPane.style.display == DisplayStyle.None)
+                collapsedPane = m_RightPane;
+
+            if (collapsedPane == null)
+                return;
+
             m_LeftPane.style.display = DisplayStyle.Flex;
             m_RightPane.style.display = DisplayStyle.Flex;
 
@@ -226,6 +236,16 @@ public void UnCollapse()
             m_CollapseMode = false;
 
             Init(m_FixedPaneIndex, m_FixedPaneInitialDimension, m_Orientation);
+
+            // Update the position of the drag line anchor after one of the pane gets uncollapsed.
+            // However, the computation of the position requires the resolved style of the panes to be computed.
+            collapsedPane.RegisterCallback<GeometryChangedEvent>(OnUncollapsedPaneResized);
+        }
+
+        void OnUncollapsedPaneResized(GeometryChangedEvent evt)
+        {
+            UpdateDragLineAnchorOffset();
+            (evt.target as VisualElement).UnregisterCallback<GeometryChangedEvent>(OnUncollapsedPaneResized);
         }
 
         internal void Init(int fixedPaneIndex, float fixedPaneInitialDimension, TwoPaneSplitViewOrientation orientation)
@@ -336,19 +356,22 @@ void PostDisplaySetup()
             m_FlexedPane.style.flexShrink = 0;
             m_FlexedPane.style.flexBasis = 0;
 
+            m_DragLineAnchor.style.left = 0;
+            m_DragLineAnchor.style.top = 0;
+
             if (m_Orientation == TwoPaneSplitViewOrientation.Horizontal)
             {
-                if (m_FixedPaneIndex == 0)
-                    m_DragLineAnchor.style.left = dimension;
-                else
-                    m_DragLineAnchor.style.left = this.resolvedStyle.width - dimension;
+                var fixedPaneMargins = m_FixedPane.resolvedStyle.marginLeft + m_FixedPane.resolvedStyle.marginRight;
+
+                m_DragLineAnchor.style.left = (m_FixedPaneIndex == 0) ? dimension + fixedPaneMargins :
+                    resolvedStyle.width - dimension - fixedPaneMargins;
             }
             else
             {
-                if (m_FixedPaneIndex == 0)
-                    m_DragLineAnchor.style.top = dimension;
-                else
-                    m_DragLineAnchor.style.top = this.resolvedStyle.height - dimension;
+                var fixedPaneMargins = m_FixedPane.resolvedStyle.marginTop + m_FixedPane.resolvedStyle.marginBottom;
+
+                m_DragLineAnchor.style.top = (m_FixedPaneIndex == 0) ? dimension + fixedPaneMargins :
+                   resolvedStyle.height - dimension - fixedPaneMargins;
             }
 
             int direction = 1;
@@ -357,10 +380,9 @@ void PostDisplaySetup()
             else
                 direction = -1;
 
-            if (m_FixedPaneIndex == 0)
-                m_Resizer = new TwoPaneSplitViewResizer(this, direction, m_Orientation);
-            else
-                m_Resizer = new TwoPaneSplitViewResizer(this, direction, m_Orientation);
+            if (m_Resizer != null)
+                m_DragLineAnchor.RemoveManipulator(m_Resizer);
+            m_Resizer = new TwoPaneSplitViewResizer(this, direction);
 
             m_DragLineAnchor.AddManipulator(m_Resizer);
 
@@ -369,46 +391,62 @@ void PostDisplaySetup()
 
         void OnSizeChange(GeometryChangedEvent evt)
         {
-            OnSizeChange();
+            UpdateLayout(true, true);
         }
 
-        void OnSizeChange()
+        void UpdateDragLineAnchorOffset()
+        {
+            UpdateLayout(false, true);
+        }
+
+        void UpdateLayout(bool updateFixedPane, bool updateDragLine)
         {
             if (m_CollapseMode)
                 return;
-
             var maxLength = resolvedStyle.width;
             var fixedPaneLength = m_FixedPane.resolvedStyle.width;
+            var fixedPaneMargins = m_FixedPane.resolvedStyle.marginLeft + m_FixedPane.resolvedStyle.marginRight;
             var fixedPaneMinLength = m_FixedPane.resolvedStyle.minWidth.value;
+            var flexedPaneMargins = m_FlexedPane.resolvedStyle.marginLeft + m_FlexedPane.resolvedStyle.marginRight;
             var flexedPaneMinLength = m_FlexedPane.resolvedStyle.minWidth.value;
 
             if (m_Orientation == TwoPaneSplitViewOrientation.Vertical)
             {
                 maxLength = resolvedStyle.height;
                 fixedPaneLength = m_FixedPane.resolvedStyle.height;
+                fixedPaneMargins = m_FixedPane.resolvedStyle.marginTop + m_FixedPane.resolvedStyle.marginBottom;
                 fixedPaneMinLength = m_FixedPane.resolvedStyle.minHeight.value;
+                flexedPaneMargins = m_FlexedPane.resolvedStyle.marginTop + m_FlexedPane.resolvedStyle.marginBottom;
                 flexedPaneMinLength = m_FlexedPane.resolvedStyle.minHeight.value;
             }
 
             // Big enough to account for current fixed pane size and flexed pane minimum size, so we let the layout
             // dictates where the dragger should be.
-            if (maxLength >= fixedPaneLength + flexedPaneMinLength)
+            if (maxLength >= fixedPaneLength + fixedPaneMargins + flexedPaneMinLength + flexedPaneMargins)
             {
-                SetDragLineOffset(m_FixedPaneIndex == 0 ? fixedPaneLength : maxLength - fixedPaneLength);
+                if (updateDragLine)
+                    SetDragLineOffset(m_FixedPaneIndex == 0 ? fixedPaneLength + fixedPaneMargins : maxLength - fixedPaneLength - fixedPaneMargins);
             }
             // Big enough to account for fixed and flexed pane minimum sizes, so we resize the fixed pane and adjust
             // where the dragger should be.
-            else if (maxLength >= fixedPaneMinLength + flexedPaneMinLength)
+            else if (maxLength >= fixedPaneMinLength + fixedPaneMargins + flexedPaneMinLength + flexedPaneMargins)
             {
-                var newDimension = maxLength - flexedPaneMinLength;
-                SetFixedPaneDimension(newDimension);
-                SetDragLineOffset(m_FixedPaneIndex == 0 ? newDimension : flexedPaneMinLength);
+                var newDimension = maxLength - flexedPaneMinLength - flexedPaneMargins - fixedPaneMargins;
+
+                if (updateFixedPane)
+                    SetFixedPaneDimension(newDimension);
+
+                if (updateDragLine)
+                    SetDragLineOffset(m_FixedPaneIndex == 0 ? newDimension + fixedPaneMargins: flexedPaneMinLength + flexedPaneMargins);
             }
             // Not big enough for fixed and flexed pane minimum sizes
             else
             {
-                SetFixedPaneDimension(fixedPaneMinLength);
-                SetDragLineOffset(m_FixedPaneIndex == 0 ? fixedPaneMinLength : flexedPaneMinLength);
+                if (updateFixedPane)
+                    SetFixedPaneDimension(fixedPaneMinLength);
+
+                if (updateDragLine)
+                    SetDragLineOffset(m_FixedPaneIndex == 0 ? fixedPaneMinLength + fixedPaneMargins : flexedPaneMinLength + flexedPaneMargins);
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitViewResizer.cs b/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitViewResizer.cs
index 423dafeddf..94eb51ac11 100644
--- a/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitViewResizer.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Controls/TwoPaneSplitViewResizer.cs
@@ -11,7 +11,7 @@ internal class TwoPaneSplitViewResizer : PointerManipulator
         TwoPaneSplitView m_SplitView;
 
         int m_Direction;
-        TwoPaneSplitViewOrientation m_Orientation;
+        TwoPaneSplitViewOrientation orientation => m_SplitView.orientation;
 
         VisualElement fixedPane => m_SplitView.fixedPane;
         VisualElement flexedPane => m_SplitView.flexedPane;
@@ -20,27 +20,48 @@ float fixedPaneMinDimension
         {
             get
             {
-                if (m_Orientation == TwoPaneSplitViewOrientation.Horizontal)
+                if (orientation == TwoPaneSplitViewOrientation.Horizontal)
                     return fixedPane.resolvedStyle.minWidth.value;
                 else
                     return fixedPane.resolvedStyle.minHeight.value;
             }
         }
 
+        float fixedPaneMargins
+        {
+            get
+            {
+                if (orientation == TwoPaneSplitViewOrientation.Horizontal)
+                    return fixedPane.resolvedStyle.marginLeft + fixedPane.resolvedStyle.marginRight;
+                else
+                    return fixedPane.resolvedStyle.marginTop + fixedPane.resolvedStyle.marginBottom;
+            }
+        }
+
         float flexedPaneMinDimension
         {
             get
             {
-                if (m_Orientation == TwoPaneSplitViewOrientation.Horizontal)
+                if (orientation == TwoPaneSplitViewOrientation.Horizontal)
                     return flexedPane.resolvedStyle.minWidth.value;
                 else
                     return flexedPane.resolvedStyle.minHeight.value;
             }
         }
 
-        public TwoPaneSplitViewResizer(TwoPaneSplitView splitView, int dir, TwoPaneSplitViewOrientation orientation)
+        float flexedPaneMargin
+        {
+            get
+            {
+                if (orientation == TwoPaneSplitViewOrientation.Horizontal)
+                    return flexedPane.resolvedStyle.marginLeft + flexedPane.resolvedStyle.marginRight;
+                else
+                    return flexedPane.resolvedStyle.marginTop + flexedPane.resolvedStyle.marginBottom;
+            }
+        }
+
+        public TwoPaneSplitViewResizer(TwoPaneSplitView splitView, int dir)
         {
-            m_Orientation = orientation;
             m_SplitView = splitView;
             m_Direction = dir;
             activators.Add(new ManipulatorActivationFilter { button = MouseButton.LeftMouse });
@@ -63,7 +84,7 @@ protected override void UnregisterCallbacksFromTarget()
 
         public void ApplyDelta(float delta)
         {
-            float oldDimension = m_Orientation == TwoPaneSplitViewOrientation.Horizontal
+            float oldDimension = orientation == TwoPaneSplitViewOrientation.Horizontal
                 ? fixedPane.resolvedStyle.width
                 : fixedPane.resolvedStyle.height;
             float newDimension = oldDimension + delta;
@@ -71,28 +92,28 @@ public void ApplyDelta(float delta)
             if (newDimension < oldDimension && newDimension < fixedPaneMinDimension)
                 newDimension = fixedPaneMinDimension;
 
-            float maxDimension = m_Orientation == TwoPaneSplitViewOrientation.Horizontal
+            float maxDimension = orientation == TwoPaneSplitViewOrientation.Horizontal
                 ? m_SplitView.resolvedStyle.width
                 : m_SplitView.resolvedStyle.height;
-            maxDimension -= flexedPaneMinDimension;
+            maxDimension -= flexedPaneMinDimension + flexedPaneMargin + fixedPaneMargins;
             if (newDimension > oldDimension && newDimension > maxDimension)
                 newDimension = maxDimension;
 
-            if (m_Orientation == TwoPaneSplitViewOrientation.Horizontal)
+            if (orientation == TwoPaneSplitViewOrientation.Horizontal)
             {
                 fixedPane.style.width = newDimension;
                 if (m_SplitView.fixedPaneIndex == 0)
-                    target.style.left = newDimension;
+                    target.style.left = newDimension + fixedPaneMargins;
                 else
-                    target.style.left = m_SplitView.resolvedStyle.width - newDimension;
+                    target.style.left = m_SplitView.resolvedStyle.width - newDimension - fixedPaneMargins;
             }
             else
             {
                 fixedPane.style.height = newDimension;
                 if (m_SplitView.fixedPaneIndex == 0)
-                    target.style.top = newDimension;
+                    target.style.top = newDimension + fixedPaneMargins;
                 else
-                    target.style.top = m_SplitView.resolvedStyle.height - newDimension;
+                    target.style.top = m_SplitView.resolvedStyle.height - newDimension - fixedPaneMargins;
             }
             m_SplitView.fixedPaneDimension = newDimension;
         }
@@ -122,7 +143,7 @@ protected void OnPointerMove(PointerMoveEvent e)
 
             Vector2 diff = e.localPosition - m_Start;
             var mouseDiff = diff.x;
-            if (m_Orientation == TwoPaneSplitViewOrientation.Vertical)
+            if (orientation == TwoPaneSplitViewOrientation.Vertical)
                 mouseDiff = diff.y;
 
             var delta = m_Direction * mouseDiff;
diff --git a/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs b/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs
index 9af6e2999b..97b4c7a932 100644
--- a/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DefaultEventSystem.cs
@@ -70,6 +70,9 @@ private bool ShouldIgnoreEventsOnAppNotFocused()
 
         private Event m_Event = new Event();
         private BaseRuntimePanel m_FocusedPanel;
+        private BaseRuntimePanel m_PreviousFocusedPanel;
+        private Focusable m_PreviousFocusedElement;
+        private EventModifiers m_CurrentModifiers;
 
         public BaseRuntimePanel focusedPanel
         {
@@ -102,21 +105,52 @@ public void Update(UpdateMode updateMode = UpdateMode.Always)
             if (!m_SendingPenEvent)
                 m_SendingTouchEvents = ProcessTouchEvents();
 
-            SendIMGUIEvents();
+            using (FocusBasedEventSequence())
+            {
+                SendIMGUIEvents();
+                SendInputEvents();
+            }
+        }
 
-            SendInputEvents();
+        internal struct FocusBasedEventSequenceContext : IDisposable
+        {
+            private DefaultEventSystem es;
+
+            public FocusBasedEventSequenceContext(DefaultEventSystem es)
+            {
+                this.es = es;
+                es.m_PreviousFocusedPanel = es.focusedPanel;
+                es.m_PreviousFocusedElement = es.focusedPanel?.focusController.GetLeafFocusedElement();
+            }
+            public void Dispose()
+            {
+                es.m_PreviousFocusedPanel = null;
+                es.m_PreviousFocusedElement = null;
+            }
+        }
+
+        internal FocusBasedEventSequenceContext FocusBasedEventSequence()
+        {
+            return new FocusBasedEventSequenceContext(this);
         }
 
         void SendIMGUIEvents()
         {
+            bool first = true;
+
             while (Event.PopEvent(m_Event))
             {
-                if (m_Event.type == EventType.Repaint)
+                if (m_Event.type == EventType.Ignore || m_Event.type == EventType.Repaint ||
+                    m_Event.type == EventType.Layout)
                     continue;
 
+                m_CurrentModifiers = first ? m_Event.modifiers : (m_CurrentModifiers | m_Event.modifiers);
+                first = false;
+
                 if (m_Event.type == EventType.KeyUp || m_Event.type == EventType.KeyDown)
                 {
                     SendFocusBasedEvent(self => UIElementsRuntimeUtility.CreateEvent(self.m_Event), this);
+                    ProcessTabEvent(m_Event, m_CurrentModifiers);
                 }
                 else if (!m_SendingTouchEvents && !m_SendingPenEvent && input.mousePresent)
                 {
@@ -151,29 +185,40 @@ void SendInputEvents()
 
             if (sendNavigationMove)
             {
-                SendFocusBasedEvent(self => NavigationMoveEvent.GetPooled(self.GetRawMoveVector()), this);
+                SendFocusBasedEvent(
+                    self => NavigationMoveEvent.GetPooled(self.GetRawMoveVector(),
+                        self.input.anyKey ? NavigationDeviceType.Keyboard : NavigationDeviceType.NonKeyboard,
+                        self.m_CurrentModifiers), this);
             }
 
             if (input.GetButtonDown(m_SubmitButton))
             {
-                SendFocusBasedEvent(self => NavigationSubmitEvent.GetPooled(), this);
+                SendFocusBasedEvent(
+                    self => NavigationSubmitEvent.GetPooled(
+                        self.input.anyKey ? NavigationDeviceType.Keyboard : NavigationDeviceType.NonKeyboard,
+                        self.m_CurrentModifiers), this);
             }
 
             if (input.GetButtonDown(m_CancelButton))
             {
-                SendFocusBasedEvent(self => NavigationCancelEvent.GetPooled(), this);
+                SendFocusBasedEvent(
+                    self => NavigationCancelEvent.GetPooled(
+                        self.input.anyKey ? NavigationDeviceType.Keyboard : NavigationDeviceType.NonKeyboard,
+                        self.m_CurrentModifiers), this);
             }
         }
 
         internal void SendFocusBasedEvent<TArg>(Func<TArg, EventBase> evtFactory, TArg arg)
         {
-            // Send focus-based events to focused panel if there's one
-            if (focusedPanel != null)
+            // Send all focus-based events to the same previously focused panel if there's one
+            // This allows Navigation events to use the same target as related KeyDown (and eventually Gamepad) events
+            if (m_PreviousFocusedPanel != null)
             {
                 using (EventBase evt = evtFactory(arg))
                 {
-                    focusedPanel.visualTree.SendEvent(evt);
-                    UpdateFocusedPanel(focusedPanel);
+                    evt.target = m_PreviousFocusedElement ?? m_PreviousFocusedPanel.visualTree;
+                    m_PreviousFocusedPanel.visualTree.SendEvent(evt);
+                    UpdateFocusedPanel(m_PreviousFocusedPanel);
                     return;
                 }
             }
@@ -190,16 +235,20 @@ internal void SendFocusBasedEvent<TArg>(Func<TArg, EventBase> evtFactory, TArg a
                 {
                     using (EventBase evt = evtFactory(arg))
                     {
+                        // Since there was no focused element, send event to the visualTree to avoid reacting to a
+                        // focus change in between events.
+                        evt.target = runtimePanel.visualTree;
                         runtimePanel.visualTree.SendEvent(evt);
 
-                        if (evt.processedByFocusController)
+                        if (runtimePanel.focusController.focusedElement != null)
                         {
-                            UpdateFocusedPanel(runtimePanel);
+                            focusedPanel = runtimePanel;
+                            break;
                         }
 
                         if (evt.isPropagationStopped)
                         {
-                            break;
+                            return;
                         }
                     }
                 }
@@ -219,82 +268,72 @@ void SendPositionBasedEvent<TArg>(Vector3 mousePosition, Vector3 delta, int poin
                 UpdateFocusedPanel(focusedPanel);
             }
 
-            var panels = UIElementsRuntimeUtility.GetSortedPlayerPanels();
-            for (var i = panels.Count - 1; i >= 0; i--)
-            {
-                var panel = panels[i];
-                if (panel is BaseRuntimePanel runtimePanel)
-                {
-                    if (panel.GetCapturingElement(pointerId) is VisualElement ve && ve.panel == panel)
-                    {
-                        runtimePanel.ScreenToPanel(mousePosition, delta, out var panelPosition, out var panelDelta, true);
+            var capturingPanel = PointerDeviceState.GetPlayerPanelWithSoftPointerCapture(pointerId);
 
-                        using (EventBase evt = evtFactory(panelPosition, panelDelta, arg))
-                        {
-                            runtimePanel.visualTree.SendEvent(evt);
+            // Allow element with pointer capture to update panel soft capture
+            var capturing = RuntimePanel.s_EventDispatcher.pointerState.GetCapturingElement(pointerId);
+            if (capturing is VisualElement capturingVE)
+            {
+                capturingPanel = capturingVE.panel;
+            }
 
-                            if (evt.processedByFocusController)
-                            {
-                                UpdateFocusedPanel(runtimePanel);
-                            }
+            BaseRuntimePanel targetPanel = null;
+            Vector2 targetPanelPosition = Vector2.zero;
+            Vector2 targetPanelDelta = Vector2.zero;
 
-                            // Only 1 panel receives the event.
-                            return;
-                        }
-                    }
-                }
+            if (capturingPanel is BaseRuntimePanel capturingRuntimePanel)
+            {
+                // Panel with soft capture has priority, that is it will receive pointer events until pointer up
+                targetPanel = capturingRuntimePanel;
+                targetPanel.ScreenToPanel(mousePosition, delta, out targetPanelPosition, out targetPanelDelta);
             }
-
-            // Find a candidate panel for the event
-            // Try all the panels, from closest to deepest
-            BaseRuntimePanel candidatePanel = null;
-            Vector2 candidateMousePosition = Vector2.zero;
-            Vector2 candidateDelta = Vector2.zero;
-            for (var i = panels.Count - 1; i >= 0; i--)
+            else
             {
-                if (panels[i] is BaseRuntimePanel runtimePanel && (targetDisplay == null || runtimePanel.targetDisplay == targetDisplay))
+                // Find a candidate panel for the event
+                // Try all the panels, from closest to deepest
+                var panels = UIElementsRuntimeUtility.GetSortedPlayerPanels();
+                for (var i = panels.Count - 1; i >= 0; i--)
                 {
-                    if (runtimePanel.ScreenToPanel(mousePosition, delta, out candidateMousePosition, out candidateDelta) &&
-                        runtimePanel.Pick(candidateMousePosition) != null)
+                    if (panels[i] is BaseRuntimePanel runtimePanel && (targetDisplay == null || runtimePanel.targetDisplay == targetDisplay))
                     {
-                        candidatePanel = runtimePanel;
-                        break;
+                        if (runtimePanel.ScreenToPanel(mousePosition, delta, out targetPanelPosition, out targetPanelDelta) &&
+                            runtimePanel.Pick(targetPanelPosition) != null)
+                        {
+                            targetPanel = runtimePanel;
+                            break;
+                        }
                     }
                 }
             }
 
             BaseRuntimePanel lastActivePanel = PointerDeviceState.GetPanel(pointerId, ContextType.Player) as BaseRuntimePanel;
-            if (lastActivePanel != null && lastActivePanel != candidatePanel)
+
+            if (lastActivePanel != targetPanel)
             {
-                // Send an event to the last panel the pointer was in, so it can dispatch [Mouse|Pointer][Out|Leave] events.
-                lastActivePanel.ScreenToPanel(mousePosition, delta, out var panelPosition, out var panelDelta, true);
-                using (EventBase lastActivePanelEvent = evtFactory(panelPosition, panelDelta, arg))
-                {
-                    lastActivePanel.visualTree.SendEvent(lastActivePanelEvent);
-                }
+                // Allow last panel the pointer was in to dispatch [Mouse|Pointer][Out|Leave] events if needed.
+                lastActivePanel?.PointerLeavesPanel(pointerId, lastActivePanel.ScreenToPanel(mousePosition));
+                targetPanel?.PointerEntersPanel(pointerId, targetPanelPosition);
             }
 
-            if (candidatePanel != null)
+            if (targetPanel != null)
             {
-                using (EventBase evt = evtFactory(candidateMousePosition, candidateDelta, arg))
+                using (EventBase evt = evtFactory(targetPanelPosition, targetPanelDelta, arg))
                 {
-                    candidatePanel.visualTree.SendEvent(evt);
+                    targetPanel.visualTree.SendEvent(evt);
 
                     if (evt.processedByFocusController)
                     {
-                        UpdateFocusedPanel(candidatePanel);
+                        UpdateFocusedPanel(targetPanel);
                     }
+
+                    if (evt.eventTypeId == PointerDownEvent.TypeId())
+                        PointerDeviceState.SetPlayerPanelWithSoftPointerCapture(pointerId, targetPanel);
+                    else if (evt.eventTypeId == PointerUpEvent.TypeId() && ((PointerUpEvent)evt).pressedButtons == 0)
+                        PointerDeviceState.SetPlayerPanelWithSoftPointerCapture(pointerId, null);
                 }
             }
             else
             {
-                if (lastActivePanel == null)
-                {
-                    // Mouse and pointer events calls PointerDeviceState.SavePointerPosition in their PreDispatch().
-                    // If we did not send any event, we need to manually update the pointer position.
-                    PointerDeviceState.SavePointerPosition(pointerId, mousePosition, null, ContextType.Player);
-                }
-
                 if (deselectIfNoTarget)
                 {
                     focusedPanel = null;
@@ -470,6 +509,18 @@ static Vector2 GetLocalScreenPosition(Event evt, out int? targetDisplay)
             return evt.mousePosition;
         }
 
+        void ProcessTabEvent(Event e, EventModifiers modifiers)
+        {
+            if (e.type == EventType.KeyDown && e.character == '\t')
+            {
+                var direction = e.shift ? NavigationMoveEvent.Direction.Previous : NavigationMoveEvent.Direction.Next;
+                SendFocusBasedEvent(
+                    t => NavigationMoveEvent.GetPooled(t.direction,
+                        t.input.anyKey ? NavigationDeviceType.Keyboard : NavigationDeviceType.NonKeyboard, t.modifiers),
+                    (direction, modifiers, input));
+            }
+        }
+
         internal interface IInput
         {
             bool GetButtonDown(string button);
@@ -482,6 +533,7 @@ internal interface IInput
             int touchCount { get; }
             Touch GetTouch(int index);
             bool mousePresent { get; }
+            bool anyKey { get; }
         }
 
         private class Input : IInput
@@ -496,6 +548,7 @@ private class Input : IInput
             public int touchCount => UnityEngine.Input.touchCount;
             public Touch GetTouch(int index) => UnityEngine.Input.GetTouch(index);
             public bool mousePresent => UnityEngine.Input.mousePresent;
+            public bool anyKey => UnityEngine.Input.anyKey;
         }
 
         private class NoInput : IInput
@@ -510,6 +563,7 @@ public void ClearLastPenContactEvent() { }
             public PenData GetPenEvent(int index) => default;
             public PenData GetLastPenContactEvent() => default;
             public bool mousePresent => false;
+            public bool anyKey => false;
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/DropdownMenu.cs b/ModuleOverrides/com.unity.ui/Core/DropdownMenu.cs
index a07b45c94c..e60eadb88d 100644
--- a/ModuleOverrides/com.unity.ui/Core/DropdownMenu.cs
+++ b/ModuleOverrides/com.unity.ui/Core/DropdownMenu.cs
@@ -319,6 +319,14 @@ public void RemoveItemAt(int index)
             m_MenuItems.RemoveAt(index);
         }
 
+        /// <summary>
+        /// Clear the all items from the menu.
+        /// </summary>
+        public void ClearItems()
+        {
+            m_MenuItems.Clear();
+        }
+
         /// <summary>
         /// Update the status of all items by calling their status callback and remove the separators in excess. This is called just before displaying the menu.
         /// </summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/EventDispatcher.cs b/ModuleOverrides/com.unity.ui/Core/EventDispatcher.cs
index 02dee2fc35..1585cdf0d9 100644
--- a/ModuleOverrides/com.unity.ui/Core/EventDispatcher.cs
+++ b/ModuleOverrides/com.unity.ui/Core/EventDispatcher.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using JetBrains.Annotations;
 
 namespace UnityEngine.UIElements
 {
@@ -119,6 +121,8 @@ struct EventRecord
         {
             public EventBase m_Event;
             public IPanel m_Panel;
+            public StackTrace m_StackTrace;
+            public string stackTrace => m_StackTrace?.ToString() ?? string.Empty;
         }
 
         private ClickDetector m_ClickDetector = new ClickDetector();
@@ -165,6 +169,7 @@ internal static void ClearEditorDispatcher()
             new KeyboardEventDispatchingStrategy(),
             new PointerEventDispatchingStrategy(),
             new MouseEventDispatchingStrategy(),
+            new NavigationEventDispatchingStrategy(),
             new CommandEventDispatchingStrategy(),
             new IMGUIEventDispatchingStrategy(),
             new DefaultDispatchingStrategy(),
@@ -204,7 +209,7 @@ bool dispatchImmediately
 
         internal bool processingEvents { get; private set; }
 
-        internal void Dispatch(EventBase evt, IPanel panel, DispatchMode dispatchMode)
+        internal void Dispatch(EventBase evt, [NotNull] IPanel panel, DispatchMode dispatchMode)
         {
             evt.MarkReceivedByDispatcher();
 
@@ -224,7 +229,13 @@ internal void Dispatch(EventBase evt, IPanel panel, DispatchMode dispatchMode)
             else
             {
                 evt.Acquire();
-                m_Queue.Enqueue(new EventRecord {m_Event = evt, m_Panel = panel});
+                m_Queue.Enqueue(new EventRecord
+                {
+                    m_Event = evt,
+                    m_Panel = panel,
+                    m_StackTrace = panel is BaseVisualElementPanel p &&
+                                   p.panelDebug != null && p.panelDebug.hasAttachedDebuggers ? new StackTrace() : null
+                });
             }
         }
 
@@ -307,7 +318,7 @@ void ProcessEventQueue()
                     }
                     catch (ExitGUIException e)
                     {
-                        Debug.Assert(caughtExitGUIException == null);
+                        Debug.Assert(caughtExitGUIException == null, eventRecord.stackTrace);
                         caughtExitGUIException = e;
                     }
                     finally
@@ -329,7 +340,7 @@ void ProcessEventQueue()
             }
         }
 
-        void ProcessEvent(EventBase evt, IPanel panel)
+        void ProcessEvent(EventBase evt, [NotNull] IPanel panel)
         {
             Event e = evt.imguiEvent;
             // Sometimes (in tests only?) we receive Used events. Protect our verification from this case.
@@ -344,9 +355,19 @@ void ProcessEvent(EventBase evt, IPanel panel)
                     ApplyDispatchingStrategies(evt, panel, imguiEventIsInitiallyUsed);
                 }
 
-                if (evt.path != null)
+                // Last chance to build a path. Some dispatching strategies (e.g. PointerCaptureDispatchingStrategy)
+                // don't call PropagateEvents but still need to call ExecuteDefaultActions on composite roots.
+                var path = evt.path;
+                if (path == null && evt.bubblesOrTricklesDown && evt.leafTarget is VisualElement leafTarget)
+                {
+                    path = PropagationPaths.Build(leafTarget, evt);
+                    evt.path = path;
+                    EventDebugger.LogPropagationPaths(evt, path);
+                }
+
+                if (path != null)
                 {
-                    foreach (var element in evt.path.targetElements)
+                    foreach (var element in path.targetElements)
                     {
                         if (element.panel == panel)
                         {
@@ -361,11 +382,15 @@ void ProcessEvent(EventBase evt, IPanel panel)
                 else
                 {
                     // If no propagation path, make sure EventDispatchUtilities.ExecuteDefaultAction has a target
-                    if (evt.target == null && panel != null)
+                    if (!(evt.target is VisualElement target))
+                    {
+                        evt.target = target = panel.visualTree;
+                    }
+
+                    if (target.panel == panel)
                     {
-                        evt.target = panel.visualTree;
+                        EventDispatchUtilities.ExecuteDefaultAction(evt);
                     }
-                    EventDispatchUtilities.ExecuteDefaultAction(evt);
                 }
 
                 m_DebuggerEventDispatchingStrategy.PostDispatch(evt, panel);
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs b/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs
index 907208c2c8..cf6651f99c 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/EventBase.cs
@@ -148,6 +148,9 @@ protected set
             }
         }
 
+        internal bool bubblesOrTricklesDown =>
+            (propagation & (EventPropagation.Bubbles | EventPropagation.TricklesDown)) != 0;
+
         internal bool skipDisabledElements
         {
             get { return (propagation & EventPropagation.SkipDisabledElements) != 0; }
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebugger.cs b/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebugger.cs
index d49dcd7fd4..24492934c9 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebugger.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebugger.cs
@@ -497,6 +497,21 @@ IEnumerator AwaitForNextEvent(int currentIndex)
                     panel.dispatcher.Dispatch(UIElementsUtility.CreateEvent(newEvent, EventType.KeyUp), panel,
                         DispatchMode.Default);
                 }
+                else if (eventBase.eventTypeId == NavigationMoveEvent.TypeId())
+                {
+                    panel.dispatcher.Dispatch(NavigationMoveEvent.GetPooled(eventBase.navigationDirection, eventBase.deviceType, eventBase.modifiers), panel,
+                        DispatchMode.Default);
+                }
+                else if (eventBase.eventTypeId == NavigationSubmitEvent.TypeId())
+                {
+                    panel.dispatcher.Dispatch(NavigationSubmitEvent.GetPooled(eventBase.deviceType, eventBase.modifiers), panel,
+                        DispatchMode.Default);
+                }
+                else if (eventBase.eventTypeId == NavigationCancelEvent.TypeId())
+                {
+                    panel.dispatcher.Dispatch(NavigationCancelEvent.GetPooled(eventBase.deviceType, eventBase.modifiers), panel,
+                        DispatchMode.Default);
+                }
                 else if (eventBase.eventTypeId == DragUpdatedEvent.TypeId())
                 {
                     newEvent.type = EventType.DragUpdated;
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs b/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs
index 717d1627ec..daf303668e 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/EventDebugger/EventDebuggerEventRecord.cs
@@ -65,6 +65,12 @@ internal class EventDebuggerEventRecord
         [field: SerializeField]
         public string commandName { get; private set; }
 
+        // Navigation events specific
+        [field: SerializeField]
+        public NavigationDeviceType deviceType { get; private set; }
+        [field: SerializeField]
+        public NavigationMoveEvent.Direction navigationDirection { get; private set; }
+
         void Init(EventBase evt)
         {
             var type = evt.GetType();
@@ -138,6 +144,16 @@ void Init(EventBase evt)
             {
                 commandName = commandEvent.commandName;
             }
+
+            INavigationEvent navigationEvent = evt as INavigationEvent;
+            if (navigationEvent != null)
+            {
+                deviceType = navigationEvent.deviceType;
+                if (evt is NavigationMoveEvent nme)
+                {
+                    navigationDirection = nme.direction;
+                }
+            }
         }
 
         public EventDebuggerEventRecord(EventBase evt)
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs b/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs
index a3ff75dc2c..bd6d4ebfba 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/EventHandler.cs
@@ -43,6 +43,10 @@ public interface IEventHandler
     /// </summary>
     public abstract class CallbackEventHandler : IEventHandler
     {
+        // IMGUIContainers are special snowflakes that need custom treatment regarding events.
+        // This enables early outs in some dispatching strategies.
+        internal bool isIMGUIContainer = false;
+
         EventCallbackRegistry m_CallbackRegistry;
 
         /// <summary>
@@ -230,6 +234,10 @@ public virtual void HandleEvent(EventBase evt)
                     {
                         m_CallbackRegistry?.InvokeCallbacks(evt, evt.propagationPhase);
                     }
+                    if (isIMGUIContainer && !evt.isPropagationStopped)
+                    {
+                        ((IMGUIContainer) this).ProcessEvent(evt);
+                    }
                     break;
                 }
 
@@ -244,6 +252,10 @@ public virtual void HandleEvent(EventBase evt)
                     {
                         m_CallbackRegistry?.InvokeCallbacks(evt, PropagationPhase.BubbleUp);
                     }
+                    if (isIMGUIContainer && !evt.isPropagationStopped)
+                    {
+                        ((IMGUIContainer) this).ProcessEvent(evt);
+                    }
                 }
                 break;
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/FocusEvents.cs b/ModuleOverrides/com.unity.ui/Core/Events/FocusEvents.cs
index 969113119e..010b0109d4 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/FocusEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/FocusEvents.cs
@@ -133,7 +133,7 @@ protected internal override void PreDispatch(IPanel panel)
 
             if (relatedTarget == null)
             {
-                focusController.DoFocusChange(null);
+                focusController.ProcessPendingFocusChange(null);
             }
         }
     }
@@ -184,7 +184,7 @@ static FocusEvent()
         protected internal override void PreDispatch(IPanel panel)
         {
             base.PreDispatch(panel);
-            focusController.DoFocusChange(target as Focusable);
+            focusController.ProcessPendingFocusChange(target as Focusable);
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/IEventDispatchingStrategy.cs b/ModuleOverrides/com.unity.ui/Core/Events/IEventDispatchingStrategy.cs
index 965644001e..75cad61ea6 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/IEventDispatchingStrategy.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/IEventDispatchingStrategy.cs
@@ -76,7 +76,7 @@ public static void PropagateEvent(EventBase evt)
             Debug.Assert(!evt.dispatch, "Event is being dispatched recursively.");
             evt.dispatch = true;
 
-            if ((evt.propagation & (EventBase.EventPropagation.Bubbles | EventBase.EventPropagation.TricklesDown)) == 0)
+            if (!evt.bubblesOrTricklesDown)
             {
                 // Early out if no callback on target.
                 if (ve.HasEventCallbacksOrDefaultActionAtTarget(evt.eventCategory))
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEventDispatchingStrategy.cs b/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEventDispatchingStrategy.cs
index 90014e5a2f..03ceab220c 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEventDispatchingStrategy.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEventDispatchingStrategy.cs
@@ -15,10 +15,16 @@ public void DispatchEvent(EventBase evt, IPanel panel)
         {
             if (panel != null)
             {
+                // Note that here we always overwrite evt.target, even if it's already set. This might be required by
+                // some pre-existing editor content, but it's not standard among the dispatching strategies and should
+                // probably be changed in the future.
+
                 var leafFocusElement = panel.focusController.GetLeafFocusedElement();
 
                 if (leafFocusElement != null)
                 {
+                    evt.target = leafFocusElement;
+
                     if (leafFocusElement.isIMGUIContainer)
                     {
                         IMGUIContainer imguiContainer =  (IMGUIContainer)leafFocusElement;
@@ -30,7 +36,6 @@ public void DispatchEvent(EventBase evt, IPanel panel)
                     }
                     else
                     {
-                        evt.target = leafFocusElement;
                         EventDispatchUtilities.PropagateEvent(evt);
                     }
                 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs b/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs
index d9259cce22..670f2d206f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/KeyboardEvents.cs
@@ -257,6 +257,65 @@ internal void GetEquivalentImguiEvent(Event outImguiEvent)
                 outImguiEvent.keyCode = keyCode;
             }
         }
+
+        protected internal override void PostDispatch(IPanel panel)
+        {
+            base.PostDispatch(panel);
+
+            // Only editor panels send navigation events automatically. This is because runtime panels may have an
+            // abstract input layer where navigation events can be triggered by various different input combinations.
+            // Note that by convention, stopping the KeyDownEvent will not stop resulting navigation events, but using
+            // the IMGUI Event will, because IMGUI has no other way of stopping the navigation events.
+            if (panel.contextType == ContextType.Editor && !(imguiEvent?.type == EventType.Used))
+            {
+                SendEquivalentNavigationEventIfAny(panel);
+            }
+        }
+
+        private void SendEquivalentNavigationEventIfAny(IPanel panel)
+        {
+            if (character == '\n' || character == 3 || character == 10 || character == ' ')
+            {
+                using (var ne = NavigationSubmitEvent.GetPooled(NavigationDeviceType.Keyboard, modifiers))
+                {
+                    ne.target = leafTarget;
+                    panel.visualTree.SendEvent(ne);
+                }
+            }
+            else if (keyCode == KeyCode.Escape)
+            {
+                using (var ne = NavigationCancelEvent.GetPooled(NavigationDeviceType.Keyboard, modifiers))
+                {
+                    ne.target = leafTarget;
+                    panel.visualTree.SendEvent(ne);
+                }
+            }
+            // Important: wait for character \t instead of KeyCode.Tab, because we don't want to insert a
+            // NavigationTabEvent between the two KeyDownEvents, in case some controls use \t to navigate.
+            else if (character == '\t' && !ctrlKey && !altKey && !commandKey)
+            {
+                using (var ne = NavigationMoveEvent.GetPooled(
+                    shiftKey ? NavigationMoveEvent.Direction.Previous : NavigationMoveEvent.Direction.Next,
+                    NavigationDeviceType.Keyboard, modifiers))
+                {
+                    ne.target = leafTarget;
+                    panel.visualTree.SendEvent(ne);
+                }
+            }
+            else if (keyCode == KeyCode.RightArrow || keyCode == KeyCode.LeftArrow ||
+                     keyCode == KeyCode.UpArrow || keyCode == KeyCode.DownArrow)
+            {
+                var d = keyCode == KeyCode.RightArrow ? Vector2.right :
+                    keyCode == KeyCode.LeftArrow ? Vector2.left :
+                    keyCode == KeyCode.UpArrow ? Vector2.up :
+                    Vector2.down;
+                using (var ne = NavigationMoveEvent.GetPooled(d, NavigationDeviceType.Keyboard, modifiers))
+                {
+                    ne.target = leafTarget;
+                    panel.visualTree.SendEvent(ne);
+                }
+            }
+        }
     }
 
     /// <summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/MouseEventDispatchingStrategy.cs b/ModuleOverrides/com.unity.ui/Core/Events/MouseEventDispatchingStrategy.cs
index cbc80f369e..b36858c09f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/MouseEventDispatchingStrategy.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/MouseEventDispatchingStrategy.cs
@@ -54,6 +54,7 @@ static bool SendEventToIMGUIContainer(EventBase evt, BaseVisualElementPanel pane
 
             // If root IMGUI doesn't use event, send it to other IMGUIs down the line.
             if (evt.propagateToIMGUI ||
+                evt.eventTypeId == DragExitedEvent.TypeId() ||
                 evt.eventTypeId == MouseEnterWindowEvent.TypeId() ||
                 evt.eventTypeId == MouseLeaveWindowEvent.TypeId())
             {
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/NavigationEventDispatchingStrategy.cs b/ModuleOverrides/com.unity.ui/Core/Events/NavigationEventDispatchingStrategy.cs
index 838dfd6371..b7c8dc1308 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/NavigationEventDispatchingStrategy.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/NavigationEventDispatchingStrategy.cs
@@ -15,7 +15,7 @@ public void DispatchEvent(EventBase evt, IPanel panel)
         {
             if (panel != null)
             {
-                evt.target = panel.focusController.GetLeafFocusedElement() ?? panel.visualTree;
+                evt.target ??= panel.focusController.GetLeafFocusedElement() ?? panel.visualTree;
                 EventDispatchUtilities.PropagateEvent(evt);
             }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/NavigationEvents.cs b/ModuleOverrides/com.unity.ui/Core/Events/NavigationEvents.cs
index bce7eadf6b..0e77ccf9f7 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/NavigationEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/NavigationEvents.cs
@@ -2,8 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using UnityEngine;
-using UnityEngine.UIElements;
 
 namespace UnityEngine.UIElements
 {
@@ -12,6 +10,83 @@ namespace UnityEngine.UIElements
     /// </summary>
     public interface INavigationEvent
     {
+        /// <summary>
+        /// Gets flags that indicate whether modifier keys (Alt, Ctrl, Shift, Windows/Cmd) are pressed.
+        /// </summary>
+        EventModifiers modifiers { get; }
+
+        /// <summary>
+        /// Describes the type of device this event was created from.
+        /// </summary>
+        /// <remarks>
+        /// The device type indicates whether there should be an KeyDownEvent observable before this navigation event.
+        /// </remarks>
+        internal NavigationDeviceType deviceType { get; }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Shift key is pressed. True means the Shift key is pressed.
+        /// False means it isn't.
+        /// </summary>
+        bool shiftKey { get; }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Ctrl key is pressed. True means the Ctrl key is pressed.
+        /// False means it isn't.
+        /// </summary>
+        bool ctrlKey { get; }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Windows/Cmd key is pressed. True means the Windows/Cmd key
+        /// is pressed. False means it isn't.
+        /// </summary>
+        bool commandKey { get; }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Alt key is pressed. True means the Alt key is pressed.
+        /// False means it isn't.
+        /// </summary>
+        bool altKey { get; }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the platform-specific action key is pressed. True means the action
+        /// key is pressed. False means it isn't.
+        /// </summary>
+        /// <remarks>
+        /// The platform-specific action key is Cmd on macOS, and Ctrl on all other platforms.
+        /// </remarks>
+        bool actionKey { get; }
+    }
+
+    /// <summary>
+    /// Describes types of devices that can generate navigation events.
+    /// This can help avoid duplicated treatment of events when some controls react to keyboard input
+    /// using KeyDownEvent while others react to navigation events coming from the same keyboard input.
+    /// </summary>
+    internal enum NavigationDeviceType
+    {
+        /// <summary>
+        /// Indicates that no specific information is known about this device.
+        /// </summary>
+        /// <remarks>
+        /// Controls reacting to navigation events from an unknown device should react conservatively.
+        /// For example, if there is a conflict between a KeyDownEvent and a subsequent navigation event,
+        /// a control could assume that the device type is a keyboard and conservatively block the navigation event.
+        /// </remarks>
+        Unknown = 0,
+        /// <summary>
+        /// Indicates that this device is known to be a keyboard.
+        /// </summary>
+        /// <remarks>
+        /// This device should also send a KeyDownEvent immediately before any navigation event it generates.
+        /// </remarks>
+        Keyboard,
+        /// <summary>
+        /// Indicates that this device is anything else than a keyboard (it could be a Gamepad, for example).
+        /// </summary>
+        /// <remarks>
+        /// This device should not send a KeyDownEvent before the navigation events it generates.
+        /// </remarks>
+        NonKeyboard
     }
 
     /// <summary>
@@ -24,6 +99,79 @@ public interface INavigationEvent
     [EventCategory(EventCategory.Navigation)]
     public abstract class NavigationEventBase<T> : EventBase<T>, INavigationEvent where T : NavigationEventBase<T>, new()
     {
+        /// <summary>
+        /// Gets flags that indicate whether modifier keys (Alt, Ctrl, Shift, Windows/Cmd) are pressed.
+        /// </summary>
+        public EventModifiers modifiers { get; protected set; }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Shift key is pressed. True means the Shift key is pressed.
+        /// False means it isn't.
+        /// </summary>
+        public bool shiftKey
+        {
+            get { return (modifiers & EventModifiers.Shift) != 0; }
+        }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Ctrl key is pressed. True means the Ctrl key is pressed.
+        /// False means it isn't.
+        /// </summary>
+        public bool ctrlKey
+        {
+            get { return (modifiers & EventModifiers.Control) != 0; }
+        }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Windows/Cmd key is pressed. True means the Windows/Cmd key
+        /// is pressed. False means it isn't.
+        /// </summary>
+        public bool commandKey
+        {
+            get { return (modifiers & EventModifiers.Command) != 0; }
+        }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the Alt key is pressed. True means the Alt key is pressed.
+        /// False means it isn't.
+        /// </summary>
+        public bool altKey
+        {
+            get { return (modifiers & EventModifiers.Alt) != 0; }
+        }
+
+        /// <summary>
+        /// Gets a boolean value that indicates whether the platform-specific action key is pressed. True means the action
+        /// key is pressed. False means it isn't.
+        /// </summary>
+        /// <remarks>
+        /// The platform-specific action key is Cmd on macOS, and Ctrl on all other platforms.
+        /// </remarks>
+        public bool actionKey
+        {
+            get
+            {
+                if (Application.platform == RuntimePlatform.OSXEditor ||
+                    Application.platform == RuntimePlatform.OSXPlayer)
+                {
+                    return commandKey;
+                }
+                else
+                {
+                    return ctrlKey;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Describes the type of device this event was created from.
+        /// </summary>
+        /// <remarks>
+        /// The device type indicates whether there should be an KeyDownEvent observable before this navigation event.
+        /// </remarks>
+        NavigationDeviceType INavigationEvent.deviceType => deviceType;
+        internal NavigationDeviceType deviceType { get; private set; }
+
         /// <summary>
         /// Constructor.
         /// </summary>
@@ -43,6 +191,32 @@ void LocalInit()
             propagation = EventPropagation.Bubbles | EventPropagation.TricklesDown | EventPropagation.Cancellable |
                 EventPropagation.SkipDisabledElements;
             propagateToIMGUI = false;
+            modifiers = EventModifiers.None;
+            deviceType = NavigationDeviceType.Unknown;
+        }
+
+        /// <summary>
+        /// Gets an event from the event pool and initializes it with the given values.
+        /// Use this function instead of creating new events.
+        /// Events obtained from this method should be released back to the pool using Dispose().
+        /// </summary>
+        /// <param name="modifiers">The modifier keys held down during the event.</param>
+        /// <param name="deviceType">The type of device this event was created from.</param>
+        /// <returns>An initialized navigation event.</returns>
+        public static T GetPooled(EventModifiers modifiers = EventModifiers.None)
+        {
+            T e = EventBase<T>.GetPooled();
+            e.modifiers = modifiers;
+            e.deviceType = NavigationDeviceType.Unknown;
+            return e;
+        }
+
+        internal static T GetPooled(NavigationDeviceType deviceType, EventModifiers modifiers = EventModifiers.None)
+        {
+            T e = EventBase<T>.GetPooled();
+            e.modifiers = modifiers;
+            e.deviceType = deviceType;
+            return e;
         }
     }
 
@@ -66,21 +240,30 @@ public enum Direction
             /// </summary>
             None,
             /// <summary>
-            /// Lefto.
+            /// Left.
             /// </summary>
             Left,
             /// <summary>
-            /// Upo.
+            /// Up.
             /// </summary>
             Up,
             /// <summary>
-            /// Righto.
+            /// Right.
             /// </summary>
             Right,
             /// <summary>
-            /// Downo.
+            /// Down.
             /// </summary>
-            Down
+            Down,
+
+            /// <summary>
+            /// Forwards, toward next element.
+            /// </summary>
+            Next,
+            /// <summary>
+            /// Backwards, toward previous element.
+            /// </summary>
+            Previous,
         }
 
         internal static Direction DetermineMoveDirection(float x, float y, float deadZone = 0.6f)
@@ -109,8 +292,12 @@ internal static Direction DetermineMoveDirection(float x, float y, float deadZon
         public Direction direction { get; private set; }
 
         /// <summary>
-        /// The move vector.
+        /// The move vector, if applicable.
         /// </summary>
+        /// <remarks>
+        /// This information is not guaranteed to be available through all input sources that can generate
+        /// NavigationMoveEvents. UI Toolkit standard controls should never depend on this value being set.
+        /// </remarks>
         public Vector2 move { get; private set; }
 
         /// <summary>
@@ -119,80 +306,49 @@ internal static Direction DetermineMoveDirection(float x, float y, float deadZon
         /// Events obtained from this method should be released back to the pool using Dispose().
         /// </summary>
         /// <param name="moveVector">The move vector.</param>
+        /// <param name="modifiers">The modifier keys held down during the event.</param>
         /// <returns>An initialized navigation event.</returns>
-        public static NavigationMoveEvent GetPooled(Vector2 moveVector)
+        public static NavigationMoveEvent GetPooled(Vector2 moveVector, EventModifiers modifiers = EventModifiers.None)
         {
-            NavigationMoveEvent e = GetPooled();
+            NavigationMoveEvent e = GetPooled(NavigationDeviceType.Unknown, modifiers);
             e.direction = DetermineMoveDirection(moveVector.x, moveVector.y);
             e.move = moveVector;
             return e;
         }
 
-        /// <summary>
-        /// Initialize the event members.
-        /// </summary>
-        protected override void Init()
+        internal static NavigationMoveEvent GetPooled(Vector2 moveVector, NavigationDeviceType deviceType, EventModifiers modifiers = EventModifiers.None)
         {
-            base.Init();
-            direction = Direction.None;
-            move = Vector2.zero;
-        }
-
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        public NavigationMoveEvent()
-        {
-            Init();
-        }
-    }
-
-    // This event is not used in current UIElementsEventSystem implementation but is used by the
-    // Input System integration branch.
-    // Ideally this would be made public and replace the KeyDownEvent with KeyCode.Tab in UIElementsEventSystem too.
-    /// <summary>
-    /// Event typically sent when the user presses L1/R1 or presses tab or shift+tab key.
-    /// </summary>
-    internal class NavigationTabEvent : NavigationEventBase<NavigationTabEvent>
-    {
-        static NavigationTabEvent()
-        {
-            SetCreateFunction(() => new NavigationTabEvent());
-        }
-
-        /// <summary>
-        /// Tab event direction.
-        /// </summary>
-        public enum Direction
-        {
-            /// <summary>
-            /// No specific direction.
-            /// </summary>
-            None,
-            /// <summary>
-            /// Forwards, toward next element.
-            /// </summary>
-            Next,
-            /// <summary>
-            /// Backwards, toward previous element.
-            /// </summary>
-            Previous,
+            NavigationMoveEvent e = GetPooled(deviceType, modifiers);
+            e.direction = DetermineMoveDirection(moveVector.x, moveVector.y);
+            e.move = moveVector;
+            return e;
         }
 
         /// <summary>
-        /// The direction of the navigation
+        /// Gets an event from the event pool and initializes it with the given values.
+        /// Use this function instead of creating new events.
+        /// Events obtained from this method should be released back to the pool using Dispose().
         /// </summary>
-        public Direction direction { get; private set; }
-
-        internal static Direction DetermineMoveDirection(int moveValue)
+        /// <param name="direction">The logical direction of the navigation.</param>
+        /// <param name="modifiers">The modifier keys held down during the event.</param>
+        /// <returns>An initialized navigation event.</returns>
+        /// <remarks>
+        /// This method doesn't set any move vector. For NavigationMoveEvents using move vector information, see
+        /// <see cref="GetPooled(UnityEngine.Vector2,UnityEngine.EventModifiers,UnityEngine.UIElements.NavigationDeviceType)"/>.
+        /// </remarks>
+        public static NavigationMoveEvent GetPooled(Direction direction, EventModifiers modifiers = EventModifiers.None)
         {
-            return moveValue > 0 ? Direction.Next : moveValue < 0 ? Direction.Previous : Direction.None;
+            NavigationMoveEvent e = GetPooled(NavigationDeviceType.Unknown, modifiers);
+            e.direction = direction;
+            e.move = Vector2.zero;
+            return e;
         }
 
-        public static NavigationTabEvent GetPooled(int moveValue)
+        internal static NavigationMoveEvent GetPooled(Direction direction, NavigationDeviceType deviceType, EventModifiers modifiers = EventModifiers.None)
         {
-            NavigationTabEvent e = GetPooled();
-            e.direction = DetermineMoveDirection(moveValue);
+            NavigationMoveEvent e = GetPooled(deviceType, modifiers);
+            e.direction = direction;
+            e.move = Vector2.zero;
             return e;
         }
 
@@ -202,15 +358,21 @@ public static NavigationTabEvent GetPooled(int moveValue)
         protected override void Init()
         {
             base.Init();
-            direction = Direction.None;
+            LocalInit();
         }
 
         /// <summary>
         /// Constructor.
         /// </summary>
-        public NavigationTabEvent()
+        public NavigationMoveEvent()
         {
-            Init();
+            LocalInit();
+        }
+
+        void LocalInit()
+        {
+            direction = Direction.None;
+            move = Vector2.zero;
         }
     }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/PointerDeviceState.cs b/ModuleOverrides/com.unity.ui/Core/Events/PointerDeviceState.cs
index 0e6f171885..7c836c1199 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/PointerDeviceState.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/PointerDeviceState.cs
@@ -42,6 +42,11 @@ internal void SetLocation(Vector2 position, IPanel panel)
         private static PointerLocation[] s_PlayerPointerLocations = new PointerLocation[PointerId.maxPointers];
         private static int[] s_PressedButtons = new int[PointerId.maxPointers];
 
+        // When a pointer button is pressed on top of a runtime panel, that panel is flagged as having "soft capture" of that pointer,
+        // that is, unless an element has an actual pointer capture, pointer move events should stay inside this panel until
+        // all pointer buttons are released again. This is used by runtime panels to mimic GUIView.cpp window capture behavior.
+        private static readonly IPanel[] s_PlayerPanelWithSoftPointerCapture = new IPanel[PointerId.maxPointers];
+
         // For test usage
         internal static void Reset()
         {
@@ -50,6 +55,20 @@ internal static void Reset()
                 s_EditorPointerLocations[i].SetLocation(Vector2.zero, null);
                 s_PlayerPointerLocations[i].SetLocation(Vector2.zero, null);
                 s_PressedButtons[i] = 0;
+                s_PlayerPanelWithSoftPointerCapture[i] = null;
+            }
+        }
+
+        internal static void RemovePanelData(IPanel panel)
+        {
+            for (var i = 0; i < PointerId.maxPointers; i++)
+            {
+                if (s_EditorPointerLocations[i].Panel == panel)
+                    s_EditorPointerLocations[i].SetLocation(Vector2.zero, null);
+                if (s_PlayerPointerLocations[i].Panel == panel)
+                   s_PlayerPointerLocations[i].SetLocation(Vector2.zero, null);
+                if (s_PlayerPanelWithSoftPointerCapture[i] == panel)
+                   s_PlayerPanelWithSoftPointerCapture[i] = null;
             }
         }
 
@@ -140,5 +159,15 @@ internal static bool HasAdditionalPressedButtons(int pointerId, int exceptButton
         {
             return (s_PressedButtons[pointerId] & ~(1 << exceptButtonId)) != 0;
         }
+
+        internal static void SetPlayerPanelWithSoftPointerCapture(int pointerId, IPanel panel)
+        {
+            s_PlayerPanelWithSoftPointerCapture[pointerId] = panel;
+        }
+
+        internal static IPanel GetPlayerPanelWithSoftPointerCapture(int pointerId)
+        {
+            return s_PlayerPanelWithSoftPointerCapture[pointerId];
+        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Events/PointerEventDispatchingStrategy.cs b/ModuleOverrides/com.unity.ui/Core/Events/PointerEventDispatchingStrategy.cs
index 02b0ba835e..c38aeab28d 100644
--- a/ModuleOverrides/com.unity.ui/Core/Events/PointerEventDispatchingStrategy.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Events/PointerEventDispatchingStrategy.cs
@@ -37,10 +37,15 @@ static void SetBestTargetForEvent(EventBase evt, IPanel panel)
             }
             else if (evt.target == null && elementUnderPointer == null)
             {
-                // Event occured outside the window.
-                // Send event to visual tree root and
-                // don't modify evt.propagateToIMGUI.
-                evt.target = panel?.visualTree;
+                // Event occurred outside the window.
+                // Fix for case 1306631 - a MouseUp event received outside of the GameView
+                // is re-directed to the DockArea IMGUIContainer. Otherwise send the event
+                // to the visual tree root and don't modify evt.propagateToIMGUI, allowing
+                // MouseLeaveWindow events may be received via trickle down traversal.
+                if (panel?.contextType == ContextType.Editor && evt.eventTypeId == PointerUpEvent.TypeId())
+                    evt.target = (panel as Panel)?.rootIMGUIContainer;
+                else
+                    evt.target = panel?.visualTree;
             }
             else if (evt.target != null)
             {
diff --git a/ModuleOverrides/com.unity.ui/Core/FocusController.cs b/ModuleOverrides/com.unity.ui/Core/FocusController.cs
index f6a9a76ffb..7392ce7ed4 100644
--- a/ModuleOverrides/com.unity.ui/Core/FocusController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/FocusController.cs
@@ -67,10 +67,6 @@ internal bool excludeFromFocusRing
             }
         }
 
-        // IMGUIContainers are special snowflakes that need custom treatment regarding events.
-        // This enables early outs in some dispatching strategies.
-        internal bool isIMGUIContainer = false;
-
         /// <summary>
         /// Return true if the element can be focused.
         /// </summary>
@@ -150,14 +146,14 @@ static Focusable GetFirstFocusableChild(VisualElement ve)
         }
 
         // If we open IFocusRing to users, we need to offer a way to listen to other event types.
-        [EventInterest(typeof(PointerDownEvent), typeof(KeyDownEvent), typeof(NavigationMoveEvent), typeof(NavigationTabEvent))]
+        [EventInterest(typeof(PointerDownEvent), typeof(NavigationMoveEvent))]
         protected override void ExecuteDefaultAction(EventBase evt)
         {
             base.ExecuteDefaultAction(evt);
             ProcessEvent(evt);
         }
 
-        [EventInterest(typeof(PointerDownEvent), typeof(KeyDownEvent), typeof(NavigationMoveEvent), typeof(NavigationTabEvent))]
+        [EventInterest(typeof(PointerDownEvent), typeof(NavigationMoveEvent))]
         internal override void ExecuteDefaultActionDisabled(EventBase evt)
         {
             base.ExecuteDefaultActionDisabled(evt);
@@ -265,15 +261,40 @@ struct FocusedElement
             public Focusable m_FocusedElement;
         }
 
+        TextElement m_SelectedTextElement;
+
+        internal TextElement selectedTextElement
+        {
+            get => m_SelectedTextElement;
+            set
+            {
+                if (m_SelectedTextElement == value)
+                    return;
+
+                m_SelectedTextElement?.selection.SelectNone();
+                m_SelectedTextElement = value;
+            }
+        }
+
         List<FocusedElement> m_FocusedElements = new List<FocusedElement>();
 
         /// <summary>
         /// The currently focused VisualElement.
         /// </summary>
-        public Focusable focusedElement => GetRetargetedFocusedElement(null);
+        public Focusable focusedElement
+        {
+            get
+            {
+                var result = GetRetargetedFocusedElement(null);
+                return IsLocalElement(result) ? result : null;
+            }
+        }
 
         internal bool IsFocused(Focusable f)
         {
+            if (!IsLocalElement(f))
+                return false;
+
             foreach (var fe in m_FocusedElements)
             {
                 if (fe.m_FocusedElement == f)
@@ -318,11 +339,20 @@ internal Focusable GetLeafFocusedElement()
         {
             if (m_FocusedElements.Count > 0)
             {
-                return m_FocusedElements[0].m_FocusedElement;
+                var result = m_FocusedElements[0].m_FocusedElement;
+                return IsLocalElement(result) ? result : null;
             }
             return null;
         }
 
+        private bool IsLocalElement(Focusable f)
+        {
+            // Case 1378840, case 1379300: if element leaves panel, its focus is invisible to its former panel.
+            // Case 1401673: however if element immediately comes back to panel, it's focus becomes visible again.
+            // This is needed to preserve focus when rebuilding PropertyEditor, which clears then re-adds everything.
+            return f?.focusController == this;
+        }
+
         private Focusable m_LastFocusedElement;
         private Focusable m_LastPendingFocusedElement;
         private int m_PendingFocusCount = 0;
@@ -364,6 +394,9 @@ internal void SetFocusToLastFocusedElement()
 
         internal void BlurLastFocusedElement()
         {
+            // Unselect selected TextElement when panel loses focus
+            selectedTextElement = null;
+
             if (m_LastFocusedElement != null && !(m_LastFocusedElement is IMGUIContainer))
             {
                 // Blur will change the lastFocusedElement to null
@@ -373,6 +406,7 @@ internal void BlurLastFocusedElement()
             }
         }
 
+        // Do the focus change for real, no questions asked. This will not trigger any events.
         internal void DoFocusChange(Focusable f)
         {
             m_FocusedElements.Clear();
@@ -388,10 +422,15 @@ internal void DoFocusChange(Focusable f)
                 }
                 ve = ve.hierarchy.parent;
             }
+        }
 
+        internal void ProcessPendingFocusChange(Focusable f)
+        {
             m_PendingFocusCount--;
             if (m_PendingFocusCount == 0)
                 m_LastPendingFocusedElement = null;
+
+            DoFocusChange(f);
         }
 
         internal Focusable FocusNextInDirection(FocusChangeDirection direction)
@@ -495,23 +534,20 @@ internal void SwitchFocus(Focusable newFocusedElement, FocusChangeDirection dire
             }
         }
 
-        internal Focusable SwitchFocusOnEvent(EventBase e)
+        internal void SwitchFocusOnEvent(EventBase e)
         {
             if (e.processedByFocusController)
-                return GetLeafFocusedElement();
+                return;
 
             using (FocusChangeDirection direction = focusRing.GetFocusChangeDirection(GetLeafFocusedElement(), e))
             {
                 if (direction != FocusChangeDirection.none)
                 {
-                    Focusable f = FocusNextInDirection(direction);
+                    FocusNextInDirection(direction);
                     e.processedByFocusController = true;
-                    // f does not have the focus yet. It will when the series of focus events will have been handled.
-                    return f;
+                    // The new element does not have the focus until the series of focus events have been handled.
                 }
             }
-
-            return GetLeafFocusedElement();
         }
 
         internal void ReevaluateFocus()
diff --git a/ModuleOverrides/com.unity.ui/Core/GameObjects/NavigateFocusRing.cs b/ModuleOverrides/com.unity.ui/Core/GameObjects/NavigateFocusRing.cs
index 53856896aa..65372a5258 100644
--- a/ModuleOverrides/com.unity.ui/Core/GameObjects/NavigateFocusRing.cs
+++ b/ModuleOverrides/com.unity.ui/Core/GameObjects/NavigateFocusRing.cs
@@ -2,6 +2,8 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
+
 namespace UnityEngine.UIElements
 {
     internal class NavigateFocusRing : IFocusRing
@@ -15,8 +17,8 @@ public ChangeDirection(int i) : base(i) {}
         public static readonly ChangeDirection Right = new ChangeDirection(2);
         public static readonly ChangeDirection Up = new ChangeDirection(3);
         public static readonly ChangeDirection Down = new ChangeDirection(4);
-        public static readonly ChangeDirection Next = new ChangeDirection(5);
-        public static readonly ChangeDirection Previous = new ChangeDirection(6);
+        public static readonly FocusChangeDirection Next = VisualElementFocusChangeDirection.right;
+        public static readonly FocusChangeDirection Previous = VisualElementFocusChangeDirection.left;
 
         private readonly VisualElement m_Root;
         private readonly VisualElementFocusRing m_Ring;
@@ -44,54 +46,41 @@ public FocusChangeDirection GetFocusChangeDirection(Focusable currentFocusable,
                     case NavigationMoveEvent.Direction.Up: return Up;
                     case NavigationMoveEvent.Direction.Right: return Right;
                     case NavigationMoveEvent.Direction.Down: return Down;
+                    case NavigationMoveEvent.Direction.Next: return Next;
+                    case NavigationMoveEvent.Direction.Previous: return Previous;
                 }
             }
-            //TODO: make NavigationTabEvent public and use it here
-            else if (e.eventTypeId == KeyDownEvent.TypeId())
-            {
-                var kde = (KeyDownEvent)e;
-
-                // Important: using KeyDownEvent.character for focus prevents a TextField bug.
-                // IMGUI sends KeyDownEvent with keyCode != None, then it sends another one with character != '\0'.
-                // If we use keyCode instead of character, TextField will receive focus on the first KeyDownEvent,
-                // then text will become selected and, in the case of multiline, the KeyDownEvent with character = '\t'
-                // will immediately overwrite the text with a single Tab string.
-                if (kde.character == (char)25 || kde.character == '\t')
-                    return kde.shiftKey ? Previous : Next;
-            }
 
             return FocusChangeDirection.none;
         }
 
         public virtual Focusable GetNextFocusable(Focusable currentFocusable, FocusChangeDirection direction)
         {
-            if (direction is VisualElementFocusChangeTarget changeTarget)
-            {
-                return changeTarget.target;
-            }
-
-            if (direction == Next || direction == Previous)
-            {
-                return m_Ring.GetNextFocusable(currentFocusable, direction == Next
-                    ? VisualElementFocusChangeDirection.right
-                    : VisualElementFocusChangeDirection.left);
-            }
-
             if (direction == Up || direction == Down || direction == Right || direction == Left)
             {
                 return GetNextFocusable2D(currentFocusable, (ChangeDirection)direction);
             }
 
-            return currentFocusable;
+            return m_Ring.GetNextFocusable(currentFocusable, direction);
         }
 
+        // Searches for a navigable element starting from currentFocusable and scanning along the specified direction.
+        // If no elements are found, wraps around from the other side of the panel and scan along the same direction
+        // up to currentFocusable. If still no elements are found, returns currentFocusable.
+        //
+        // Though search order is hierarchy-based, the "best candidate" selection process is intended to be independent
+        // from any hierarchy consideration. Scanned elements are validated using an intersection test between their
+        // worldBound and a scanning validation rect, currentFocusable's worldBound extended to the panel's limits in
+        // the direction of the search (or from the other side during the second "wrap-around" scan).
+        //
+        // The best candidate is the element whose border is "least advanced" in the scanning direction, using the
+        // element's worldBound border opposite from scanning direction, left border when scanning right, right border
+        // for scanning left, etc. See FocusableHierarchyTraversal for more details and how further ties are resolved.
         Focusable GetNextFocusable2D(Focusable currentFocusable, ChangeDirection direction)
         {
             if (!(currentFocusable is VisualElement ve))
                 ve = m_Root;
 
-            ve = GetRootFocusable(ve);
-
             Rect panelBounds = m_Root.worldBoundingBox;
             Rect panelRect = new Rect(panelBounds.position - Vector2.one, panelBounds.size + Vector2.one * 2);
             Rect rect = ve.worldBound;
@@ -101,7 +90,7 @@ Focusable GetNextFocusable2D(Focusable currentFocusable, ChangeDirection directi
             else if (direction == Left) validRect.xMin = panelRect.xMin;
             else if (direction == Right) validRect.xMax = panelRect.xMax;
 
-            var best = new FocusableHierarchyTraversal
+            Focusable best = new FocusableHierarchyTraversal
             {
                 currentFocusable = ve,
                 direction = direction,
@@ -110,7 +99,7 @@ Focusable GetNextFocusable2D(Focusable currentFocusable, ChangeDirection directi
             }.GetBestOverall(m_Root);
 
             if (best != null)
-                return GetLeafFocusable(best);
+                return best;
 
             validRect = new Rect(rect.position - Vector2.one, rect.size + Vector2.one * 2);
             if (direction == Down) validRect.yMin = panelRect.yMin;
@@ -127,7 +116,7 @@ Focusable GetNextFocusable2D(Focusable currentFocusable, ChangeDirection directi
             }.GetBestOverall(m_Root);
 
             if (best != null)
-                return GetLeafFocusable(best);
+                return best;
 
             return currentFocusable;
         }
@@ -137,53 +126,13 @@ static bool IsActive(VisualElement v)
             return v.resolvedStyle.display != DisplayStyle.None && v.enabledInHierarchy;
         }
 
-        static bool IsFocusable(Focusable focusable)
-        {
-            return focusable.canGrabFocus && focusable.tabIndex >= 0;
-        }
-
-        static bool IsLeaf(Focusable focusable)
+        // Valid navigation results are
+        // - focusable: canGrabFocus and tabIndex >= 0
+        // - leaf: !delegatesFocus and !excludeFromFocusRing
+        static bool IsNavigable(Focusable focusable)
         {
-            return !focusable.excludeFromFocusRing && !focusable.delegatesFocus;
-        }
-
-        static bool IsFocusRoot(VisualElement focusable)
-        {
-            if (focusable.isCompositeRoot) return true;
-            var parent = focusable.hierarchy.parent;
-            return parent == null || !IsFocusable(parent);
-        }
-
-        static VisualElement GetLeafFocusable(VisualElement v)
-        {
-            return GetLeafFocusableRecursive(v) ?? v;
-        }
-
-        static VisualElement GetLeafFocusableRecursive(VisualElement v)
-        {
-            if (IsLeaf(v))
-                return v;
-            int n = v.childCount;
-            for (int i = 0; i < n; i++)
-            {
-                var child = v[i];
-                if (!IsFocusable(child))
-                    continue;
-                var leaf = GetLeafFocusableRecursive(child);
-                if (leaf != null)
-                    return leaf;
-            }
-            return null;
-        }
-
-        static VisualElement GetRootFocusable(VisualElement v)
-        {
-            while (true)
-            {
-                if (IsFocusRoot(v))
-                    return v;
-                v = v.hierarchy.parent;
-            }
+            return focusable.canGrabFocus && focusable.tabIndex >= 0 &&
+                   !focusable.delegatesFocus && !focusable.excludeFromFocusRing;
         }
 
         struct FocusableHierarchyTraversal
@@ -200,7 +149,7 @@ bool ValidateHierarchyTraversal(VisualElement v)
 
             bool ValidateElement(VisualElement v)
             {
-                return IsFocusable(v) && v.worldBound.Overlaps(validRect);
+                return IsNavigable(v) && v.worldBound.Overlaps(validRect);
             }
 
             int Order(VisualElement a, VisualElement b)
@@ -229,7 +178,7 @@ int StrictOrder(Rect ra, Rect rb)
 
             int TieBreaker(Rect ra, Rect rb)
             {
-                // Elements are aligned in the search axis. Find who's top-left corner is closer to current element.
+                // Elements are aligned in the search axis. Find whose top-left corner is closer to current element.
                 // TODO: use other corners if grow direction is not left-to-right / top-to-bottom
                 Rect rc = currentFocusable.worldBound;
                 float diff = (ra.min - rc.min).sqrMagnitude - (rb.min - rc.min).sqrMagnitude;
@@ -251,8 +200,7 @@ public VisualElement GetBestOverall(VisualElement candidate, VisualElement bestS
                         (bestSoFar == null || Order(bestSoFar, candidate) > 0))
                         bestSoFar = candidate;
 
-                    if (IsFocusRoot(candidate))
-                        return bestSoFar;
+                    return bestSoFar;
                 }
 
                 int n = candidate.childCount;
diff --git a/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs b/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs
index 6467523400..dbb2b5a39e 100644
--- a/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs
+++ b/ModuleOverrides/com.unity.ui/Core/GameObjects/PanelSettings.cs
@@ -152,6 +152,11 @@ private void DisposeRelatedPanel()
             {
                 UIElementsRuntimeUtility.DisposeRuntimePanel(m_Settings);
             }
+
+            internal void MarkPotentiallyEmpty()
+            {
+                UIElementsRuntimeUtility.MarkPotentiallyEmpty(m_Settings);
+            }
         }
 
 
@@ -213,6 +218,19 @@ public PanelScaleMode scaleMode
             set => m_ScaleMode = value;
         }
 
+        /// <summary>
+        /// Sprites have a Pixels Per Unit value that controls the pixel density of the sprite.
+        /// For sprites that have the same Pixels Per Unit value as the Reference Pixels Per Unit value in the
+        /// PanelSettings asset, the pixel density will be one to one.
+        /// </summary>
+        public float referenceSpritePixelsPerUnit {
+            get { return m_ReferenceSpritePixelsPerUnit; }
+            set { m_ReferenceSpritePixelsPerUnit = value; }
+        }
+
+        [SerializeField]
+        private float m_ReferenceSpritePixelsPerUnit = 100;
+
         [SerializeField]
         private float m_Scale = k_DefaultScaleValue;
 
@@ -441,7 +459,7 @@ internal static void SetupLiveReloadPanelTrackers(bool isLiveReloadOn)
         /// </summary>
         internal VisualElement visualTree => m_PanelAccess.panel.visualTree;
 
-        private UIDocumentList m_AttachedUIDocumentsList;
+        internal UIDocumentList m_AttachedUIDocumentsList;
 
         [HideInInspector]
         [SerializeField]
@@ -475,6 +493,8 @@ internal static void SetupLiveReloadPanelTrackers(bool isLiveReloadOn)
         private Rect m_TargetRect;
         private float m_ResolvedScale; // panel scaling factor (pixels <-> points)
 
+        private StyleSheet m_OldThemeUss;
+
         private PanelSettings()
         {
             m_PanelAccess = new RuntimePanelAccess(this);
@@ -498,7 +518,15 @@ private void OnEnable()
         {
             if (themeUss == null)
             {
-                Debug.LogWarning("No Theme Style Sheet set to PanelSettings " + name + ", UI will not render properly", this);
+                // In the Editor, we only want this to run when in play mode, because otherwise users may get a false
+                // alarm when the project is loading and the theme asset is not yet loaded. By keeping it here, we can
+                // still inform them of a potential problem (it's also in the PanelSettings inspector).
+                // On a built player, this will always show, so if they're UI is missing they can have a clue of why.
+                if (UIDocument.IsEditorPlayingOrWillChangePlaymode())
+                {
+                    Debug.LogWarning(
+                        "No Theme Style Sheet set to PanelSettings " + name + ", UI will not render properly", this);
+                }
             }
 
             InitializeShaders();
@@ -509,6 +537,11 @@ private void OnDisable()
             m_PanelAccess.DisposePanel();
         }
 
+        internal void DisposePanel()
+        {
+            m_PanelAccess.DisposePanel();
+        }
+
         private void ApplyThemeStyleSheet(VisualElement root = null)
         {
             if (!m_PanelAccess.isInitialized)
@@ -521,12 +554,20 @@ private void ApplyThemeStyleSheet(VisualElement root = null)
                 root = visualTree;
             }
 
+            if (m_OldThemeUss != themeUss && m_OldThemeUss != null)
+            {
+                root?.styleSheets.Remove(m_OldThemeUss);
+            }
+
             if (themeUss != null)
             {
+
                 // Ensure that isDefaultStyleSheet is set to true even though isDefaultStyleSheet is defaulted to true for ThemeStyleSheet.
                 themeUss.isDefaultStyleSheet = true;
                 root?.styleSheets.Add(themeUss);
             }
+
+            m_OldThemeUss = themeUss;
         }
 
         void InitializeShaders()
@@ -568,6 +609,7 @@ internal void ApplyPanelSettings()
             panel.targetDisplay = targetDisplay;
             panel.drawToCameras = false; //we don`t support WorldSpace rendering just yet
             panel.clearSettings = new PanelClearSettings {clearColor = m_ClearColor, clearDepthStencil = m_ClearDepthStencil, color = m_ColorClearValue};
+            panel.referenceSpritePixelsPerUnit = referenceSpritePixelsPerUnit;
 
             var atlas = panel.atlas as DynamicAtlas;
             if (atlas != null)
@@ -697,15 +739,11 @@ internal void DetachUIDocument(UIDocument uiDocument)
             m_AttachedUIDocumentsList.RemoveFromListAndFromVisualTree(uiDocument);
 
             if (m_AttachedUIDocumentsList.m_AttachedUIDocuments.Count == 0)
-            {
-                // No references to the panel, we can dispose it and it'll be recreated if it's used again.
-                m_PanelAccess.DisposePanel();
-            }
+                m_PanelAccess.MarkPotentiallyEmpty();
         }
 
         private float m_OldReferenceDpi;
         private float m_OldFallbackDpi;
-        private StyleSheet m_OldThemeUss;
         private RenderTexture m_OldTargetTexture;
         private float m_OldSortingOrder;
         private bool m_IsLoaded = false;
@@ -737,15 +775,7 @@ private void OnValidate()
                 if (m_OldThemeUss != themeUss)
                 {
                     var root = visualTree;
-                    if (root != null)
-                    {
-                        if (m_OldThemeUss != null)
-                        {
-                            root.styleSheets.Remove(m_OldThemeUss);
-                        }
-
-                        ApplyThemeStyleSheet(root);
-                    }
+                    ApplyThemeStyleSheet(root); // m_OldThemeUss is updated in ApplyThemeStyleSheet
                     isDirty = true;
                 }
 
@@ -768,7 +798,6 @@ private void OnValidate()
 
             m_OldReferenceDpi = m_ReferenceDpi;
             m_OldFallbackDpi = m_FallbackDpi;
-            m_OldThemeUss = themeUss;
             m_OldTargetTexture = m_TargetTexture;
             m_OldSortingOrder = m_SortingOrder;
 
diff --git a/ModuleOverrides/com.unity.ui/Core/GameObjects/RuntimePanel.cs b/ModuleOverrides/com.unity.ui/Core/GameObjects/RuntimePanel.cs
index 7e407701e7..e4dfec92cd 100644
--- a/ModuleOverrides/com.unity.ui/Core/GameObjects/RuntimePanel.cs
+++ b/ModuleOverrides/com.unity.ui/Core/GameObjects/RuntimePanel.cs
@@ -25,7 +25,7 @@ internal interface IRuntimePanel
 
     internal class RuntimePanel : BaseRuntimePanel, IRuntimePanel
     {
-        static readonly EventDispatcher s_EventDispatcher = RuntimeEventDispatcher.Create();
+        internal static readonly EventDispatcher s_EventDispatcher = RuntimeEventDispatcher.Create();
 
         private readonly PanelSettings m_PanelSettings;
         public PanelSettings panelSettings => m_PanelSettings;
diff --git a/ModuleOverrides/com.unity.ui/Core/GameObjects/UIDocument.cs b/ModuleOverrides/com.unity.ui/Core/GameObjects/UIDocument.cs
index 8c007202d3..c7ba9d5c18 100644
--- a/ModuleOverrides/com.unity.ui/Core/GameObjects/UIDocument.cs
+++ b/ModuleOverrides/com.unity.ui/Core/GameObjects/UIDocument.cs
@@ -400,7 +400,7 @@ private void RecreateUI()
         {
             if (m_RootVisualElement != null)
             {
-                m_RootVisualElement.RemoveFromHierarchy();
+               RemoveFromHierarchy();
                 m_PanelSettings?.panel.liveReloadSystem.UnregisterVisualTreeAssetTracker(m_RootVisualElement);
                 m_RootVisualElement = null;
             }
@@ -496,19 +496,7 @@ private void AddRootVisualElementToTree()
             }
         }
 
-        private void OnDisable()
-        {
-            if (m_RootVisualElement != null)
-            {
-                m_RootVisualElement.RemoveFromHierarchy();
-                // Unhook tracking, we're going down (but only after we detach from the panel).
-                if (m_PanelSettings != null)
-                    m_PanelSettings.panel.liveReloadSystem.UnregisterVisualTreeAssetTracker(m_RootVisualElement);
-                m_RootVisualElement = null;
-            }
-        }
-
-        private void OnDestroy()
+        private void RemoveFromHierarchy()
         {
             if (parentUI != null)
             {
@@ -520,6 +508,18 @@ private void OnDestroy()
             }
         }
 
+        private void OnDisable()
+        {
+            if (m_RootVisualElement != null)
+            {
+                RemoveFromHierarchy();
+                // Unhook tracking, we're going down (but only after we detach from the panel).
+                if (m_PanelSettings != null)
+                    m_PanelSettings.panel.liveReloadSystem.UnregisterVisualTreeAssetTracker(m_RootVisualElement);
+                m_RootVisualElement = null;
+            }
+        }
+
         private void OnTransformChildrenChanged()
         {
             // In Editor, when not playing, we let a watcher listen for hierarchy changed events, except if
@@ -677,7 +677,7 @@ private void OnValidate()
                 m_OldUxml = sourceAsset;
             }
 
-            if (m_PreviousPanelSettings != m_PanelSettings)
+            if (m_PreviousPanelSettings != m_PanelSettings && m_RootVisualElement != null && m_RootVisualElement.panel != null)
             {
                 // We'll use the setter as it guarantees the right behavior.
                 // It's necessary for the setter that the old value is still in place.
@@ -688,8 +688,12 @@ private void OnValidate()
 
             if (m_OldSortingOrder != m_SortingOrder)
             {
+                if (m_RootVisualElement != null && m_RootVisualElement.panel != null)
+                {
+                    ApplySortingOrder();
+                }
+
                 m_OldSortingOrder = m_SortingOrder;
-                ApplySortingOrder();
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/ILiveReloadAssetTracker.cs b/ModuleOverrides/com.unity.ui/Core/ILiveReloadAssetTracker.cs
index b8f8578460..cb9ebf5659 100644
--- a/ModuleOverrides/com.unity.ui/Core/ILiveReloadAssetTracker.cs
+++ b/ModuleOverrides/com.unity.ui/Core/ILiveReloadAssetTracker.cs
@@ -13,7 +13,7 @@ internal interface ILiveReloadAssetTracker<T> where T : ScriptableObject
         bool IsTrackingAsset(T asset);
         bool IsTrackingAssets();
         bool CheckTrackedAssetsDirty();
-        void UpdateAssetDirtyCount(T asset, int newDirtyCount);
+        void UpdateAssetTrackerCounts(T asset, int newDirtyCount, int newElementCount, int newInlinePropertiesCount, int newAttributePropertiesDirtyCount);
         bool OnAssetsImported(HashSet<T> changedAssets, HashSet<string> deletedAssets);
         void OnTrackedAssetChanged();
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/ILiveReloadSystem.cs b/ModuleOverrides/com.unity.ui/Core/ILiveReloadSystem.cs
index 074df6d893..0ec6998021 100644
--- a/ModuleOverrides/com.unity.ui/Core/ILiveReloadSystem.cs
+++ b/ModuleOverrides/com.unity.ui/Core/ILiveReloadSystem.cs
@@ -2,14 +2,24 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Collections.Generic;
 
 namespace UnityEngine.UIElements
 {
+    [Flags]
+    internal enum LiveReloadTrackers
+    {
+        Document = 1 << 0,
+        Text = 1 << 1,
+    }
+
     internal interface ILiveReloadSystem
     {
         bool enable { get; set; }
 
+        LiveReloadTrackers enabledTrackers { get; set; }
+
         void Update();
 
         void RegisterVisualTreeAssetTracker(ILiveReloadAssetTracker<VisualTreeAsset> tracker, VisualElement owner);
diff --git a/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs b/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs
index 34ccfc7e43..c413cd5b47 100644
--- a/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs
+++ b/ModuleOverrides/com.unity.ui/Core/IMGUIContainer.cs
@@ -185,6 +185,8 @@ public IMGUIContainer()
         public IMGUIContainer(Action onGUIHandler)
         {
             isIMGUIContainer = true;
+            eventCallbackCategories |= (int)EventCategoryFlags.TriggeredByOS |
+                                       (1 << (int)EventCategory.Navigation);
 
             AddToClassList(ussClassName);
 
@@ -502,15 +504,13 @@ public void MarkDirtyLayout()
             IncrementVersion(VersionChangeType.Layout);
         }
 
-        [EventInterest(EventInterestOptionsInternal.TriggeredByOS)]
-        protected override void ExecuteDefaultActionAtTarget(EventBase evt)
+        internal void ProcessEvent(EventBase evt)
         {
-            base.ExecuteDefaultActionAtTarget(evt);
-
-            if (evt.imguiEvent == null)
-                return;
-
-            if (SendEventToIMGUI(evt))
+            if (evt.imguiEvent != null && SendEventToIMGUI(evt) ||
+                // Prevent navigation events since IMGUI already uses KeyDown events
+                evt.eventTypeId == NavigationMoveEvent.TypeId() ||
+                evt.eventTypeId == NavigationSubmitEvent.TypeId() ||
+                evt.eventTypeId == NavigationCancelEvent.TypeId())
             {
                 evt.StopPropagation();
                 evt.PreventDefault();
@@ -600,7 +600,7 @@ private bool SendEventToIMGUIRaw(EventBase evt, bool canAffectFocus, bool verify
 
         private bool VerifyBounds(EventBase evt)
         {
-            return IsContainerCapturingTheMouse() || !IsLocalEvent(evt) || IsEventInsideLocalWindow(evt);
+            return IsContainerCapturingTheMouse() || !IsLocalEvent(evt) || IsEventInsideLocalWindow(evt) || IsDockAreaMouseUp(evt);
         }
 
         private bool IsContainerCapturingTheMouse()
@@ -625,6 +625,12 @@ private bool IsEventInsideLocalWindow(EventBase evt)
             return GUIUtility.HitTest(clippingRect, evt.originalMousePosition, isDirectManipulationDevice);
         }
 
+        private static bool IsDockAreaMouseUp(EventBase evt)
+        {
+            return evt.eventTypeId == MouseUpEvent.TypeId() &&
+                   evt.target == (evt.target as VisualElement)?.elementPanel.rootIMGUIContainer;
+        }
+
         private bool HandleIMGUIEvent(Event e, bool canAffectFocus)
         {
             return HandleIMGUIEvent(e, onGUIHandler, canAffectFocus);
diff --git a/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs b/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs
index 733da0f930..de66007ae7 100644
--- a/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/KeyboardNavigationManipulator.cs
@@ -90,14 +90,6 @@ protected override void UnregisterCallbacksFromTarget()
         }
 
         internal void OnKeyDown(KeyDownEvent evt)
-        {
-            if (target.panel?.contextType == ContextType.Editor)
-                OnEditorKeyDown(evt);
-            else
-                OnRuntimeKeyDown(evt);
-        }
-
-        void OnRuntimeKeyDown(KeyDownEvent evt)
         {
             // At the moment these actions are not mapped dynamically in the InputSystemEventSystem component.
             // When that becomes the case in the future, remove the following and use corresponding Navigation events.
@@ -111,35 +103,14 @@ KeyboardNavigationOperation GetOperation()
                     case KeyCode.PageUp: return KeyboardNavigationOperation.PageUp;
                     case KeyCode.PageDown: return KeyboardNavigationOperation.PageDown;
                 }
-                // TODO why do we want to invoke the callback in this case? Looks weird.
                 return KeyboardNavigationOperation.None;
             }
 
-            Invoke(GetOperation(), evt);
-        }
-
-        void OnEditorKeyDown(KeyDownEvent evt)
-        {
-            KeyboardNavigationOperation GetOperation()
+            var op = GetOperation();
+            if (op != KeyboardNavigationOperation.None)
             {
-                switch (evt.keyCode)
-                {
-                    case KeyCode.A when evt.actionKey: return KeyboardNavigationOperation.SelectAll;
-                    case KeyCode.Escape: return KeyboardNavigationOperation.Cancel;
-                    case KeyCode.Return:
-                    case KeyCode.KeypadEnter: return KeyboardNavigationOperation.Submit;
-                    case KeyCode.UpArrow: return KeyboardNavigationOperation.Previous;
-                    case KeyCode.DownArrow: return KeyboardNavigationOperation.Next;
-                    case KeyCode.Home: return KeyboardNavigationOperation.Begin;
-                    case KeyCode.End: return KeyboardNavigationOperation.End;
-                    case KeyCode.PageUp: return KeyboardNavigationOperation.PageUp;
-                    case KeyCode.PageDown: return KeyboardNavigationOperation.PageDown;
-                }
-
-                return KeyboardNavigationOperation.None;
+                Invoke(op, evt);
             }
-
-            Invoke(GetOperation(), evt);
         }
 
         void OnNavigationCancel(NavigationCancelEvent evt)
@@ -167,9 +138,6 @@ void OnNavigationMove(NavigationMoveEvent evt)
 
         void Invoke(KeyboardNavigationOperation operation, EventBase evt)
         {
-            if (operation == KeyboardNavigationOperation.None)
-                return;
-
             m_Action?.Invoke(operation, evt);
         }
     }
diff --git a/ModuleOverrides/com.unity.ui/Core/Panel.cs b/ModuleOverrides/com.unity.ui/Core/Panel.cs
index b891d5d48d..490e8b7b84 100644
--- a/ModuleOverrides/com.unity.ui/Core/Panel.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Panel.cs
@@ -175,6 +175,8 @@ internal interface IPanelDebug
         VisualElement visualTree { get; }
         VisualElement debugContainer { get; }
 
+        bool hasAttachedDebuggers { get; }
+
         void AttachDebugger(IPanelDebugger debugger);
         void DetachDebugger(IPanelDebugger debugger);
         void DetachAllDebuggers();
@@ -286,6 +288,8 @@ protected virtual void Dispose(bool disposing)
                 }
                 if (ownerObject != null)
                     UIElementsUtility.RemoveCachedPanel(ownerObject.GetInstanceID());
+
+                PointerDeviceState.RemovePanelData(this);
             }
             else
                 DisposeHelper.NotifyMissingDispose(this);
@@ -303,6 +307,7 @@ protected virtual void Dispose(bool disposing)
 
         public abstract void UpdateAssetTrackers();
         public abstract void DirtyStyleSheets();
+        internal abstract void UpdateInlineStylesRecursively(VisualElement root = null);
 
         public bool enableAssetReload
         {
@@ -358,6 +363,8 @@ public float scaledPixelsPerPoint
             get { return m_PixelsPerPoint * m_Scale; }
         }
 
+        public float referenceSpritePixelsPerUnit { get; set; } = 100.0f;
+
         // For backwards compatibility with debugger in 2020.1
         public PanelClearFlags clearFlags
         {
@@ -966,6 +973,21 @@ internal override IVisualTreeUpdater GetEditorUpdater(VisualTreeEditorUpdatePhas
             return m_VisualTreeUpdater.visualTreeEditorUpdater.GetUpdater(phase);
         }
 
+        internal override void UpdateInlineStylesRecursively(VisualElement rootElement = null)
+        {
+            var root = rootElement ?? m_RootContainer;
+
+            if (root.visualTreeAssetSource?.inlineSheet?.rules.Length == 0)
+                return;
+
+            foreach (var element in root.Children())
+            {
+                if (element.visualTreeAssetSource?.inlineSheet != null && element.inlineStyleAccess?.inlineRule.rule != null)
+                    element.UpdateInlineRule(element.visualTreeAssetSource.inlineSheet, element.inlineStyleAccess.inlineRule.rule);
+
+                UpdateInlineStylesRecursively(element);
+            }
+        }
 
         static internal event Action<Panel> beforeAnyRepaint;
 
@@ -1063,6 +1085,8 @@ public float sortingPriority
             }
         }
 
+        internal int resolvedSortingIndex = 0;
+
         public event Action destroyed;
 
         protected BaseRuntimePanel(ScriptableObject ownerObject, EventDispatcher dispatcher = null)
@@ -1126,7 +1150,7 @@ internal bool drawToCameras
 
         public override void Repaint(Event e)
         {
-            // if the renderTarget is not set, we simply render on whatever target is currently set
+            // if the targetTexture is not set, we simply render on whatever target is currently set
             if (targetTexture == null)
             {
                 // This is called after the camera(s) are done rendering, so the
@@ -1140,11 +1164,17 @@ public override void Repaint(Event e)
                 return;
             }
 
-            var toBeRestoredTarget = RenderTexture.active;
+            var oldCam = Camera.current;
+            var oldRT = RenderTexture.active;
+
+            Camera.SetupCurrent(null);
             RenderTexture.active = targetTexture;
+
             GL.Viewport(new Rect(0, 0, targetTexture.width, targetTexture.height));
             base.Repaint(e);
-            RenderTexture.active = toBeRestoredTarget;
+
+            Camera.SetupCurrent(oldCam);
+            RenderTexture.active = oldRT;
         }
 
         internal static readonly Func<Vector2, Vector2> DefaultScreenToPanelSpace = (p) => (p);
@@ -1168,6 +1198,8 @@ internal bool ScreenToPanel(Vector2 screenPosition, Vector2 screenDelta,
 
             Vector2 panelPrevPosition;
 
+            // We don't allow pointer events outside of a panel to be considered
+            // unless it is capturing the mouse (see SendPositionBasedEvent).
             if (!allowOutside)
             {
                 var panelRect = visualTree.layout;
@@ -1210,6 +1242,18 @@ private void AssignPanelToComponents(BaseRuntimePanel panel)
                 ObjectListPool<IRuntimePanelComponent>.Release(components);
             }
         }
+
+        internal void PointerLeavesPanel(int pointerId, Vector2 position)
+        {
+            ClearCachedElementUnderPointer(pointerId, null);
+            CommitElementUnderPointers();
+            PointerDeviceState.SavePointerPosition(pointerId, position, null, contextType);
+        }
+
+        internal void PointerEntersPanel(int pointerId, Vector2 position)
+        {
+            PointerDeviceState.SavePointerPosition(pointerId, position, this, contextType);
+        }
     }
 
     internal interface IRuntimePanelComponent
diff --git a/ModuleOverrides/com.unity.ui/Core/PointerCaptureController.cs b/ModuleOverrides/com.unity.ui/Core/PointerCaptureController.cs
index ad9464fd23..bf9aefb90a 100644
--- a/ModuleOverrides/com.unity.ui/Core/PointerCaptureController.cs
+++ b/ModuleOverrides/com.unity.ui/Core/PointerCaptureController.cs
@@ -2,8 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
-using System.Net;
 
 namespace UnityEngine.UIElements
 {
@@ -142,8 +140,8 @@ public void CapturePointer(IEventHandler handler, int pointerId)
         {
             if (pointerId == PointerId.mousePointerId && m_PendingPointerCapture[pointerId] != handler && GUIUtility.hotControl != 0)
             {
-                Debug.LogWarning("Should not be capturing when there is a hotcontrol");
-                return;
+                // Note that this will release the mouse and call ProcessPointerCapture immediately
+                GUIUtility.hotControl = 0;
             }
 
             m_PendingPointerCapture[pointerId] = handler;
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/SafeHandleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/SafeHandleAccess.cs
new file mode 100644
index 0000000000..485d873059
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/SafeHandleAccess.cs
@@ -0,0 +1,25 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEngine.UIElements
+{
+    internal  struct SafeHandleAccess
+    {
+        private  IntPtr m_Handle;
+
+        public SafeHandleAccess(IntPtr ptr)
+        {
+            m_Handle = ptr;
+        }
+
+        public static implicit operator IntPtr(SafeHandleAccess a)
+        {
+            if (a.m_Handle == IntPtr.Zero)
+                throw new ArgumentNullException();
+            return a.m_Handle;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandGenerator.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandGenerator.cs
index 4eb1f94555..1b882a2599 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandGenerator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandGenerator.cs
@@ -49,7 +49,8 @@ public unsafe static UIRStylePainter.ClosingInfo PaintElement(RenderChain render
 
             var isClippingWithStencil = ve.renderChainData.clipMethod == ClipMethod.Stencil;
             var isClippingWithScissors = ve.renderChainData.clipMethod == ClipMethod.Scissor;
-            if ((UIRUtility.IsElementSelfHidden(ve) && !isClippingWithStencil && !isClippingWithScissors) || ve.renderChainData.isHierarchyHidden)
+            var isGroup = (ve.renderHints & RenderHints.GroupTransform) != 0; // Groups need to push view and scissors
+            if ((UIRUtility.IsElementSelfHidden(ve) && !isClippingWithStencil && !isClippingWithScissors && !isGroup) || ve.renderChainData.isHierarchyHidden)
             {
                 if (ve.renderChainData.data != null)
                 {
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs
index 3b87c5f865..62879e8ceb 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRLayoutUpdater.cs
@@ -26,13 +26,6 @@ public override void OnVersionChanged(VisualElement ve, VersionChangeType versio
             if ((versionChangeType & (VersionChangeType.Layout | VersionChangeType.Hierarchy)) == 0)
                 return;
 
-            // Yoga DOES NOT expect the node tree to mutate while layout is being computed.
-            // it could lead to crashes (EXC_BAD_ACCESS)
-            if ((versionChangeType & VersionChangeType.Hierarchy) != 0 && panel.duringLayoutPhase)
-            {
-                throw new InvalidOperationException("Hierarchy change detected while computing layout, this is not supported.");
-            }
-
             var yogaNode = ve.yogaNode;
             if (yogaNode != null && yogaNode.IsMeasureDefined)
             {
@@ -40,12 +33,16 @@ public override void OnVersionChanged(VisualElement ve, VersionChangeType versio
             }
         }
 
+        List<KeyValuePair<Rect, VisualElement>> changeEventsList = new List<KeyValuePair<Rect, VisualElement>>();
+
         public override void Update()
         {
             // update flex once
             int validateLayoutCount = 0;
             while (visualTree.yogaNode.IsDirty)
             {
+                changeEventsList.Clear();
+
                 // Doing multiple layout passes requires to update the styles or else the
                 // elements may not be initialized properly and the resulting layout will be invalid.
                 if (validateLayoutCount > 0)
@@ -55,10 +52,8 @@ public override void Update()
                 visualTree.yogaNode.CalculateLayout();
                 panel.duringLayoutPhase = false;
 
-                using (new EventDispatcherGate(visualTree.panel.dispatcher))
-                {
-                    UpdateSubTree(visualTree, validateLayoutCount);
-                }
+                UpdateSubTree(visualTree, true, changeEventsList);
+                DispatchChangeEvents(changeEventsList, validateLayoutCount);
 
                 if (validateLayoutCount++ >= kMaxValidateLayoutCount)
                 {
@@ -75,19 +70,23 @@ public override void Update()
             visualTree.focusController.ReevaluateFocus();
         }
 
-        private void UpdateSubTree(VisualElement ve, int currentLayoutPass, bool isDisplayed = true)
+        private void UpdateSubTree(VisualElement ve, bool isDisplayed, List<KeyValuePair<Rect, VisualElement>> changeEvents)
         {
             Rect yogaLayoutRect = new Rect(ve.yogaNode.LayoutX, ve.yogaNode.LayoutY, ve.yogaNode.LayoutWidth, ve.yogaNode.LayoutHeight);
+
+            // we encode right/bottom into width/height
+            Rect rawPadding = new Rect(ve.yogaNode.LayoutPaddingLeft, ve.yogaNode.LayoutPaddingLeft, ve.yogaNode.LayoutPaddingRight, ve.yogaNode.LayoutPaddingBottom);
+
             // This is not the "real" padding rect: it may differ in size and position because the borders are ignored.
             // Alone, it cannot be used to identify padding size changes, because the bottom and right values depend on the
             // layout rect width/height. A change in layout rect width/height with a corresponding variation in
             // right/bottom values may yield the same pseudoPaddingRect. Fortunately, the layout rect size and padding rect
             // size change trigger the same code path which explains why we haven't seen any issue with this so far.
             Rect yogaPseudoPaddingRect = new Rect(
-                ve.yogaNode.LayoutPaddingLeft,
-                ve.yogaNode.LayoutPaddingTop,
-                ve.yogaNode.LayoutWidth - (ve.yogaNode.LayoutPaddingLeft + ve.yogaNode.LayoutPaddingRight),
-                ve.yogaNode.LayoutHeight - (ve.yogaNode.LayoutPaddingTop + ve.yogaNode.LayoutPaddingBottom));
+               rawPadding.x,
+                rawPadding.y,
+                yogaLayoutRect.width - (rawPadding.x + rawPadding.width),
+                yogaLayoutRect.height - (rawPadding.y + rawPadding.height));
             Rect lastLayoutRect = ve.lastLayout;
             Rect lastPseudoPaddingRect = ve.lastPseudoPadding;
             bool wasHierarchyDisplayed = ve.isHierarchyDisplayed;
@@ -124,20 +123,15 @@ private void UpdateSubTree(VisualElement ve, int currentLayoutPass, bool isDispl
                 var childCount = ve.hierarchy.childCount;
                 for (int i = 0; i < childCount; ++i)
                 {
-                    UpdateSubTree(ve.hierarchy[i], currentLayoutPass, isDisplayed);
+                    UpdateSubTree(ve.hierarchy[i], isDisplayed, changeEvents);
                 }
             }
 
             // Only send GeometryChanged events when the layout changes
-            // (padding changes don't affect the element's geometry).
+            // (padding changes don't affect the element's outer geometry).
             if ((layoutSizeChanged || layoutPositionChanged) && ve.HasEventCallbacksOrDefaultActions(GeometryChangedEvent.EventCategory))
             {
-                using (var evt = GeometryChangedEvent.GetPooled(lastLayoutRect, yogaLayoutRect))
-                {
-                    evt.layoutPass = currentLayoutPass;
-                    evt.target = ve;
-                    ve.HandleEventAtTargetAndDefaultPhase(evt);
-                }
+                changeEvents.Add(new KeyValuePair<Rect, VisualElement>(lastLayoutRect, ve));
             }
 
             if (hasNewLayout)
@@ -145,5 +139,22 @@ private void UpdateSubTree(VisualElement ve, int currentLayoutPass, bool isDispl
                 ve.yogaNode.MarkLayoutSeen();
             }
         }
+
+
+        private void DispatchChangeEvents(List<KeyValuePair<Rect, VisualElement>> changeEvents, int currentLayoutPass)
+        {
+            foreach (var changeElement in changeEvents)
+            {
+                var ve = changeElement.Value;
+
+                using (var evt = GeometryChangedEvent.GetPooled(changeElement.Key, ve.lastLayout))
+                {
+                    evt.layoutPass = currentLayoutPass;
+                    evt.target = ve;
+                    ve.HandleEventAtTargetAndDefaultPhase(evt);
+                }
+            }
+        }
+
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshBuilder.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshBuilder.cs
index b1933b1228..59fb3d3398 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshBuilder.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshBuilder.cs
@@ -7,6 +7,7 @@
 using Unity.Collections;
 using Unity.Profiling;
 using UnityEngine.TextCore.Text;
+using System.IO;
 
 namespace UnityEngine.UIElements.UIR
 {
@@ -16,6 +17,8 @@ namespace UnityEngine.UIElements.UIR
     internal static class MeshBuilder
     {
         static ProfilerMarker s_VectorGraphics9Slice = new ProfilerMarker("UIR.MakeVector9Slice");
+        static ProfilerMarker s_VectorGraphicsSplitTriangle = new ProfilerMarker("UIR.SplitTriangle");
+        static ProfilerMarker s_VectorGraphicsScaleTriangle = new ProfilerMarker("UIR.ScaleTriangle");
         static ProfilerMarker s_VectorGraphicsStretch = new ProfilerMarker("UIR.MakeVectorStretch");
 
         internal static readonly int s_MaxTextMeshVertices = 0xC000; // Max 48k vertices. We leave room for masking, borders, background, etc.
@@ -273,6 +276,7 @@ internal static void MakeSlicedQuad(ref MeshGenerationContextUtils.RectanglePara
             float rightSlice = Mathf.Max(0.0f, rectParams.rightSlice);
             float bottomSlice = Mathf.Max(0.0f, rectParams.bottomSlice);
             float topSlice = Mathf.Max(0.0f, rectParams.topSlice);
+            float sliceScale = Mathf.Max(0.01f, rectParams.sliceScale);
 
             // Clamp UVs in the [0,1] range
             float uvLeftSlice = Mathf.Clamp(leftSlice * uConversion, 0.0f, 1.0f);
@@ -280,6 +284,11 @@ internal static void MakeSlicedQuad(ref MeshGenerationContextUtils.RectanglePara
             float uvBottomSlice = Mathf.Clamp(bottomSlice * vConversion, 0.0f, 1.0f);
             float uvTopslice = Mathf.Clamp(topSlice * vConversion, 0.0f, 1.0f);
 
+            leftSlice *= rectParams.sliceScale;
+            rightSlice *= rectParams.sliceScale;
+            bottomSlice *= rectParams.sliceScale;
+            topSlice *= rectParams.sliceScale;
+
             k_TexCoordSlicesX[0] = rectParams.uv.min.x;
             k_TexCoordSlicesX[1] = rectParams.uv.min.x + uvLeftSlice;
             k_TexCoordSlicesX[2] = rectParams.uv.max.x - uvRightSlice;
@@ -444,6 +453,8 @@ internal static void MakeVectorGraphicsStretchBackground(Vertex[] svgVertices, U
             s_VectorGraphicsStretch.Begin();
 
             posOffset -= svgSubRectOffset * posScale;
+            posOffset.x += targetRect.x;
+            posOffset.y += targetRect.y;
 
             int newVertexCount = svgVertices.Length;
             int newIndexCount = svgIndices.Length;
@@ -513,36 +524,334 @@ internal static void MakeVectorGraphicsStretchBackground(Vertex[] svgVertices, U
             s_VectorGraphicsStretch.End();
         }
 
-        private static void MakeVectorGraphics9SliceBackground(Vertex[] svgVertices, UInt16[] svgIndices, float svgWidth, float svgHeight, Rect targetRect, Vector4 sliceLTRB, bool stretch, Color tint, int settingIndexOffset, AllocMeshData meshAlloc)
+        enum SliceIndices
+        {
+            SliceIndexL = 0,
+            SliceIndexT = 1,
+            SliceIndexR = 2,
+            SliceIndexB = 3
+        }
+
+        unsafe private static void SplitTriangle(Vertex* vertices, UInt16* indices, ref int vertexCount, int indexToProcess, ref int indexCount, float svgWidth, float svgHeight, Vector4 sliceLTRB, int sliceIndex)
+        {
+
+            // check on which size of the slice we are
+            int axis = ((sliceIndex == (int)SliceIndices.SliceIndexL) || (sliceIndex == (int)SliceIndices.SliceIndexR)) ? 0 : 1;
+
+            int before = 0;
+
+            bool* beforeAxis = stackalloc bool[3];
+            beforeAxis[0] = false;
+            beforeAxis[1] = false;
+            beforeAxis[2] = false;
+
+            float sliceValue = sliceLTRB[sliceIndex];
+
+            if (sliceIndex == (int)SliceIndices.SliceIndexB)
+            {
+                sliceValue = svgHeight - sliceValue;
+            }
+            else if (sliceIndex == (int)SliceIndices.SliceIndexR)
+            {
+                sliceValue = svgWidth - sliceValue;
+            }
+
+            int* originalTriangleIndices = stackalloc int[3];
+
+            originalTriangleIndices[0] = indices[indexToProcess];
+            originalTriangleIndices[1] = indices[indexToProcess + 1];
+            originalTriangleIndices[2] = indices[indexToProcess + 2];
+
+            Vertex* v0 = &vertices[originalTriangleIndices[0]];
+            Vertex* v1 = &vertices[originalTriangleIndices[1]];
+            Vertex* v2 = &vertices[originalTriangleIndices[2]];
+
+            if (v0->position[axis] < sliceValue)
+            {
+                before++;
+                beforeAxis[0] = true;
+            }
+            if (v1->position[axis] < sliceValue)
+            {
+                before++;
+                beforeAxis[1] = true;
+            }
+            if (v2->position[axis] < sliceValue)
+            {
+                before++;
+                beforeAxis[2] = true;
+            }
+
+            if (before == 1 || before == 2)
+            {
+                // check which vertex is alone on its side
+                int singleSideVertexIndex = 0;
+                if (beforeAxis[0] == beforeAxis[1])
+                {
+                    singleSideVertexIndex = 2;
+                }
+                else if (beforeAxis[0] == beforeAxis[2])
+                {
+                    singleSideVertexIndex = 1;
+                }
+
+                int otherSideVertex1 = (singleSideVertexIndex + 1) % 3;
+                int otherSideVertex2 = (singleSideVertexIndex + 2) % 3;
+
+                Vertex** triangle = stackalloc Vertex*[3];
+                triangle[0] = v0;
+                triangle[1] = v1;
+                triangle[2] = v2;
+
+                // We can do simple linear interpolation in X/Y direction
+                float totalAxisA = triangle[otherSideVertex1]->position[axis] - triangle[singleSideVertexIndex]->position[axis];
+                float deltaAxisA = sliceValue - triangle[singleSideVertexIndex]->position[axis];
+                float ratioA = Math.Abs(deltaAxisA) / Math.Abs(totalAxisA);
+
+                Vector3 pA = (triangle[otherSideVertex1]->position - triangle[singleSideVertexIndex]->position) * ratioA + triangle[singleSideVertexIndex]->position;
+                int indexA = vertexCount++;
+                Vertex* vA = &vertices[indexA];
+
+                *vA = *triangle[singleSideVertexIndex];
+                vA->position = pA;
+                vA->tint = Color.LerpUnclamped(triangle[singleSideVertexIndex]->tint, triangle[otherSideVertex1]->tint, ratioA);
+                vA->uv = Vector2.LerpUnclamped(triangle[singleSideVertexIndex]->uv, triangle[otherSideVertex1]->uv, ratioA);
+                vA->opacityColorPages.a = triangle[singleSideVertexIndex]->opacityColorPages.a;
+                vA->opacityColorPages.b = triangle[singleSideVertexIndex]->opacityColorPages.b;
+
+                float totalAxisB = triangle[otherSideVertex2]->position[axis] - triangle[singleSideVertexIndex]->position[axis];
+                float deltaAxisB = sliceValue - triangle[singleSideVertexIndex]->position[axis];
+                float ratioB = Math.Abs(deltaAxisB) / Math.Abs(totalAxisB);
+
+                Vector3 pB = (triangle[otherSideVertex2]->position - triangle[singleSideVertexIndex]->position) * ratioB + triangle[singleSideVertexIndex]->position;
+                int indexB = vertexCount++;
+                Vertex* vB = &vertices[indexB];
+
+                *vB = *triangle[singleSideVertexIndex];
+                vB->position = pB;
+                vB->tint = Color.LerpUnclamped(triangle[singleSideVertexIndex]->tint, triangle[otherSideVertex2]->tint, ratioB);
+                vB->uv = Vector2.LerpUnclamped(triangle[singleSideVertexIndex]->uv, triangle[otherSideVertex2]->uv, ratioB);
+                vB->opacityColorPages.a = triangle[singleSideVertexIndex]->opacityColorPages.a;
+                vB->opacityColorPages.b = triangle[singleSideVertexIndex]->opacityColorPages.b;
+
+                // overwrite input triangle
+                indices[indexToProcess] = (UInt16)indexA;
+                indices[indexToProcess+1] = (UInt16)originalTriangleIndices[otherSideVertex1];
+                indices[indexToProcess+2] = (UInt16)originalTriangleIndices[otherSideVertex2];
+
+                indices[indexCount++] = (UInt16)originalTriangleIndices[otherSideVertex2];
+                indices[indexCount++] = (UInt16)indexB;
+                indices[indexCount++] = (UInt16)indexA;
+
+                indices[indexCount++] = (UInt16)indexA;
+                indices[indexCount++] = (UInt16)indexB;
+                indices[indexCount++] = (UInt16)originalTriangleIndices[singleSideVertexIndex];
+            }
+        }
+
+        unsafe private static void ScaleSplittedTriangles(Vertex* vertices, int vertexCount, float svgWidth, float svgHeight, Rect targetRect, Vector4 sliceLTRB)
         {
-            var mwd = meshAlloc.alloc((uint)svgVertices.Length, (uint)svgIndices.Length, ref meshAlloc);
-            mwd.SetAllIndices(svgIndices);
+            float startWidth = sliceLTRB.x;
+            float endWidth = sliceLTRB.z;
+            float middleWidth = svgWidth - (startWidth + endWidth);
+            float totalWidth = svgWidth;
+            float totalMinusMiddleWidth = totalWidth - middleWidth;
+            float widthOutsideScale = 1.0F;
+            float widthInsideScale = 1.0F;
+            float widthInsideOffset = 0.0F;
+
+            if (targetRect.width < totalMinusMiddleWidth)
+            {
+                widthInsideScale = 0;
+                widthOutsideScale = targetRect.width / totalMinusMiddleWidth;
+            }
+            else
+            {
+                if (middleWidth < 0.001F)
+                {
+                    widthInsideScale = 1.0F;
+                    widthInsideOffset = targetRect.width - totalMinusMiddleWidth;
+                }
+                else
+                {
+                    widthInsideScale = (targetRect.width - totalMinusMiddleWidth) / middleWidth;
+                }
+            }
+
+            float startWidthOffset = startWidth * widthOutsideScale;
+            float middleWidthOffset = (startWidth * widthOutsideScale + middleWidth * widthInsideScale);
+            float startHeight = sliceLTRB.y;
+            float endHeight = sliceLTRB.w;
+            float middleHeight = svgHeight - (startHeight + endHeight);
+            float totalHeight = svgHeight;
+            float totalMinusMiddleHeight = totalHeight - middleHeight;
+            float heightOutsideScale = 1.0F;
+            float heightInsideScale = 1.0F;
+            float heightInsideOffset = 0.0F;
+
+            if (targetRect.height < totalMinusMiddleHeight)
+            {
+                heightInsideScale = 0;
+                heightOutsideScale = targetRect.height / totalMinusMiddleHeight;
+            }
+            else
+            {
+                if (middleHeight < 0.001F)
+                {
+                    heightInsideScale = 1.0F;
+                    heightInsideOffset = targetRect.height - totalMinusMiddleHeight;
+                }
+                else
+                {
+                    heightInsideScale = (targetRect.height - totalMinusMiddleHeight) / middleHeight;
+                }
+            }
+
+            float startHeightOffset = startHeight * heightOutsideScale;
+            float middleHeightOffset = (startHeight * heightOutsideScale + middleHeight * heightInsideScale);
+
+            for (int i = 0; i < vertexCount; ++i)
+            {
+                Vertex* v = &vertices[i];
+
+                if (v->position.x < startWidth)
+                {
+                    v->position.x = targetRect.x + v->position.x * widthOutsideScale;
+                }
+                else if (v->position.x < (startWidth+middleWidth))
+                {
+                    v->position.x = targetRect.x +  (v->position.x - startWidth) * widthInsideScale + startWidthOffset + widthInsideOffset;
+                }
+                else
+                {
+                    v->position.x = targetRect.x + (v->position.x - (startWidth + middleWidth)) * widthOutsideScale + middleWidthOffset + widthInsideOffset;
+                }
+
+                if (v->position.y < startHeight)
+                {
+                    v->position.y = targetRect.y + v->position.y * heightOutsideScale; ;
+                }
+                else if (v->position.y < (startHeight + middleHeight))
+                {
+                    v->position.y = targetRect.y + (v->position.y - startHeight) * heightInsideScale + startHeightOffset + heightInsideOffset;
+                }
+                else
+                {
+                    v->position.y = targetRect.y + (v->position.y - (startHeight + middleHeight)) * heightOutsideScale + middleHeightOffset + heightInsideOffset;
+                }
+            }
+        }
 
+        internal unsafe static void MakeVectorGraphics9SliceBackground(Vertex[] svgVertices, UInt16[] svgIndices, float svgWidth, float svgHeight, Rect targetRect, Vector4 sliceLTRB, bool stretch, Color tint, int settingIndexOffset, AllocMeshData meshAlloc)
+        {
             if (!stretch)
                 throw new NotImplementedException("Support for repeating 9-slices is not done yet");
 
             s_VectorGraphics9Slice.Begin();
 
-            var uvRegion = mwd.uvRegion;
-            int vertsCount = svgVertices.Length;
-            Vector2 sliceInvSize = new Vector2(1.0f / (svgWidth - sliceLTRB.z - sliceLTRB.x), 1.0f / (svgHeight - sliceLTRB.w - sliceLTRB.y));
-            Vector2 stretchAmount = new Vector2(targetRect.width - svgWidth, targetRect.height - svgHeight);
-            for (int i = 0; i < vertsCount; i++)
+            // Make sure sliceLTRB is valid
+            for (int i = 0; i < 4; ++i)
             {
-                var v = svgVertices[i];
-                Vector2 skinWeight;
-                skinWeight.x = Mathf.Clamp01((v.position.x - sliceLTRB.x) * sliceInvSize.x);
-                skinWeight.y = Mathf.Clamp01((v.position.y - sliceLTRB.y) * sliceInvSize.y);
+                sliceLTRB[i] = Math.Max(0, sliceLTRB[i]);
+            }
+            sliceLTRB[0] = Math.Min(sliceLTRB[0], svgWidth);
+            sliceLTRB[1] = Math.Min(sliceLTRB[1], svgHeight);
+            sliceLTRB[2] = Math.Min(sliceLTRB[2], svgWidth - sliceLTRB[0]);
+            sliceLTRB[3] = Math.Min(sliceLTRB[3], svgHeight - sliceLTRB[1]);
 
-                v.position.x += skinWeight.x * stretchAmount.x;
-                v.position.y += skinWeight.y * stretchAmount.y;
-                v.uv.x = v.uv.x * uvRegion.width + uvRegion.xMin;
-                v.uv.y = v.uv.y * uvRegion.height + uvRegion.yMin;
-                v.tint *= tint;
-                uint settingIndex = (uint)(((v.opacityColorPages.b << 8) | v.opacityColorPages.a) + settingIndexOffset);
-                v.opacityColorPages.b = (byte)(settingIndex >> 8);
-                v.opacityColorPages.a = (byte)settingIndex;
-                mwd.SetNextVertex(v);
+            int indiceCount = svgIndices.Length;
+            int totalNumberOfVertices = 0;
+            int totalNumberOfIndices = 0;
+
+            s_VectorGraphicsSplitTriangle.Begin();
+
+            // worst case is 3^4 times increase in vertex and indices.
+            int maxVertexCount = 3 * (3 * 3 * 3 * 3);
+            UInt16* generatedDryRunIndices = stackalloc UInt16[maxVertexCount];
+            Vertex* generatedDryRunVertices = stackalloc Vertex[maxVertexCount];
+
+            for (int i = 0; i < indiceCount; i += 3)
+            {
+                int index0 = svgIndices[i + 0];
+                int index1 = svgIndices[i + 1];
+                int index2 = svgIndices[i + 2];
+                Vertex v0 = svgVertices[index0];
+                Vertex v1 = svgVertices[index1];
+                Vertex v2 = svgVertices[index2];
+
+                generatedDryRunVertices[0] = v0;
+                generatedDryRunVertices[1] = v1;
+                generatedDryRunVertices[2] = v2;
+
+                generatedDryRunIndices[0] = 0;
+                generatedDryRunIndices[1] = 1;
+                generatedDryRunIndices[2] = 2;
+
+                int vertexCount = 3;
+                int indexCount = 3;
+                for (int sliceIndex = 0; sliceIndex < 4; ++sliceIndex)
+                {
+                    int maxIndexToProcess = indexCount;
+                    for (int j = 0; j < maxIndexToProcess; j += 3)
+                    {
+                        SplitTriangle(generatedDryRunVertices, generatedDryRunIndices, ref vertexCount, j, ref indexCount, svgWidth, svgHeight, sliceLTRB, sliceIndex);
+                    }
+                }
+
+                totalNumberOfVertices += vertexCount;
+                totalNumberOfIndices += indexCount;
+            }
+
+            UInt16* generatedIndices = stackalloc UInt16[totalNumberOfIndices];
+            Vertex* generatedVertices  = stackalloc Vertex[totalNumberOfVertices];
+
+            // copy original vertices
+            for (int i = 0; i < svgVertices.Length; ++i)
+            {
+                generatedVertices[i] = svgVertices[i];
+
+                // Adjust settingsIndex
+                uint settingIndex = (uint)(((generatedVertices[i].opacityColorPages.b << 8) | generatedVertices[i].opacityColorPages.a) + settingIndexOffset);
+                generatedVertices[i].opacityColorPages.b = (byte)(settingIndex >> 8);
+                generatedVertices[i].opacityColorPages.a = (byte)settingIndex;
+            }
+
+            int generatedIndexCount = 0;
+            int generatedVertexCount = svgVertices.Length;
+            int firstIndexToProcess = 0;
+
+            // Since the rendering triangle order is important (overlapping triangles), we have to add a single triangle at a time from the original list and completely split it.
+            for (int i = 0; i < svgIndices.Length; i += 3)
+            {
+                firstIndexToProcess = generatedIndexCount;
+                generatedIndices[generatedIndexCount++] = svgIndices[i];
+                generatedIndices[generatedIndexCount++] = svgIndices[i + 1];
+                generatedIndices[generatedIndexCount++] = svgIndices[i + 2];
+
+                for (int sliceIndex = 0; sliceIndex < 4; ++sliceIndex)
+                {
+                    int lastIndexToProcess = generatedIndexCount;
+                    for (int j = firstIndexToProcess; j < lastIndexToProcess; j += 3)
+                    {
+                        SplitTriangle(generatedVertices, generatedIndices, ref generatedVertexCount, j, ref generatedIndexCount, svgWidth, svgHeight, sliceLTRB, sliceIndex);
+                    }
+                }
+            }
+            s_VectorGraphicsSplitTriangle.End();
+
+            s_VectorGraphicsScaleTriangle.Begin();
+            ScaleSplittedTriangles(generatedVertices, generatedVertexCount, svgWidth, svgHeight, targetRect, sliceLTRB);
+            s_VectorGraphicsScaleTriangle.End();
+
+            var mwd = meshAlloc.alloc((uint)generatedVertexCount, (uint)generatedIndexCount, ref meshAlloc);
+            for (int i = 0; i < generatedIndexCount; i++)
+            {
+                mwd.SetNextIndex(generatedIndices[i]);
+            }
+
+            for (int i = 0; i < generatedVertexCount; i++)
+            {
+                mwd.SetNextVertex(generatedVertices[i]);
             }
 
             s_VectorGraphics9Slice.End();
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerationContext.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerationContext.cs
index d1f96db0cc..4943919e23 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerationContext.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRMeshGenerationContext.cs
@@ -4,8 +4,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Unity.Collections;
+using Unity.Profiling;
 
 namespace UnityEngine.UIElements
 {
@@ -59,7 +61,7 @@ public struct Vertex
     /// </remarks>
     public class MeshWriteData
     {
-        internal MeshWriteData() {}  // Don't want users to instatiate this class themselves
+        internal MeshWriteData() {}  // Don't want users to instantiate this class themselves
 
         /// <summary>
         /// The number of vertices successfully allocated for <see cref="VisualElement"/> content drawing.
@@ -91,6 +93,7 @@ internal MeshWriteData() {}  // Don't want users to instatiate this class themse
         ///
         /// Note that calling <see cref="SetNextVertex"/> fewer times than the allocated number of vertices will leave the remaining vertices with random values as <see cref="MeshGenerationContext.Allocate"/> does not initialize the returned data to 0 to avoid redundant work.
         /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void SetNextVertex(Vertex vertex) { m_Vertices[currentVertex++] = vertex; }
 
         /// <summary>
@@ -106,6 +109,7 @@ internal MeshWriteData() {}  // Don't want users to instatiate this class themse
         /// <remarks>
         /// Note that calling <see cref="SetNextIndex"/> fewer times than the allocated number of indices will leave the remaining indices with random values as <see cref="MeshGenerationContext.Allocate"/> does not initialize the returned data to 0 to avoid redundant work.
         /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void SetNextIndex(UInt16 index) { m_Indices[currentIndex++] = index; }
 
         /// <summary>
@@ -292,6 +296,8 @@ public struct RectangleParams
             public int rightSlice;
             public int bottomSlice;
 
+            public float sliceScale;
+
             // Cached sprite geometry, which is expensive to evaluate.
             internal Rect spriteGeomRect;
 
@@ -702,8 +708,10 @@ public static void AdjustBackgroundSizeForBorders(VisualElement visualElement, r
     /// inside the <see cref="MeshWriteData.uvRegion"/> rectangle. If you do not remap the UVs, the texture may display incorrectly when atlassed.
     /// The following example demonstrates the correct way to generate UVs.
     /// </para>
-    /// <example>
+    /// </remarks>
+    ///<example>
     /// <code>
+    /// <![CDATA[
     /// class TexturedElement : VisualElement
     /// {
     ///     static readonly Vertex[] k_Vertices = new Vertex[4];
@@ -720,7 +728,7 @@ public static void AdjustBackgroundSizeForBorders(VisualElement visualElement, r
     ///     public TexturedElement()
     ///     {
     ///         generateVisualContent += OnGenerateVisualContent;
-    ///         m_Texture = AssetDatabase.LoadAssetAtPath&lt;Texture2D&gt;("Assets/tex.png");
+    ///         m_Texture = AssetDatabase.LoadAssetAtPath<Texture2D>("Assets/tex.png");
     ///     }
     ///
     ///     Texture2D m_Texture;
@@ -728,7 +736,7 @@ public static void AdjustBackgroundSizeForBorders(VisualElement visualElement, r
     ///     void OnGenerateVisualContent(MeshGenerationContext mgc)
     ///     {
     ///         Rect r = contentRect;
-    ///         if (r.width &lt; 0.01f || r.height &lt; 0.01f)
+    ///         if (r.width < 0.01f || r.height < 0.01f)
     ///             return; // Skip rendering when too small.
     ///
     ///         float left = 0;
@@ -755,9 +763,9 @@ public static void AdjustBackgroundSizeForBorders(VisualElement visualElement, r
     ///         mwd.SetAllIndices(k_Indices);
     ///     }
     /// }
+    /// ]]>
     /// </code>
     /// </example>
-    /// </remarks>
     public class MeshGenerationContext
     {
         [Flags]
@@ -791,6 +799,8 @@ public Painter2D painter2D
 
         internal MeshGenerationContext(IStylePainter painter) { this.painter = painter; }
 
+        private static readonly ProfilerMarker s_AllocateMarker = new ProfilerMarker("UIR.MeshGenerationContext.Allocate");
+
         /// <summary>
         /// Allocates the specified number of vertices and indices required to express geometry for drawing the content of a <see cref="VisualElement"/>.
         /// </summary>
@@ -803,12 +813,14 @@ public Painter2D painter2D
         /// <returns>An object that gives access to the newely allocated data. If the returned vertex count is 0, then allocation failed (the system ran out of memory).</returns>
         public MeshWriteData Allocate(int vertexCount, int indexCount, Texture texture = null)
         {
-            return painter.DrawMesh(vertexCount, indexCount, texture, null, MeshFlags.None);
+            using (s_AllocateMarker.Auto())
+                return painter.DrawMesh(vertexCount, indexCount, texture, null, MeshFlags.None);
         }
 
         internal MeshWriteData Allocate(int vertexCount, int indexCount, Texture texture, Material material, MeshFlags flags)
         {
-            return painter.DrawMesh(vertexCount, indexCount, texture, material, flags);
+            using (s_AllocateMarker.Auto())
+                return painter.DrawMesh(vertexCount, indexCount, texture, material, flags);
         }
 
         internal IStylePainter painter;
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs
index 5d1b9af0c2..2af68d1e1b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRPainter2D.cs
@@ -8,6 +8,8 @@
 using System.Runtime.CompilerServices;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
+using Unity.Profiling;
+using UnityEngine.Profiling;
 using UnityEngine.UIElements.UIR;
 
 // Overview of the Vector Graphics API
@@ -52,147 +54,32 @@
 
 namespace UnityEngine.UIElements
 {
-    /// <summary>
-    /// The fill rule to use when filling shapes with <see cref="Painter2D.Fill(FillRule)"/>.
-    /// </summary>
-    public enum FillRule
-    {
-        /// <summary>The "non-zero" winding rule.</summary>
-        NonZero,
-
-        /// <summary>The "odd-even" winding rule.</summary>
-        OddEven
-    }
-
-    /// <summary>
-    /// Join types connecting two sub-paths (see <see cref="Painter2D.lineJoin"/>).
-    /// </summary>
-    public enum LineJoin
-    {
-        /// <summary>
-        /// Joins the sub-paths with a sharp corner.
-        /// The join converts to a beveled join when the <see cref="Painter2D.miterLimit"/> ratio is reached.
-        /// </summary>
-        Miter,
-
-        /// <summary>Joins the sub-paths with a beveled corner.</summary>
-        Bevel,
-
-        /// <summary>Joins the sub-paths with a round corner.</summary>
-        Round
-    }
-
-    /// <summary>
-    /// Cap types for the beginning and end of paths (see <see cref="Painter2D.lineCap"/>).
-    /// </summary>
-    public enum LineCap
-    {
-        /// <summary>Terminates the path with no tip.</summary>
-        Butt,
-
-        /// <summary>Terminates the path with a round tip.</summary>
-        Round
-    }
-
-    /// <summary>
-    /// Direction to use when defining an arc (see <see cref="Painter2D.Arc(Vector2, float, Angle, Angle, ArcDirection)"/>).
-    /// </summary>
-    public enum ArcDirection
-    {
-        /// <summary>A clockwise direction.</summary>
-        Clockwise,
-
-        /// <summary>A counter-clockwise direction.</summary>
-        CounterClockwise
-    }
-
     /// <summary>
     /// Object to draw 2D vector graphics. Do not instantiate this class directly. Access it
     /// from the <see cref="MeshGenerationContext.painter2D"/> property.
     /// </summary>
     public class Painter2D
     {
-        private static float k_Epsilon = 0.001f;
-        private static float k_EdgeBuffer = 2.0f;
-        private Vector2 m_Pen;
-        private Vector2 m_SubPathStart;
-        private bool m_AtSubPathStart = true;
-        private bool m_PenIsSet = false;
-        private bool m_IsPathClosed = false;
-        private bool m_PathHasBegun = false;
-        private int m_SubPathStartIndex;
-        private List<SubPathEntry> m_SubPathEntries = new List<SubPathEntry>(100);
-
-        internal enum EntryType
-        {
-            Move,
-            Line,
-            Arc,
-            ArcTo,
-            Bezier,
-            StartCap,
-            EndCap,
-            Join
-        }
+        private MeshGenerationContext m_Ctx;
+        internal SafeHandleAccess m_Handle;
 
-        internal struct SubPathEntry
+        // Instantiated internally by UIR, users shouldn't derive from this class.
+        internal Painter2D(MeshGenerationContext ctx)
         {
-            public EntryType type;
-            public Vector2 p0;
-            public Vector2 p1;
-            public Vector2 p2;
-            public Vector2 p3;
-            public Vector2 startPos; // Used with ClosePath()
-            public JoinInfo beginJoinInfo;
-            public JoinInfo endJoinInfo;
-            public int joinToIndex;
+            m_Handle = new SafeHandleAccess(UIPainter2D.Create(maxArcRadius));
+            m_Ctx = ctx;
+            Reset();
         }
 
-        // JoinInfo is used to compute proper joins between sub-paths during stroke operations.
-        // We store the vertex indices to be able to move them to avoid overlaps.
-        //
-        //  left0    left1
-        //     +------+
-        //     | \    |
-        //     |   \  |
-        //  p0 +------+ p1    p0/p1 can be the connect point
-        //     |   /  |       depending if its the begin or end join
-        //     | /    |
-        //     +------+
-        //  right0   right1
-
-        internal struct JoinInfo
+        internal void Reset()
         {
-            public Vector2 p0;
-            public Vector2 p1;
-
-            public int leftPointIndex0; // The mesh points on the left side of connect point
-            public int leftPointIndex1;
-            public int leftPointIndex2; // Next point to complete the left triangle
-
-            public int rightPointIndex0; // The mesh points on the right side of connect point
-            public int rightPointIndex1;
-            public int rightPointIndex2; // Next point to complete the right triangle
-
-            public bool useTangent; // Use tangent instead of mesh points, to work around hairy situations
-            public Vector2 tangent;
+            UIPainter2D.Reset(m_Handle);
         }
 
-        internal Vector2 pen {
-            get { return m_Pen; }
-            set { m_Pen = value; m_PenIsSet = true; }
-        }
-        internal bool atSubPathStart => m_AtSubPathStart;
-        internal List<SubPathEntry> subPathEntries => m_SubPathEntries;
-
-        private MeshGenerationContext m_Ctx;
-        private static Color32 s_ArcFlags = new Color32(0, 0, 1, 0);
-
-        // Instantiated internally by UIR, users shouldn't derive from this class.
-        internal Painter2D(MeshGenerationContext ctx)
+        internal void Destroy()
         {
-            m_Ctx = ctx;
-            Reset();
+            UIPainter2D.Destroy(m_Handle);
+            m_Handle = new SafeHandleAccess(IntPtr.Zero);
         }
 
         /// <summary>
@@ -200,40 +87,45 @@ internal Painter2D(MeshGenerationContext ctx)
         /// </summary>
         public float lineWidth
         {
-            get { return m_LineWidth; }
-            set { m_LineWidth = value; }
+            get => UIPainter2D.GetLineWidth(m_Handle);
+            set => UIPainter2D.SetLineWidth(m_Handle, value);
         }
-        private float m_LineWidth = 1.0f;
 
         /// <summary>
         /// The color of draw paths when using <see cref="Stroke"/>.
         /// </summary>
         public Color strokeColor
         {
-            get { return m_StrokeColor; }
-            set { m_StrokeColor = value; }
+            get => UIPainter2D.GetStrokeColor(m_Handle);
+            set => UIPainter2D.SetStrokeColor(m_Handle, value);
         }
-        private Color m_StrokeColor = Color.black;
 
         /// <summary>
         /// The color used for fill paths when using <see cref="Fill"/>.
         /// </summary>
         public Color fillColor
         {
-            get { return m_FillColor; }
-            set { m_FillColor = value; }
+            get => UIPainter2D.GetFillColor(m_Handle);
+            set => UIPainter2D.SetFillColor(m_Handle, value);
         }
-        private Color m_FillColor = Color.black;
 
         /// <summary>
         /// The join to use when drawing paths using <see cref="Stroke"/>.
         /// </summary>
-        public LineJoin lineJoin { get; set; }
+        public LineJoin lineJoin
+        {
+            get => UIPainter2D.GetLineJoin(m_Handle);
+            set => UIPainter2D.SetLineJoin(m_Handle, value);
+        }
 
         /// <summary>
         /// The cap to use when drawing paths using <see cref="Stroke"/>.
         /// </summary>
-        public LineCap lineCap { get; set; }
+        public LineCap lineCap
+        {
+            get => UIPainter2D.GetLineCap(m_Handle);
+            set => UIPainter2D.SetLineCap(m_Handle, value);
+        }
 
         /// <summary>
         /// When using <see cref="LineJoin.Miter"/> joins, this defines the limit on the ratio of the miter length to the
@@ -241,10 +133,9 @@ public Color fillColor
         /// </summary>
         public float miterLimit
         {
-            get { return m_MiterLimit; }
-            set { m_MiterLimit = Mathf.Max(1.0f, value); }
+            get => UIPainter2D.GetMiterLimit(m_Handle);
+            set => UIPainter2D.SetMiterLimit(m_Handle, value);
         }
-        private float m_MiterLimit = 10.0f;
 
         internal static bool isPainterActive { get; set; }
         private static bool ValidateState()
@@ -281,31 +172,7 @@ public void BeginPath()
             if (!ValidateState())
                 return;
 
-            BeginPathInternal();
-        }
-
-        internal void BeginPathInternal()
-        {
-            m_SubPathEntries.Clear();
-            m_AtSubPathStart = true;
-            m_IsPathClosed = false;
-            m_PathHasBegun = true;
-            m_Pen = Vector2.zero;
-            m_PenIsSet = false;
-            m_SubPathStart = Vector2.zero;
-            m_SubPathStartIndex = 0;
-        }
-
-        internal void Reset()
-        {
-            BeginPathInternal();
-            strokeColor = Color.black;
-            fillColor = Color.black;
-            lineWidth = 1.0f;
-            lineJoin = LineJoin.Miter;
-            lineCap = LineCap.Butt;
-            miterLimit = 10.0f;
-            m_PathHasBegun = false;
+            UIPainter2D.BeginPath(m_Handle);
         }
 
         /// <summary>
@@ -316,47 +183,7 @@ public void ClosePath()
             if (!ValidateState())
                 return;
 
-            if (m_IsPathClosed)
-                return;
-
-            // Attempt to close current sub-path with a straight line
-            bool hasGraphics = false;
-            int firstSubPathGraphicIndex = 0;
-            for (int i = m_SubPathStartIndex; i < m_SubPathEntries.Count; ++i)
-            {
-                if (IsEntryTypeGraphic(m_SubPathEntries[i].type))
-                {
-                    hasGraphics = true;
-                    LineTo(m_SubPathEntries[i].startPos);
-                    firstSubPathGraphicIndex = i;
-                    break;
-                }
-            }
-
-            TerminateSubPath(false);
-
-            if (hasGraphics)
-            {
-                if (firstSubPathGraphicIndex >= 1 && m_SubPathEntries[firstSubPathGraphicIndex - 1].type == EntryType.StartCap)
-                {
-                    // Remove the starting cap and fix the join-to indices
-                    m_SubPathEntries.RemoveAt(firstSubPathGraphicIndex - 1);
-                    for (int i = firstSubPathGraphicIndex; i < m_SubPathEntries.Count; ++i)
-                    {
-                        var entry = m_SubPathEntries[i];
-                        if (entry.type == EntryType.Join)
-                        {
-                            --entry.joinToIndex;
-                            m_SubPathEntries[i] = entry;
-                        }
-                    }
-                }
-
-                // Insert a join to link with the first sub-path entry
-                m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.Join, joinToIndex = m_SubPathStartIndex });
-            }
-
-            m_IsPathClosed = true;
+            UIPainter2D.ClosePath(m_Handle);
         }
 
         /// <summary>
@@ -368,23 +195,7 @@ public void MoveTo(Vector2 pos)
             if (!ValidateState())
                 return;
 
-            if (!m_PathHasBegun)
-            {
-                Debug.LogError("Calling MoveTo() before BeginPath()");
-                return;
-            }
-
-            TerminateSubPath();
-
-            if (m_SubPathEntries.Count == 0 || m_SubPathEntries[m_SubPathEntries.Count - 1].type != EntryType.Move)
-                m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.Move });
-
-            pen = pos;
-
-            m_SubPathStart = pos;
-            m_SubPathStartIndex = m_SubPathEntries.Count;
-            m_AtSubPathStart = true;
-            m_IsPathClosed = false;
+            UIPainter2D.MoveTo(m_Handle, pos);
         }
 
         /// <summary>
@@ -396,25 +207,7 @@ public void LineTo(Vector2 pos)
             if (!ValidateState())
                 return;
 
-            if (!m_PathHasBegun)
-            {
-                Debug.LogError("Calling LineTo() before BeginPath()");
-                return;
-            }
-
-            if (!m_PenIsSet)
-            {
-                // Basically a MoveTo() if the pen wasn't set
-                pen = pos;
-                return;
-            }
-
-            PrepareSubPath();
-
-            if (pos != m_Pen)
-                m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.Line, p0 = m_Pen, p1 = pos, startPos = m_Pen });
-
-            pen = pos;
+            UIPainter2D.LineTo(m_Handle, pos);
         }
 
         /// <summary>
@@ -428,48 +221,7 @@ public void ArcTo(Vector2 p1, Vector2 p2, float radius)
             if (!ValidateState())
                 return;
 
-            if (!m_PathHasBegun)
-            {
-                Debug.LogError("Calling ArcTo() before BeginPath()");
-                return;
-            }
-
-            if (!m_PenIsSet)
-                pen = p1;
-
-            if (pen == p1 && pen == p2)
-            {
-                return; // Nothing to do
-            }
-            else if (pen == p1 || p1 == p2 || ArePointsColinear(pen, p1, p2))
-            {
-                // No need for an arc
-                LineTo(p2);
-            }
-            else
-            {
-                var arcToEntry = new SubPathEntry() {
-                    type = EntryType.ArcTo,
-                    p0 = pen, p1 = p1, p2 = p2, p3 = new Vector2(radius, 0.0f),
-                    startPos = pen
-                };
-
-                // The pen may not reach p2, depending on how the arc fits in the provided points.
-                // We have to evaluate the arc to know where it will land
-                Vector2 arcStart, arcEnd, newCenter;
-                if (EvalArcTo(arcToEntry, out arcStart, out arcEnd, out newCenter))
-                {
-                    if (!AlmostEq(pen, arcStart))
-                        LineTo(arcStart);
-                    pen = arcEnd;
-                }
-                else
-                    pen = p2;
-
-                PrepareSubPath();
-
-                m_SubPathEntries.Add(arcToEntry);
-            }
+            UIPainter2D.ArcTo(m_Handle, p1, p2, radius);
         }
 
         /// <summary>
@@ -485,40 +237,7 @@ public void Arc(Vector2 center, float radius, Angle startAngle, Angle endAngle,
             if (!ValidateState())
                 return;
 
-            if (!m_PathHasBegun)
-            {
-                Debug.LogError("Calling Arc() before BeginPath()");
-                return;
-            }
-
-            float startAngleRads = startAngle.ToRadians();
-            float endAngleRads = endAngle.ToRadians();
-            bool antiClockwise = (direction == ArcDirection.CounterClockwise);
-            if (radius > k_Epsilon && !Mathf.Approximately(startAngleRads, endAngleRads))
-            {
-                var arcEntry = new SubPathEntry() {
-                    type = EntryType.Arc,
-                    p0 = center,
-                    p1 = new Vector2(startAngleRads, endAngleRads),
-                    p2 = new Vector2(radius, antiClockwise ? 1.0f : 0.0f),
-                    startPos = pen
-                };
-
-                Vector2 p0, p1, pMid;
-                EvalArcPositions(ref arcEntry, out p0, out p1, out pMid);
-
-                if (!m_PenIsSet)
-                    arcEntry.startPos = p0;
-                else if (p0 != pen)
-                    LineTo(p0); // Implicit line-to
-
-                bool isFullCircle = (p0 == p1);
-                PrepareSubPath(!isFullCircle); // Don't insert a cap if this is a full circle
-
-                m_SubPathEntries.Add(arcEntry);
-
-                pen = p1;
-            }
+            UIPainter2D.Arc(m_Handle, center, radius, startAngle.ToRadians(), endAngle.ToRadians(), direction);
         }
 
         /// <summary>
@@ -532,21 +251,7 @@ public void BezierCurveTo(Vector2 p1, Vector2 p2, Vector2 p3)
             if (!ValidateState())
                 return;
 
-            if (!m_PathHasBegun)
-            {
-                Debug.LogError("Calling BezierTo() before BeginPath()");
-                return;
-            }
-
-            if (!m_PenIsSet)
-                pen = p1;
-
-            if (pen == p1 && pen == p2 && pen == p3)
-                return;
-
-            PrepareSubPath();
-            m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.Bezier, p0 = pen, p1 = p1, p2 = p2, p3 = p3, startPos = pen });
-            pen = p3;
+            UIPainter2D.BezierCurveTo(m_Handle, p1, p2, p3);
         }
 
         /// <summary>
@@ -559,2228 +264,65 @@ public void QuadraticCurveTo(Vector2 p1, Vector2 p2)
             if (!ValidateState())
                 return;
 
-            if (!m_PathHasBegun)
-            {
-                Debug.LogError("Calling QuadraticBezierTo() before BeginPath()");
-                return;
-            }
-
-            if (!m_PenIsSet)
-                pen = p1;
-
-            if (pen == p1 && pen == p2)
-                return;
-
-            PrepareSubPath();
-
-            // Convert the quadratic curve to a cubic curve
-            var cP0 = pen;
-            var cP3 = p2;
-
-            float t = 2.0f / 3.0f;
-            var cP1 = cP0 + t * (p1 - cP0);
-            var cP2 = p2 + t * (p1 - p2);
-
-            m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.Bezier, p0 = cP0, p1 = cP1, p2 = cP2, p3 = cP3 });
-            pen = p2;
+            UIPainter2D.QuadraticCurveTo(m_Handle, p1, p2);
         }
 
+        private static readonly ProfilerMarker s_StrokeMarker = new ProfilerMarker("Painter2D.Stroke");
+
         /// <summary>
         /// Strokes the currently defined path.
         /// </summary>
         public void Stroke()
         {
-            if (!ValidateState())
-                return;
-
-            if (!m_PathHasBegun)
+            using (s_StrokeMarker.Auto())
             {
-                Debug.LogError("Calling Stroke() before BeginPath()");
-                return;
-            }
+                if (!ValidateState())
+                    return;
 
-            TerminateSubPath();
+                var meshData = UIPainter2D.Stroke(m_Handle);
 
-            if (lineWidth < k_Epsilon || strokeColor == Color.clear)
-                return;
-
-            int vertexCount = 0;
-            int indexCount = 0;
+                if (meshData.vertexCount == 0)
+                    return;
 
-            // Stroking the entries using a null MeshWriteData will only count the required vertices/indices
-            StrokeInternal(null, ref vertexCount, ref indexCount);
-
-            var mwd = m_Ctx.Allocate(vertexCount, indexCount);
-            vertexCount = 0;
-            indexCount = 0;
-            StrokeInternal(mwd, ref vertexCount, ref indexCount);
+                // transfer all data in a single batch
+                var meshWrite = m_Ctx.Allocate(meshData.vertexCount, meshData.indexCount);
+                unsafe
+                {
+                    var vertices = UIRenderDevice.PtrToSlice<Vertex>((void*)meshData.vertices, meshData.vertexCount);
+                    var indices = UIRenderDevice.PtrToSlice<UInt16>((void*)meshData.indices, meshData.indexCount);
+                    meshWrite.SetAllVertices(vertices);
+                    meshWrite.SetAllIndices(indices);
+                }
+            }
         }
 
+        private static readonly ProfilerMarker s_FillMarker = new ProfilerMarker("Painter2D.Fill");
+
         /// <summary>
         /// Fills the currently defined path.
         /// <param name="fillRule">The fill rule (non-zero or odd-even) to use. Default is non-zero.</param>
         /// </summary>
         public void Fill(FillRule fillRule = FillRule.NonZero)
         {
-            if (!ValidateState())
-                return;
-
-            if (!m_PathHasBegun)
-            {
-                Debug.LogError("Calling Fill() before BeginPath()");
-                return;
-            }
-
-            if (fillColor == Color.clear)
-                return;
-
-            // Filling the entries using a null MeshWriteData will only count the required vertices/indices
-            GenerateFilledArcs();
-
-            // Call libtess
-            m_LibTessVertices.Clear();
-            m_LibTessIndices.Clear();
-            m_LibTessVertexIndices.Clear();
-            m_LibTessContours.Clear();
-            TessellateFillWithArcMappings(fillRule, m_LibTessVertices, m_LibTessIndices, m_LibTessVertexIndices, m_LibTessContours);
-
-            // Mesh generation
-            GenerateFilledMesh(m_LibTessVertices, m_LibTessIndices, m_LibTessVertexIndices);
-        }
-
-        private void PrepareSubPath(bool canInsertCap = true)
-        {
-            if (m_AtSubPathStart)
-            {
-                if (canInsertCap && (m_SubPathEntries.Count == 0 || m_SubPathEntries[m_SubPathEntries.Count - 1].type != EntryType.StartCap))
-                    // Start the new sub-path with a cap
-                    m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.StartCap });
-
-                m_AtSubPathStart = false;
-            }
-            else if (m_SubPathEntries.Count > 0)
-            {
-                // Attempt to insert a join
-                var lastType = m_SubPathEntries[m_SubPathEntries.Count - 1].type;
-                if (IsEntryTypeGraphic(lastType))
-                    m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.Join, joinToIndex = m_SubPathEntries.Count + 1 });
-            }
-        }
-
-        private void TerminateSubPath(bool addEndCap = true)
-        {
-            if (m_AtSubPathStart)
-                return; // Nothing to do
-
-            int lastIndex = m_SubPathEntries.Count - 1;
-
-            // Remove any pending joins
-            while (lastIndex >= 0 && m_SubPathEntries[lastIndex].type == EntryType.Join)
-            {
-                m_SubPathEntries.RemoveAt(lastIndex);
-                --lastIndex;
-            }
-
-            if (lastIndex >= 0)
-            {
-                var lastEntryType = m_SubPathEntries[lastIndex].type;
-                if (lastEntryType == EntryType.StartCap)
-                {
-                    // A sub-path was started, but nothing was added to it, remove the starting cap
-                    m_SubPathEntries.RemoveAt(lastIndex);
-                    --lastIndex;
-                }
-                else if (addEndCap && lastEntryType != EntryType.EndCap)
-                {
-                    // If there's any sub-path to terminate, add the final cap
-                    if (ShouldAddEndCap(m_SubPathEntries[lastIndex]))
-                        m_SubPathEntries.Add(new SubPathEntry() { type = EntryType.EndCap });
-                }
-            }
-
-            m_AtSubPathStart = true;
-        }
-
-        private static bool ShouldAddEndCap(SubPathEntry entry)
-        {
-            // There are situations where we don't want to end the path with an end-cap,
-            // they are enumerated here.
-
-            if (entry.type == EntryType.Arc)
+            using (s_FillMarker.Auto())
             {
-                Vector2 p0, p1, pMid;
-                EvalArcPositions(ref entry, out p0, out p1, out pMid);
-                if (p0 == p1)
-                    // This is a circle, don't end the path
-                    return false;
-            }
-
-            return true;
-        }
-
-        internal static bool ArePointsColinear(Vector2 p0, Vector2 p1, Vector2 p2)
-        {
-            var v = p1 - p0;
-            var w = p2 - p1;
-            var crossZ = v.x * w.y - v.y * w.x;
-            return Mathf.Abs(crossZ) <= k_Epsilon;
-        }
-
-        private static bool IsEntryTypeGraphic(EntryType type)
-        {
-            return type == EntryType.Line || type == EntryType.Arc || type == EntryType.ArcTo || type == EntryType.Bezier;
-        }
-
-        private void StrokeInternal(MeshWriteData mwd, ref int vertexCount, ref int indexCount)
-        {
-            int entryCount = m_SubPathEntries.Count;
-            int bezierIndex = 0;
+                if (!ValidateState())
+                    return;
 
-            // Stroke everything but the joins/caps, which requires join-info of future sub-paths.
-            // Join-infos are computed during the stroke generation.
-            for (int i = 0; i < entryCount; ++i)
-            {
-                var entry = m_SubPathEntries[i];
-                switch (entry.type)
-                {
-                    case EntryType.Line:
-                        StrokeLine(mwd, ref entry, ref vertexCount, ref indexCount);
-                        break;
-                    case EntryType.Arc:
-                        StrokeArc(mwd, ref entry, ref vertexCount, ref indexCount);
-                        break;
-                    case EntryType.ArcTo:
-                        StrokeArcTo(mwd, ref entry, ref vertexCount, ref indexCount);
-                        break;
-                    case EntryType.Bezier:
-                        StrokeBezier(mwd, ref entry, bezierIndex++, ref vertexCount, ref indexCount);
-                        break;
-                    default:
-                        break;
-                }
-                m_SubPathEntries[i] = entry;
-            }
+                var meshData = UIPainter2D.Fill(m_Handle, fillRule);
+                if (meshData.vertexCount == 0)
+                    return;
 
-            // Stroke the joins/caps
-            for (int i = 0; i < entryCount; ++i)
-            {
-                var entry = m_SubPathEntries[i];
-                switch (entry.type)
+                // transfer all data in a single batch
+                var meshWrite = m_Ctx.Allocate(meshData.vertexCount, meshData.indexCount);
+                unsafe
                 {
-                    case EntryType.Join:
-                    {
-                        if (i > 0)
-                        {
-                            int prevIndex = i - 1;
-                            int nextIndex = entry.joinToIndex;
-                            if (prevIndex != nextIndex && prevIndex >= 0 && nextIndex >= 0 && nextIndex < entryCount)
-                            {
-                                var prevEntry = m_SubPathEntries[prevIndex];
-                                var nextEntry = m_SubPathEntries[nextIndex];
-                                if (IsEntryTypeGraphic(prevEntry.type) && IsEntryTypeGraphic(nextEntry.type))
-                                    StrokeJoin(mwd, ref prevEntry.endJoinInfo, ref nextEntry.beginJoinInfo, ref vertexCount, ref indexCount);
-                            }
-                        }
-                    }
-                    break;
-                    case EntryType.StartCap:
-                    {
-                        if (i < (entryCount - 1))
-                        {
-                            var nextEntry = m_SubPathEntries[i + 1];
-                            if (IsEntryTypeGraphic(nextEntry.type))
-                                StrokeCap(mwd, ref nextEntry.beginJoinInfo, true, ref vertexCount, ref indexCount);
-                        }
-                    }
-                    break;
-                    case EntryType.EndCap:
-                    {
-                        if (i > 0)
-                        {
-                            var prevEntry = m_SubPathEntries[i - 1];
-                            if (IsEntryTypeGraphic(prevEntry.type))
-                                StrokeCap(mwd, ref prevEntry.endJoinInfo, false, ref vertexCount, ref indexCount);
-                        }
-                    }
-                    break;
+                    var vertices = UIRenderDevice.PtrToSlice<Vertex>((void*)meshData.vertices, meshData.vertexCount);
+                    var indices = UIRenderDevice.PtrToSlice<UInt16>((void*)meshData.indices, meshData.indexCount);
+                    meshWrite.SetAllVertices(vertices);
+                    meshWrite.SetAllIndices(indices);
                 }
             }
         }
-
-        private void StrokeLine(MeshWriteData mwd, ref SubPathEntry lineEntry, ref int vertexCount, ref int indexCount)
-        {
-            if (mwd == null)
-            {
-                vertexCount += 6;
-                indexCount += 12;
-                return;
-            }
-
-            float halfThickness = Mathf.Max(1.0f, lineWidth) / 2.0f;
-            float geomHalfThickness = halfThickness + k_EdgeBuffer;
-            var p0 = lineEntry.p0;
-            var p1 = lineEntry.p1;
-            var v = (p1 - p0);
-            var perp = new Vector2(-v.y, v.x).normalized * geomHalfThickness;
-
-            float ratio = geomHalfThickness / halfThickness;
-
-            var circle0 = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle1 = new Vector4(0.0f, ratio, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-            var color = strokeColor;
-            color.a *= Mathf.Clamp01(lineWidth);
-
-            mwd.SetNextVertex(new Vertex() { position = p0,        tint = color, flags = s_ArcFlags, circle = circle0 });
-            mwd.SetNextVertex(new Vertex() { position = p0 + perp, tint = color, flags = s_ArcFlags, circle = circle1 });
-            mwd.SetNextVertex(new Vertex() { position = p0 - perp, tint = color, flags = s_ArcFlags, circle = circle1 });
-
-            mwd.SetNextVertex(new Vertex() { position = p1,        tint = color, flags = s_ArcFlags, circle = circle0 });
-            mwd.SetNextVertex(new Vertex() { position = p1 + perp, tint = color, flags = s_ArcFlags, circle = circle1 });
-            mwd.SetNextVertex(new Vertex() { position = p1 - perp, tint = color, flags = s_ArcFlags, circle = circle1 });
-
-            mwd.SetNextIndex((UInt16)(vertexCount + 0));
-            mwd.SetNextIndex((UInt16)(vertexCount + 3));
-            mwd.SetNextIndex((UInt16)(vertexCount + 1));
-            mwd.SetNextIndex((UInt16)(vertexCount + 1));
-            mwd.SetNextIndex((UInt16)(vertexCount + 3));
-            mwd.SetNextIndex((UInt16)(vertexCount + 4));
-
-            mwd.SetNextIndex((UInt16)(vertexCount + 0));
-            mwd.SetNextIndex((UInt16)(vertexCount + 2));
-            mwd.SetNextIndex((UInt16)(vertexCount + 3));
-            mwd.SetNextIndex((UInt16)(vertexCount + 3));
-            mwd.SetNextIndex((UInt16)(vertexCount + 2));
-            mwd.SetNextIndex((UInt16)(vertexCount + 5));
-
-            lineEntry.beginJoinInfo = new JoinInfo() {
-                p0 = p0, p1 = p1,
-                leftPointIndex0 = vertexCount + 2,
-                leftPointIndex1 = vertexCount + 5,
-                leftPointIndex2 = vertexCount,
-                rightPointIndex0 = vertexCount + 1,
-                rightPointIndex1 = vertexCount + 4,
-                rightPointIndex2 = vertexCount + 3,
-                tangent = (p1 - p0).normalized
-            };
-
-            lineEntry.endJoinInfo = lineEntry.beginJoinInfo;
-
-            vertexCount += 6;
-            indexCount += 12;
-        }
-
-        internal static bool EvalArcTo(SubPathEntry arcToEntry, out Vector2 p0, out Vector2 p1, out Vector2 center)
-        {
-            // Computes the end point and center of an arc from an arc-to subpath entry.
-
-            float radius = arcToEntry.p3.x;
-            var v = (arcToEntry.p0 - arcToEntry.p1).normalized;
-            var w = (arcToEntry.p2 - arcToEntry.p1).normalized;
-            var bisect = ((v + w) * 0.5f).normalized;
-
-            // Find the point along v and w where the radius fits between the two lines
-            var theta = Vector2.Angle(v, bisect) * Mathf.Deg2Rad;
-            if (theta < k_Epsilon)
-            {
-                p0 = p1 = center = Vector2.zero;
-                return false; // Shouldn't happen, we test for colinearity before registering an arc
-            }
-
-            float sideDist = radius / Mathf.Tan(theta);
-            float centerDist = radius / Mathf.Sin(theta);
-
-            center = arcToEntry.p1 + bisect * centerDist;
-            p0 = arcToEntry.p1 + v * sideDist;
-            p1 = arcToEntry.p1 + w * sideDist;
-
-            return true;
-        }
-
-        private void StrokeArcTo(MeshWriteData mwd, ref SubPathEntry arcToEntry,  ref int vertexCount, ref int indexCount)
-        {
-            SubPathEntry arcEntry;
-            if (!ConvertArcToEntryToArcEntry(ref arcToEntry, out arcEntry))
-                return;
-
-            StrokeArc(mwd, ref arcEntry, ref vertexCount, ref indexCount);
-
-            arcToEntry.beginJoinInfo = arcEntry.beginJoinInfo;
-            arcToEntry.endJoinInfo = arcEntry.endJoinInfo;
-        }
-
-        internal static bool ConvertArcToEntryToArcEntry(ref SubPathEntry arcToEntry, out SubPathEntry outArcEntry)
-        {
-            // Arc-to entries are processed the same as normal arc entries. This method converts an arc-to entry
-            // to an arc entry.
-
-            float radius = arcToEntry.p3.x;
-            Vector2 p0, p1, center;
-            if (!EvalArcTo(arcToEntry, out p0, out p1, out center))
-            {
-                outArcEntry = new SubPathEntry();
-                return false;
-            }
-
-            var v = (p0 - center);
-            var w = (p1 - center);
-
-            float startAngle = Vector2.SignedAngle(Vector2.right, v) * Mathf.Deg2Rad;
-            float endAngle = Vector2.SignedAngle(Vector2.right, w) * Mathf.Deg2Rad;
-
-            float crossZ = v.x * w.y - v.y * w.x;
-            bool antiClockwise = crossZ < 0.0f;
-
-            outArcEntry = new SubPathEntry() {
-                type = EntryType.Arc,
-                p0 = center,
-                p1 = new Vector2(startAngle, endAngle),
-                p2 = new Vector2(radius, antiClockwise ? 1.0f : 0.0f)
-            };
-            return true;
-        }
-
-        private static void GetArcData(SubPathEntry arcEntry, out Vector2 center, out float startAngle, out float endAngle, out float radius, out bool antiClockwise)
-        {
-            // Decodes the arc data stored in an arc entry
-
-            center = arcEntry.p0;
-            startAngle = arcEntry.p1.x;
-            endAngle = arcEntry.p1.y;
-            radius = arcEntry.p2.x;
-            antiClockwise = arcEntry.p2.y == 1.0f;
-
-            // Clamp angles between 0 - 2pi
-            startAngle = NormalizeAngle(startAngle);
-            endAngle = NormalizeAngle(endAngle);
-        }
-
-        private static float NormalizeAngle(float a)
-        {
-            /// Convert any angle to the (0 - 2pi) range
-            const float twoPI = Mathf.PI * 2.0f;
-            bool isNeg = a < 0.0f;
-            a = Mathf.Abs(a);
-            if (a > twoPI)
-                a = Mathf.Repeat(a, twoPI);
-            if (isNeg)
-                a = twoPI - a;
-            return a;
-        }
-
-        internal static void EvalArcPositions(ref SubPathEntry arcEntry, out Vector2 p0, out Vector2 p1, out Vector2 pMid)
-        {
-            Vector2 center;
-            float startAngle, endAngle, radius;
-            bool antiClockwise;
-            GetArcData(arcEntry, out center, out startAngle, out endAngle, out radius, out antiClockwise);
-
-            p0 = arcEntry.p0 + new Vector2(Mathf.Cos(startAngle), Mathf.Sin(startAngle)) * radius;
-            p1 = arcEntry.p0 + new Vector2(Mathf.Cos(endAngle), Mathf.Sin(endAngle)) * radius;
-
-            float halfSweep = SweepAngle(startAngle, endAngle, antiClockwise) * 0.5f;
-            if (antiClockwise)
-                halfSweep = -halfSweep;
-            var v = (p0 - center).normalized;
-            v = Quaternion.Euler(0.0f, 0.0f, halfSweep * Mathf.Rad2Deg) * v;
-            pMid = center + v * radius;
-        }
-
-        internal static float SweepAngle(float startAngle, float endAngle, bool antiClockwise)
-        {
-            if (Mathf.Approximately(startAngle, endAngle))
-                return 0.0f;
-
-            startAngle = NormalizeAngle(startAngle);
-            endAngle = NormalizeAngle(endAngle);
-
-            const float twoPI = (Mathf.PI * 2.0f);
-            float sweep = antiClockwise ? (startAngle - endAngle) : (endAngle - startAngle);
-            if (sweep < 0.0f)
-                sweep = twoPI + sweep;
-
-            if (sweep < UIRUtility.k_Epsilon)
-                return twoPI; // Can't have a sweep of 0, we validate that the start/end angles aren't the same
-
-            return sweep;
-        }
-
-        unsafe private void StrokeArc(MeshWriteData mwd, ref SubPathEntry arcEntry, ref int vertexCount, ref int indexCount)
-        {
-            Vector2 center;
-            float startAngle, endAngle, radius;
-            bool antiClockwise;
-            GetArcData(arcEntry, out center, out startAngle, out endAngle, out radius, out antiClockwise);
-
-            Vector2 p0, p1, pMid;
-            EvalArcPositions(ref arcEntry, out p0, out p1, out pMid);
-
-            // Adjust the number of verts according to the subdivision steps
-            float sweepAngle = SweepAngle(startAngle, endAngle, antiClockwise);
-
-            float arcDelta = Mathf.PI / 6.0f;
-            if (antiClockwise)
-                arcDelta = -arcDelta;
-
-            int subdivs = (Math.Abs(Mathf.CeilToInt(sweepAngle / arcDelta)) + 1);
-            int maxVerts = subdivs * 2;
-
-            if (mwd == null)
-            {
-                vertexCount += maxVerts;
-                indexCount += (subdivs - 1) * 6;
-                return;
-            }
-
-            var verts = stackalloc Vector2[maxVerts];
-            int vCount = 0;
-
-            float halfStrokeWidth = lineWidth * 0.5f;
-            float outerDist = (radius * 1.1f) + halfStrokeWidth + k_EdgeBuffer;
-            float innerDist = radius - halfStrokeWidth - k_EdgeBuffer;
-
-            var p = p0;
-            var rot = Quaternion.Euler(0.0f, 0.0f, arcDelta * Mathf.Rad2Deg);
-            for (int i = 0; i < subdivs; ++i)
-            {
-                var w = Vector2.one;
-                if (i == 0)
-                    w = (p0 - center).normalized;
-                else if (i == (subdivs - 1))
-                    w = (p1 - center).normalized;
-                else
-                    w = (p - center).normalized;
-
-                var q0 = center + w * outerDist;
-                var q1 = center + w * innerDist;
-
-                verts[vCount++] = q0;
-                verts[vCount++] = q1;
-
-                w = rot * w;
-                p = center + w;
-            }
-
-            float halfThickness = Mathf.Max(1.0f, lineWidth) / 2.0f;
-            var color = strokeColor;
-            color.a *= Mathf.Clamp01(lineWidth);
-
-            float invOuterRadius = 1.0f / (radius + halfThickness);
-            float invInnerRadius = 1.0f / (radius - halfThickness);
-            for (int i = 0; i < vCount; ++i)
-            {
-                var outerRatio = (verts[i] - center) * invOuterRadius;
-                var innerRatio = (verts[i] - center) * invInnerRadius;
-                var circle = new Vector4(outerRatio.x, outerRatio.y, innerRatio.x, innerRatio.y);
-                mwd.SetNextVertex(new Vertex() { position = verts[i], tint = color, flags = s_ArcFlags, circle = circle });
-            }
-
-            // We may have allocated a bit more vertices than necessary, write degenerate triangles
-            var lastVert = verts[vCount - 1];
-            while (vCount < maxVerts)
-            {
-                mwd.SetNextVertex(new Vertex() { position = lastVert, tint = color });
-                ++vCount;
-            }
-
-            int baseVertex = vertexCount;
-            for (int i = 0; i < (subdivs - 1); ++i)
-            {
-                EmitTriangleCW(mwd, baseVertex + 0, baseVertex + 1, baseVertex + 2);
-                EmitTriangleCW(mwd, baseVertex + 2, baseVertex + 1, baseVertex + 3);
-                baseVertex += 2;
-            }
-
-            vertexCount += subdivs * 2;
-            indexCount += (subdivs - 1) * 6;
-
-            var tangent0 = (p0 - center).normalized;
-            tangent0 = new Vector2(-tangent0.y, tangent0.x);
-
-            var tangent1 = (p1 - center).normalized;
-            tangent1 = new Vector2(-tangent1.y, tangent1.x);
-
-            if (antiClockwise)
-            {
-                tangent0 = -tangent0;
-                tangent1 = -tangent1;
-            }
-
-            arcEntry.beginJoinInfo = new JoinInfo() {
-                p0 = p0, p1 = p1,
-                tangent = tangent0,
-                useTangent = true
-            };
-            arcEntry.endJoinInfo = new JoinInfo() {
-                p0 = p0, p1 = p1,
-                tangent = tangent1,
-                useTangent = true
-            };
-        }
-
-        internal struct BezierArcExtrusionData
-        {
-            // p0
-            // +------------              p1
-            //  \            `------------+
-            //    \                      /
-            //      \      [ Arc ]      /
-            //        \                /
-            //         +--------------+
-            //        p3             p2
-            //
-            // The curve is always extruding towards p0-p1, regardless of arc direction
-
-            public Vector2 p0;
-            public Vector2 p1;
-            public Vector2 p2;
-            public Vector2 p3;
-        }
-
-        internal struct BezierArcSegment
-        {
-            public float t0;
-            public float t1;
-            public Vector2 p0;
-            public Vector2 pMid;
-            public Vector2 p1;
-            public Vector2 center;
-            public float radius;
-            public bool isArc; // False for a straight segment
-            public bool isSelfIntersecting;
-            public bool isSingularity;
-            public bool arcGoingRight;
-
-            public BezierArcExtrusionData extrudeData;
-        }
-
-        private const int kMaxRecursion = 8;
-        private List<List<BezierArcSegment>> m_BezierArcs = new List<List<BezierArcSegment>>(64);
-
-        internal static void SubdivideBezierIntoArcs(ref SubPathEntry bezierEntry, List<BezierArcSegment> bezierArcs, float t0 = 0.0f, float t1 = 1.0f, int iteration = 1)
-        {
-            float midT = (t0 + t1) * 0.5f;
-            var p0 = BezierEval(bezierEntry, t0);
-            var pMid = BezierEval(bezierEntry, midT);
-            var p1 = BezierEval(bezierEntry, t1);
-
-            var center = Vector2.zero;
-            float radius = 0.0f;
-            CircleThroughThreePoints(p0, pMid, p1, out center, out radius);
-
-            if (radius >= maxArcRadius)
-            {
-                // This is a straight segment
-                bezierArcs.Add(new BezierArcSegment() { t0 = t0, t1 = t1, p0 = p0, p1 = p1, isArc = false });
-                return;
-            }
-
-            var tan0 = BezierTangent(bezierEntry, t0).normalized;
-            var tan1 = BezierTangent(bezierEntry, t1).normalized;
-            if (Vector2.Dot(tan0, tan1) < 0.0f && iteration < kMaxRecursion)
-            {
-                // Tangents divergence, subdivide further
-                SubdivideBezierIntoArcs(ref bezierEntry, bezierArcs, t0, midT, iteration + 1);
-                SubdivideBezierIntoArcs(ref bezierEntry, bezierArcs, midT, t1, iteration + 1);
-                return;
-            }
-
-            // Rough error evaluation by sampling a couple more points
-            float u0 = (t0 + midT) * 0.5f;
-            float u1 = (t1 + midT) * 0.5f;
-            var q0 = BezierEval(bezierEntry, u0);
-            var q1 = BezierEval(bezierEntry, u1);
-
-            bool closeEnough = iteration >= kMaxRecursion;
-            if (!closeEnough)
-            {
-                float err0 = (q0 - center).magnitude - radius;
-                float err1 = (q1 - center).magnitude - radius;
-                float err = err0 * err0 + err1 * err1;
-                closeEnough = err < 0.01f;
-            }
-
-            if (closeEnough)
-            {
-                var arc = new BezierArcSegment() {
-                    t0 = t0, t1 = t1,
-                    p0 = p0, pMid = pMid, p1 = p1,
-                    center = center, radius = radius,
-                    isArc = true
-                };
-                SplitLargeArc(bezierEntry, arc, bezierArcs);
-                return;
-            }
-
-            // Subdivide and conquer
-            SubdivideBezierIntoArcs(ref bezierEntry, bezierArcs, t0, midT, iteration + 1);
-            SubdivideBezierIntoArcs(ref bezierEntry, bezierArcs, midT, t1, iteration + 1);
-        }
-
-        static private void SplitLargeArc(SubPathEntry bezierEntry, BezierArcSegment arc, List<BezierArcSegment> bezierArcs)
-        {
-            var p = (arc.p0 + arc.p1) * 0.5f;
-            var cordDist = arc.radius - (p - arc.center).magnitude;
-            if (cordDist <= (k_EdgeBuffer - 1))
-                bezierArcs.Add(arc);
-            else
-            {
-                float midT = (arc.t0 + arc.t1) * 0.5f;
-                var mid = BezierEval(bezierEntry, midT);
-
-                var left = new BezierArcSegment() {
-                    t0 = arc.t0, t1 = midT,
-                    p0 = arc.p0, p1 = mid,
-                    pMid = BezierEval(bezierEntry, (arc.t0 + midT) * 0.5f),
-                    center = arc.center,
-                    radius = arc.radius,
-                    isArc = true
-                };
-                SplitLargeArc(bezierEntry, left, bezierArcs);
-
-                var right = new BezierArcSegment() {
-                    t0 = midT, t1 = arc.t1,
-                    p0 = mid, p1 = arc.p1,
-                    pMid = BezierEval(bezierEntry, (midT + arc.t1) * 0.5f),
-                    center = arc.center,
-                    radius = arc.radius,
-                    isArc = true
-                };
-                SplitLargeArc(bezierEntry, right, bezierArcs);
-            }
-        }
-
-        private void PopulateArcsExtrudeData(ref SubPathEntry bezierEntry, List<BezierArcSegment> bezierArcs, out int intersectionCount, out int singularityCount)
-        {
-            intersectionCount = 0;
-            singularityCount = 0;
-
-            float halfThickness = lineWidth * 0.5f;
-
-            int arcCount = bezierArcs.Count;
-            for (int i = 0; i < arcCount; ++i)
-            {
-                var arc = bezierArcs[i];
-
-                // Compute normals at extremities
-                var t0 = BezierTangent(bezierEntry, arc.t0).normalized;
-                var t1 = BezierTangent(bezierEntry, arc.t1).normalized;
-                var n0 = new Vector2(-t0.y, t0.x); // Rotate right 90 deg to find normals
-                var n1 = new Vector2(-t1.y, t1.x);
-                var n2 = -n1;
-                var n3 = -n0;
-
-                bool arcGoingRight = Vector2.Dot(n0, t1) >= 0.0f;
-                arc.arcGoingRight = arcGoingRight;
-
-                float dist = halfThickness + k_EdgeBuffer;
-                n0 *= dist;
-                n1 *= dist;
-                n2 *= dist;
-                n3 *= dist;
-
-                var p0 = arc.p0 + n0;
-                var p1 = arc.p1 + n1;
-                var p2 = arc.p1 + n2;
-                var p3 = arc.p0 + n3;
-
-                if (arcGoingRight)
-                {
-                    // Swap p0/p3 and p1/p2 so that the outside arc is always defined by the p0-p1 segment
-                    var tmp = p0;
-                    p0 = p3;
-                    p3 = tmp;
-
-                    tmp = p1;
-                    p1 = p2;
-                    p2 = tmp;
-                }
-
-                if (arc.isArc)
-                {
-                    if (Vector2.Dot(t0, t1) < 0.0f)
-                    {
-                        // Tangents in opposite directions, this can happen at a singularity, non-differentiable point.
-                        // Collapse that point.
-                        arc.p0 = arc.p1 = arc.pMid;
-                        arc.radius = 0.0f;
-                        arc.center = arc.pMid;
-                        ++singularityCount;
-                        arc.isSingularity = true;
-                    }
-                    else
-                    {
-                        // Try to find self intersection
-                        var q = Tessellation.IntersectLines(p0, p3, p1, p2);
-                        if (!float.IsNaN(q.x))
-                        {
-                            var qP0 = (q - p0);
-                            var qP1 = (q - p1);
-                            var p2P1 = (p2 - p1);
-                            var p3P0 = (p3 - p0);
-
-                            float qP0Length = qP0.magnitude;
-                            float qP1Length = qP1.magnitude;
-                            float p2P1Length = p2P1.magnitude;
-                            float p3P0Length = p3P0.magnitude;
-
-                            if (qP0Length > UIRUtility.k_Epsilon) qP0 /= qP0Length;
-                            else qP0 = Vector2.zero;
-
-                            if (qP1Length > UIRUtility.k_Epsilon) qP1 /= qP1Length;
-                            else qP1 = Vector2.zero;
-
-                            if (p2P1Length > UIRUtility.k_Epsilon) p2P1 /= p2P1Length;
-                            else p2P1 = Vector2.zero;
-
-                            if (p3P0Length > UIRUtility.k_Epsilon) p3P0 /= p3P0Length;
-                            else p3P0 = Vector2.zero;
-
-                            float qt0 = (p3P0Length > UIRUtility.k_Epsilon) ? (qP0Length / p3P0Length) : 0.0f;
-                            if (Vector2.Dot(p3P0, qP0) < 0.0f)
-                                qt0 = -qt0;
-
-                            float qt1 = (p2P1Length > UIRUtility.k_Epsilon) ? (qP1Length / p2P1Length) : 0.0f;
-                            if (Vector2.Dot(p2P1, qP1) < 0.0f)
-                                qt1 = -qt1;
-
-                            if (qt0 >= 0.0f && qt0 <= 1.0f && qt1 >= 0.0f && qt1 <= 1.0f)
-                            {
-                                p2 = p3 = q; // Collapse at intersection point
-                                ++intersectionCount;
-                                arc.isSelfIntersecting = true;
-                            }
-                        }
-                    }
-                }
-
-                arc.extrudeData = new BezierArcExtrusionData() { p0 = p0, p1 = p1, p2 = p2, p3 = p3 };
-                bezierArcs[i] = arc; // Update with extrude data
-            }
-        }
-
-        private void StrokeBezier(MeshWriteData mwd, ref SubPathEntry bezierEntry, int bezierIndex, ref int vertexCount, ref int indexCount)
-        {
-            if (mwd == null)
-            {
-                if (bezierIndex >= m_BezierArcs.Count)
-                    m_BezierArcs.Add(new List<BezierArcSegment>(64));
-                var arcs = m_BezierArcs[bezierIndex];
-                arcs.Clear();
-
-                SubdivideBezierIntoArcs(ref bezierEntry, arcs);
-
-                vertexCount += arcs.Count * 4;
-                indexCount += arcs.Count * 6;
-
-                // More quads to deal with self-intersecting arcs
-                int intersectionCount, singularityCount;
-                PopulateArcsExtrudeData(ref bezierEntry, arcs, out intersectionCount, out singularityCount);
-                vertexCount += intersectionCount * 4;
-                indexCount += intersectionCount * 6;
-                vertexCount += singularityCount * 5;
-                indexCount += singularityCount * 12;
-
-                return;
-            }
-
-            var bezierArcs = m_BezierArcs[bezierIndex];
-
-            if (bezierArcs.Count == 0)
-                return;
-
-            float halfThickness = Mathf.Max(1.0f, lineWidth) / 2.0f;
-            var color = strokeColor;
-            color.a *= Mathf.Clamp01(lineWidth);
-
-            for (int i = 0; i < bezierArcs.Count; ++i)
-            {
-                var arc = bezierArcs[i];
-                var extrudeData = arc.extrudeData;
-
-                var p0 = extrudeData.p0;
-                var p1 = extrudeData.p1;
-                var p2 = extrudeData.p2;
-                var p3 = extrudeData.p3;
-
-                var circle0 = Vector4.zero;
-                var circle1 = Vector4.zero;
-                var circle2 = Vector4.zero;
-                var circle3 = Vector4.zero;
-
-                if (arc.isArc)
-                {
-                    float outerRadius = 1.0f / (arc.radius + halfThickness);
-                    float innerRadius = 1.0f / (arc.radius - halfThickness);
-
-                    var edge0 = (p0 - arc.center);
-                    var edge1 = (p1 - arc.center);
-                    var edge2 = (p2 - arc.center);
-                    var edge3 = (p3 - arc.center);
-
-                    var outerRatio0 = edge0 * outerRadius;
-                    var innerRatio0 = edge0 * innerRadius;
-                    var outerRatio1 = edge1 * outerRadius;
-                    var innerRatio1 = edge1 * innerRadius;
-                    var outerRatio2 = edge2 * outerRadius;
-                    var innerRatio2 = edge2 * innerRadius;
-                    var outerRatio3 = edge3 * outerRadius;
-                    var innerRatio3 = edge3 * innerRadius;
-
-                    circle0 = new Vector4(outerRatio0.x, outerRatio0.y, innerRatio0.x, innerRatio0.y);
-                    circle1 = new Vector4(outerRatio1.x, outerRatio1.y, innerRatio1.x, innerRatio1.y);
-                    circle2 = new Vector4(outerRatio2.x, outerRatio2.y, innerRatio2.x, innerRatio2.y);
-                    circle3 = new Vector4(outerRatio3.x, outerRatio3.y, innerRatio3.x, innerRatio3.y);
-
-                    var intersectionToCircle = (arc.pMid - p2);
-                    float intersectionToCircleLength = intersectionToCircle.magnitude;
-                    if (arc.isSelfIntersecting && intersectionToCircleLength <= halfThickness)
-                    {
-                        edge0 = (p0 - p2);
-                        edge1 = (p1 - p2);
-                        float radius = intersectionToCircleLength + halfThickness;
-                        var ratio0 = edge0 / radius;
-                        var ratio1 = edge1 / radius;
-                        circle0 = new Vector4(ratio0.x, ratio0.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                        circle1 = new Vector4(ratio1.x, ratio1.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                        circle2 = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                        circle3 = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    }
-                }
-                else
-                {
-                    float outerRadius = 1.0f / (k_EdgeBuffer + lineWidth);
-                    float innerRadius = 1.0f / k_EdgeBuffer;
-
-                    var edge0 = (p0 - p3);
-                    var edge1 = (p1 - p2);
-
-                    var outerRatio0 = edge0 * outerRadius;
-                    var innerRatio0 = edge0 * innerRadius;
-                    var outerRatio1 = edge1 * outerRadius;
-                    var innerRatio1 = edge1 * innerRadius;
-
-                    circle0 = new Vector4(outerRatio0.x, outerRatio0.y, innerRatio0.x, innerRatio0.y);
-                    circle1 = new Vector4(outerRatio1.x, outerRatio1.y, innerRatio1.x, innerRatio1.y);
-                    circle2 = Vector4.zero;
-                    circle3 = Vector4.zero;
-                }
-
-                mwd.SetNextVertex(new Vertex() { position = new Vector3(p0.x, p0.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle0 });
-                mwd.SetNextVertex(new Vertex() { position = new Vector3(p1.x, p1.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle1 });
-                mwd.SetNextVertex(new Vertex() { position = new Vector3(p2.x, p2.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle2 });
-                mwd.SetNextVertex(new Vertex() { position = new Vector3(p3.x, p3.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle3 });
-
-                EmitTriangleCW(mwd, vertexCount, vertexCount + 1, vertexCount + 2);
-                EmitTriangleCW(mwd, vertexCount, vertexCount + 2, vertexCount + 3);
-
-                if (i == 0)
-                {
-                    bezierEntry.beginJoinInfo = new JoinInfo() {
-                        p0 = arc.p0, p1 = arc.p1,
-                        useTangent = true,
-                        tangent = BezierTangent(bezierEntry, 0.0f).normalized
-                    };
-                }
-                else if (i == (bezierArcs.Count - 1))
-                {
-                    bezierEntry.endJoinInfo = new JoinInfo() {
-                        p0 = arc.p0, p1 = arc.p1,
-                        useTangent = true,
-                        tangent = BezierTangent(bezierEntry, 1.0f).normalized
-                    };
-                }
-
-                vertexCount += 4;
-                indexCount += 6;
-
-                if (arc.isSelfIntersecting)
-                {
-                    // Generate and extra extrusion quad to fill missing section above the intersection triangle.
-                    // Intersection point is in p2 and p3.
-                    var q0 = p0;
-                    var q1 = p1;
-                    var v = (q1 - q0).normalized;
-                    var leftPerp = new Vector2(v.y, -v.x);
-                    if (!arc.arcGoingRight)
-                        leftPerp = -leftPerp;
-
-                    var toCircle = (arc.p0 - p2);
-                    var toCircleLength = toCircle.magnitude;
-                    float radius0 = toCircleLength + halfThickness;
-
-                    toCircle = (arc.p1 - p2);
-                    toCircleLength = toCircle.magnitude;
-                    float radius1 = toCircleLength + halfThickness;
-
-                    var mid = (q0 + q1) * 0.5f;
-                    float extrusionWidth = Mathf.Max(0.0f, Mathf.Max(radius0, radius1) - (mid - p2).magnitude);
-                    if (extrusionWidth > Tessellation.kEpsilon)
-                        extrusionWidth += k_EdgeBuffer;
-
-                    var q2 = q1 + leftPerp * extrusionWidth;
-                    var q3 = q0 + leftPerp * extrusionWidth;
-
-                    var edge0 = (q0 - p2);
-                    var edge1 = (q1 - p2);
-                    var edge2 = (q2 - p2);
-                    var edge3 = (q3 - p2);
-                    float invRadius0 = 1.0f / radius0;
-                    float invRadius1 = 1.0f / radius1;
-                    var ratio0 = edge0 * invRadius0;
-                    var ratio1 = edge1 * invRadius1;
-                    var ratio2 = edge2 * invRadius1;
-                    var ratio3 = edge3 * invRadius0;
-                    circle0 = new Vector4(ratio0.x, ratio0.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    circle1 = new Vector4(ratio1.x, ratio1.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    circle2 = new Vector4(ratio2.x, ratio2.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    circle3 = new Vector4(ratio3.x, ratio3.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q0.x, q0.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle0 });
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q1.x, q1.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle1 });
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q2.x, q2.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle2 });
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q3.x, q3.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle3 });
-
-                    EmitTriangleCW(mwd, vertexCount, vertexCount + 1, vertexCount + 2);
-                    EmitTriangleCW(mwd, vertexCount, vertexCount + 2, vertexCount + 3);
-
-                    vertexCount += 4;
-                    indexCount += 6;
-                }
-
-                if (arc.isSingularity)
-                {
-                    // We can't determine a proper arc for singularities, just generate a full circle and hope for the best.
-                    float extrusion = halfThickness + k_EdgeBuffer;
-                    var q0 = arc.pMid;
-                    var q1 = q0 + new Vector2(-1, -1) * extrusion;
-                    var q2 = q0 + new Vector2(1, -1) * extrusion;
-                    var q3 = q0 + new Vector2(1, 1) * extrusion;
-                    var q4 = q0 + new Vector2(-1, 1) * extrusion;
-
-                    var edge1 = (q1 - q0);
-                    var edge2 = (q2 - q0);
-                    var edge3 = (q3 - q0);
-                    var edge4 = (q4 - q0);
-
-                    float invRadius = 1.0f / halfThickness;
-                    var ratio1 = edge1 * invRadius;
-                    var ratio2 = edge2 * invRadius;
-                    var ratio3 = edge3 * invRadius;
-                    var ratio4 = edge4 * invRadius;
-
-                    circle0 = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    circle1 = new Vector4(ratio1.x, ratio1.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    circle2 = new Vector4(ratio2.x, ratio2.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    circle3 = new Vector4(ratio3.x, ratio3.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                    var circle4 = new Vector4(ratio4.x, ratio4.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q0.x, q0.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle0 });
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q1.x, q1.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle1 });
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q2.x, q2.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle2 });
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q3.x, q3.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle3 });
-                    mwd.SetNextVertex(new Vertex() { position = new Vector3(q4.x, q4.y, Vertex.nearZ), tint = color, flags = s_ArcFlags, circle = circle4 });
-
-                    EmitTriangleCW(mwd, vertexCount, vertexCount + 1, vertexCount + 2);
-                    EmitTriangleCW(mwd, vertexCount, vertexCount + 2, vertexCount + 3);
-                    EmitTriangleCW(mwd, vertexCount, vertexCount + 3, vertexCount + 4);
-                    EmitTriangleCW(mwd, vertexCount, vertexCount + 4, vertexCount + 1);
-
-                    vertexCount += 5;
-                    indexCount += 12;
-                }
-            }
-        }
-
-        internal static Vector2 BezierEval(SubPathEntry bezierEntry, float t)
-        {
-            float t2 = t * t;
-            float t3 = t2 * t;
-            return
-                (bezierEntry.p3 - 3.0f * bezierEntry.p2 + 3.0f * bezierEntry.p1 - bezierEntry.p0) * t3
-                + (3.0f * bezierEntry.p2 - 6.0f * bezierEntry.p1 + 3.0f * bezierEntry.p0) * t2
-                + (3.0f * bezierEntry.p1 - 3.0f * bezierEntry.p0) * t
-                + bezierEntry.p0;
-        }
-
-        internal static Vector2 BezierTangent(SubPathEntry bezierEntry, float t)
-        {
-            // The tangent is the first derivative
-            float t2 = t * t;
-            return
-                3.0f * (bezierEntry.p3 - 3.0f * bezierEntry.p2 + 3.0f * bezierEntry.p1 - bezierEntry.p0) * t2
-                + 2.0f * (3.0f * bezierEntry.p2 - 6.0f * bezierEntry.p1 + 3.0f * bezierEntry.p0) * t
-                + (3.0f * bezierEntry.p1 - 3.0f * bezierEntry.p0);
-        }
-
-        internal static void CircleThroughThreePoints(Vector2 p0, Vector2 p1, Vector2 p2, out Vector2 center, out float radius)
-        {
-            float t = p1.x * p1.x + p1.y * p1.y;
-            float bc = (p0.x * p0.x + p0.y * p0.y - t) / 2.0f;
-            float cd = (t - p2.x * p2.x - p2.y * p2.y) / 2.0f;
-            float det = (p0.x - p1.x) * (p1.y - p2.y) - (p1.x - p2.x) * (p0.y - p1.y);
-
-            if (Math.Abs(det) < 1.0e-7f)
-            {
-                // Points are probably collapsed together
-                center = p0;
-                radius = 0.0f;
-                return;
-            }
-
-            det = 1.0f / det;
-            float x = ((p1.y - p2.y) * bc - (p0.y - p1.y) * cd) * det;
-            float y = ((p0.x - p1.x) * cd - (p1.x - p2.x) * bc) * det;
-            float r = Mathf.Sqrt((x - p0.x) * (x - p0.x) + (y - p0.y) * (y - p0.y));
-
-            center = new Vector2(x, y);
-            radius = r;
-        }
-
-        private void StrokeJoin(MeshWriteData mwd, ref JoinInfo joinInfoA, ref JoinInfo joinInfoB, ref int vertexCount, ref int indexCount)
-        {
-            switch (lineJoin)
-            {
-                case LineJoin.Miter:
-                    StrokeMiteredJoin(mwd, ref joinInfoA, ref joinInfoB, ref vertexCount, ref indexCount);
-                    break;
-                case LineJoin.Bevel:
-                    StrokeBeveledJoin(mwd, ref joinInfoA, ref joinInfoB, ref vertexCount, ref indexCount);
-                    break;
-                case LineJoin.Round:
-                    StrokeRoundedJoin(mwd, ref joinInfoA, ref joinInfoB, ref vertexCount, ref indexCount);
-                    break;
-                default: break;
-            }
-        }
-
-        private bool SkipIfContinuous(MeshWriteData mwd, ref JoinInfo joinInfoA, ref JoinInfo joinInfoB, int expectedVertices, int expectedIndices, ref int vertexCount, ref int indexCount)
-        {
-            var t0 = joinInfoA.tangent;
-            var t1 = joinInfoB.tangent;
-            if (Mathf.Abs(Vector2.Dot(t0, t1) - 1.0f) < k_Epsilon)
-            {
-                // No need for a join, sub-paths are continuous
-                for (int i = 0; i < expectedVertices; ++i)
-                    mwd.SetNextVertex(new Vertex());
-                for (int i = 0; i < expectedIndices; ++i)
-                    mwd.SetNextIndex((UInt16)vertexCount);
-                vertexCount += expectedVertices;
-                indexCount += expectedIndices;
-                return true;
-            }
-            return false;
-        }
-
-        private void StrokeMiteredJoin(MeshWriteData mwd, ref JoinInfo joinInfoA, ref JoinInfo joinInfoB, ref int vertexCount, ref int indexCount)
-        {
-            const int kExpectedVertices = 6;
-            const int kExpectedIndices = 6;
-            if (mwd == null)
-            {
-                // This assumes StrokeBeveledJoin() uses 6 verts and 6 inds as well
-                vertexCount += kExpectedVertices;
-                indexCount += kExpectedIndices;
-                return;
-            }
-
-            if (SkipIfContinuous(mwd, ref joinInfoA, ref joinInfoB, kExpectedVertices, kExpectedIndices, ref vertexCount, ref indexCount))
-                return;
-
-            float angle = Vector2.Angle(-joinInfoA.tangent, joinInfoB.tangent);
-            float minMiterAngle = (2.0f * Mathf.Asin(1.0f / miterLimit)) * Mathf.Rad2Deg;
-            bool useMiter = (angle > minMiterAngle);
-
-            if (!useMiter)
-            {
-                StrokeBeveledJoin(mwd, ref joinInfoA, ref joinInfoB, ref vertexCount, ref indexCount);
-                return;
-            }
-
-            ConnectInnerJoins(mwd, ref joinInfoA, ref joinInfoB);
-
-            Vector2 outerPointA0, outerPointA1, outerPointB0, outerPointB1;
-            GetOuterJoinPoints(mwd, ref joinInfoA, ref joinInfoB, out outerPointA0, out outerPointA1, out outerPointB0, out outerPointB1);
-
-            // Find intersection point between outer edges.
-            // Given the miter limit, the intersection should always be valid.
-            var intersection = Tessellation.IntersectLines(outerPointA0, outerPointA1, outerPointB0, outerPointB1);
-
-            var a0 = joinInfoA.p1;
-            var a1 = outerPointA1;
-            var a2 = intersection;
-            var b0 = joinInfoB.p0;
-            var b1 = outerPointB0;
-            var b2 = intersection;
-
-            float invHalfLineWidth = 1.0f / (lineWidth * 0.5f);
-            var ratioA = (a1 - a0) * invHalfLineWidth;
-            var ratioB = (b1 - b0) * invHalfLineWidth;
-
-            var circleZ = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circleA = new Vector4(ratioA.x, ratioA.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circleB = new Vector4(ratioB.x, ratioB.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(a0.x, a0.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleZ });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(a1.x, a1.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleA });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(a2.x, a2.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleA });
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(b0.x, b0.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleZ });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(b1.x, b1.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleB });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(b2.x, b2.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleB });
-
-            EmitTriangleCW(mwd, vertexCount + 0, vertexCount + 1, vertexCount + 2);
-            EmitTriangleCW(mwd, vertexCount + 3, vertexCount + 4, vertexCount + 5);
-
-            vertexCount += kExpectedVertices;
-            indexCount += kExpectedIndices;
-        }
-
-        private void StrokeBeveledJoin(MeshWriteData mwd, ref JoinInfo joinInfoA, ref JoinInfo joinInfoB, ref int vertexCount, ref int indexCount)
-        {
-            const int kExpectedVertices = 6;
-            const int kExpectedIndices = 6;
-            if (mwd == null)
-            {
-                vertexCount += kExpectedVertices;
-                indexCount += kExpectedIndices;
-                return;
-            }
-
-            if (SkipIfContinuous(mwd, ref joinInfoA, ref joinInfoB, kExpectedVertices, kExpectedIndices, ref vertexCount, ref indexCount))
-                return;
-
-            ConnectInnerJoins(mwd, ref joinInfoA, ref joinInfoB);
-
-            Vector2 outerPointA0, outerPointA1, outerPointB0, outerPointB1;
-            GetOuterJoinPoints(mwd, ref joinInfoA, ref joinInfoB, out outerPointA0, out outerPointA1, out outerPointB0, out outerPointB1);
-
-            float halfLineWidth = lineWidth * 0.5f;
-            var v = (outerPointA1 - joinInfoA.p1).normalized;
-            var w = (outerPointB0 - joinInfoB.p0).normalized;
-            v *= halfLineWidth;
-            w *= halfLineWidth;
-
-            var bevelMid = ((joinInfoA.p1 + v) + (joinInfoB.p0 + w)) * 0.5f;
-            bevelMid = (bevelMid - joinInfoA.p1);
-            float bevelMidLength = bevelMid.magnitude;
-            var bevelPoint = joinInfoA.p1 + bevelMid.normalized * (bevelMidLength + k_EdgeBuffer);
-
-            var p = joinInfoA.p1;
-            var a = outerPointA1;
-            var b = bevelPoint;
-
-            var ratioA = (a - p) / halfLineWidth;
-            var ratioB = (b - p) / bevelMidLength;
-
-            var circleZ = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circleA = new Vector4(0.0f, ratioA.magnitude, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circleB = new Vector4(0.0f, ratioB.magnitude, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p.x, p.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleZ });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(a.x, a.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleA });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(b.x, b.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleB });
-            EmitTriangleCW(mwd, vertexCount + 0, vertexCount + 1, vertexCount + 2);
-
-            p = joinInfoB.p0;
-            a = outerPointB0;
-            b = bevelPoint;
-
-            ratioA = (a - p) / halfLineWidth;
-            ratioB = (b - p) / bevelMidLength;
-
-            circleZ = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            circleA = new Vector4(0.0f, ratioA.magnitude, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            circleB = new Vector4(0.0f, ratioB.magnitude, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p.x, p.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleZ });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(a.x, a.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleA });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(b.x, b.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circleB });
-            EmitTriangleCW(mwd, vertexCount + 3, vertexCount + 4, vertexCount + 5);
-
-            vertexCount += kExpectedVertices;
-            indexCount += kExpectedIndices;
-        }
-
-        private void StrokeRoundedJoin(MeshWriteData mwd, ref JoinInfo joinInfoA, ref JoinInfo joinInfoB, ref int vertexCount, ref int indexCount)
-        {
-            const int kExpectedVertices = 5;
-            const int kExpectedIndices = 9;
-            if (mwd == null)
-            {
-                vertexCount += kExpectedVertices;
-                indexCount += kExpectedIndices;
-                return;
-            }
-
-            if (SkipIfContinuous(mwd, ref joinInfoA, ref joinInfoB, kExpectedVertices, kExpectedIndices, ref vertexCount, ref indexCount))
-                return;
-
-            ConnectInnerJoins(mwd, ref joinInfoA, ref joinInfoB);
-
-            Vector2 outerPointA0, outerPointA1, outerPointB0, outerPointB1;
-            GetOuterJoinPoints(mwd, ref joinInfoA, ref joinInfoB, out outerPointA0, out outerPointA1, out outerPointB0, out outerPointB1);
-
-            var v0 = (joinInfoA.p1 - joinInfoA.p0).normalized;
-            var v1 = (joinInfoB.p1 - joinInfoB.p0).normalized;
-            var rightPerp = new Vector2(-v0.y, v0.x);
-            var dot = Vector2.Dot(v1, rightPerp);
-            bool turningRight = dot >= 0.0f;
-
-            if (outerPointA1 != outerPointB0)
-            {
-                float radius = lineWidth / 2.0f;
-
-                var perp = outerPointB0 - outerPointA1;
-                perp = new Vector2(perp.y, -perp.x).normalized * (radius + k_EdgeBuffer);
-                if (!turningRight)
-                    perp = -perp;
-
-                var outerPointA1Perp = outerPointA1 + perp;
-                var outerPointB0Perp = outerPointB0 + perp;
-
-                var p0 = new Vector3(joinInfoA.p1.x, joinInfoA.p1.y, Vertex.nearZ);
-                var p1 = new Vector3(outerPointA1.x, outerPointA1.y, Vertex.nearZ);
-                var p2 = new Vector3(outerPointA1Perp.x, outerPointA1Perp.y, Vertex.nearZ);
-                var p3 = new Vector3(outerPointB0Perp.x, outerPointB0Perp.y, Vertex.nearZ);
-                var p4 = new Vector3(outerPointB0.x, outerPointB0.y, Vertex.nearZ);
-
-                float invRadius = 1.0f / radius;
-                var ratioP1 = (p1 - p0) * invRadius;
-                var ratioP2 = (p2 - p0) * invRadius;
-                var ratioP3 = (p3 - p0) * invRadius;
-                var ratioP4 = (p4 - p0) * invRadius;
-
-                var circle0 = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                var circle1 = new Vector4(ratioP1.x, ratioP1.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                var circle2 = new Vector4(ratioP2.x, ratioP2.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                var circle3 = new Vector4(ratioP3.x, ratioP3.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-                var circle4 = new Vector4(ratioP4.x, ratioP4.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-                mwd.SetNextVertex(new Vertex() { position = p0, tint = strokeColor, flags = s_ArcFlags, circle = circle0 });
-                mwd.SetNextVertex(new Vertex() { position = p1, tint = strokeColor, flags = s_ArcFlags, circle = circle1 });
-                mwd.SetNextVertex(new Vertex() { position = p2, tint = strokeColor, flags = s_ArcFlags, circle = circle2 });
-                mwd.SetNextVertex(new Vertex() { position = p3, tint = strokeColor, flags = s_ArcFlags, circle = circle3 });
-                mwd.SetNextVertex(new Vertex() { position = p4, tint = strokeColor, flags = s_ArcFlags, circle = circle4 });
-
-                EmitTriangleCW(mwd, vertexCount, vertexCount + 1, vertexCount + 2);
-                EmitTriangleCW(mwd, vertexCount, vertexCount + 2, vertexCount + 3);
-                EmitTriangleCW(mwd, vertexCount, vertexCount + 3, vertexCount + 4);
-            }
-            else
-            {
-                // Make degenerate triangles
-                var p = new Vector3(joinInfoA.p1.x, joinInfoA.p1.y, Vertex.nearZ);
-                var vert = new Vertex() { position = p, tint = Color.clear };
-                for (int i = 0; i < 5; ++i)
-                    mwd.SetNextVertex(vert);
-                for (int i = 0; i < 9; ++i)
-                    mwd.SetNextIndex((UInt16)vertexCount);
-            }
-
-            vertexCount += kExpectedVertices;
-            indexCount += kExpectedIndices;
-        }
-
-        private void ConnectInnerJoins(MeshWriteData mwd, ref JoinInfo joinInfoA, ref JoinInfo joinInfoB)
-        {
-            if (joinInfoA.useTangent || joinInfoB.useTangent)
-                return;
-
-            bool turningRight = IsJoinTurningRight(ref joinInfoA, ref joinInfoB);
-
-            // Look if we need to move the inner vertices to avoid mesh overlap between the two sub-paths
-            int innerIndexA0 = turningRight ? joinInfoA.rightPointIndex0 : joinInfoA.leftPointIndex0;
-            int innerIndexA1 = turningRight ? joinInfoA.rightPointIndex1 : joinInfoA.leftPointIndex1;
-            int innerIndexA2 = turningRight ? joinInfoA.rightPointIndex2 : joinInfoA.leftPointIndex2;
-            int innerIndexB0 = turningRight ? joinInfoB.rightPointIndex0 : joinInfoB.leftPointIndex0;
-            int innerIndexB1 = turningRight ? joinInfoB.rightPointIndex1 : joinInfoB.leftPointIndex1;
-            int innerIndexB2 = turningRight ? joinInfoB.rightPointIndex2 : joinInfoB.leftPointIndex2;
-
-            var verts = mwd.m_Vertices;
-            var innerPointA0 = verts[innerIndexA0].position;
-            var innerPointA1 = verts[innerIndexA1].position;
-            var innerPointB0 = verts[innerIndexB0].position;
-            var innerPointB1 = verts[innerIndexB1].position;
-
-            var innerPoint = Tessellation.IntersectLines(innerPointA0, innerPointA1, innerPointB0, innerPointB1);
-            if (float.IsNaN(innerPoint.x))
-                return; // Lines are parallel
-
-            // Check if the intersection is further than the length of the segments
-            float t = TFromPointOnSegment(innerPoint, innerPointA0, innerPointA1);
-            if (t < 0.0f || t > 1.0f)
-                return;
-
-            t = TFromPointOnSegment(innerPoint, innerPointB0, innerPointB1);
-            if (t < 0.0f || t > 1.0f)
-                return;
-
-            // Okay, it's safe to move the inner vertices
-            var vertA0 = verts[innerIndexA0];
-            var vertA1 = verts[innerIndexA1];
-            var vertA2 = verts[innerIndexA2];
-            vertA1.circle = Tessellation.GetInterpolatedCircle(innerPoint, ref vertA0, ref vertA1, ref vertA2);
-            vertA1.position = innerPoint;
-            verts[innerIndexA1] = vertA1;
-
-            var vertB0 = verts[innerIndexB0];
-            var vertB1 = verts[innerIndexB1];
-            var vertB2 = verts[innerIndexB2];
-            vertB0.circle = Tessellation.GetInterpolatedCircle(innerPoint, ref vertB0, ref vertB1, ref vertB2);
-            vertB0.position = innerPoint;
-            verts[innerIndexB0] = vertB0;
-        }
-
-        internal float TFromPointOnSegment(Vector2 p, Vector2 p0, Vector2 p1)
-        {
-            var v = (p1 - p0);
-            var w = (p - p0);
-
-            float vLength = v.magnitude;
-            float wLength = w.magnitude;
-
-            if (vLength <= UIRUtility.k_Epsilon)
-                return 0.0f;
-
-            if (vLength > UIRUtility.k_Epsilon) v /= vLength;
-            else v = Vector2.zero;
-
-            if (wLength > UIRUtility.k_Epsilon) w /= wLength;
-            else w = Vector2.zero;
-
-            float t = wLength / vLength;
-            if (Vector2.Dot(v, w) < 0.0f)
-                return -t;
-            return t;
-        }
-
-        private void GetOuterJoinPoints(MeshWriteData mwd, ref JoinInfo joinInfoA, ref JoinInfo joinInfoB, out Vector2 outerPointA0, out Vector2 outerPointA1, out Vector2 outerPointB0, out Vector2 outerPointB1)
-        {
-            bool turningRight = IsJoinTurningRight(ref joinInfoA, ref joinInfoB);
-
-            if (joinInfoA.useTangent || joinInfoB.useTangent)
-            {
-                var tA = joinInfoA.tangent;
-                var tB = joinInfoB.tangent;
-                var perpA = new Vector2(-tA.y, tA.x);
-                var perpB = new Vector2(-tB.y, tB.x);
-                if (turningRight)
-                {
-                    perpA = -perpA;
-                    perpB = -perpB;
-                }
-
-                float halfStrokeWidth = lineWidth * 0.5f;
-                perpA *= halfStrokeWidth;
-                perpB *= halfStrokeWidth;
-
-                outerPointA0 = (joinInfoA.p1 - tA) + perpA;
-                outerPointA1 = joinInfoA.p1 + perpA;
-                outerPointB0 = joinInfoB.p0 + perpB;
-                outerPointB1 = (joinInfoB.p0 + tB) + perpB;
-            }
-            else
-            {
-                int outerIndexA0 = turningRight ? joinInfoA.leftPointIndex0 : joinInfoA.rightPointIndex0;
-                int outerIndexA1 = turningRight ? joinInfoA.leftPointIndex1 : joinInfoA.rightPointIndex1;
-                int outerIndexB0 = turningRight ? joinInfoB.leftPointIndex0 : joinInfoB.rightPointIndex0;
-                int outerIndexB1 = turningRight ? joinInfoB.leftPointIndex1 : joinInfoB.rightPointIndex1;
-
-                var verts = mwd.m_Vertices;
-                outerPointA0 = (Vector2)verts[outerIndexA0].position;
-                outerPointA1 = (Vector2)verts[outerIndexA1].position;
-                outerPointB0 = (Vector2)verts[outerIndexB0].position;
-                outerPointB1 = (Vector2)verts[outerIndexB1].position;
-            }
-        }
-
-        internal bool IsJoinTurningRight(ref JoinInfo joinInfoA, ref JoinInfo joinInfoB)
-        {
-            var v = (joinInfoA.p1 - joinInfoA.p0);
-            var w = (joinInfoB.p1 - joinInfoB.p0);
-            float crossZ = v.x * w.y - v.y * w.x;
-            return crossZ >= 0.0f;
-        }
-
-        private void StrokeCap(MeshWriteData mwd, ref JoinInfo joinInfo, bool isStartingCap, ref int vertexCount, ref int indexCount)
-        {
-            switch (lineCap)
-            {
-                case LineCap.Butt:
-                    // No antialiasing for now on  chopped caps
-                    break;
-                case LineCap.Round:
-                    StrokeRoundedCap(mwd, ref joinInfo, isStartingCap, ref vertexCount, ref indexCount);
-                    break;
-                default: break;
-            }
-        }
-
-        private void StrokeRoundedCap(MeshWriteData mwd, ref JoinInfo joinInfo, bool isStartingCap, ref int vertexCount, ref int indexCount)
-        {
-            if (mwd == null)
-            {
-                vertexCount += 5;
-                indexCount += 9;
-                return;
-            }
-
-            float radius = lineWidth * 0.5f;
-            float dist = radius + k_EdgeBuffer;
-
-            var p0 = Vector2.zero;
-            var p1 = Vector2.zero;
-            var p2 = Vector2.zero;
-            var p3 = Vector2.zero;
-            var p4 = Vector2.zero;
-
-            if (joinInfo.useTangent)
-            {
-                var tan = joinInfo.tangent.normalized;
-                if (isStartingCap)
-                    tan = -tan;
-
-                var nRight = tan;
-                nRight = new Vector2(-nRight.y, nRight.x);
-                nRight *= dist;
-                tan *= dist;
-
-                p0 = isStartingCap ? joinInfo.p0 : joinInfo.p1;
-                p1 = p0 + nRight;
-                p2 = p0 + nRight + tan;
-                p3 = p0 - nRight + tan;
-                p4 = p0 - nRight;
-            }
-            else
-            {
-                var verts = mwd.m_Vertices;
-                var leftPoint0 = (Vector2)verts[joinInfo.leftPointIndex0].position;
-                var leftPoint1 = (Vector2)verts[joinInfo.leftPointIndex1].position;
-                var rightPoint0 = (Vector2)verts[joinInfo.rightPointIndex0].position;
-                var rightPoint1 = (Vector2)verts[joinInfo.rightPointIndex1].position;
-
-                var nLeft = (leftPoint1 - leftPoint0).normalized * dist;
-                var nRight = (rightPoint1 - rightPoint0).normalized * dist;
-
-                p0 = isStartingCap ? joinInfo.p0 : joinInfo.p1;
-                p1 = isStartingCap ? leftPoint0 : leftPoint1;
-                p2 = isStartingCap ? leftPoint0 - nLeft : leftPoint1 + nLeft;
-                p3 = isStartingCap ? rightPoint0 - nRight : rightPoint1 + nRight;
-                p4 = isStartingCap ? rightPoint0 : rightPoint1;
-            }
-
-            float invRadius = 1.0f / radius;
-            var ratioP1 = (p1 - p0) * invRadius;
-            var ratioP2 = (p2 - p0) * invRadius;
-            var ratioP3 = (p3 - p0) * invRadius;
-            var ratioP4 = (p4 - p0) * invRadius;
-
-            var circle0 = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle1 = new Vector4(ratioP1.x, ratioP1.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle2 = new Vector4(ratioP2.x, ratioP2.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle3 = new Vector4(ratioP3.x, ratioP3.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle4 = new Vector4(ratioP4.x, ratioP4.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p0.x, p0.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circle0 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p1.x, p1.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circle1 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p2.x, p2.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circle2 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p3.x, p3.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circle3 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p4.x, p4.y, Vertex.nearZ), tint = strokeColor, flags = s_ArcFlags, circle = circle4 });
-
-            EmitTriangleCW(mwd, vertexCount, vertexCount + 1, vertexCount + 2);
-            EmitTriangleCW(mwd, vertexCount, vertexCount + 2, vertexCount + 3);
-            EmitTriangleCW(mwd, vertexCount, vertexCount + 3, vertexCount + 4);
-
-            vertexCount += 5;
-            indexCount += 9;
-        }
-
-        internal struct FillingArc
-        {
-            public Vector2 p0;
-            public Vector2 pMid;
-            public Vector2 p1;
-            public Vector2 p2; // 3rd vertex of the triangle (not shared on the arc)
-            public Vector2 center;
-            public float radius;
-            public bool isArc; // false for a straight segment
-            public bool isConcave;
-            public bool isContourBreaker; // true when starting a new contour
-        }
-
-        struct ContourInfo
-        {
-            public NativeArray<Vector2> verts;
-            public int vertexCount;
-        }
-
-        struct IndexPair
-        {
-            public IndexPair(int f, int s) { first = f; second = s; }
-            public int first;
-            public int second;
-        }
-
-        private List<FillingArc> m_FillingArcs = new List<FillingArc>(64);
-        private List<BezierArcSegment> m_FilledBezierArcs = new List<BezierArcSegment>(64);
-        private List<IndexPair> m_ArcIndicesPerVertex = new List<IndexPair>(64);
-
-        private void RecordArcAtVertexIndex(int arcIndex, int vertexIndex)
-        {
-            Debug.Assert(vertexIndex >= 0);
-            while (vertexIndex >= m_ArcIndicesPerVertex.Count)
-                m_ArcIndicesPerVertex.Add(new IndexPair(-1, -1));
-
-            var pair = m_ArcIndicesPerVertex[vertexIndex];
-            if (pair.first == arcIndex || pair.second == arcIndex)
-                return; // Already recorded
-
-            if (pair.first == -1)
-                pair.first = arcIndex;
-            else if (pair.second == -1)
-                pair.second = arcIndex;
-            m_ArcIndicesPerVertex[vertexIndex] = pair;
-        }
-
-        private void PopulateContoursWithArcMappings(List<ContourInfo> contours)
-        {
-            contours.Clear();
-
-            int arcCount = m_FillingArcs.Count;
-            if (arcCount == 0)
-                return;
-
-            m_ArcIndicesPerVertex.Clear();
-
-            var currentContour = new ContourInfo() { verts = new NativeArray<Vector2>(m_FillingArcs.Count * 2, Allocator.Temp) };
-
-            int nextVertexIndex = 0;
-            int totalVertexIndex = 0;
-            int contourStartArcIndex = 0;
-            int contourStartVertexIndex = 0;
-            bool atContourStart = true;
-            for (int i = 0; i < arcCount; ++i)
-            {
-                var arc = m_FillingArcs[i];
-
-                if (arc.isContourBreaker)
-                {
-                    if (currentContour.vertexCount > 0)
-                        contours.Add(currentContour);
-                    contourStartArcIndex = i + 1;
-                    contourStartVertexIndex = totalVertexIndex;
-                    atContourStart = true;
-                    nextVertexIndex = 0;
-                    currentContour = new ContourInfo() { verts = new NativeArray<Vector2>(m_FillingArcs.Count * 2, Allocator.Temp) };
-                    continue;
-                }
-
-                if (atContourStart)
-                {
-                    RecordArcAtVertexIndex(i, totalVertexIndex++);
-                    currentContour.verts[nextVertexIndex++] = arc.p0;
-                    currentContour.vertexCount = nextVertexIndex;
-                    atContourStart = false;
-                }
-
-                RecordArcAtVertexIndex(i, totalVertexIndex - 1);
-
-                int nextI = i + 1;
-                bool isClosingContour = nextI >= arcCount || m_FillingArcs[nextI].isContourBreaker;
-                if (isClosingContour && AlmostEq(m_FillingArcs[i].p1, m_FillingArcs[contourStartArcIndex].p0))
-                {
-                    // Closing the contour
-                    RecordArcAtVertexIndex(i, contourStartVertexIndex);
-                }
-                else
-                {
-                    RecordArcAtVertexIndex(i, totalVertexIndex++);
-                    currentContour.verts[nextVertexIndex++] = arc.p1;
-                    currentContour.vertexCount = nextVertexIndex;
-                }
-            }
-
-            // Add the last contour
-            contours.Add(currentContour);
-        }
-
-        private void GenerateFilledArcs()
-        {
-            m_FillingArcs.Clear();
-
-            int entryCount = m_SubPathEntries.Count;
-            for (int i = 0; i < entryCount; ++i)
-            {
-                var entry = m_SubPathEntries[i];
-                switch (entry.type)
-                {
-                    case EntryType.Line:
-                        GenerateLineFillArc(ref entry);
-                        break;
-                    case EntryType.Arc:
-                        GenerateFillArc(ref entry);
-                        break;
-                    case EntryType.ArcTo:
-                        GenerateFillArcTo(ref entry);
-                        break;
-                    case EntryType.Bezier:
-                        GenerateBezierFillArcs(ref entry);
-                        break;
-                    case EntryType.Move:
-                        // Insert contour breaker
-                        if (m_FillingArcs.Count > 0 && !m_FillingArcs[m_FillingArcs.Count-1].isContourBreaker)
-                            m_FillingArcs.Add(new FillingArc() { isContourBreaker = true });
-                        break;
-                    default: break;
-                }
-            }
-
-            // Subdivide arcs when the ratio is higher than 10% (completely empiric value, nothing scientific)
-            int arcCount = m_FillingArcs.Count;
-            for (int i = 0; i < arcCount; ++i)
-            {
-                var arc = m_FillingArcs[i];
-                if (!arc.isArc)
-                    continue;
-
-                var v = (arc.p1 - arc.p0);
-                var mid = (arc.p0 + arc.p1) * 0.5f;
-                float arcWidth = v.magnitude;
-                float arcHeight = arc.radius - (mid - arc.center).magnitude;
-                float heightRatio = arcHeight / arcWidth;
-
-                if (heightRatio >= 0.1f || arcCount == 1)
-                {
-                    FillingArc arc0, arc1;
-                    SplitArc(arc, out arc0, out arc1);
-
-                    m_FillingArcs[i] = arc0;
-                    m_FillingArcs.Insert(i + 1, arc1);
-                    ++i;
-                }
-            }
-        }
-
-        internal static void SplitArc(FillingArc arc, out FillingArc arc0, out FillingArc arc1)
-        {
-            // This splitting method only works for sweep angle < pi/2
-            var mid0 = (arc.p0 + arc.pMid) * 0.5f;
-            var mid1 = (arc.p1 + arc.pMid) * 0.5f;
-            var pMid0 = mid0 + (mid0 - arc.center).normalized * arc.radius;
-            var pMid1 = mid1 + (mid1 - arc.center).normalized * arc.radius;
-            arc0 = new FillingArc() { p0 = arc.p0, p1 = arc.pMid, pMid = pMid0, center = arc.center, radius = arc.radius, isArc = arc.isArc };
-            arc1 = new FillingArc() { p0 = arc.pMid, p1 = arc.p1, pMid = pMid1, center = arc.center, radius = arc.radius, isArc = arc.isArc };
-        }
-
-        internal static void SplitArcMinSweep(FillingArc arc, float startAngle, float endAngle, bool antiClockwise, float minSweep, List<FillingArc> arcs)
-        {
-            if (Mathf.Abs(startAngle - endAngle) <= Tessellation.kEpsilon)
-                return;
-
-            float sweep = SweepAngle(startAngle, endAngle, antiClockwise);
-            if (sweep <= minSweep)
-            {
-                arcs.Add(arc);
-                return;
-            }
-
-            float sweepDelta = sweep * 0.5f;
-            if (antiClockwise)
-                sweepDelta = -sweepDelta;
-
-            var q = Quaternion.Euler(0.0f, 0.0f, sweepDelta * Mathf.Rad2Deg);
-            var qMid = Quaternion.Euler(0.0f, 0.0f, (sweepDelta * 0.5f) * Mathf.Rad2Deg);
-
-            var p0 = arc.p0;
-            var v = (p0 - arc.center).normalized;
-            var p1 = arc.center + (Vector2)(q * v) * arc.radius;
-            var pMid = arc.center + (Vector2)(qMid * v) * arc.radius;
-
-            float newEndAngle = startAngle + sweepDelta;
-
-            var subArc = new FillingArc() { p0 = p0, p1 = p1, pMid = pMid, center = arc.center, radius = arc.radius, isArc = arc.isArc };
-            SplitArcMinSweep(subArc, startAngle, newEndAngle, antiClockwise, minSweep, arcs);
-
-            p0 = p1;
-            v = (p0 - arc.center).normalized;
-            p1 = arc.center + (Vector2)(q * v) * arc.radius;
-            pMid = arc.center + (Vector2)(qMid * v) * arc.radius;
-
-            float newStartAngle = newEndAngle;
-
-            subArc = new FillingArc() { p0 = p0, p1 = p1, pMid = pMid, center = arc.center, radius = arc.radius, isArc = arc.isArc };
-            SplitArcMinSweep(subArc, newStartAngle, endAngle, antiClockwise, minSweep, arcs);
-        }
-
-        private void GenerateLineFillArc(ref SubPathEntry entry)
-        {
-            var mid = (entry.p0 + entry.p1) * 0.5f;
-            m_FillingArcs.Add(new FillingArc() { p0 = entry.p0, pMid = mid, p1 = entry.p1, isArc = false });
-        }
-
-        private void GenerateFillArc(ref SubPathEntry arcEntry)
-        {
-            Vector2 p0, p1, pMid;
-            EvalArcPositions(ref arcEntry, out p0, out p1, out pMid);
-
-            Vector2 center;
-            float startAngle, endAngle, radius;
-            bool antiClockwise;
-            GetArcData(arcEntry, out center, out startAngle, out endAngle, out radius, out antiClockwise);
-
-            int prevCount = m_FillingArcs.Count;
-
-            var arc = new FillingArc() { p0 = p0, pMid = pMid, p1 = p1, radius = radius, center = center, isArc = true };
-            SplitArcMinSweep(arc, startAngle, endAngle, antiClockwise, Mathf.PI / 2, m_FillingArcs);
-
-            if ((m_FillingArcs.Count - prevCount) == 1)
-            {
-                // Only one arc was added, we'll split it to avoid sending only two vertices to libtess
-                var lastArc = m_FillingArcs[m_FillingArcs.Count - 1];
-
-                FillingArc arc0, arc1;
-                SplitArc(lastArc, out arc0, out arc1);
-
-                m_FillingArcs[m_FillingArcs.Count - 1] = arc0;
-                m_FillingArcs.Add(arc1);
-            }
-        }
-
-        private void GenerateFillArcTo(ref SubPathEntry arcToEntry)
-        {
-            SubPathEntry arcEntry;
-            if (!ConvertArcToEntryToArcEntry(ref arcToEntry, out arcEntry))
-                return;
-
-            GenerateFillArc(ref arcEntry);
-        }
-
-        private void GenerateBezierFillArcs(ref SubPathEntry entry)
-        {
-            m_FilledBezierArcs.Clear();
-            SubdivideBezierIntoArcs(ref entry, m_FilledBezierArcs);
-
-            foreach (var ba in m_FilledBezierArcs)
-                m_FillingArcs.Add(new FillingArc() { p0 = ba.p0, pMid = ba.pMid, p1 = ba.p1, center = ba.center, radius = ba.radius, isArc = ba.isArc });
-        }
-
-        private List<Vector2> m_LibTessVertices = new List<Vector2>(64);
-        private List<int> m_LibTessIndices = new List<int>(64);
-        private List<int> m_LibTessVertexIndices = new List<int>(64);
-        private List<ContourInfo> m_LibTessContours = new List<ContourInfo>(8);
-
-        private unsafe void TessellateFillWithArcMappings(FillRule fillRule, List<Vector2> vertices, List<int> indices, List<int> vertexIndices, List<ContourInfo> contours)
-        {
-            PopulateContoursWithArcMappings(contours);
-
-            var tess = UITessellation.BeginTess();
-
-            try
-            {
-                foreach (var c in contours)
-                    UITessellation.AddContour(tess, c.verts.GetUnsafePtr(), c.vertexCount, sizeof(Vector2));
-
-                if (UITessellation.Tessellate(tess, fillRule == FillRule.OddEven))
-                {
-                    var tessVertCount = UITessellation.GetVertexCount(tess);
-                    var tessVerts = UITessellation.GetVertices(tess);
-                    var tessElementCount = UITessellation.GetElementCount(tess);
-                    var tessElements = UITessellation.GetElements(tess);
-                    var tessVertIndices = UITessellation.GetVertexIndices(tess);
-
-                    for (int i = 0; i < tessVertCount; ++i)
-                    {
-                        var x = tessVerts[i * 2];
-                        var y = tessVerts[i * 2 + 1];
-                        vertices.Add(new Vector2(x, y));
-                    }
-                    for (int i = 0; i < tessElementCount; ++i)
-                    {
-                        indices.Add(tessElements[i * 3]);
-                        indices.Add(tessElements[i * 3 + 1]);
-                        indices.Add(tessElements[i * 3 + 2]);
-                    }
-                    for (int i = 0; i < tessVertCount; ++i)
-                    {
-                        vertexIndices.Add(tessVertIndices[i]);
-                    }
-                }
-            }
-            finally
-            {
-                UITessellation.EndTess(tess);
-
-                foreach (var c in contours)
-                    c.verts.Dispose();
-            }
-        }
-
-        struct TriangleInfo
-        {
-            public Vector2 p0;
-            public Vector2 p1;
-            public Vector2 p2;
-            public FillingArc arc; // Arc joining p0 and p1, p2 is used to complete the triangle
-            public bool isConcaveFilled;
-            public bool isFilled;
-        }
-
-        private List<int> m_MatchedArcs = new List<int>(64);
-        private List<TriangleInfo> m_TriangleInfo = new List<TriangleInfo>(256);
-
-        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
-        bool AlmostEq(Vector2 p, Vector2 q)
-        {
-            return Mathf.Abs(p.x - q.x) <= Tessellation.kEpsilon &&
-                Mathf.Abs(p.y - q.y) <= Tessellation.kEpsilon;
-        }
-
-        private void GenerateFilledMesh(List<Vector2> vertices, List<int> indices, List<int> vertexIndices)
-        {
-            m_TriangleInfo.Clear();
-
-            int vertexCount = 0;
-            int indexCount = 0;
-
-            for (int i = 0; i < indices.Count; i += 3)
-            {
-                // Find matching pair to locate edge arc
-                m_MatchedArcs.Clear();
-
-                var i0 = indices[i];
-                var i1 = indices[i + 1];
-                var i2 = indices[i + 2];
-
-                var v0 = vertices[i0];
-                var v1 = vertices[i1];
-                var v2 = vertices[i2];
-
-                var vi0 = vertexIndices[i0];
-                var vi1 = vertexIndices[i1];
-                var vi2 = vertexIndices[i2];
-
-                var pair0 = vi0 >= 0 ? m_ArcIndicesPerVertex[vi0] : new IndexPair(-1, -1);
-                var pair1 = vi1 >= 0 ? m_ArcIndicesPerVertex[vi1] : new IndexPair(-1, -1);
-                var pair2 = vi2 >= 0 ? m_ArcIndicesPerVertex[vi2] : new IndexPair(-1, -1);
-
-                if (pair0.first != -1 && (pair0.first == pair1.first || pair0.first == pair1.second))
-                    m_MatchedArcs.Add(pair0.first);
-                if (pair0.second != -1 && (pair0.second == pair1.first || pair0.second == pair1.second))
-                    m_MatchedArcs.Add(pair0.second);
-
-                if (pair1.first != -1 && (pair1.first == pair2.first || pair1.first == pair2.second))
-                    m_MatchedArcs.Add(pair1.first);
-                if (pair1.second != -1 && (pair1.second == pair2.first || pair1.second == pair2.second))
-                    m_MatchedArcs.Add(pair1.second);
-
-                if (pair2.first != -1 && (pair2.first == pair0.first || pair2.first == pair0.second))
-                    m_MatchedArcs.Add(pair2.first);
-                if (pair2.second != -1 && (pair2.second == pair0.first || pair2.second == pair0.second))
-                    m_MatchedArcs.Add(pair2.second);
-
-                // Check if we have more than one concave arc for a given triangle
-                int concaveArcCount = 0;
-                foreach (var arcIndex in m_MatchedArcs)
-                {
-                    var arc = m_FillingArcs[arcIndex];
-
-                    // Determine the vertex that completes the triangle (not on the arc)
-                    var p2 = Vector2.zero;
-                    if ((AlmostEq(arc.p0, v0) && AlmostEq(arc.p1, v1)) || (AlmostEq(arc.p0, v1) && AlmostEq(arc.p1, v0)))
-                        p2 = v2;
-                    else if ((AlmostEq(arc.p0, v1) && AlmostEq(arc.p1, v2)) || (AlmostEq(arc.p0, v2) && AlmostEq(arc.p1, v1)))
-                        p2 = v0;
-                    else
-                        p2 = v1;
-
-                    bool isConcave = false;
-                    if (arc.isArc)
-                    {
-                        var mid = (arc.p0 + arc.p1) * 0.5f;
-                        isConcave = Vector2.Dot((arc.center - mid), (p2 - mid)) <= 0.0f;
-                        if (isConcave)
-                            ++concaveArcCount;
-                    }
-                    else
-                    {
-                        isConcave = true;
-                        ++concaveArcCount; // Straight lines are processed as concave
-                    }
-
-                    arc.isConcave = isConcave;
-                    arc.p2 = p2;
-                    m_FillingArcs[arcIndex] = arc;
-                }
-
-                // Cannot have more than one concave arc per triangle, so we'll have to split this triangle.
-                if (concaveArcCount == 1)
-                {
-                    foreach (var arcIndex in m_MatchedArcs)
-                    {
-                        var arc = m_FillingArcs[arcIndex];
-                        if (!arc.isConcave)
-                            continue;
-
-                        m_TriangleInfo.Add(new TriangleInfo() { p0 = arc.p0, p1 = arc.p1, p2 = arc.p2, arc = arc, isConcaveFilled = true });
-                        vertexCount += 3;
-                        indexCount += 3;
-                        break;
-                    }
-                }
-                else if (concaveArcCount == 2)
-                {
-                    TriangleInfo a, b;
-                    SplitDoubleConcaveTriangle(v0, v1, v2, out a, out b);
-                    m_TriangleInfo.Add(a);
-                    m_TriangleInfo.Add(b);
-                    vertexCount += 6;
-                    indexCount += 6;
-                }
-
-                foreach (var arcIndex in m_MatchedArcs)
-                {
-                    var arc = m_FillingArcs[arcIndex];
-                    if (!arc.isConcave)
-                    {
-                        m_TriangleInfo.Add(new TriangleInfo() { p0 = arc.p0, p1 = arc.p1, p2 = arc.p2, arc = arc, isConcaveFilled = false });
-                        vertexCount += 4;
-                        indexCount += 6;
-                    }
-                }
-
-                if (concaveArcCount == 0)
-                {
-                    m_TriangleInfo.Add(new TriangleInfo() { p0 = v0, p1 = v1, p2 = v2, isFilled = true });
-                    vertexCount += 3;
-                    indexCount += 3;
-                }
-            }
-
-            var mwd = m_Ctx.Allocate(vertexCount, indexCount);
-            vertexCount = 0;
-            indexCount = 0;
-
-            foreach (var tri in m_TriangleInfo)
-            {
-                var arc = tri.arc;
-                if (tri.isFilled)
-                    FillTriangle(mwd, tri, ref vertexCount, ref indexCount);
-                else if (tri.isConcaveFilled)
-                {
-                    if (tri.arc.isArc)
-                        FillConcaveArc(mwd, tri, ref vertexCount, ref indexCount);
-                    else
-                        FillConcaveLine(mwd, tri, ref vertexCount, ref indexCount);
-                }
-                else
-                    ExtrudeFillArc(mwd, tri, ref vertexCount, ref indexCount);
-            }
-        }
-
-        unsafe private void SplitDoubleConcaveTriangle(Vector2 v0, Vector2 v1, Vector2 v2, out TriangleInfo a, out TriangleInfo b)
-        {
-            var usedEdge = stackalloc int[2];
-            var arcs = stackalloc FillingArc[2];
-
-            int concaveIndex = 0;
-            foreach (var arcIndex in m_MatchedArcs)
-            {
-                var arc = m_FillingArcs[arcIndex];
-                if (!arc.isConcave)
-                    continue;
-
-                if ((v0 == arc.p0 && v1 == arc.p1) || (v0 == arc.p1 && v1 == arc.p0))
-                    usedEdge[concaveIndex] = 0; // v0-v1
-                else if ((v0 == arc.p0 && v2 == arc.p1) || (v0 == arc.p1 && v2 == arc.p0))
-                    usedEdge[concaveIndex] = 1; // v0-v2
-                else
-                    usedEdge[concaveIndex] = 2; // v1-v2
-
-                arcs[concaveIndex] = arc;
-
-                ++concaveIndex;
-            }
-
-            // Identify the unused edge, this is the one that will be split in half
-            if ((usedEdge[0] == 0 && usedEdge[1] == 1) || usedEdge[0] == 1 && usedEdge[1] == 0)
-            {
-                // Split v1-v2
-                var mid = (v1 + v2) * 0.5f;
-                a = new TriangleInfo() {
-                    p0 = v0,
-                    p1 = usedEdge[0] == 0 ? v1 : v2,
-                    p2 = mid,
-                    arc = arcs[0],
-                    isConcaveFilled = true
-                };
-                b = new TriangleInfo() {
-                    p0 = v0,
-                    p1 = usedEdge[1] == 0 ? v1 : v2,
-                    p2 = mid,
-                    arc = arcs[1],
-                    isConcaveFilled = true
-                };
-            }
-            else if ((usedEdge[0] == 0 && usedEdge[1] == 2) || (usedEdge[0] == 2 && usedEdge[1] == 0))
-            {
-                // Split v0-v2
-                var mid = (v0 + v2) * 0.5f;
-                a = new TriangleInfo() {
-                    p0 = v1,
-                    p1 = usedEdge[0] == 0 ? v0 : v2,
-                    p2 = mid,
-                    arc = arcs[0],
-                    isConcaveFilled = true
-                };
-                b = new TriangleInfo() {
-                    p0 = v1,
-                    p1 = usedEdge[1] == 0 ? v0 : v2,
-                    p2 = mid,
-                    arc = arcs[1],
-                    isConcaveFilled = true
-                };
-            }
-            else
-            {
-                // Split v0-v1
-                var mid = (v0 + v1) * 0.5f;
-                a = new TriangleInfo() {
-                    p0 = v2,
-                    p1 = usedEdge[0] == 1 ? v0 : v1,
-                    p2 = mid,
-                    arc = arcs[0],
-                    isConcaveFilled = true
-                };
-                b = new TriangleInfo() {
-                    p0 = v2,
-                    p1 = usedEdge[1] == 1 ? v0 : v1,
-                    p2 = mid,
-                    arc = arcs[1],
-                    isConcaveFilled = true
-                };
-            }
-        }
-
-        private void FillTriangle(MeshWriteData mwd, TriangleInfo tri, ref int vertexCount, ref int indexCount)
-        {
-            // Filled triangle
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(tri.p0.x, tri.p0.y, Vertex.nearZ), tint = fillColor });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(tri.p1.x, tri.p1.y, Vertex.nearZ), tint = fillColor });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(tri.p2.x, tri.p2.y, Vertex.nearZ), tint = fillColor });
-            EmitTriangleCW(mwd, vertexCount + 0, vertexCount + 1, vertexCount + 2);
-
-            vertexCount += 3;
-            indexCount += 3;
-        }
-
-        private void FillConcaveArc(MeshWriteData mwd, TriangleInfo tri, ref int vertexCount, ref int indexCount)
-        {
-            var arc = tri.arc;
-            var p0 = tri.p0;
-            var p1 = tri.p1;
-            var p2 = tri.p2;
-
-            // Concave arc digging inside the triangle
-            float invRadius = 1.0f / arc.radius;
-            var innerRatio0 = (p0 - arc.center) * invRadius;
-            var innerRatio1 = (p1 - arc.center) * invRadius;
-            var innerRatio2 = (p2 - arc.center) * invRadius;
-
-            var circle0 = new Vector4(Tessellation.kUnusedArc, Tessellation.kUnusedArc, innerRatio0.x, innerRatio0.y);
-            var circle1 = new Vector4(Tessellation.kUnusedArc, Tessellation.kUnusedArc, innerRatio1.x, innerRatio1.y);
-            var circle2 = new Vector4(Tessellation.kUnusedArc, Tessellation.kUnusedArc, innerRatio2.x, innerRatio2.y);
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p0.x, p0.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle0 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p1.x, p1.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle1 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p2.x, p2.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle2 });
-            EmitTriangleCW(mwd, vertexCount + 0, vertexCount + 1, vertexCount + 2);
-
-            vertexCount += 3;
-            indexCount += 3;
-        }
-
-        private void FillConcaveLine(MeshWriteData mwd, TriangleInfo tri, ref int vertexCount, ref int indexCount)
-        {
-            var arc = tri.arc;
-            var p0 = tri.p0;
-            var p1 = tri.p1;
-            var p2 = tri.p2;
-
-            var circle0 = new Vector4(0.0f, 1.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle1 = new Vector4(0.0f, 1.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle2 = new Vector4(0.0f, 0.0f, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p0.x, p0.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle0 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p1.x, p1.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle1 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p2.x, p2.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle2 });
-            EmitTriangleCW(mwd, vertexCount + 0, vertexCount + 1, vertexCount + 2);
-
-            vertexCount += 3;
-            indexCount += 3;
-        }
-
-        private void ExtrudeFillArc(MeshWriteData mwd, TriangleInfo tri, ref int vertexCount, ref int indexCount)
-        {
-            var arc = tri.arc;
-
-            var p0 = arc.p0;
-            var p1 = arc.p1;
-            var mid = (p0 + p1) * 0.5f;
-            var midCenter = (mid - arc.center);
-            var arcHeight = arc.radius - midCenter.magnitude;
-
-            var perp = (p1 - p0).normalized;
-            perp = new Vector2(perp.y, -perp.x);
-            if (Vector2.Dot(perp, midCenter) < 0.0f)
-                perp = -perp;
-
-            var p2 = p1 + perp * (arcHeight + 2.0f);
-            var p3 = p0 + perp * (arcHeight + 2.0f);
-
-            float invRadius = 1.0f / arc.radius;
-            var outerRatio0 = (p0 - arc.center) * invRadius;
-            var outerRatio1 = (p1 - arc.center) * invRadius;
-            var outerRatio2 = (p2 - arc.center) * invRadius;
-            var outerRatio3 = (p3 - arc.center) * invRadius;
-
-            var circle0 = new Vector4(outerRatio0.x, outerRatio0.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle1 = new Vector4(outerRatio1.x, outerRatio1.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle2 = new Vector4(outerRatio2.x, outerRatio2.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-            var circle3 = new Vector4(outerRatio3.x, outerRatio3.y, Tessellation.kUnusedArc, Tessellation.kUnusedArc);
-
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p0.x, p0.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle0 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p1.x, p1.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle1 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p2.x, p2.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle2 });
-            mwd.SetNextVertex(new Vertex() { position = new Vector3(p3.x, p3.y, Vertex.nearZ), tint = fillColor, flags = s_ArcFlags, circle = circle3 });
-            EmitTriangleCW(mwd, vertexCount + 0, vertexCount + 1, vertexCount + 2);
-            EmitTriangleCW(mwd, vertexCount + 2, vertexCount + 0, vertexCount + 3);
-
-            vertexCount += 4;
-            indexCount += 6;
-        }
-
-        private void EmitTriangleCW(MeshWriteData mwd, int i, int j, int k)
-        {
-            var verts = mwd.m_Vertices;
-            var v0 = verts[i].position;
-            var v1 = verts[j].position;
-            var v2 = verts[k].position;
-            var v = (v1 - v0);
-            var w = (v2 - v0);
-            float crossZ = v.x * w.y - v.y * w.x;
-            if (crossZ >= 0.0f)
-            {
-                mwd.SetNextIndex((UInt16)i);
-                mwd.SetNextIndex((UInt16)j);
-                mwd.SetNextIndex((UInt16)k);
-            }
-            else
-            {
-                mwd.SetNextIndex((UInt16)i);
-                mwd.SetNextIndex((UInt16)k);
-                mwd.SetNextIndex((UInt16)j);
-            }
-        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs
index cde3841359..165218a3b2 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderChain.cs
@@ -256,7 +256,16 @@ void Destructor()
             device?.Dispose();
             opacityIdAccelerator?.Dispose();
 
-            painter = null;
+            if (painter != null)
+            {
+                // todo: move painter2d to the render chain instead of the mgc
+                if (painter.meshGenerationContext.hasPainter2D)
+                {
+                    painter.meshGenerationContext.painter2D.Destroy();
+                }
+                painter = null;
+            }
+
             atlas = null;
             shaderInfoAllocator = new UIRVEShaderInfoAllocator();
             device = null;
@@ -492,7 +501,7 @@ public void Render()
         public void UIEOnChildAdded(VisualElement ve)
         {
             VisualElement parent = ve.hierarchy.parent;
-            int index = parent != null ? parent.IndexOf(ve) : 0;
+            int index = parent != null ? parent.hierarchy.IndexOf(ve) : 0;
 
             if (m_BlockDirtyRegistration)
                 throw new InvalidOperationException("VisualElements cannot be added to an active visual tree during generateVisualContent callback execution nor during visual tree rendering");
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs
index 6379bc821a..44db815983 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs
@@ -72,14 +72,26 @@ static Matrix4x4 GetTransformIDTransformInfo(VisualElement ve)
 
         static Vector4 GetClipRectIDClipInfo(VisualElement ve)
         {
+            Rect rect;
+
             Debug.Assert(RenderChainVEData.AllocatesID(ve.renderChainData.clipRectID));
             if (ve.renderChainData.groupTransformAncestor == null)
-                return UIRUtility.ToVector4(ve.worldClip);
+                rect = ve.worldClip;
+            else
+            {
+                rect = ve.worldClipMinusGroup;
+                // Subtract the transform of the group transform ancestor
+                VisualElement.TransformAlignedRect(ref ve.renderChainData.groupTransformAncestor.worldTransformInverse, ref rect);
+            }
 
-            Rect rect = ve.worldClipMinusGroup;
-            // Subtract the transform of the group transform ancestor
-            VisualElement.TransformAlignedRect(ref ve.renderChainData.groupTransformAncestor.worldTransformInverse, ref rect);
-            return UIRUtility.ToVector4(rect);
+            // See ComputeRelativeClipRectCoords in the shader for details on this computation
+            Vector2 min = rect.min;
+            Vector2 max = rect.max;
+            Vector2 diff = max - min;
+            Vector2 mul = new Vector2(1 / (diff.x + 0.0001f), 1 / (diff.y + 0.0001f));
+            Vector2 a = 2 * mul;
+            Vector2 b = -(min + max) * mul;
+            return new Vector4(a.x, a.y, b.x, b.y);
         }
 
         internal static uint DepthFirstOnChildAdded(RenderChain renderChain, VisualElement parent, VisualElement ve, int index, bool resetState)
@@ -644,6 +656,9 @@ static void DepthFirstOnVisualsChanged(RenderChain renderChain, VisualElement ve
             if (ve is TextElement)
                 RenderEvents.UpdateTextCoreSettings(renderChain, ve);
 
+            if ((ve.renderHints & RenderHints.DynamicColor) == RenderHints.DynamicColor)
+                SetColorValues(renderChain, ve);
+
             UIRStylePainter.ClosingInfo closingInfo = CommandGenerator.PaintElement(renderChain, ve, ref stats);
 
             if (hierarchical)
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRStylePainter.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRStylePainter.cs
index 42fbc01b9b..2a1f1a4285 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRStylePainter.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRStylePainter.cs
@@ -406,7 +406,7 @@ public void DrawVisualElementBackground()
                 // Draw solid color background
                 var rectParams = new MeshGenerationContextUtils.RectangleParams
                 {
-                    rect = GUIUtility.AlignRectToDevice(currentElement.rect),
+                    rect = currentElement.rect,
                     color = style.backgroundColor,
                     colorPage = ColorPage.Init(m_Owner, currentElement.renderChainData.backgroundColorID),
                     playmodeTintColor = currentElement.panel.contextType == ContextType.Editor ? UIElementsUtility.editorPlayModeTintColor : Color.white
@@ -440,11 +440,12 @@ public void DrawVisualElementBackground()
             {
                 // Draw background image (be it from a texture or a vector image)
                 var rectParams = new MeshGenerationContextUtils.RectangleParams();
+                float sliceScale = visualElement.resolvedStyle.unitySliceScale;
 
                 if (background.texture != null)
                 {
                     rectParams = MeshGenerationContextUtils.RectangleParams.MakeTextured(
-                        GUIUtility.AlignRectToDevice(currentElement.rect),
+                        currentElement.rect,
                         new Rect(0, 0, 1, 1),
                         background.texture,
                         style.unityBackgroundScaleMode,
@@ -453,17 +454,19 @@ public void DrawVisualElementBackground()
                 else if (background.sprite != null)
                 {
                     rectParams = MeshGenerationContextUtils.RectangleParams.MakeSprite(
-                        GUIUtility.AlignRectToDevice(currentElement.rect),
+                        currentElement.rect,
                         background.sprite,
                         style.unityBackgroundScaleMode,
                         currentElement.panel.contextType,
                         radiusParams.HasRadius(Tessellation.kEpsilon),
                         ref slices);
+
+                    sliceScale *= UIElementsUtility.PixelsPerUnitScaleForElement(visualElement, background.sprite);
                 }
                 else if (background.renderTexture != null)
                 {
                     rectParams = MeshGenerationContextUtils.RectangleParams.MakeTextured(
-                        GUIUtility.AlignRectToDevice(currentElement.rect),
+                        currentElement.rect,
                         new Rect(0, 0, 1, 1),
                         background.renderTexture,
                         style.unityBackgroundScaleMode,
@@ -472,7 +475,7 @@ public void DrawVisualElementBackground()
                 else if (background.vectorImage != null)
                 {
                     rectParams = MeshGenerationContextUtils.RectangleParams.MakeVectorTextured(
-                        GUIUtility.AlignRectToDevice(currentElement.rect),
+                        currentElement.rect,
                         new Rect(0, 0, 1, 1),
                         background.vectorImage,
                         style.unityBackgroundScaleMode,
@@ -490,6 +493,8 @@ public void DrawVisualElementBackground()
                     rectParams.topSlice = Mathf.RoundToInt(slices.y);
                     rectParams.rightSlice = Mathf.RoundToInt(slices.z);
                     rectParams.bottomSlice = Mathf.RoundToInt(slices.w);
+
+                    rectParams.sliceScale = sliceScale;
                 }
 
                 rectParams.color = style.unityBackgroundImageTintColor;
@@ -513,7 +518,7 @@ public void DrawVisualElementBorder()
                 {
                     var borderParams = new MeshGenerationContextUtils.BorderParams
                     {
-                        rect = GUIUtility.AlignRectToDevice(currentElement.rect),
+                        rect = currentElement.rect,
                         leftColor = style.borderLeftColor,
                         topColor = style.borderTopColor,
                         rightColor = style.borderRightColor,
@@ -748,7 +753,7 @@ void GenerateStencilClipEntryForRoundedRectBackground()
 
             var rp = new MeshGenerationContextUtils.RectangleParams()
             {
-                rect = GUIUtility.AlignRectToDevice(currentElement.rect),
+                rect = currentElement.rect,
                 color = Color.white,
 
                 // Adjust the radius of the inner masking shape
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs
index 2563c8906d..75a3137aa0 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs
@@ -177,7 +177,7 @@ internal struct UIRVEShaderInfoAllocator
         internal static readonly Vector4 identityTransformRow0Value = identityTransformValue.GetRow(0);
         internal static readonly Vector4 identityTransformRow1Value = identityTransformValue.GetRow(1);
         internal static readonly Vector4 identityTransformRow2Value = identityTransformValue.GetRow(2);
-        internal static readonly Vector4 infiniteClipRectValue = new Vector4(-float.MaxValue, -float.MaxValue, float.MaxValue, float.MaxValue);
+        internal static readonly Vector4 infiniteClipRectValue = new Vector4(0, 0, 0, 0);
         internal static readonly Vector4 fullOpacityValue = new Vector4(1, 1, 1, 1);
         internal static readonly Vector4 clearColorValue = new Vector4(0, 0, 0, 0);
         internal static readonly TextCoreSettings defaultTextCoreSettingsValue = new TextCoreSettings() {
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs
index 397ac29301..5992950346 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs
@@ -84,7 +84,6 @@ public void Dispose()
         private List<List<AllocToUpdate>> m_Updates;
         private UInt32[] m_Fences;
         private MaterialPropertyBlock m_StandardMatProps; // Properties that are constant throughout the evaluation of the commands
-        private MaterialPropertyBlock m_CommonMatProps; // Uniform Clip Rect
         private uint m_FrameIndex;
         private uint m_NextUpdateID = 1; // For the current frame only, 0 is not an accepted value here
         private DrawStatistics m_DrawStats;
@@ -98,10 +97,8 @@ public void Dispose()
         private static bool m_SubscribedToNotifications; // Not thread safe for now
         private static bool m_SynchronousFree; // This is set on domain unload or app quit, so it is irreversible
 
-        static readonly int s_PixelClipInvViewPropID = Shader.PropertyToID("_PixelClipInvView");
         static readonly int s_GradientSettingsTexID = Shader.PropertyToID("_GradientSettingsTex");
         static readonly int s_ShaderInfoTexID = Shader.PropertyToID("_ShaderInfoTex");
-        static readonly int s_ScreenClipRectPropID = Shader.PropertyToID("_ScreenClipRect");
         static readonly int s_TransformsPropID = Shader.PropertyToID("_Transforms");
         static readonly int s_ClipRectsPropID = Shader.PropertyToID("_ClipRects");
 
@@ -295,7 +292,6 @@ void CompleteCreation()
 
             m_Fences = new uint[(int)k_MaxQueuedFrameCount];
             m_StandardMatProps = new MaterialPropertyBlock();
-            m_CommonMatProps = new MaterialPropertyBlock();
             m_DefaultStencilState = Utility.CreateStencilState(new StencilState
             {
                 enabled = true,
@@ -635,25 +631,6 @@ public void Free(MeshHandle mesh)
 
         }
 
-        static void Set1PixelSizeParameter(DrawParams drawParams, MaterialPropertyBlock props)
-        {
-            Vector4 _PixelClipInvView = new Vector4();
-
-            // Size of 1 pixel in clip space
-            RectInt viewport = Utility.GetActiveViewport();
-            _PixelClipInvView.x = 2.0f / viewport.width;
-            _PixelClipInvView.y = 2.0f / viewport.height;
-
-            // Pixel density in group space
-            Matrix4x4 matProj = Utility.GetUnityProjectionMatrix();
-            Matrix4x4 matVPInv = (matProj * drawParams.view.Peek().transform).inverse;
-            Vector3 v = matVPInv.MultiplyVector(new Vector3(_PixelClipInvView.x, _PixelClipInvView.y));
-            _PixelClipInvView.z = 1 / (Mathf.Abs(v.x) + UIRUtility.k_Epsilon);
-            _PixelClipInvView.w = 1 / (Mathf.Abs(v.y) + UIRUtility.k_Epsilon);
-
-            props.SetVector(s_PixelClipInvViewPropID, _PixelClipInvView);
-        }
-
         public void OnFrameRenderingBegin()
         {
             AdvanceFrame();
@@ -673,7 +650,7 @@ public void OnFrameRenderingBegin()
             s_MarkerBeforeDraw.End();
         }
 
-        unsafe static NativeSlice<T> PtrToSlice<T>(void* p, int count) where T : struct
+        internal unsafe static NativeSlice<T> PtrToSlice<T>(void* p, int count) where T : struct
         {
             var slice = NativeSliceUnsafeUtility.ConvertExistingDataToNativeSlice<T>(p, UnsafeUtility.SizeOf<T>(), count);
             NativeSliceUnsafeUtility.SetAtomicSafetyHandle(ref slice, AtomicSafetyHandle.GetTempUnsafePtrSliceHandle());
@@ -754,9 +731,6 @@ void ApplyBatchState(ref EvaluationState st, bool allowMaterialChange)
                     st.mustApplyStencil = true;
                 }
 
-                if (st.mustApplyCommonBlock && m_CommonMatProps != null)
-                    Utility.SetPropertyBlock(m_CommonMatProps);
-
                 if (st.mustApplyStateBlock)
                     Utility.SetPropertyBlock(st.stateMatProps);
 
@@ -799,10 +773,7 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
                     UIR.Utility.SetVectorArray<Transform3x4>(m_StandardMatProps, s_TransformsPropID, transforms);
                 if (clipRects.Length > 0)
                     UIR.Utility.SetVectorArray<Vector4>(m_StandardMatProps, s_ClipRectsPropID, clipRects);
-                Set1PixelSizeParameter(drawParams, m_CommonMatProps);
-                m_CommonMatProps.SetVector(s_ScreenClipRectPropID, drawParams.view.Peek().clipRect);
                 Utility.SetPropertyBlock(m_StandardMatProps);
-                Utility.SetPropertyBlock(m_CommonMatProps);
             }
 
             int rangesCount = 1024; // Must be powers of two. TODO: Can be estimated better from the render chain command count
@@ -975,16 +946,6 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
                             }
                         }
                     }
-
-                    if (head.type == CommandType.PushView || head.type == CommandType.PopView)
-                    {
-                        if (m_CommonMatProps != null)
-                        {
-                            Set1PixelSizeParameter(drawParams, m_CommonMatProps);
-                            m_CommonMatProps.SetVector(s_ScreenClipRectPropID, drawParams.view.Peek().clipRect);
-                            Utility.SetPropertyBlock(m_CommonMatProps);
-                        }
-                    }
                 } // If kick ranges
 
                 if (head.type == CommandType.Draw && mustApplyCmdState)
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs
index c841ee91ab..29d68efb2f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs
@@ -44,12 +44,6 @@ internal enum CommandType
         PushDefaultMaterial, PopDefaultMaterial,
     }
 
-    internal struct ViewTransform
-    {
-        internal Matrix4x4 transform;
-        internal Vector4 clipRect;
-    }
-
     internal class DrawParams
     {
         internal static readonly Rect k_UnlimitedRect = new Rect(-100000, -100000, 200000, 200000);
@@ -59,14 +53,14 @@ internal class DrawParams
         public void Reset()
         {
             view.Clear();
-            view.Push(new ViewTransform { transform = Matrix4x4.identity, clipRect = UIRUtility.ToVector4(k_FullNormalizedRect) });
+            view.Push(Matrix4x4.identity);
             scissor.Clear();
             scissor.Push(k_UnlimitedRect);
             renderTexture.Clear();
             defaultMaterial.Clear();
         }
 
-        internal readonly Stack<ViewTransform> view = new Stack<ViewTransform>(8);
+        internal readonly Stack<Matrix4x4> view = new Stack<Matrix4x4>(8);
         internal readonly Stack<Rect> scissor = new Stack<Rect>(8);
 
         // Using list instead of stack to allow access to all elements in previson for the blit of any RT into any RT.
@@ -126,6 +120,8 @@ internal void ExecuteNonDrawMesh(DrawParams drawParams, float pixelsPerPoint, re
 
                     s_ImmediateOverheadMarker.Begin();
                     Matrix4x4 oldProjection = Utility.GetUnityProjectionMatrix();
+                    Camera oldCamera = Camera.current;
+                    RenderTexture oldRT = RenderTexture.active;
                     bool hasScissor = drawParams.scissor.Count > 1; // We always expect the "unbound" scissor rectangle to exists
                     if (hasScissor)
                         Utility.DisableScissor(); // Disable scissor since most IMGUI code assume it's inactive
@@ -144,7 +140,9 @@ internal void ExecuteNonDrawMesh(DrawParams drawParams, float pixelsPerPoint, re
                         s_ImmediateOverheadMarker.Begin();
                     }
 
-                    GL.modelview = drawParams.view.Peek().transform;
+                    Camera.SetupCurrent(oldCamera);
+                    RenderTexture.active = oldRT;
+                    GL.modelview = drawParams.view.Peek();
                     GL.LoadProjectionMatrix(oldProjection);
 
                     if (hasScissor)
@@ -154,33 +152,50 @@ internal void ExecuteNonDrawMesh(DrawParams drawParams, float pixelsPerPoint, re
                     break;
                 }
                 case CommandType.PushView:
+                {
+                    // Transform
+                    drawParams.view.Push(owner.worldTransform);
+                    GL.modelview = owner.worldTransform;
+                    // Scissors
                     var parent = owner.hierarchy.parent;
-                    Vector4 clipRect;
+                    Rect clipRect;
                     if (parent != null)
-                        clipRect = RectToClipSpace(parent.worldClip);
+                        clipRect = parent.worldClip;
                     else
-                        clipRect = UIRUtility.ToVector4(DrawParams.k_FullNormalizedRect);
-                    var vt = new ViewTransform() { transform = owner.worldTransform, clipRect = clipRect };
-                    drawParams.view.Push(vt);
-                    GL.modelview = vt.transform;
+                        clipRect = DrawParams.k_FullNormalizedRect;
+                    drawParams.scissor.Push(clipRect);
+                    Utility.SetScissorRect(RectPointsToPixelsAndFlipYAxis(clipRect, pixelsPerPoint));
                     break;
+                }
                 case CommandType.PopView:
+                {
+                    // Transform
                     drawParams.view.Pop();
-                    GL.modelview = drawParams.view.Peek().transform;
+                    GL.modelview = drawParams.view.Peek();
+                    // Scissors
+                    drawParams.scissor.Pop();
+                    Rect prevRect = drawParams.scissor.Peek();
+                    if (prevRect.x == DrawParams.k_UnlimitedRect.x)
+                        Utility.DisableScissor();
+                    else Utility.SetScissorRect(RectPointsToPixelsAndFlipYAxis(prevRect, pixelsPerPoint));
                     break;
+                }
                 case CommandType.PushScissor:
+                {
                     Rect elemRect = CombineScissorRects(owner.worldClip, drawParams.scissor.Peek());
                     drawParams.scissor.Push(elemRect);
                     Utility.SetScissorRect(RectPointsToPixelsAndFlipYAxis(elemRect, pixelsPerPoint));
                     break;
+                }
                 case CommandType.PopScissor:
+                {
                     drawParams.scissor.Pop();
                     Rect prevRect = drawParams.scissor.Peek();
                     if (prevRect.x == DrawParams.k_UnlimitedRect.x)
                         Utility.DisableScissor();
                     else Utility.SetScissorRect(RectPointsToPixelsAndFlipYAxis(prevRect, pixelsPerPoint));
                     break;
-
+                }
                 case CommandType.PushRenderTexture:
                 {
                     RectInt viewport = Utility.GetActiveViewport();
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs
index 93b7fa1a67..3f12bed773 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/ComputedStyle.cs
@@ -192,25 +192,53 @@ public static bool StartAnimationInlineTextShadow(VisualElement element, ref Com
         public static bool StartAnimationInlineRotate(VisualElement element, ref ComputedStyle computedStyle, StyleRotate rotate, int durationMs, int delayMs, Func<float, float> easingCurve)
         {
             var to = rotate.keyword == StyleKeyword.Initial ? InitialStyle.rotate : rotate.value;
-            return element.styleAnimation.Start(StylePropertyId.Rotate, computedStyle.transformData.Read().rotate, to, durationMs, delayMs, easingCurve);
+            var result = element.styleAnimation.Start(StylePropertyId.Rotate, computedStyle.transformData.Read().rotate, to, durationMs, delayMs, easingCurve);
+
+            if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+            {
+                element.usageHints |= UsageHints.DynamicTransform;
+            }
+
+            return result;
         }
 
         public static bool StartAnimationInlineTranslate(VisualElement element, ref ComputedStyle computedStyle, StyleTranslate translate, int durationMs, int delayMs, Func<float, float> easingCurve)
         {
             var to = translate.keyword == StyleKeyword.Initial ? InitialStyle.translate : translate.value;
-            return element.styleAnimation.Start(StylePropertyId.Translate, computedStyle.transformData.Read().translate, to, durationMs, delayMs, easingCurve);
+            var result = element.styleAnimation.Start(StylePropertyId.Translate, computedStyle.transformData.Read().translate, to, durationMs, delayMs, easingCurve);
+
+            if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+            {
+                element.usageHints |= UsageHints.DynamicTransform;
+            }
+
+            return result;
         }
 
         public static bool StartAnimationInlineScale(VisualElement element, ref ComputedStyle computedStyle, StyleScale scale, int durationMs, int delayMs, Func<float, float> easingCurve)
         {
             var to = scale.keyword == StyleKeyword.Initial ? InitialStyle.scale : scale.value;
-            return element.styleAnimation.Start(StylePropertyId.Scale, computedStyle.transformData.Read().scale, to, durationMs, delayMs, easingCurve);
+            var result = element.styleAnimation.Start(StylePropertyId.Scale, computedStyle.transformData.Read().scale, to, durationMs, delayMs, easingCurve);
+
+            if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+            {
+                element.usageHints |= UsageHints.DynamicTransform;
+            }
+
+            return result;
         }
 
         public static bool StartAnimationInlineTransformOrigin(VisualElement element, ref ComputedStyle computedStyle, StyleTransformOrigin transformOrigin, int durationMs, int delayMs, Func<float, float> easingCurve)
         {
             var to = transformOrigin.keyword == StyleKeyword.Initial ? InitialStyle.transformOrigin : transformOrigin.value;
-            return element.styleAnimation.Start(StylePropertyId.TransformOrigin, computedStyle.transformData.Read().transformOrigin, to, durationMs, delayMs, easingCurve);
+            var result = element.styleAnimation.Start(StylePropertyId.TransformOrigin, computedStyle.transformData.Read().transformOrigin, to, durationMs, delayMs, easingCurve);
+
+            if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+            {
+                element.usageHints |= UsageHints.DynamicTransform;
+            }
+
+            return result;
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/CustomStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/CustomStyle.cs
index 0ec5b04116..5f2087f577 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/CustomStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/CustomStyle.cs
@@ -107,11 +107,6 @@ public interface ICustomStyle
         /// Gets the value associated with the specified <see cref="CustomStyleProperty{T}"/>.
         /// </summary>
         /// <returns>True if the property is found, false if not.</returns>
-        bool TryGetValue(CustomStyleProperty<Object> property, out Object value);
-        /// <summary>
-        /// Gets the value associated with the specified <see cref="CustomStyleProperty{T}"/>.
-        /// </summary>
-        /// <returns>True if the property is found, false if not.</returns>
         bool TryGetValue<T>(CustomStyleProperty<T> property, out T value) where T : Object;
         /// <summary>
         /// Gets the value associated with the specified <see cref="CustomStyleProperty{T}"/>.
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs
index 14d5c2557f..d63f99aa22 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ComputedStyle.cs
@@ -99,6 +99,7 @@ internal partial struct ComputedStyle
         public int unitySliceBottom => rareData.Read().unitySliceBottom;
         public int unitySliceLeft => rareData.Read().unitySliceLeft;
         public int unitySliceRight => rareData.Read().unitySliceRight;
+        public float unitySliceScale => rareData.Read().unitySliceScale;
         public int unitySliceTop => rareData.Read().unitySliceTop;
         public TextAnchor unityTextAlign => inheritedData.Read().unityTextAlign;
         public Color unityTextOutlineColor => inheritedData.Read().unityTextOutlineColor;
@@ -410,6 +411,9 @@ public void ApplyProperties(StylePropertyReader reader, ref ComputedStyle parent
                     case StylePropertyId.UnitySliceRight:
                         rareData.Write().unitySliceRight = reader.ReadInt(0);
                         break;
+                    case StylePropertyId.UnitySliceScale:
+                        rareData.Write().unitySliceScale = reader.ReadFloat(0);
+                        break;
                     case StylePropertyId.UnitySliceTop:
                         rareData.Write().unitySliceTop = reader.ReadInt(0);
                         break;
@@ -640,6 +644,9 @@ public void ApplyStyleValue(StyleValue sv, ref ComputedStyle parentStyle)
                 case StylePropertyId.UnitySliceRight:
                     rareData.Write().unitySliceRight = (int)sv.number;
                     break;
+                case StylePropertyId.UnitySliceScale:
+                    rareData.Write().unitySliceScale = sv.number;
+                    break;
                 case StylePropertyId.UnitySliceTop:
                     rareData.Write().unitySliceTop = (int)sv.number;
                     break;
@@ -935,6 +942,9 @@ public void ApplyFromComputedStyle(StylePropertyId id, ref ComputedStyle other)
                 case StylePropertyId.UnitySliceRight:
                     rareData.Write().unitySliceRight = other.rareData.Read().unitySliceRight;
                     break;
+                case StylePropertyId.UnitySliceScale:
+                    rareData.Write().unitySliceScale = other.rareData.Read().unitySliceScale;
+                    break;
                 case StylePropertyId.UnitySliceTop:
                     rareData.Write().unitySliceTop = other.rareData.Read().unitySliceTop;
                     break;
@@ -1142,6 +1152,10 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, float n
                     visualData.Write().opacity = newValue;
                     ve.IncrementVersion(VersionChangeType.Opacity);
                     break;
+                case StylePropertyId.UnitySliceScale:
+                    rareData.Write().unitySliceScale = newValue;
+                    ve.IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint);
+                    break;
                 case StylePropertyId.UnityTextOutlineWidth:
                     inheritedData.Write().unityTextOutlineWidth = newValue;
                     ve.IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint | VersionChangeType.StyleSheet);
@@ -1471,7 +1485,7 @@ public void ApplyPropertyAnimation(VisualElement ve, StylePropertyId id, Scale n
             {
                 case StylePropertyId.Scale:
                     transformData.Write().scale = newValue;
-                    ve.IncrementVersion(VersionChangeType.Layout | VersionChangeType.Transform);
+                    ve.IncrementVersion(VersionChangeType.Transform);
                     break;
                 default:
                     throw new ArgumentException("Invalid animation property id. Can't apply value of type 'Scale' to property '" + id + "'. Please make sure that this property is animatable.", nameof(id));
@@ -1491,11 +1505,31 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
                 case StylePropertyId.All:
                     return StartAnimationAllProperty(element, ref oldStyle, ref newStyle, durationMs, delayMs, easingCurve);
                 case StylePropertyId.BackgroundColor:
-                    return element.styleAnimation.Start(StylePropertyId.BackgroundColor, oldStyle.visualData.Read().backgroundColor, newStyle.visualData.Read().backgroundColor, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.BackgroundColor, oldStyle.visualData.Read().backgroundColor, newStyle.visualData.Read().backgroundColor, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.BackgroundImage:
                     return element.styleAnimation.Start(StylePropertyId.BackgroundImage, oldStyle.visualData.Read().backgroundImage, newStyle.visualData.Read().backgroundImage, durationMs, delayMs, easingCurve);
                 case StylePropertyId.BorderBottomColor:
-                    return element.styleAnimation.Start(StylePropertyId.BorderBottomColor, oldStyle.visualData.Read().borderBottomColor, newStyle.visualData.Read().borderBottomColor, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.BorderBottomColor, oldStyle.visualData.Read().borderBottomColor, newStyle.visualData.Read().borderBottomColor, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.BorderBottomLeftRadius:
                     return element.styleAnimation.Start(StylePropertyId.BorderBottomLeftRadius, oldStyle.visualData.Read().borderBottomLeftRadius, newStyle.visualData.Read().borderBottomLeftRadius, durationMs, delayMs, easingCurve);
                 case StylePropertyId.BorderBottomRightRadius:
@@ -1509,11 +1543,27 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
                     result |= element.styleAnimation.Start(StylePropertyId.BorderRightColor, oldStyle.visualData.Read().borderRightColor, newStyle.visualData.Read().borderRightColor, durationMs, delayMs, easingCurve);
                     result |= element.styleAnimation.Start(StylePropertyId.BorderBottomColor, oldStyle.visualData.Read().borderBottomColor, newStyle.visualData.Read().borderBottomColor, durationMs, delayMs, easingCurve);
                     result |= element.styleAnimation.Start(StylePropertyId.BorderLeftColor, oldStyle.visualData.Read().borderLeftColor, newStyle.visualData.Read().borderLeftColor, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
                     return result;
                 }
 
                 case StylePropertyId.BorderLeftColor:
-                    return element.styleAnimation.Start(StylePropertyId.BorderLeftColor, oldStyle.visualData.Read().borderLeftColor, newStyle.visualData.Read().borderLeftColor, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.BorderLeftColor, oldStyle.visualData.Read().borderLeftColor, newStyle.visualData.Read().borderLeftColor, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.BorderLeftWidth:
                     return element.styleAnimation.Start(StylePropertyId.BorderLeftWidth, oldStyle.layoutData.Read().borderLeftWidth, newStyle.layoutData.Read().borderLeftWidth, durationMs, delayMs, easingCurve);
                 case StylePropertyId.BorderRadius:
@@ -1527,11 +1577,31 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
                 }
 
                 case StylePropertyId.BorderRightColor:
-                    return element.styleAnimation.Start(StylePropertyId.BorderRightColor, oldStyle.visualData.Read().borderRightColor, newStyle.visualData.Read().borderRightColor, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.BorderRightColor, oldStyle.visualData.Read().borderRightColor, newStyle.visualData.Read().borderRightColor, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.BorderRightWidth:
                     return element.styleAnimation.Start(StylePropertyId.BorderRightWidth, oldStyle.layoutData.Read().borderRightWidth, newStyle.layoutData.Read().borderRightWidth, durationMs, delayMs, easingCurve);
                 case StylePropertyId.BorderTopColor:
-                    return element.styleAnimation.Start(StylePropertyId.BorderTopColor, oldStyle.visualData.Read().borderTopColor, newStyle.visualData.Read().borderTopColor, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.BorderTopColor, oldStyle.visualData.Read().borderTopColor, newStyle.visualData.Read().borderTopColor, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.BorderTopLeftRadius:
                     return element.styleAnimation.Start(StylePropertyId.BorderTopLeftRadius, oldStyle.visualData.Read().borderTopLeftRadius, newStyle.visualData.Read().borderTopLeftRadius, durationMs, delayMs, easingCurve);
                 case StylePropertyId.BorderTopRightRadius:
@@ -1551,7 +1621,17 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
                 case StylePropertyId.Bottom:
                     return element.styleAnimation.Start(StylePropertyId.Bottom, oldStyle.layoutData.Read().bottom, newStyle.layoutData.Read().bottom, durationMs, delayMs, easingCurve);
                 case StylePropertyId.Color:
-                    return element.styleAnimation.Start(StylePropertyId.Color, oldStyle.inheritedData.Read().color, newStyle.inheritedData.Read().color, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.Color, oldStyle.inheritedData.Read().color, newStyle.inheritedData.Read().color, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.Display:
                     return element.styleAnimation.StartEnum(StylePropertyId.Display, (int)oldStyle.layoutData.Read().display, (int)newStyle.layoutData.Read().display, durationMs, delayMs, easingCurve);
                 case StylePropertyId.Flex:
@@ -1636,9 +1716,29 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
                 case StylePropertyId.Right:
                     return element.styleAnimation.Start(StylePropertyId.Right, oldStyle.layoutData.Read().right, newStyle.layoutData.Read().right, durationMs, delayMs, easingCurve);
                 case StylePropertyId.Rotate:
-                    return element.styleAnimation.Start(StylePropertyId.Rotate, oldStyle.transformData.Read().rotate, newStyle.transformData.Read().rotate, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.Rotate, oldStyle.transformData.Read().rotate, newStyle.transformData.Read().rotate, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.Scale:
-                    return element.styleAnimation.Start(StylePropertyId.Scale, oldStyle.transformData.Read().scale, newStyle.transformData.Read().scale, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.Scale, oldStyle.transformData.Read().scale, newStyle.transformData.Read().scale, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.TextOverflow:
                     return element.styleAnimation.StartEnum(StylePropertyId.TextOverflow, (int)oldStyle.rareData.Read().textOverflow, (int)newStyle.rareData.Read().textOverflow, durationMs, delayMs, easingCurve);
                 case StylePropertyId.TextShadow:
@@ -1646,11 +1746,41 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
                 case StylePropertyId.Top:
                     return element.styleAnimation.Start(StylePropertyId.Top, oldStyle.layoutData.Read().top, newStyle.layoutData.Read().top, durationMs, delayMs, easingCurve);
                 case StylePropertyId.TransformOrigin:
-                    return element.styleAnimation.Start(StylePropertyId.TransformOrigin, oldStyle.transformData.Read().transformOrigin, newStyle.transformData.Read().transformOrigin, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.TransformOrigin, oldStyle.transformData.Read().transformOrigin, newStyle.transformData.Read().transformOrigin, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.Translate:
-                    return element.styleAnimation.Start(StylePropertyId.Translate, oldStyle.transformData.Read().translate, newStyle.transformData.Read().translate, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.Translate, oldStyle.transformData.Read().translate, newStyle.transformData.Read().translate, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicTransform) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.UnityBackgroundImageTintColor:
-                    return element.styleAnimation.Start(StylePropertyId.UnityBackgroundImageTintColor, oldStyle.rareData.Read().unityBackgroundImageTintColor, newStyle.rareData.Read().unityBackgroundImageTintColor, durationMs, delayMs, easingCurve);
+                {
+                    var result = element.styleAnimation.Start(StylePropertyId.UnityBackgroundImageTintColor, oldStyle.rareData.Read().unityBackgroundImageTintColor, newStyle.rareData.Read().unityBackgroundImageTintColor, durationMs, delayMs, easingCurve);
+
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
+                }
+
                 case StylePropertyId.UnityBackgroundScaleMode:
                     return element.styleAnimation.StartEnum(StylePropertyId.UnityBackgroundScaleMode, (int)oldStyle.rareData.Read().unityBackgroundScaleMode, (int)newStyle.rareData.Read().unityBackgroundScaleMode, durationMs, delayMs, easingCurve);
                 case StylePropertyId.UnityFont:
@@ -1669,6 +1799,8 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
                     return element.styleAnimation.Start(StylePropertyId.UnitySliceLeft, oldStyle.rareData.Read().unitySliceLeft, newStyle.rareData.Read().unitySliceLeft, durationMs, delayMs, easingCurve);
                 case StylePropertyId.UnitySliceRight:
                     return element.styleAnimation.Start(StylePropertyId.UnitySliceRight, oldStyle.rareData.Read().unitySliceRight, newStyle.rareData.Read().unitySliceRight, durationMs, delayMs, easingCurve);
+                case StylePropertyId.UnitySliceScale:
+                    return element.styleAnimation.Start(StylePropertyId.UnitySliceScale, oldStyle.rareData.Read().unitySliceScale, newStyle.rareData.Read().unitySliceScale, durationMs, delayMs, easingCurve);
                 case StylePropertyId.UnitySliceTop:
                     return element.styleAnimation.Start(StylePropertyId.UnitySliceTop, oldStyle.rareData.Read().unitySliceTop, newStyle.rareData.Read().unitySliceTop, durationMs, delayMs, easingCurve);
                 case StylePropertyId.UnityTextAlign:
@@ -1703,13 +1835,21 @@ public static bool StartAnimation(VisualElement element, StylePropertyId id, ref
         public static bool StartAnimationAllProperty(VisualElement element, ref ComputedStyle oldStyle, ref ComputedStyle newStyle, int durationMs, int delayMs, Func<float, float> easingCurve)
         {
             bool result = false;
+            UsageHints usageHints = UsageHints.None;
+
             if (!oldStyle.inheritedData.Equals(newStyle.inheritedData))
             {
                 ref readonly var oldData = ref oldStyle.inheritedData.Read();
                 ref readonly var newData = ref newStyle.inheritedData.Read();
                 if (oldData.color != newData.color)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.Color, oldData.color, newData.color, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.Color, oldData.color, newData.color, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.fontSize != newData.fontSize)
@@ -1959,7 +2099,13 @@ public static bool StartAnimationAllProperty(VisualElement element, ref Computed
 
                 if (oldData.unityBackgroundImageTintColor != newData.unityBackgroundImageTintColor)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.UnityBackgroundImageTintColor, oldData.unityBackgroundImageTintColor, newData.unityBackgroundImageTintColor, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.UnityBackgroundImageTintColor, oldData.unityBackgroundImageTintColor, newData.unityBackgroundImageTintColor, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.unityBackgroundScaleMode != newData.unityBackgroundScaleMode)
@@ -1987,6 +2133,11 @@ public static bool StartAnimationAllProperty(VisualElement element, ref Computed
                     result |= element.styleAnimation.Start(StylePropertyId.UnitySliceRight, oldData.unitySliceRight, newData.unitySliceRight, durationMs, delayMs, easingCurve);
                 }
 
+                if (oldData.unitySliceScale != newData.unitySliceScale)
+                {
+                    result |= element.styleAnimation.Start(StylePropertyId.UnitySliceScale, oldData.unitySliceScale, newData.unitySliceScale, durationMs, delayMs, easingCurve);
+                }
+
                 if (oldData.unitySliceTop != newData.unitySliceTop)
                 {
                     result |= element.styleAnimation.Start(StylePropertyId.UnitySliceTop, oldData.unitySliceTop, newData.unitySliceTop, durationMs, delayMs, easingCurve);
@@ -2004,22 +2155,46 @@ public static bool StartAnimationAllProperty(VisualElement element, ref Computed
                 ref readonly var newData = ref newStyle.transformData.Read();
                 if (oldData.rotate != newData.rotate)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.Rotate, oldData.rotate, newData.rotate, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.Rotate, oldData.rotate, newData.rotate, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.scale != newData.scale)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.Scale, oldData.scale, newData.scale, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.Scale, oldData.scale, newData.scale, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.transformOrigin != newData.transformOrigin)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.TransformOrigin, oldData.transformOrigin, newData.transformOrigin, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.TransformOrigin, oldData.transformOrigin, newData.transformOrigin, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.translate != newData.translate)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.Translate, oldData.translate, newData.translate, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.Translate, oldData.translate, newData.translate, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicTransform;
+                    }
+
+                    result |= partialResult;
                 }
             }
 
@@ -2029,7 +2204,13 @@ public static bool StartAnimationAllProperty(VisualElement element, ref Computed
                 ref readonly var newData = ref newStyle.visualData.Read();
                 if (oldData.backgroundColor != newData.backgroundColor)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.BackgroundColor, oldData.backgroundColor, newData.backgroundColor, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.BackgroundColor, oldData.backgroundColor, newData.backgroundColor, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.backgroundImage != newData.backgroundImage)
@@ -2039,7 +2220,13 @@ public static bool StartAnimationAllProperty(VisualElement element, ref Computed
 
                 if (oldData.borderBottomColor != newData.borderBottomColor)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.BorderBottomColor, oldData.borderBottomColor, newData.borderBottomColor, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.BorderBottomColor, oldData.borderBottomColor, newData.borderBottomColor, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.borderBottomLeftRadius != newData.borderBottomLeftRadius)
@@ -2054,17 +2241,35 @@ public static bool StartAnimationAllProperty(VisualElement element, ref Computed
 
                 if (oldData.borderLeftColor != newData.borderLeftColor)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.BorderLeftColor, oldData.borderLeftColor, newData.borderLeftColor, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.BorderLeftColor, oldData.borderLeftColor, newData.borderLeftColor, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.borderRightColor != newData.borderRightColor)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.BorderRightColor, oldData.borderRightColor, newData.borderRightColor, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.BorderRightColor, oldData.borderRightColor, newData.borderRightColor, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.borderTopColor != newData.borderTopColor)
                 {
-                    result |= element.styleAnimation.Start(StylePropertyId.BorderTopColor, oldData.borderTopColor, newData.borderTopColor, durationMs, delayMs, easingCurve);
+                    bool partialResult = element.styleAnimation.Start(StylePropertyId.BorderTopColor, oldData.borderTopColor, newData.borderTopColor, durationMs, delayMs, easingCurve);
+                    if (partialResult)
+                    {
+                        usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    result |= partialResult;
                 }
 
                 if (oldData.borderTopLeftRadius != newData.borderTopLeftRadius)
@@ -2088,6 +2293,11 @@ public static bool StartAnimationAllProperty(VisualElement element, ref Computed
                 }
             }
 
+            if (usageHints != UsageHints.None)
+            {
+                element.usageHints |= usageHints;
+            }
+
             return result;
         }
 
@@ -2122,7 +2332,13 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                 case StylePropertyId.BackgroundColor:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.backgroundColor : sv.color;
-                    return element.styleAnimation.Start(StylePropertyId.BackgroundColor, computedStyle.visualData.Read().backgroundColor, to, durationMs, delayMs, easingCurve);
+                    bool result = element.styleAnimation.Start(StylePropertyId.BackgroundColor, computedStyle.visualData.Read().backgroundColor, to, durationMs, delayMs, easingCurve);
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
                 }
 
                 case StylePropertyId.BackgroundImage:
@@ -2134,7 +2350,13 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                 case StylePropertyId.BorderBottomColor:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.borderBottomColor : sv.color;
-                    return element.styleAnimation.Start(StylePropertyId.BorderBottomColor, computedStyle.visualData.Read().borderBottomColor, to, durationMs, delayMs, easingCurve);
+                    bool result = element.styleAnimation.Start(StylePropertyId.BorderBottomColor, computedStyle.visualData.Read().borderBottomColor, to, durationMs, delayMs, easingCurve);
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
                 }
 
                 case StylePropertyId.BorderBottomLeftRadius:
@@ -2158,7 +2380,13 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                 case StylePropertyId.BorderLeftColor:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.borderLeftColor : sv.color;
-                    return element.styleAnimation.Start(StylePropertyId.BorderLeftColor, computedStyle.visualData.Read().borderLeftColor, to, durationMs, delayMs, easingCurve);
+                    bool result = element.styleAnimation.Start(StylePropertyId.BorderLeftColor, computedStyle.visualData.Read().borderLeftColor, to, durationMs, delayMs, easingCurve);
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
                 }
 
                 case StylePropertyId.BorderLeftWidth:
@@ -2170,7 +2398,13 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                 case StylePropertyId.BorderRightColor:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.borderRightColor : sv.color;
-                    return element.styleAnimation.Start(StylePropertyId.BorderRightColor, computedStyle.visualData.Read().borderRightColor, to, durationMs, delayMs, easingCurve);
+                    bool result = element.styleAnimation.Start(StylePropertyId.BorderRightColor, computedStyle.visualData.Read().borderRightColor, to, durationMs, delayMs, easingCurve);
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
                 }
 
                 case StylePropertyId.BorderRightWidth:
@@ -2182,7 +2416,13 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                 case StylePropertyId.BorderTopColor:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.borderTopColor : sv.color;
-                    return element.styleAnimation.Start(StylePropertyId.BorderTopColor, computedStyle.visualData.Read().borderTopColor, to, durationMs, delayMs, easingCurve);
+                    bool result = element.styleAnimation.Start(StylePropertyId.BorderTopColor, computedStyle.visualData.Read().borderTopColor, to, durationMs, delayMs, easingCurve);
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
                 }
 
                 case StylePropertyId.BorderTopLeftRadius:
@@ -2212,7 +2452,13 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                 case StylePropertyId.Color:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.color : sv.color;
-                    return element.styleAnimation.Start(StylePropertyId.Color, computedStyle.inheritedData.Read().color, to, durationMs, delayMs, easingCurve);
+                    bool result = element.styleAnimation.Start(StylePropertyId.Color, computedStyle.inheritedData.Read().color, to, durationMs, delayMs, easingCurve);
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
                 }
 
                 case StylePropertyId.Display:
@@ -2394,7 +2640,13 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                 case StylePropertyId.UnityBackgroundImageTintColor:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.unityBackgroundImageTintColor : sv.color;
-                    return element.styleAnimation.Start(StylePropertyId.UnityBackgroundImageTintColor, computedStyle.rareData.Read().unityBackgroundImageTintColor, to, durationMs, delayMs, easingCurve);
+                    bool result = element.styleAnimation.Start(StylePropertyId.UnityBackgroundImageTintColor, computedStyle.rareData.Read().unityBackgroundImageTintColor, to, durationMs, delayMs, easingCurve);
+                    if (result && (element.usageHints & UsageHints.DynamicColor) == 0)
+                    {
+                        element.usageHints |= UsageHints.DynamicColor;
+                    }
+
+                    return result;
                 }
 
                 case StylePropertyId.UnityBackgroundScaleMode:
@@ -2451,6 +2703,12 @@ public static bool StartAnimationInline(VisualElement element, StylePropertyId i
                     return element.styleAnimation.Start(StylePropertyId.UnitySliceRight, computedStyle.rareData.Read().unitySliceRight, to, durationMs, delayMs, easingCurve);
                 }
 
+                case StylePropertyId.UnitySliceScale:
+                {
+                    var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.unitySliceScale : sv.number;
+                    return element.styleAnimation.Start(StylePropertyId.UnitySliceScale, computedStyle.rareData.Read().unitySliceScale, to, durationMs, delayMs, easingCurve);
+                }
+
                 case StylePropertyId.UnitySliceTop:
                 {
                     var to = sv.keyword == StyleKeyword.Initial ? InitialStyle.unitySliceTop : (int)sv.number;
@@ -2802,6 +3060,9 @@ public void ApplyInitialValue(StylePropertyId id)
                 case StylePropertyId.UnitySliceRight:
                     rareData.Write().unitySliceRight = InitialStyle.unitySliceRight;
                     break;
+                case StylePropertyId.UnitySliceScale:
+                    rareData.Write().unitySliceScale = InitialStyle.unitySliceScale;
+                    break;
                 case StylePropertyId.UnitySliceTop:
                     rareData.Write().unitySliceTop = InitialStyle.unitySliceTop;
                     break;
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs
index 6d627be21b..fed689cce8 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IResolvedStyle.cs
@@ -300,6 +300,10 @@ public interface IResolvedStyle
         /// </summary>
         int unitySliceRight { get; }
         /// <summary>
+        /// Scale applied to an element's slices.
+        /// </summary>
+        float unitySliceScale { get; }
+        /// <summary>
         /// Size of the 9-slice's top edge when painting an element's background image.
         /// </summary>
         int unitySliceTop { get; }
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs
index 0b808806df..2a684844e2 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/IStyle.cs
@@ -319,6 +319,10 @@ public interface IStyle
         /// </summary>
         StyleInt unitySliceRight { get; set; }
         /// <summary>
+        /// Scale applied to an element's slices.
+        /// </summary>
+        StyleFloat unitySliceScale { get; set; }
+        /// <summary>
         /// Size of the 9-slice's top edge when painting an element's background image.
         /// </summary>
         StyleInt unitySliceTop { get; set; }
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/InitialStyle.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/InitialStyle.cs
index 04ccad2fe0..da5b0bd114 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/InitialStyle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/InitialStyle.cs
@@ -98,6 +98,7 @@ static InitialStyle()
             s_InitialStyle.rareData.Write().unitySliceBottom = 0;
             s_InitialStyle.rareData.Write().unitySliceLeft = 0;
             s_InitialStyle.rareData.Write().unitySliceRight = 0;
+            s_InitialStyle.rareData.Write().unitySliceScale = 1f;
             s_InitialStyle.rareData.Write().unitySliceTop = 0;
             s_InitialStyle.inheritedData.Write().unityTextAlign = TextAnchor.UpperLeft;
             s_InitialStyle.inheritedData.Write().unityTextOutlineColor = Color.clear;
@@ -177,6 +178,7 @@ static InitialStyle()
         public static int unitySliceBottom => s_InitialStyle.rareData.Read().unitySliceBottom;
         public static int unitySliceLeft => s_InitialStyle.rareData.Read().unitySliceLeft;
         public static int unitySliceRight => s_InitialStyle.rareData.Read().unitySliceRight;
+        public static float unitySliceScale => s_InitialStyle.rareData.Read().unitySliceScale;
         public static int unitySliceTop => s_InitialStyle.rareData.Read().unitySliceTop;
         public static TextAnchor unityTextAlign => s_InitialStyle.inheritedData.Read().unityTextAlign;
         public static Color unityTextOutlineColor => s_InitialStyle.inheritedData.Read().unityTextOutlineColor;
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs
index 55d4b77249..a02728a89f 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/InlineStyleAccess.cs
@@ -1055,6 +1055,22 @@ StyleInt IStyle.unitySliceRight
             }
         }
 
+        StyleFloat IStyle.unitySliceScale
+        {
+            get
+            {
+                return GetStyleFloat(StylePropertyId.UnitySliceScale);
+            }
+
+            set
+            {
+                if (SetStyleValue(StylePropertyId.UnitySliceScale, value))
+                {
+                    ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Layout | VersionChangeType.Repaint);
+                }
+            }
+        }
+
         StyleInt IStyle.unitySliceTop
         {
             get
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs
index a91e11e0ad..bd0664d63a 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/ResolvedStyleAccess.cs
@@ -84,6 +84,7 @@ public partial class VisualElement : IResolvedStyle
         int IResolvedStyle.unitySliceBottom => computedStyle.unitySliceBottom;
         int IResolvedStyle.unitySliceLeft => computedStyle.unitySliceLeft;
         int IResolvedStyle.unitySliceRight => computedStyle.unitySliceRight;
+        float IResolvedStyle.unitySliceScale => computedStyle.unitySliceScale;
         int IResolvedStyle.unitySliceTop => computedStyle.unitySliceTop;
         TextAnchor IResolvedStyle.unityTextAlign => computedStyle.unityTextAlign;
         Color IResolvedStyle.unityTextOutlineColor => computedStyle.unityTextOutlineColor;
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDataStructs.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDataStructs.cs
index f11665111e..ec8c2bd38e 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDataStructs.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDataStructs.cs
@@ -259,6 +259,7 @@ internal struct RareData : IStyleDataGroup<RareData>, IEquatable<RareData>
         public int unitySliceBottom;
         public int unitySliceLeft;
         public int unitySliceRight;
+        public float unitySliceScale;
         public int unitySliceTop;
         public TextOverflowPosition unityTextOverflowPosition;
 
@@ -282,6 +283,7 @@ public void CopyFrom(ref RareData other)
                 lhs.unitySliceBottom == rhs.unitySliceBottom &&
                 lhs.unitySliceLeft == rhs.unitySliceLeft &&
                 lhs.unitySliceRight == rhs.unitySliceRight &&
+                lhs.unitySliceScale == rhs.unitySliceScale &&
                 lhs.unitySliceTop == rhs.unitySliceTop &&
                 lhs.unityTextOverflowPosition == rhs.unityTextOverflowPosition;
         }
@@ -316,6 +318,7 @@ public override int GetHashCode()
                 hashCode = (hashCode * 397) ^ unitySliceBottom;
                 hashCode = (hashCode * 397) ^ unitySliceLeft;
                 hashCode = (hashCode * 397) ^ unitySliceRight;
+                hashCode = (hashCode * 397) ^ unitySliceScale.GetHashCode();
                 hashCode = (hashCode * 397) ^ unitySliceTop;
                 hashCode = (hashCode * 397) ^ (int)unityTextOverflowPosition;
                 return hashCode;
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDebug.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDebug.cs
index ac444a0003..7e5f8a02e5 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDebug.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StyleDebug.cs
@@ -157,6 +157,8 @@ public static object GetComputedStyleValue(in ComputedStyle computedStyle, Style
                     return computedStyle.unitySliceLeft;
                 case StylePropertyId.UnitySliceRight:
                     return computedStyle.unitySliceRight;
+                case StylePropertyId.UnitySliceScale:
+                    return computedStyle.unitySliceScale;
                 case StylePropertyId.UnitySliceTop:
                     return computedStyle.unitySliceTop;
                 case StylePropertyId.UnityTextAlign:
@@ -323,6 +325,8 @@ public static Type GetComputedStyleType(StylePropertyId id)
                     return typeof(int);
                 case StylePropertyId.UnitySliceRight:
                     return typeof(int);
+                case StylePropertyId.UnitySliceScale:
+                    return typeof(float);
                 case StylePropertyId.UnitySliceTop:
                     return typeof(int);
                 case StylePropertyId.UnityTextAlign:
@@ -349,6 +353,28 @@ public static Type GetComputedStyleType(StylePropertyId id)
             }
         }
 
+        public static Type GetShorthandStyleType(StylePropertyId id)
+        {
+            switch (id)
+            {
+                case StylePropertyId.BorderColor:
+                    return typeof(Color);
+                case StylePropertyId.BorderRadius:
+                    return typeof(Length);
+                case StylePropertyId.BorderWidth:
+                    return typeof(float);
+                case StylePropertyId.Margin:
+                    return typeof(Length);
+                case StylePropertyId.Padding:
+                    return typeof(Length);
+                default:
+                {
+                    Debug.LogAssertion($"Cannot get shorthand style type for property id {id}");
+                    return null;
+                }
+            }
+        }
+
         public static object GetInlineStyleValue(IStyle style, StylePropertyId id)
         {
             switch (id)
@@ -489,6 +515,8 @@ public static object GetInlineStyleValue(IStyle style, StylePropertyId id)
                     return style.unitySliceLeft;
                 case StylePropertyId.UnitySliceRight:
                     return style.unitySliceRight;
+                case StylePropertyId.UnitySliceScale:
+                    return style.unitySliceScale;
                 case StylePropertyId.UnitySliceTop:
                     return style.unitySliceTop;
                 case StylePropertyId.UnityTextAlign:
@@ -723,6 +751,9 @@ public static void SetInlineStyleValue(IStyle style, StylePropertyId id, object
                 case StylePropertyId.UnitySliceRight:
                     style.unitySliceRight = (StyleInt)value;
                     break;
+                case StylePropertyId.UnitySliceScale:
+                    style.unitySliceScale = (StyleFloat)value;
+                    break;
                 case StylePropertyId.UnitySliceTop:
                     style.unitySliceTop = (StyleInt)value;
                     break;
@@ -896,6 +927,8 @@ public static object ConvertComputedToInlineStyleValue(StylePropertyId id, objec
                     return (StyleInt)(int)value;
                 case StylePropertyId.UnitySliceRight:
                     return (StyleInt)(int)value;
+                case StylePropertyId.UnitySliceScale:
+                    return (StyleFloat)(float)value;
                 case StylePropertyId.UnitySliceTop:
                     return (StyleInt)(int)value;
                 case StylePropertyId.UnityTextAlign:
@@ -1062,6 +1095,8 @@ public static Type GetInlineStyleType(StylePropertyId id)
                     return typeof(StyleInt);
                 case StylePropertyId.UnitySliceRight:
                     return typeof(StyleInt);
+                case StylePropertyId.UnitySliceScale:
+                    return typeof(StyleFloat);
                 case StylePropertyId.UnitySliceTop:
                     return typeof(StyleInt);
                 case StylePropertyId.UnityTextAlign:
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyCache.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyCache.cs
index 58b7eae3a8..5272ceb7ac 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyCache.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyCache.cs
@@ -94,6 +94,7 @@ internal static partial class StylePropertyCache
             {"-unity-slice-bottom", "<integer>"},
             {"-unity-slice-left", "<integer>"},
             {"-unity-slice-right", "<integer>"},
+            {"-unity-slice-scale", "<length>"},
             {"-unity-slice-top", "<integer>"},
             {"-unity-text-align", "upper-left | middle-left | lower-left | upper-center | middle-center | lower-center | upper-right | middle-right | lower-right"},
             {"-unity-text-outline", "<length> || <color>"},
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyEnums.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyEnums.cs
index 1c04003462..35c18a49c5 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyEnums.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyEnums.cs
@@ -126,12 +126,13 @@ internal enum StylePropertyId
         UnitySliceBottom = StylePropertyGroup.Rare << k_GroupOffset | 5,
         UnitySliceLeft = StylePropertyGroup.Rare << k_GroupOffset | 6,
         UnitySliceRight = StylePropertyGroup.Rare << k_GroupOffset | 7,
-        UnitySliceTop = StylePropertyGroup.Rare << k_GroupOffset | 8,
+        UnitySliceScale = StylePropertyGroup.Rare << k_GroupOffset | 8,
+        UnitySliceTop = StylePropertyGroup.Rare << k_GroupOffset | 9,
         UnityTextAlign = StylePropertyGroup.Inherited << k_GroupOffset | 8,
         UnityTextOutline = StylePropertyGroup.Shorthand << k_GroupOffset | 8,
         UnityTextOutlineColor = StylePropertyGroup.Inherited << k_GroupOffset | 9,
         UnityTextOutlineWidth = StylePropertyGroup.Inherited << k_GroupOffset | 10,
-        UnityTextOverflowPosition = StylePropertyGroup.Rare << k_GroupOffset | 9,
+        UnityTextOverflowPosition = StylePropertyGroup.Rare << k_GroupOffset | 10,
         Visibility = StylePropertyGroup.Inherited << k_GroupOffset | 11,
         WhiteSpace = StylePropertyGroup.Inherited << k_GroupOffset | 12,
         Width = StylePropertyGroup.Layout << k_GroupOffset | 32,
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyUtil.cs b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyUtil.cs
index ece4ea694e..63cc16b43b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyUtil.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Generated/StylePropertyUtil.cs
@@ -96,6 +96,7 @@ internal static partial class StylePropertyUtil
             {"-unity-slice-bottom", StylePropertyId.UnitySliceBottom},
             {"-unity-slice-left", StylePropertyId.UnitySliceLeft},
             {"-unity-slice-right", StylePropertyId.UnitySliceRight},
+            {"-unity-slice-scale", StylePropertyId.UnitySliceScale},
             {"-unity-slice-top", StylePropertyId.UnitySliceTop},
             {"-unity-text-align", StylePropertyId.UnityTextAlign},
             {"-unity-text-outline", StylePropertyId.UnityTextOutline},
@@ -186,6 +187,7 @@ internal static partial class StylePropertyUtil
             {StylePropertyId.UnitySliceBottom, "-unity-slice-bottom"},
             {StylePropertyId.UnitySliceLeft, "-unity-slice-left"},
             {StylePropertyId.UnitySliceRight, "-unity-slice-right"},
+            {StylePropertyId.UnitySliceScale, "-unity-slice-scale"},
             {StylePropertyId.UnitySliceTop, "-unity-slice-top"},
             {StylePropertyId.UnityTextAlign, "-unity-text-align"},
             {StylePropertyId.UnityTextOutline, "-unity-text-outline"},
@@ -198,7 +200,24 @@ internal static partial class StylePropertyUtil
             {StylePropertyId.WordSpacing, "word-spacing"}
         };
 
-        internal static readonly StylePropertyId[] s_AnimatableProperties = new StylePropertyId[]{StylePropertyId.AlignContent, StylePropertyId.AlignItems, StylePropertyId.AlignSelf, StylePropertyId.All, StylePropertyId.BackgroundColor, StylePropertyId.BackgroundImage, StylePropertyId.BorderBottomColor, StylePropertyId.BorderBottomLeftRadius, StylePropertyId.BorderBottomRightRadius, StylePropertyId.BorderBottomWidth, StylePropertyId.BorderColor, StylePropertyId.BorderLeftColor, StylePropertyId.BorderLeftWidth, StylePropertyId.BorderRadius, StylePropertyId.BorderRightColor, StylePropertyId.BorderRightWidth, StylePropertyId.BorderTopColor, StylePropertyId.BorderTopLeftRadius, StylePropertyId.BorderTopRightRadius, StylePropertyId.BorderTopWidth, StylePropertyId.BorderWidth, StylePropertyId.Bottom, StylePropertyId.Color, StylePropertyId.Display, StylePropertyId.Flex, StylePropertyId.FlexBasis, StylePropertyId.FlexDirection, StylePropertyId.FlexGrow, StylePropertyId.FlexShrink, StylePropertyId.FlexWrap, StylePropertyId.FontSize, StylePropertyId.Height, StylePropertyId.JustifyContent, StylePropertyId.Left, StylePropertyId.LetterSpacing, StylePropertyId.Margin, StylePropertyId.MarginBottom, StylePropertyId.MarginLeft, StylePropertyId.MarginRight, StylePropertyId.MarginTop, StylePropertyId.MaxHeight, StylePropertyId.MaxWidth, StylePropertyId.MinHeight, StylePropertyId.MinWidth, StylePropertyId.Opacity, StylePropertyId.Overflow, StylePropertyId.Padding, StylePropertyId.PaddingBottom, StylePropertyId.PaddingLeft, StylePropertyId.PaddingRight, StylePropertyId.PaddingTop, StylePropertyId.Position, StylePropertyId.Right, StylePropertyId.Rotate, StylePropertyId.Scale, StylePropertyId.TextOverflow, StylePropertyId.TextShadow, StylePropertyId.Top, StylePropertyId.TransformOrigin, StylePropertyId.Translate, StylePropertyId.UnityBackgroundImageTintColor, StylePropertyId.UnityBackgroundScaleMode, StylePropertyId.UnityFont, StylePropertyId.UnityFontDefinition, StylePropertyId.UnityFontStyleAndWeight, StylePropertyId.UnityOverflowClipBox, StylePropertyId.UnityParagraphSpacing, StylePropertyId.UnitySliceBottom, StylePropertyId.UnitySliceLeft, StylePropertyId.UnitySliceRight, StylePropertyId.UnitySliceTop, StylePropertyId.UnityTextAlign, StylePropertyId.UnityTextOutline, StylePropertyId.UnityTextOutlineColor, StylePropertyId.UnityTextOutlineWidth, StylePropertyId.UnityTextOverflowPosition, StylePropertyId.Visibility, StylePropertyId.WhiteSpace, StylePropertyId.Width, StylePropertyId.WordSpacing};
+        internal static readonly HashSet<StylePropertyId> s_AnimatableProperties = new HashSet<StylePropertyId>()
+        {StylePropertyId.AlignContent, StylePropertyId.AlignItems, StylePropertyId.AlignSelf, StylePropertyId.All, StylePropertyId.BackgroundColor, StylePropertyId.BackgroundImage, StylePropertyId.BorderBottomColor, StylePropertyId.BorderBottomLeftRadius, StylePropertyId.BorderBottomRightRadius, StylePropertyId.BorderBottomWidth, StylePropertyId.BorderColor, StylePropertyId.BorderLeftColor, StylePropertyId.BorderLeftWidth, StylePropertyId.BorderRadius, StylePropertyId.BorderRightColor, StylePropertyId.BorderRightWidth, StylePropertyId.BorderTopColor, StylePropertyId.BorderTopLeftRadius, StylePropertyId.BorderTopRightRadius, StylePropertyId.BorderTopWidth, StylePropertyId.BorderWidth, StylePropertyId.Bottom, StylePropertyId.Color, StylePropertyId.Display, StylePropertyId.Flex, StylePropertyId.FlexBasis, StylePropertyId.FlexDirection, StylePropertyId.FlexGrow, StylePropertyId.FlexShrink, StylePropertyId.FlexWrap, StylePropertyId.FontSize, StylePropertyId.Height, StylePropertyId.JustifyContent, StylePropertyId.Left, StylePropertyId.LetterSpacing, StylePropertyId.Margin, StylePropertyId.MarginBottom, StylePropertyId.MarginLeft, StylePropertyId.MarginRight, StylePropertyId.MarginTop, StylePropertyId.MaxHeight, StylePropertyId.MaxWidth, StylePropertyId.MinHeight, StylePropertyId.MinWidth, StylePropertyId.Opacity, StylePropertyId.Overflow, StylePropertyId.Padding, StylePropertyId.PaddingBottom, StylePropertyId.PaddingLeft, StylePropertyId.PaddingRight, StylePropertyId.PaddingTop, StylePropertyId.Position, StylePropertyId.Right, StylePropertyId.Rotate, StylePropertyId.Scale, StylePropertyId.TextOverflow, StylePropertyId.TextShadow, StylePropertyId.Top, StylePropertyId.TransformOrigin, StylePropertyId.Translate, StylePropertyId.UnityBackgroundImageTintColor, StylePropertyId.UnityBackgroundScaleMode, StylePropertyId.UnityFont, StylePropertyId.UnityFontDefinition, StylePropertyId.UnityFontStyleAndWeight, StylePropertyId.UnityOverflowClipBox, StylePropertyId.UnityParagraphSpacing, StylePropertyId.UnitySliceBottom, StylePropertyId.UnitySliceLeft, StylePropertyId.UnitySliceRight, StylePropertyId.UnitySliceScale, StylePropertyId.UnitySliceTop, StylePropertyId.UnityTextAlign, StylePropertyId.UnityTextOutline, StylePropertyId.UnityTextOutlineColor, StylePropertyId.UnityTextOutlineWidth, StylePropertyId.UnityTextOverflowPosition, StylePropertyId.Visibility, StylePropertyId.WhiteSpace, StylePropertyId.Width, StylePropertyId.WordSpacing};
+
+        internal static readonly Dictionary<StylePropertyId, UsageHints> s_AnimatableWithUsageHintProperties = new Dictionary<StylePropertyId, UsageHints>()
+        {
+            {StylePropertyId.BackgroundColor, UsageHints.DynamicColor},
+            {StylePropertyId.BorderBottomColor, UsageHints.DynamicColor},
+            {StylePropertyId.BorderColor, UsageHints.DynamicColor},
+            {StylePropertyId.BorderLeftColor, UsageHints.DynamicColor},
+            {StylePropertyId.BorderRightColor, UsageHints.DynamicColor},
+            {StylePropertyId.BorderTopColor, UsageHints.DynamicColor},
+            {StylePropertyId.Color, UsageHints.DynamicColor},
+            {StylePropertyId.Rotate, UsageHints.DynamicTransform},
+            {StylePropertyId.Scale, UsageHints.DynamicTransform},
+            {StylePropertyId.TransformOrigin, UsageHints.DynamicTransform},
+            {StylePropertyId.Translate, UsageHints.DynamicTransform},
+            {StylePropertyId.UnityBackgroundImageTintColor, UsageHints.DynamicColor}
+        };
 
         public static bool TryGetEnumIntValue(StyleEnumType enumType, string value, out int intValue)
         {
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs
index 5b54b58e04..91da3b1a2c 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/InlineStyleAccess.cs
@@ -157,7 +157,8 @@ internal partial class InlineStyleAccess : StyleValueCollection
         internal struct InlineRule
         {
             public StyleSheet sheet;
-            public StyleProperty[] properties;
+            public StyleRule rule;
+            public StyleProperty[] properties => rule.properties;
             public StylePropertyId[] propertyIds;
         }
 
@@ -184,7 +185,7 @@ public InlineStyleAccess(VisualElement ve)
         public void SetInlineRule(StyleSheet sheet, StyleRule rule)
         {
             m_InlineRule.sheet = sheet;
-            m_InlineRule.properties = rule.properties;
+            m_InlineRule.rule = rule;
             m_InlineRule.propertyIds = StyleSheetCache.GetPropertyIds(rule);
 
             ApplyInlineStyles(ref ve.computedStyle);
@@ -234,7 +235,7 @@ public void ApplyInlineStyles(ref ComputedStyle computedStyle)
 
             if (m_InlineRule.sheet != null)
             {
-                s_StylePropertyReader.SetInlineContext(m_InlineRule.sheet, m_InlineRule.properties, m_InlineRule.propertyIds);
+                s_StylePropertyReader.SetInlineContext(m_InlineRule.sheet, m_InlineRule.rule.properties, m_InlineRule.propertyIds);
                 computedStyle.ApplyProperties(s_StylePropertyReader, ref parentStyle);
             }
 
@@ -438,7 +439,7 @@ StyleScale IStyle.scale
                 // The layout need to be regenerated because the TextNative requires the scale to mesure it's size to be pixel perfect.
                 if (SetInlineScale(value))
                 {
-                    ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Transform | VersionChangeType.Layout);
+                    ve.IncrementVersion(VersionChangeType.Styles | VersionChangeType.Transform);
                 }
             }
         }
@@ -752,9 +753,8 @@ private bool SetInlineCursor(StyleCursor inlineValue)
 
             if (inlineValue.keyword == StyleKeyword.Null)
             {
-                RemoveInlineStyle(StylePropertyId.Cursor);
                 m_HasInlineCursor = false;
-                return m_HasInlineCursor;
+                return RemoveInlineStyle(StylePropertyId.Cursor);
             }
 
             m_InlineCursor = styleCursor;
@@ -790,9 +790,8 @@ private bool SetInlineTextShadow(StyleTextShadow inlineValue)
 
             if (inlineValue.keyword == StyleKeyword.Null)
             {
-                RemoveInlineStyle(StylePropertyId.TextShadow);
                 m_HasInlineTextShadow = false;
-                return m_HasInlineTextShadow;
+                return RemoveInlineStyle(StylePropertyId.TextShadow);
             }
 
             m_InlineTextShadow = styleTextShadow;
@@ -841,9 +840,8 @@ private bool SetInlineTransformOrigin(StyleTransformOrigin inlineValue)
 
             if (inlineValue.keyword == StyleKeyword.Null)
             {
-                RemoveInlineStyle(StylePropertyId.TransformOrigin);
                 m_HasInlineTransformOrigin = false;
-                return m_HasInlineTransformOrigin;
+                return RemoveInlineStyle(StylePropertyId.TransformOrigin);
             }
 
             m_InlineTransformOrigin = inlineValue;
@@ -893,9 +891,8 @@ private bool SetInlineTranslate(StyleTranslate inlineValue)
 
             if (inlineValue.keyword == StyleKeyword.Null)
             {
-                RemoveInlineStyle(StylePropertyId.Translate);
                 m_HasInlineTranslate = false;
-                return m_HasInlineTranslate;
+                return RemoveInlineStyle(StylePropertyId.Translate);
             }
 
             m_InlineTranslateOperation = inlineValue;
@@ -943,9 +940,9 @@ private bool SetInlineScale(StyleScale inlineValue)
 
             if (inlineValue.keyword == StyleKeyword.Null)
             {
-                RemoveInlineStyle(StylePropertyId.Scale);
+
                 m_HasInlineScale = false;
-                return m_HasInlineScale;
+                return RemoveInlineStyle(StylePropertyId.Scale);
             }
 
             m_InlineScale = inlineValue;
@@ -995,9 +992,8 @@ private bool SetInlineRotate(StyleRotate inlineValue)
 
             if (inlineValue.keyword == StyleKeyword.Null)
             {
-                RemoveInlineStyle(StylePropertyId.Rotate);
                 m_HasInlineRotate = false;
-                return m_HasInlineRotate;
+                return RemoveInlineStyle(StylePropertyId.Rotate);
             }
 
             m_InlineRotateOperation = inlineValue;
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/StylePropertyUtil.cs b/ModuleOverrides/com.unity.ui/Core/Style/StylePropertyUtil.cs
index acb3ed7864..f64a7a1a5b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/StylePropertyUtil.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/StylePropertyUtil.cs
@@ -2,22 +2,14 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Collections.Generic;
 
 namespace UnityEngine.UIElements.StyleSheets
 {
     internal static partial class StylePropertyUtil
     {
-        private static readonly HashSet<StylePropertyId> s_AnimatablePropertiesHash;
-
-        static StylePropertyUtil()
-        {
-            s_AnimatablePropertiesHash = new HashSet<StylePropertyId>(s_AnimatableProperties);
-        }
-
         public static bool IsAnimatable(StylePropertyId id)
         {
-            return s_AnimatablePropertiesHash.Contains(id);
+            return s_AnimatableProperties.Contains(id);
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/TransformOrigin.cs b/ModuleOverrides/com.unity.ui/Core/Style/TransformOrigin.cs
index b25855acea..2f353c15ba 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/TransformOrigin.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/TransformOrigin.cs
@@ -20,6 +20,12 @@ public TransformOrigin(Length x, Length y , float z)
             m_Z = z;
         }
 
+        /// <summary>
+        /// Create a TransformOrigin data with two Lengths for the x and y axis.
+        /// </summary>
+        public TransformOrigin(Length x, Length y) : this(x, y, 0)
+        { }
+
         /// <summary>
         /// Returns the initial value for the TransformOrigin property.
         /// </summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/Style/Translate.cs b/ModuleOverrides/com.unity.ui/Core/Style/Translate.cs
index 6cddcd9042..afdec755ef 100644
--- a/ModuleOverrides/com.unity.ui/Core/Style/Translate.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Style/Translate.cs
@@ -21,6 +21,12 @@ public Translate(Length x, Length y , float z)
             m_isNone = false;
         }
 
+        /// <summary>
+        /// Create a Translate data with two Lengths for the x and y axis.
+        /// </summary>
+        public Translate(Length x, Length y) : this(x, y, 0)
+        { }
+
         /// <summary>
         /// Returns the value of a Translate object with no translation applied.
         /// </summary>
diff --git a/ModuleOverrides/com.unity.ui/Core/StyleSheets/StylePropertyReader.cs b/ModuleOverrides/com.unity.ui/Core/StyleSheets/StylePropertyReader.cs
index d386d71cc3..1ef5bf5371 100644
--- a/ModuleOverrides/com.unity.ui/Core/StyleSheets/StylePropertyReader.cs
+++ b/ModuleOverrides/com.unity.ui/Core/StyleSheets/StylePropertyReader.cs
@@ -357,7 +357,7 @@ public Cursor ReadCursor(int index)
             Texture2D texture = null;
 
             var valueType = GetValueType(index);
-            bool isCustom = valueType == StyleValueType.ResourcePath || valueType == StyleValueType.AssetReference || valueType == StyleValueType.ScalableImage;
+            bool isCustom = valueType == StyleValueType.ResourcePath || valueType == StyleValueType.AssetReference || valueType == StyleValueType.ScalableImage || valueType == StyleValueType.MissingAssetReference;
 
             if (isCustom)
             {
diff --git a/ModuleOverrides/com.unity.ui/Core/StyleSheets/Validation/StyleMatcher.cs b/ModuleOverrides/com.unity.ui/Core/StyleSheets/Validation/StyleMatcher.cs
index 3069a79f4a..3257ec1eba 100644
--- a/ModuleOverrides/com.unity.ui/Core/StyleSheets/Validation/StyleMatcher.cs
+++ b/ModuleOverrides/com.unity.ui/Core/StyleSheets/Validation/StyleMatcher.cs
@@ -743,7 +743,7 @@ protected override bool MatchResource()
 
         protected override bool MatchUrl()
         {
-            return current.handle.valueType == StyleValueType.AssetReference;
+            return current.handle.valueType is StyleValueType.AssetReference or StyleValueType.ScalableImage;
         }
 
         protected override bool MatchTime()
diff --git a/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs b/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs
index 2c5ab348d7..a2d0697b37 100644
--- a/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Text/TextEditingManipulator.cs
@@ -25,7 +25,7 @@ internal bool touchScreenTextField
         public TextEditingManipulator(TextElement textElement)
         {
             m_TextElement = textElement;
-            editingUtilities = new TextEditingUtilities(textElement.m_SelectingManipulator.m_SelectingUtilities, textElement.uitkTextHandle.textHandle);
+            editingUtilities = new TextEditingUtilities(textElement.selectingManipulator.m_SelectingUtilities, textElement.uitkTextHandle.textHandle);
             InitTextEditorEventHandler();
         }
 
@@ -63,6 +63,8 @@ internal void ExecuteDefaultActionAtTarget(EventBase evt)
         void OnFocusInEvent(FocusInEvent evt)
         {
             m_TextElement.edition.SaveValueAndText();
+            // Update the selectedTextElement when an InputField takes focus.
+            m_TextElement.focusController.selectedTextElement = m_TextElement;
 
             // When this input field receives focus, make sure the correct text editor is initialized
             // (i.e. hardware keyboard or touchscreen keyboard).
@@ -91,6 +93,8 @@ void OnFocusInEvent(FocusInEvent evt)
         void OnFocusOutEvent(FocusOutEvent evt)
         {
             m_HardwareKeyboardPoller?.Pause();
+
+            editingUtilities.OnBlur();
         }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs b/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs
index 4e506771a2..272cc2220b 100644
--- a/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Text/TextSelectingManipulator.cs
@@ -63,12 +63,18 @@ void OnSelectIndexChange()
         {
             m_TextElement.IncrementVersion(VersionChangeType.Repaint);
             m_TextElement.edition.UpdateScrollOffset?.Invoke();
+
+            if(HasSelection() && m_TextElement.focusController != null)
+                m_TextElement.focusController.selectedTextElement = m_TextElement;
         }
 
         void OnCursorIndexChange()
         {
             m_TextElement.IncrementVersion(VersionChangeType.Repaint);
             m_TextElement.edition.UpdateScrollOffset?.Invoke();
+
+            if(HasSelection() && m_TextElement.focusController != null)
+                m_TextElement.focusController.selectedTextElement = m_TextElement;
         }
 
         internal bool RevealCursor()
@@ -124,7 +130,6 @@ void OnFocusEvent(FocusEvent evt)
 
         void OnBlurEvent(BlurEvent evt)
         {
-            m_SelectingUtilities.OnLostFocus();
             selectAllOnMouseUp = m_TextElement.selection.selectAllOnMouseUp;
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs b/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs
index 957435e13b..eca2b92e57 100644
--- a/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs
+++ b/ModuleOverrides/com.unity.ui/Core/Text/UITKTextHandle.cs
@@ -50,11 +50,6 @@ public Vector2 GetCursorPositionFromIndexUsingLineHeight(int index)
             return textHandle.GetCursorPositionFromStringIndexUsingLineHeight(index);
         }
 
-        public Vector2 GetCursorPositionFromIndexUsingCharacterHeight(int index)
-        {
-            return textHandle.GetCursorPositionFromStringIndexUsingCharacterHeight(index);
-        }
-
         public float ComputeTextWidth(string textToMeasure, bool wordWrap, float width, float height)
         {
             ConvertUssToTextGenerationSettings(s_LayoutSettings);
@@ -162,6 +157,7 @@ internal void ConvertUssToTextGenerationSettings(UnityEngine.TextCore.Text.TextG
 
             tgs.fontStyle = TextGeneratorUtilities.LegacyStyleToNewStyle(style.unityFontStyleAndWeight);
             tgs.textAlignment = TextGeneratorUtilities.LegacyAlignmentToNewAlignment(style.unityTextAlign);
+
             tgs.wordWrap = style.whiteSpace == WhiteSpace.Normal;
 
             tgs.wordWrappingRatio = 0.4f;
@@ -172,6 +168,7 @@ internal void ConvertUssToTextGenerationSettings(UnityEngine.TextCore.Text.TextG
             tgs.paragraphSpacing = style.unityParagraphSpacing.value;
 
             tgs.color = style.color;
+            tgs.shouldConvertToLinearSpace = false;
 
             if (m_TextElement.panel?.contextType == ContextType.Editor)
                 tgs.color *= UIElementsUtility.editorPlayModeTintColor;
@@ -197,11 +194,11 @@ internal static Vector2 MeasureVisualElementTextSize(TextElement te, string text
             if (textToMeasure == null || !IsFontAssigned(te))
                 return new Vector2(measuredWidth, measuredHeight);
 
-            var elementScaling = te.ComputeGlobalScale();
-            if (elementScaling.x + elementScaling.y <= 0 || te.scaledPixelsPerPoint <= 0)
+            float pixelsPerPoint = te.scaledPixelsPerPoint;
+
+            if ( pixelsPerPoint <= 0)
                 return Vector2.zero;
 
-            float pixelsPerPoint = te.scaledPixelsPerPoint;
             if (widthMode == VisualElement.MeasureMode.Exactly)
             {
                 measuredWidth = width;
diff --git a/ModuleOverrides/com.unity.ui/Core/TextElement.cs b/ModuleOverrides/com.unity.ui/Core/TextElement.cs
index d172dcfb14..40db68997e 100644
--- a/ModuleOverrides/com.unity.ui/Core/TextElement.cs
+++ b/ModuleOverrides/com.unity.ui/Core/TextElement.cs
@@ -72,6 +72,9 @@ public TextElement()
         {
             requireMeasureFunction = true;
 
+            // We don't want the TextElement to be sequentially focusable through tab navigation by default.
+            tabIndex = -1;
+
             uitkTextHandle = new UITKTextHandle(this);
 
             AddToClassList(ussClassName);
@@ -170,7 +173,8 @@ public bool displayTooltipWhenElided
 
         private bool m_WasElided;
 
-        private void OnGenerateVisualContent(MeshGenerationContext mgc)
+        //Used in tests
+        internal void OnGenerateVisualContent(MeshGenerationContext mgc)
         {
             UpdateVisibleText();
             mgc.Text(this);
@@ -180,13 +184,10 @@ private void OnGenerateVisualContent(MeshGenerationContext mgc)
 
             UpdateTooltip();
 
-            if (edition.hasFocus)
-            {
-                if(selection.HasSelection())
-                    DrawHighlighting(mgc);
-                else if(!edition.isReadOnly && m_SelectingManipulator.RevealCursor())
-                    DrawCaret(mgc);
-            }
+            if(selection.HasSelection())
+                DrawHighlighting(mgc);
+            else if(!edition.isReadOnly && selection.isSelectable && selectingManipulator.RevealCursor())
+                DrawCaret(mgc);
         }
 
         internal string ElideText(string drawText, string ellipsisText, float width, TextOverflowPosition textOverflowPosition)
@@ -310,7 +311,6 @@ private void UpdateVisibleText()
             {
                 isElided = false;
             }
-
         }
 
         private bool ShouldElide()
@@ -371,8 +371,8 @@ void INotifyValueChanged<string>.SetValueWithoutNotify(string newValue)
             {
                 renderedText = newValue;
                 m_Text = newValue;
-                if (isSelectable)
-                    m_SelectingManipulator.m_SelectingUtilities.text = newValue;
+                if (selection.isSelectable)
+                    selectingManipulator.m_SelectingUtilities.text = newValue;
                 IncrementVersion(VersionChangeType.Layout | VersionChangeType.Repaint);
 
                 if (!string.IsNullOrEmpty(viewDataKey))
diff --git a/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs b/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs
index 1bb411f061..a5128d1487 100644
--- a/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs
+++ b/ModuleOverrides/com.unity.ui/Core/TextElementEdition.cs
@@ -43,8 +43,10 @@ public interface ITextEdition
         internal void RestoreValueAndText();
 
         internal Func<char, bool> AcceptCharacter { get; set; }
-        internal Action UpdateScrollOffset{ get; set; }
-        internal Action UpdateValueFromText{ get; set; }
+        internal Action UpdateScrollOffset { get; set; }
+        internal Action UpdateValueFromText { get; set; }
+        internal Action UpdateTextFromValue { get; set; }
+        internal Action MoveFocusToCompositeRoot { get; set; }
 
         internal void UpdateText(string value);
 
@@ -71,7 +73,7 @@ public partial class TextElement : ITextEdition
         /// </summary>
         internal ITextEdition edition => this;
 
-        internal TextEditingManipulator m_EditingManipulator;
+        internal TextEditingManipulator editingManipulator;
 
         bool m_Multiline;
 
@@ -82,8 +84,8 @@ bool ITextEdition.multiline
             {
                 if (value != m_Multiline)
                 {
-                    if (isSelectable)
-                        m_SelectingManipulator.m_SelectingUtilities.multiline = value;
+                    if (selection.isSelectable)
+                        selectingManipulator.m_SelectingUtilities.multiline = value;
                     m_Multiline = value;
                 }
             }
@@ -99,14 +101,7 @@ bool ITextEdition.isReadOnly
                 if (value == m_IsReadOnly)
                     return;
 
-                if (!value)
-                {
-                    isSelectable = true;
-                    m_EditingManipulator = new TextEditingManipulator(this);
-                }
-                else
-                    m_EditingManipulator = null;
-
+                editingManipulator = value ? null : new TextEditingManipulator(this);
                 m_IsReadOnly = value;
             }
         }
@@ -169,7 +164,7 @@ DropdownMenuAction.Status CopyActionStatus(DropdownMenuAction a)
 
         DropdownMenuAction.Status PasteActionStatus(DropdownMenuAction a)
         {
-            var canPaste = m_EditingManipulator.editingUtilities.CanPaste();
+            var canPaste = editingManipulator.editingUtilities.CanPaste();
             return enabledInHierarchy
                 ? canPaste ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled
                 : DropdownMenuAction.Status.Hidden;
@@ -179,16 +174,17 @@ DropdownMenuAction.Status PasteActionStatus(DropdownMenuAction a)
         [EventInterest(typeof(ContextualMenuPopulateEvent), typeof(FocusInEvent), typeof(FocusOutEvent),
             typeof(KeyDownEvent), typeof(KeyUpEvent), typeof(FocusEvent), typeof(BlurEvent),
             typeof(MouseUpEvent), typeof(MouseDownEvent), typeof(MouseMoveEvent), typeof(ValidateCommandEvent),
-            typeof(ExecuteCommandEvent), typeof(PointerDownEvent), typeof(PointerUpEvent))]
+            typeof(ExecuteCommandEvent), typeof(PointerDownEvent), typeof(PointerUpEvent),
+            typeof(NavigationMoveEvent), typeof(NavigationSubmitEvent), typeof(NavigationCancelEvent))]
         protected override void ExecuteDefaultActionAtTarget(EventBase evt)
         {
-            if (isSelectable)
+            if (selection.isSelectable)
             {
                 // Selecting is currently not supported with softKeyboard.
-                if (!m_EditingManipulator?.touchScreenTextField ?? true)
-                    m_SelectingManipulator.ExecuteDefaultActionAtTarget(evt);
+                if (!editingManipulator?.touchScreenTextField ?? true)
+                    selectingManipulator.ExecuteDefaultActionAtTarget(evt);
                 if (!edition.isReadOnly)
-                    m_EditingManipulator?.ExecuteDefaultActionAtTarget(evt);
+                    editingManipulator?.ExecuteDefaultActionAtTarget(evt);
                 elementPanel?.contextualMenuManager?.DisplayMenuIfEventMatches(evt, this);
 
                 if (evt?.eventTypeId == ContextualMenuPopulateEvent.TypeId())
@@ -239,8 +235,10 @@ void ITextEdition.RestoreValueAndText()
         }
 
         Func<char, bool> ITextEdition.AcceptCharacter { get; set; }
-        Action ITextEdition.UpdateScrollOffset{ get; set; }
-        Action ITextEdition.UpdateValueFromText{ get; set; }
+        Action ITextEdition.UpdateScrollOffset { get; set; }
+        Action ITextEdition.UpdateValueFromText { get; set; }
+        Action ITextEdition.UpdateTextFromValue { get; set; }
+        Action ITextEdition.MoveFocusToCompositeRoot { get; set; }
 
         void ITextEdition.UpdateText(string value)
         {
diff --git a/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs b/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs
index c578e87621..c202300c47 100644
--- a/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs
+++ b/ModuleOverrides/com.unity.ui/Core/TextElementSelection.cs
@@ -3,8 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Collections.Generic;
-using UnityEngine.UIElements.UIR;
 
 namespace UnityEngine.UIElements
 {
@@ -15,6 +13,11 @@ namespace UnityEngine.UIElements
     /// </summary>
     public interface ITextSelection
     {
+        /// <summary>
+        /// Returns true if the field is selectable.
+        /// </summary>
+        bool isSelectable { get; set; }
+
         /// <summary>
         /// Color of the cursor.
         /// </summary>
@@ -95,72 +98,72 @@ public partial class TextElement : ITextSelection
         /// </summary>
         public ITextSelection selection => this;
 
-        internal TextSelectingManipulator m_SelectingManipulator;
-
-        bool m_IsSelectable = false;
+        TextSelectingManipulator m_SelectingManipulator;
 
+        bool m_IsSelectable;
         /// <summary>
-        /// Controls whether the element's content is selectable.
+        /// Controls whether the element's content is selectable.  Note that selectable TextElement are required to be focusable.
         /// </summary>
-        public bool isSelectable
+        bool ITextSelection.isSelectable
         {
-            get => m_IsSelectable;
+            get => m_IsSelectable && focusable;
             set
             {
                 if (value == m_IsSelectable)
                     return;
 
-                m_SelectingManipulator = value ? new TextSelectingManipulator(this) : null;
+                focusable = value;
                 m_IsSelectable = value;
             }
         }
 
         int ITextSelection.cursorIndex
         {
-            get => m_SelectingManipulator?.cursorIndex ?? -1;
+            get => selection.isSelectable ? selectingManipulator.cursorIndex : -1;
             set
             {
-                if (isSelectable)
-                    m_SelectingManipulator.cursorIndex = value;
+                if (selection.isSelectable)
+                    selectingManipulator.cursorIndex = value;
             }
         }
 
 
         int ITextSelection.selectIndex
         {
-            get => m_SelectingManipulator?.selectIndex ?? -1;
+            get => selection.isSelectable ? selectingManipulator.selectIndex : -1;
             set
             {
-                if (isSelectable)
-                    m_SelectingManipulator.selectIndex = value;
+                if (selection.isSelectable)
+                    selectingManipulator.selectIndex = value;
             }
         }
 
         void ITextSelection.SelectAll()
         {
-            m_SelectingManipulator?.m_SelectingUtilities.SelectAll();
+            if (selection.isSelectable)
+                selectingManipulator.m_SelectingUtilities.SelectAll();
         }
 
         void ITextSelection.SelectNone()
         {
-            m_SelectingManipulator?.m_SelectingUtilities.SelectNone();
+            if (selection.isSelectable)
+                selectingManipulator.m_SelectingUtilities.SelectNone();
         }
 
         void ITextSelection.SelectRange(int cursorIndex, int selectionIndex)
         {
-            if (isSelectable)
+            if (selection.isSelectable)
             {
-                m_SelectingManipulator.m_SelectingUtilities.cursorIndex = cursorIndex;
-                m_SelectingManipulator.m_SelectingUtilities.selectIndex = selectionIndex;
+                selectingManipulator.m_SelectingUtilities.cursorIndex = cursorIndex;
+                selectingManipulator.m_SelectingUtilities.selectIndex = selectionIndex;
             }
         }
 
         bool ITextSelection.HasSelection()
         {
-            return isSelectable && m_SelectingManipulator.HasSelection();
+            return selection.isSelectable && selectingManipulator.HasSelection();
         }
 
-
         bool ITextSelection.doubleClickSelectsWord { get; set; } = true;
 
         bool ITextSelection.tripleClickSelectsLine { get; set; } = true;
@@ -181,8 +184,8 @@ bool ITextSelection.HasSelection()
 
         void ITextSelection.MoveTextEnd()
         {
-            if (isSelectable)
-                m_SelectingManipulator.m_SelectingUtilities.MoveTextEnd();
+            if (selection.isSelectable)
+                selectingManipulator.m_SelectingUtilities.MoveTextEnd();
         }
 
         Color ITextSelection.selectionColor { get; set; } = new Color(0.239f, 0.502f, 0.875f, 0.65f);
@@ -192,6 +195,10 @@ void ITextSelection.MoveTextEnd()
 
         float ITextSelection.cursorWidth { get; set; } = 1.0f;
 
+        // Always return a valid selecting manipulator and rely on isSelectable to use it/not
+        internal TextSelectingManipulator selectingManipulator =>
+            m_SelectingManipulator ??= new TextSelectingManipulator(this);
+
         private void DrawHighlighting(MeshGenerationContext mgc)
         {
             var playmodeTintColor = panel.contextType == ContextType.Editor
diff --git a/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs b/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs
index df2677dc90..1d4eabad14 100644
--- a/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UIElementsRuntimeUtility.cs
@@ -117,6 +117,8 @@ private static void RemoveCachedPanelInternal(int instanceID)
         static List<Panel> s_SortedRuntimePanels = new List<Panel>();
         private static bool s_PanelOrderingDirty = true;
 
+        internal static int s_ResolvedSortingIndexMax = 0;
+
         internal static readonly string s_RepaintProfilerMarkerName = "UIElementsRuntimeUtility.DoDispatch(Repaint Event)";
         private static readonly ProfilerMarker s_RepaintProfilerMarker = new ProfilerMarker(s_RepaintProfilerMarkerName);
 
@@ -137,9 +139,18 @@ public static void RepaintOverlayPanels()
 
         public static void RepaintOverlayPanel(BaseRuntimePanel panel)
         {
+            var oldCam = Camera.current;
+            var oldRT = RenderTexture.active;
+
+            Camera.SetupCurrent(null);
+            RenderTexture.active = null;
+
             using (s_RepaintProfilerMarker.Auto())
                 panel.Repaint(Event.current);
             (panel.panelDebug?.debuggerOverlayPanel as Panel)?.Repaint(Event.current);
+
+            Camera.SetupCurrent(oldCam);
+            RenderTexture.active = oldRT;
         }
 
         private static int currentOverlayIndex = -1;
@@ -198,6 +209,8 @@ public static void UnregisterEventSystem(Object eventSystem)
 
         public static void UpdateRuntimePanels()
         {
+            RemoveUnusedPanels();
+
             foreach (BaseRuntimePanel panel in GetSortedPlayerPanels())
             {
                 panel.Update();
@@ -209,6 +222,32 @@ public static void UpdateRuntimePanels()
             }
         }
 
+        internal static void MarkPotentiallyEmpty(PanelSettings settings)
+        {
+            if (!s_PotentiallyEmptyPanelSettings.Contains(settings))
+                s_PotentiallyEmptyPanelSettings.Add(settings);
+        }
+
+        private static List<PanelSettings> s_PotentiallyEmptyPanelSettings = new List<PanelSettings>();
+        internal static void RemoveUnusedPanels()
+        {
+
+            foreach (PanelSettings psetting in s_PotentiallyEmptyPanelSettings)
+            {
+                var m_AttachedUIDocumentsList = psetting.m_AttachedUIDocumentsList;
+                if (m_AttachedUIDocumentsList == null || m_AttachedUIDocumentsList.m_AttachedUIDocuments.Count == 0)
+                {
+                    // The runtime panel is unused, dispose it immediately as we dont want any side effect of keeping the panel alive.
+                    // It'll be recreated if it's used again.
+                    psetting.DisposePanel();
+                }
+
+            }
+
+            s_PotentiallyEmptyPanelSettings.Clear();
+
+        }
+
         public static void RegisterPlayerloopCallback()
         {
             UIElementsRuntimeUtilityNative.RegisterPlayerloopCallback();
@@ -260,6 +299,14 @@ static void SortPanels()
                 return (diff < 0) ? -1 : 1;
             });
 
+            for (var i = 0; i < s_SortedRuntimePanels.Count; i++)
+            {
+                var runtimePanel = s_SortedRuntimePanels[i] as BaseRuntimePanel;
+                if (runtimePanel != null)
+                    runtimePanel.resolvedSortingIndex = i;
+            }
+            s_ResolvedSortingIndexMax = s_SortedRuntimePanels.Count - 1;
+
             s_PanelOrderingDirty = false;
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs b/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs
index 954761acc7..27a56d96dd 100644
--- a/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UIElementsUtility.cs
@@ -178,12 +178,6 @@ bool IUIElementsUtility.TakeCapture()
             if (s_ContainerStack.Count > 0)
             {
                 var topmostContainer = s_ContainerStack.Peek();
-
-                var currentCapturingElement = topmostContainer.panel.GetCapturingElement(PointerId.mousePointerId);
-                if (currentCapturingElement != null && currentCapturingElement != topmostContainer)
-                {
-                    Debug.Log("Should not grab hot control with an active capture");
-                }
                 topmostContainer.CaptureMouse();
                 return true;
             }
@@ -433,10 +427,18 @@ internal static EventBase CreateEvent(Event systemEvent, EventType eventType)
 
         static bool DoDispatch(BaseVisualElementPanel panel)
         {
+            Debug.Assert(panel.contextType == ContextType.Editor);
+
             bool usesEvent = false;
 
             if (s_EventInstance.type == EventType.Repaint)
             {
+                var oldCam = Camera.current;
+                var oldRT = RenderTexture.active;
+
+                Camera.SetupCurrent(null);
+                RenderTexture.active = null;
+
                 using (s_RepaintProfilerMarker.Auto())
                     panel.Repaint(s_EventInstance);
 
@@ -446,6 +448,9 @@ static bool DoDispatch(BaseVisualElementPanel panel)
                 // in order to suspend to suspend OnGUI() processing on the native side
                 // since we've already run it if we have an IMGUIContainer
                 usesEvent = panel.IMGUIContainersCount > 0;
+
+                Camera.SetupCurrent(oldCam);
+                RenderTexture.active = oldRT;
             }
             else
             {
@@ -509,6 +514,17 @@ internal static Panel FindOrCreateEditorPanel(ScriptableObject ownerObject)
             return panel;
         }
 
+        internal static float PixelsPerUnitScaleForElement(VisualElement ve, Sprite sprite)
+        {
+            if (ve == null || ve.elementPanel == null || sprite == null)
+                return 1.0f;
+
+            float referencePixelsPerUnit = ve.elementPanel.referenceSpritePixelsPerUnit;
+            float pixelsPerUnit = sprite.pixelsPerUnit;
+            pixelsPerUnit = Mathf.Max(0.01f, pixelsPerUnit);
+            return referencePixelsPerUnit / pixelsPerUnit;
+        }
+
         internal static int m_InMemoryAssetsVersion { get; private set; } = 0;
 
         internal static void InMemoryAssetsHaveBeenChanged()
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAssetAttributeDescription.cs b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAssetAttributeDescription.cs
new file mode 100644
index 0000000000..1edfc128c4
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlAssetAttributeDescription.cs
@@ -0,0 +1,27 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEngine.UIElements
+{
+    internal class UxmlAssetAttributeDescription<T> : TypedUxmlAttributeDescription<T> where T : Object
+    {
+        public UxmlAssetAttributeDescription()
+        {
+            type = "string"; // In uxml, this is referenced as a string.
+            typeNamespace = xmlSchemaNamespace;
+            defaultValue = default;
+        }
+
+        public override string defaultValueAsString => defaultValue?.ToString() ?? "null";
+
+        public override T GetValueFromBag(IUxmlAttributes bag, CreationContext cc)
+        {
+            string path = null;
+            if (TryGetValueFromBag(bag, cc, (s, t) => s, null, ref path))
+                return cc.visualTreeAsset?.GetAsset<T>(path);
+
+            return null;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlFactory.cs b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlFactory.cs
index 3d5e610348..d32ca9fe10 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/UxmlFactory.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/UxmlFactory.cs
@@ -127,6 +127,11 @@ public interface IBaseUxmlFactory
         /// </summary>
         string uxmlQualifiedName { get; }
 
+        /// <summary>
+        /// The type of the UXML element read by the factory.
+        /// </summary>
+        Type uxmlType { get; }
+
         /// <summary>
         /// Must return true if the UXML element attributes are not restricted to the values enumerated by <see cref="uxmlAttributesDescription"/>.
         /// </summary>
@@ -237,13 +242,18 @@ public virtual string uxmlNamespace
         }
 
         /// <summary>
-        /// Returns the typefully qualified name of <c>T0</c>.
+        /// Returns the type fully qualified name of <c>T0</c>.
         /// </summary>
         public virtual string uxmlQualifiedName
         {
             get { return typeof(TCreatedType).FullName; }
         }
 
+        /// <summary>
+        /// Returns the type of <c>T0</c>.
+        /// </summary>
+        public virtual Type uxmlType => typeof(TCreatedType);
+
         /// <summary>
         /// Returns UxmlTraits<see cref="canHaveAnyAttribute"/> (where UxmlTraits is the argument for <c>T1</c>).
         /// </summary>
@@ -259,10 +269,7 @@ public virtual IEnumerable<UxmlAttributeDescription> uxmlAttributesDescription
         {
             get
             {
-                foreach (var attr in m_Traits.uxmlAttributesDescription)
-                {
-                    yield return attr;
-                }
+                return m_Traits.uxmlAttributesDescription;
             }
         }
 
@@ -273,10 +280,7 @@ public virtual IEnumerable<UxmlChildElementDescription> uxmlChildElementsDescrip
         {
             get
             {
-                foreach (var child in m_Traits.uxmlChildElementsDescription)
-                {
-                    yield return child;
-                }
+                return m_Traits.uxmlChildElementsDescription;
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementAsset.cs b/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementAsset.cs
index 5f41fff4e4..77de2d77ba 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementAsset.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementAsset.cs
@@ -98,6 +98,8 @@ public List<StyleSheet> stylesheets
         [SerializeField]
         private List<string> m_Properties;
 
+        int m_DirtyCount;
+
         public VisualElementAsset(string fullTypeName)
         {
             m_FullTypeName = fullTypeName;
@@ -138,6 +140,8 @@ void SetOrAddProperty(string propertyName, string propertyValue)
             if (m_Properties == null)
                 m_Properties = new List<string>();
 
+            m_DirtyCount++;
+
             for (int i = 0; i < m_Properties.Count - 1; i += 2)
             {
                 if (m_Properties[i] == propertyName)
@@ -171,5 +175,11 @@ public bool TryGetAttributeValue(string propertyName, out string value)
             value = null;
             return false;
         }
+
+        internal int GetPropertiesDirtyCount()
+        {
+            return m_DirtyCount;
+        }
+
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs b/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs
index f167d1ae5e..f87849ce74 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/VisualElementFactoryRegistry.cs
@@ -6,13 +6,26 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
+using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEngine.UIElements
 {
     internal class VisualElementFactoryRegistry
     {
         private static Dictionary<string, List<IUxmlFactory>> s_Factories;
+        private static Dictionary<string, List<IUxmlFactory>> s_MovedTypesFactories;
 
+        private static string GetMovedUIControlTypeName(Type type, MovedFromAttribute attr)
+        {
+            if (type == null)
+                return string.Empty;
+
+            MovedFromAttributeData data = attr.data;
+            var namespaceName = data.nameSpaceHasChanged ? data.nameSpace : VisualElement.GetOrCreateTypeData(type).typeNamespace;
+            var typeName = data.classHasChanged ? data.className : VisualElement.GetOrCreateTypeData(type).typeName;
+            var fullOldName = namespaceName + "." + typeName;
+            return fullOldName;
+        }
         internal static Dictionary<string, List<IUxmlFactory>> factories
         {
             get
@@ -20,6 +33,7 @@ internal static Dictionary<string, List<IUxmlFactory>> factories
                 if (s_Factories == null)
                 {
                     s_Factories = new Dictionary<string, List<IUxmlFactory>>();
+                    s_MovedTypesFactories = new Dictionary<string, List<IUxmlFactory>>(50);
                     RegisterEngineFactories();
                     RegisterUserFactories();
                 }
@@ -46,12 +60,23 @@ protected static void RegisterFactory(IUxmlFactory factory)
                 factoryList = new List<IUxmlFactory>();
                 factoryList.Add(factory);
                 factories.Add(factory.uxmlQualifiedName, factoryList);
+                Type uxmlType = factory.uxmlType;
+                var attr = uxmlType?.GetCustomAttribute<MovedFromAttribute>(false);
+                if (attr != null && typeof(VisualElement).IsAssignableFrom(uxmlType))
+                {
+                    string movedTypeName = GetMovedUIControlTypeName(uxmlType, attr);
+                    if (string.IsNullOrEmpty(movedTypeName) == false)
+                        s_MovedTypesFactories.Add(movedTypeName, factoryList);
+                }
             }
         }
 
         internal static bool TryGetValue(string fullTypeName, out List<IUxmlFactory> factoryList)
         {
-            return factories.TryGetValue(fullTypeName, out factoryList);
+            bool ret = factories.TryGetValue(fullTypeName, out factoryList);
+            if (ret == false)
+                ret = s_MovedTypesFactories.TryGetValue(fullTypeName, out factoryList);
+            return ret;
         }
 
         // Core UI Toolkit elements must be registered manually for both Editor and Player use cases.
diff --git a/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs b/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs
index de6134d135..3e5a7bae98 100644
--- a/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs
+++ b/ModuleOverrides/com.unity.ui/Core/UXML/VisualTreeAsset.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine.Assertions;
-using UnityEngine.UIElements.StyleSheets;
 
 namespace UnityEngine.UIElements
 {
@@ -45,6 +44,7 @@ internal int GetNextChildSerialNumber()
         {
             int n = m_VisualElementAssets?.Count ?? 0;
             n += m_TemplateAssets?.Count ?? 0;
+            n += m_UxmlObjectEntries?.Count ?? 0;
             return n;
         }
 
@@ -118,6 +118,26 @@ public UxmlObjectEntry(int parentId, List<UxmlObjectAsset> uxmlObjectAssets)
             }
         }
 
+        [Serializable]
+        struct AssetEntry
+        {
+            [SerializeField] public string path;
+            [SerializeField] public string typeFullName;
+            [SerializeField] public Object asset;
+
+            Type m_CachedType;
+            public Type type => m_CachedType ??= Type.GetType(typeFullName);
+
+            public AssetEntry(string path, Type type, Object asset)
+            {
+                this.path = path;
+                this.typeFullName = type.AssemblyQualifiedName;
+                this.asset = asset;
+
+                m_CachedType = type;
+            }
+        }
+
 #pragma warning disable 0649
         [SerializeField] private List<UsingEntry> m_Usings;
 #pragma warning restore 0649
@@ -273,6 +293,40 @@ internal void RegisterUxmlObject(UxmlObjectAsset uxmlObjectAsset)
             return null;
         }
 
+        [SerializeField]
+        List<AssetEntry> m_AssetEntries;
+
+        internal bool AssetEntryExists(string path, Type type)
+        {
+            if (m_AssetEntries == null)
+                return false;
+
+            foreach (var entry in m_AssetEntries)
+            {
+                if (entry.path == path && entry.type == type)
+                    return true;
+            }
+
+            return false;
+        }
+
+        internal void RegisterAssetEntry(string path, Type type, Object asset)
+        {
+            m_AssetEntries ??= new List<AssetEntry>();
+            m_AssetEntries.Add(new AssetEntry(path, type, asset));
+        }
+
+        internal T GetAsset<T>(string path) where T : Object
+        {
+            foreach (var entry in m_AssetEntries)
+            {
+                if (entry.path.Equals(path) && entry.type == typeof(T))
+                    return entry.asset as T;
+            }
+
+            return null;
+        }
+
         internal UxmlObjectEntry GetUxmlObjectEntry(int id)
         {
             if (m_UxmlObjectEntries != null)
@@ -721,37 +775,6 @@ VisualElement CreateError()
                         return CreateError();
                     }
                 }
-                else if (asset.fullTypeName == "UnityEditor.UIElements.ProgressBar" || asset.fullTypeName.StartsWith("UnityEditor.UIElements.EnumField"))
-                {
-                    string runtimeTypeName = asset.fullTypeName.Replace("UnityEditor", "UnityEngine");
-                    if (!VisualElementFactoryRegistry.TryGetValue(runtimeTypeName, out factoryList))
-                    {
-                        return CreateError();
-                    }
-                }
-                // TODO: Do it differently (UIE-814).
-                else if (asset.fullTypeName == "UnityEditor.UIElements.FloatField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.DoubleField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.EnumField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.Hash128Field"
-                         || asset.fullTypeName == "UnityEditor.UIElements.IntegerField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.LongField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.RectField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.Vector2Field"
-                         || asset.fullTypeName == "UnityEditor.UIElements.RectIntField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.Vector3Field"
-                         || asset.fullTypeName == "UnityEditor.UIElements.Vector4Field"
-                         || asset.fullTypeName == "UnityEditor.UIElements.Vector2IntField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.Vector3IntField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.BoundsField"
-                         || asset.fullTypeName == "UnityEditor.UIElements.BoundsIntField")
-                {
-                    string runtimeTypeName = asset.fullTypeName.Replace("UnityEditor", "UnityEngine");
-                    if (!VisualElementFactoryRegistry.TryGetValue(runtimeTypeName, out factoryList))
-                    {
-                        return CreateError();
-                    }
-                }
                 else if (asset.fullTypeName == UxmlRootElementFactory.k_ElementName)
                 {
                     // Support UXML without namespace for backward compatibility.
@@ -794,7 +817,9 @@ static void AssignClassListFromAssetToElement(VisualElementAsset asset, VisualEl
             if (asset.classes != null)
             {
                 for (int i = 0; i < asset.classes.Length; i++)
+                {
                     element.AddToClassList(asset.classes[i]);
+                }
             }
         }
 
@@ -803,7 +828,9 @@ static void AssignStyleSheetFromAssetToElement(VisualElementAsset asset, VisualE
             if (asset.hasStylesheetPaths)
             {
                 for (int i = 0; i < asset.stylesheetPaths.Count; i++)
+                {
                     element.AddStyleSheetPath(asset.stylesheetPaths[i]);
+                }
             }
 
             if (asset.hasStylesheets)
@@ -827,6 +854,18 @@ public int contentHash
             set { m_ContentHash = value; }
         }
 
+        // Used for Live Reload.
+        internal int GetAttributePropertiesDirtyCount()
+        {
+            var dirtyCount = 0;
+            foreach (var vea in visualElementAssets)
+            {
+                dirtyCount += vea.GetPropertiesDirtyCount();
+            }
+
+            return dirtyCount;
+        }
+
         internal void ExtractUsedUxmlQualifiedNames(HashSet<string> names)
         {
             foreach (var asset in m_VisualElementAssets)
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElement.cs b/ModuleOverrides/com.unity.ui/Core/VisualElement.cs
index 01dff6287d..17cd45f2c8 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElement.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElement.cs
@@ -217,7 +217,7 @@ public override void Init(VisualElement ve, IUxmlAttributes bag, CreationContext
                     ve.tabIndex = index;
                 }
 
-                bool focus = false;
+                var focus = false;
 
                 if (focusable.TryGetValueFromBag(bag, cc, ref focus))
                 {
@@ -470,20 +470,6 @@ Vector3 ITransform.scale
             }
         }
 
-        internal Vector3 ComputeGlobalScale()
-        {
-            Vector3 result = resolvedStyle.scale.value;
-
-            var ve = this.hierarchy.parent;
-
-            while (ve != null)
-            {
-                result.Scale(ve.resolvedStyle.scale.value);
-                ve = ve.hierarchy.parent;
-            }
-            return result;
-        }
-
         Matrix4x4 ITransform.matrix
         {
             get { return Matrix4x4.TRS(resolvedStyle.translate, resolvedStyle.rotate.ToQuaternion(), resolvedStyle.scale.value); }
@@ -1147,6 +1133,8 @@ private void ChangeIMGUIContainerCount(int delta)
         /// </summary>
         public VisualElement()
         {
+            UIElementsRuntimeUtilityNative.VisualElementCreation();
+
             m_Children = s_EmptyList;
             controlid = ++s_NextId;
 
@@ -1169,7 +1157,7 @@ public VisualElement()
 
         [EventInterest(typeof(MouseOverEvent), typeof(MouseOutEvent), typeof(PointerEnterEvent),
             typeof(PointerLeaveEvent), typeof(PointerCaptureEvent), typeof(PointerCaptureOutEvent),
-            typeof(BlurEvent), typeof(FocusEvent))]
+            typeof(BlurEvent), typeof(FocusEvent), typeof(TooltipEvent))]
         protected override void ExecuteDefaultAction(EventBase evt)
         {
             base.ExecuteDefaultAction(evt);
@@ -1216,6 +1204,21 @@ protected override void ExecuteDefaultAction(EventBase evt)
             {
                 pseudoStates = pseudoStates | PseudoStates.Focus;
             }
+            else if (evt.eventTypeId == TooltipEvent.TypeId())
+            {
+                // Allow child elements to set their own tooltip
+                SetTooltip((TooltipEvent)evt);
+            }
+        }
+
+        void SetTooltip(TooltipEvent e)
+        {
+            if (e.currentTarget is VisualElement element && !string.IsNullOrEmpty(element.tooltip))
+            {
+                e.rect = element.worldBound;
+                e.tooltip = element.tooltip;
+                e.StopImmediatePropagation();
+            }
         }
 
         public sealed override void Focus()
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs
index 48fc8b757a..67019dc391 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementFocusRing.cs
@@ -61,6 +61,9 @@ protected override void Dispose()
 
         internal override void ApplyTo(FocusController focusController, Focusable f)
         {
+            // Unselect selected TextElement on pointer down.
+            focusController.selectedTextElement = null;
+
             f.Focus(); // Call Focus() virtual method when an element is clicked or otherwise focused explicitly.
         }
 
@@ -346,37 +349,22 @@ public FocusChangeDirection GetFocusChangeDirection(Focusable currentFocusable,
                     return VisualElementFocusChangeTarget.GetPooled(target);
             }
 
-            if (currentFocusable is IMGUIContainer && e.imguiEvent != null)
+            if (currentFocusable is IMGUIContainer)
             {
                 // Let IMGUIContainer manage the focus change.
                 return FocusChangeDirection.none;
             }
 
-            return GetKeyDownFocusChangeDirection(e);
-        }
-
-        internal static FocusChangeDirection GetKeyDownFocusChangeDirection(EventBase e)
-        {
-            if (e.eventTypeId == KeyDownEvent.TypeId())
+            if (e.eventTypeId == NavigationMoveEvent.TypeId())
             {
-                KeyDownEvent kde = e as KeyDownEvent;
-
-                // Important: using KeyDownEvent.character for focus prevents a TextField bug.
-                // IMGUI sends KeyDownEvent with keyCode != None, then it sends another one with character != '\0'.
-                // If we use keyCode instead of character, TextField will receive focus on the first KeyDownEvent,
-                // then text will become selected and, in the case of multiline, the KeyDownEvent with character = '\t'
-                // will immediately overwrite the text with a single Tab string.
-                if (kde.character == (char)25 || kde.character == '\t')
-                {
-                    if (kde.modifiers == EventModifiers.Shift)
-                    {
-                        return VisualElementFocusChangeDirection.left;
-                    }
-                    if (kde.modifiers == EventModifiers.None)
-                    {
-                        return VisualElementFocusChangeDirection.right;
-                    }
-                }
+                // If navigation event was sent to an element that doesn't have the focus, ignore it.
+                // This is helpful in cases where a control reacts to KeyDown and moves the focus away, in which case
+                // any further equivalent navigation events should not move the focus again.
+
+                var direction = ((NavigationMoveEvent) e).direction;
+                return direction == NavigationMoveEvent.Direction.Next ? VisualElementFocusChangeDirection.right :
+                    direction == NavigationMoveEvent.Direction.Previous ? VisualElementFocusChangeDirection.left :
+                    FocusChangeDirection.none;
             }
 
             return FocusChangeDirection.none;
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs
index 2e1f983c8c..c769b23186 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementHierarchy.cs
@@ -406,6 +406,7 @@ public void PlaceInFront(VisualElement sibling)
         /// </summary>
         public struct Hierarchy
         {
+            private const string k_InvalidHierarchyChangeMsg = "Cannot modify VisualElement hierarchy during layout calculation";
             private readonly VisualElement m_Owner;
 
             /// <summary>
@@ -446,6 +447,9 @@ public void Insert(int index, VisualElement child)
                 if (child == m_Owner)
                     throw new ArgumentException("Cannot insert element as its own child");
 
+                if (m_Owner.elementPanel != null && m_Owner.elementPanel.duringLayoutPhase)
+                    throw new InvalidOperationException(k_InvalidHierarchyChangeMsg);
+
                 child.RemoveFromHierarchy();
 
                 if (ReferenceEquals(m_Owner.m_Children, s_EmptyList))
@@ -484,7 +488,7 @@ public void Remove(VisualElement child)
                     throw new ArgumentException("Cannot remove null child");
 
                 if (child.hierarchy.parent != m_Owner)
-                    throw new ArgumentException("This visualElement is not my child");
+                    throw new ArgumentException("This VisualElement is not my child");
 
                 int index = m_Owner.m_Children.IndexOf(child);
                 RemoveAt(index);
@@ -495,6 +499,9 @@ public void Remove(VisualElement child)
             /// </summary>
             public void RemoveAt(int index)
             {
+                if (m_Owner.elementPanel != null && m_Owner.elementPanel.duringLayoutPhase)
+                    throw new InvalidOperationException(k_InvalidHierarchyChangeMsg);
+
                 if (index < 0 || index >= childCount)
                     throw new ArgumentOutOfRangeException("Index out of range: " + index);
 
@@ -514,7 +521,8 @@ public void RemoveAt(int index)
                 {
                     ReleaseChildList();
 
-                    m_Owner.AssignMeasureFunction();
+                    if (m_Owner.requireMeasureFunction)
+                        m_Owner.AssignMeasureFunction();
                 }
 
                 // Child is detached from the panel, notify using the panel directly.
@@ -527,6 +535,9 @@ public void RemoveAt(int index)
             /// </summary>
             public void Clear()
             {
+                if (m_Owner.elementPanel != null && m_Owner.elementPanel.duringLayoutPhase)
+                    throw new InvalidOperationException(k_InvalidHierarchyChangeMsg);
+
                 if (childCount > 0)
                 {
                     // Copy children to a temporary list because removing child elements from
@@ -537,7 +548,8 @@ public void Clear()
                     ReleaseChildList();
                     m_Owner.yogaNode.Clear();
 
-                    m_Owner.AssignMeasureFunction();
+                    if (m_Owner.requireMeasureFunction)
+                        m_Owner.AssignMeasureFunction();
 
                     foreach (VisualElement e in elements)
                     {
@@ -628,6 +640,9 @@ internal void PlaceInFront(VisualElement child, VisualElement under)
 
             private void MoveChildElement(VisualElement child, int currentIndex, int nextIndex)
             {
+                if (m_Owner.elementPanel != null && m_Owner.elementPanel.duringLayoutPhase)
+                    throw new InvalidOperationException(k_InvalidHierarchyChangeMsg);
+
                 child.InvokeHierarchyChanged(HierarchyChangeType.Remove);
                 RemoveChildAtIndex(currentIndex);
                 PutChildAtIndex(child, nextIndex);
@@ -708,6 +723,9 @@ private void SetParent(VisualElement value)
             /// <param name="comp">Sorting criteria.</param>
             public void Sort(Comparison<VisualElement> comp)
             {
+                if (m_Owner.elementPanel != null && m_Owner.elementPanel.duringLayoutPhase)
+                    throw new InvalidOperationException(k_InvalidHierarchyChangeMsg);
+
                 if (childCount > 1)
                 {
                     m_Owner.m_Children.Sort(comp);
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs
index 44d0f88eec..6299e5c2e8 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementStyleAccess.cs
@@ -321,17 +321,6 @@ public bool TryGetValue(CustomStyleProperty<VectorImage> property, out VectorIma
                 return false;
             }
 
-            public bool TryGetValue(CustomStyleProperty<Object> property, out Object value)
-            {
-                if (m_CustomProperties != null && m_CustomProperties.TryGetValue(property.name, out var customProp))
-                {
-                    return customProp.sheet.TryReadAssetReference(customProp.handle, out value);
-                }
-
-                value = null;
-                return false;
-            }
-
             public bool TryGetValue<T>(CustomStyleProperty<T> property, out T value) where T : Object
             {
                 if (m_CustomProperties != null && m_CustomProperties.TryGetValue(property.name, out var customProp))
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs
index 6217646d23..b0161a3341 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementTooltip.cs
@@ -38,22 +38,11 @@ public string tooltip
                         return;
                     }
 
-                    RegisterCallback<TooltipEvent>(evt => OnTooltip(evt));
+                    RegisterCallback<TooltipEvent>(SetTooltip, TrickleDown.TrickleDown);
                 }
 
                 SetProperty(tooltipPropertyKey, value);
             }
         }
-
-        static void OnTooltip(TooltipEvent e)
-        {
-            VisualElement element = e.currentTarget as VisualElement;
-            if (element != null && !string.IsNullOrEmpty(element.tooltip))
-            {
-                e.rect = element.worldBound;
-                e.tooltip = element.tooltip;
-                e.StopImmediatePropagation();
-            }
-        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Core/VisualElementTypeData.cs b/ModuleOverrides/com.unity.ui/Core/VisualElementTypeData.cs
index 0eb9031e2f..3085daa932 100644
--- a/ModuleOverrides/com.unity.ui/Core/VisualElementTypeData.cs
+++ b/ModuleOverrides/com.unity.ui/Core/VisualElementTypeData.cs
@@ -9,7 +9,7 @@ namespace UnityEngine.UIElements
 {
     public partial class VisualElement
     {
-        private class TypeData
+        internal class TypeData
         {
             public Type type { get; }
 
@@ -20,6 +20,7 @@ public TypeData(Type type)
 
             private string m_FullTypeName = string.Empty;
             private string m_TypeName = string.Empty;
+            private string m_TypeNamespace = string.Empty;
 
             public string fullTypeName
             {
@@ -53,6 +54,26 @@ public string typeName
                     return m_TypeName;
                 }
             }
+            public string typeNamespace
+            {
+                get
+                {
+                    if (string.IsNullOrEmpty(m_TypeNamespace))
+                        m_TypeNamespace = type.Namespace;
+                    return m_TypeNamespace;
+                }
+            }
+        }
+
+        internal static TypeData GetOrCreateTypeData(Type t)
+        {
+            if (!s_TypeData.TryGetValue(t, out var data))
+            {
+                data = new TypeData(t);
+                s_TypeData.Add(t, data);
+            }
+
+            return data;
         }
 
         private static readonly Dictionary<Type, TypeData> s_TypeData = new Dictionary<Type, TypeData>();
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs
index 02ed9f28b2..b479777b4e 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingExtensions.cs
@@ -1848,11 +1848,15 @@ private void SetBinding(PopupField<string> c, SerializedObjectBindingContext con
                 var enumData = EnumDataUtility.GetCachedEnumData(enumType, true);
                 field.choices = new List<string>(enumData.displayNames);
 
-                var propertyDisplayNames = EditorGUI.EnumNamesCache.GetEnumDisplayNames(property);
-                foreach (var fieldChoice in field.choices)
-                    displayIndexToEnumIndex.Add(Array.IndexOf(propertyDisplayNames, fieldChoice));
-                foreach (var propertyChoice in propertyDisplayNames)
-                    enumIndexToDisplayIndex.Add(field.choices.IndexOf(propertyChoice));
+                // The call to EditorGUI.EnumNamesCache.GetEnumNames returns an ordered version of the enum. We use the
+                // actual enum values, not the display names, in order to make sure we can compare them to the values in
+                // enumData.names, because the display names may actually be different (if the enum has the InspectorName
+                // attribute, for example).
+                var sortedEnumNames = EditorGUI.EnumNamesCache.GetEnumNames(property);
+                foreach (var enumName in enumData.names)
+                    displayIndexToEnumIndex.Add(Array.IndexOf(sortedEnumNames, enumName));
+                foreach (var sortedEnumName in sortedEnumNames)
+                    enumIndexToDisplayIndex.Add(Array.IndexOf(enumData.names, sortedEnumName));
             }
             else
             {
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs
index f74982d37f..621d48ab3c 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/BindingStyleHelpers.cs
@@ -3,7 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -12,6 +11,12 @@ namespace UnityEditor.UIElements.Bindings
     internal static class BindingsStyleHelpers
     {
         internal static event Action<VisualElement, SerializedProperty> updateBindingStateStyle;
+        private enum BarType
+        {
+            PrefabOverride,
+            LiveProperty
+        }
+
         private static void UpdateElementRecursively(VisualElement element, SerializedProperty prop, Action<VisualElement, SerializedProperty> updateCallback)
         {
             VisualElement elementToUpdate = element;
@@ -79,7 +84,10 @@ private static void UpdateElementStyleFromProperty(VisualElement element, Serial
                 return;
 
             // Handle prefab state.
-            UpdatePrefabStateStyle(element, prop);
+            UpdatePrefabStateStyleFromProperty(element, prop);
+
+            // Handle live property state.
+            UpdateLivePropertyStyleFromProperty(element, prop);
 
             // Handle dynamic states
             updateBindingStateStyle?.Invoke(element, prop);
@@ -104,6 +112,66 @@ private static void UpdateElementStyleFromProperty(VisualElement element, Serial
             inputElement.EnableInClassList(BindingExtensions.animationAnimatedUssClassName, animated && !recording && !candidate);
         }
 
+        internal static void UpdateLivePropertyStyleFromProperty(VisualElement element, SerializedProperty prop)
+        {
+            bool handleLivePropertyState = false;
+
+            try
+            {
+                // This can throw if the serialized object changes type under our feet
+                handleLivePropertyState = prop.isLiveModified;
+            }
+            catch (Exception)
+            {
+                return;
+            }
+
+            if (handleLivePropertyState)
+            {
+                if (!element.ClassListContains(BindingExtensions.livePropertyUssClassName))
+                {
+                    var container = FindPrefabOverrideOrLivePropertyBarCompatibleParent(element);
+                    var barContainer = container?.livePropertyYellowBarsContainer;
+
+                    element.AddToClassList(BindingExtensions.livePropertyUssClassName);
+
+                    if (container != null && barContainer != null)
+                    {
+                        var livePropertyBar = new VisualElement();
+                        livePropertyBar.name = BindingExtensions.livePropertyBarName;
+                        livePropertyBar.userData = element;
+                        livePropertyBar.AddToClassList(BindingExtensions.livePropertyBarUssClassName);
+                        barContainer.Add(livePropertyBar);
+
+                        element.SetProperty(BindingExtensions.livePropertyBarName, livePropertyBar);
+
+                        // We need to try and set the bar style right away, even if the container
+                        // didn't compute its layout yet. This is for when the override is done after
+                        // everything has been layed out.
+                        UpdatePrefabOverrideOrLivePropertyBarStyle(livePropertyBar);
+
+                        // We intentionally re-register this event on the container per element and
+                        // never unregister.
+                        container.RegisterCallback<GeometryChangedEvent, BarType>(UpdatePrefabOverrideOrLivePropertyBarStyleEvent, BarType.LiveProperty);
+                    }
+                }
+            }
+            else if (element.ClassListContains(BindingExtensions.livePropertyUssClassName))
+            {
+                element.RemoveFromClassList(BindingExtensions.livePropertyUssClassName);
+
+                var container = FindPrefabOverrideOrLivePropertyBarCompatibleParent(element);
+                var barContainer = container?.livePropertyYellowBarsContainer;
+
+                if (container != null && barContainer != null)
+                {
+                    var livePropertyBar = element.GetProperty(BindingExtensions.livePropertyBarName) as VisualElement;
+                    if (livePropertyBar != null)
+                        livePropertyBar.RemoveFromHierarchy();
+                }
+            }
+        }
+
         internal static void UpdatePrefabStateStyle(VisualElement element, SerializedProperty prop)
         {
             if (element == null)
@@ -133,7 +201,7 @@ private static void UpdatePrefabStateStyleFromProperty(VisualElement element, Se
             {
                 if (!element.ClassListContains(BindingExtensions.prefabOverrideUssClassName))
                 {
-                    var container = FindPrefabOverrideBarCompatibleParent(element);
+                    var container = FindPrefabOverrideOrLivePropertyBarCompatibleParent(element);
                     var barContainer = container?.prefabOverrideBlueBarsContainer;
 
                     element.AddToClassList(BindingExtensions.prefabOverrideUssClassName);
@@ -158,11 +226,11 @@ private static void UpdatePrefabStateStyleFromProperty(VisualElement element, Se
                         // We need to try and set the bar style right away, even if the container
                         // didn't compute its layout yet. This is for when the override is done after
                         // everything has been layed out.
-                        UpdatePrefabOverrideBarStyle(prefabOverrideBar);
+                        UpdatePrefabOverrideOrLivePropertyBarStyle(prefabOverrideBar);
 
                         // We intentionally re-register this event on the container per element and
                         // never unregister.
-                        container.RegisterCallback<GeometryChangedEvent>(UpdatePrefabOverrideBarStyleEvent);
+                        container.RegisterCallback<GeometryChangedEvent, BarType>(UpdatePrefabOverrideOrLivePropertyBarStyleEvent, BarType.PrefabOverride);
                     }
                 }
             }
@@ -170,7 +238,7 @@ private static void UpdatePrefabStateStyleFromProperty(VisualElement element, Se
             {
                 element.RemoveFromClassList(BindingExtensions.prefabOverrideUssClassName);
 
-                var container = FindPrefabOverrideBarCompatibleParent(element);
+                var container = FindPrefabOverrideOrLivePropertyBarCompatibleParent(element);
                 var barContainer = container?.prefabOverrideBlueBarsContainer;
 
                 if (container != null && barContainer != null)
@@ -182,17 +250,17 @@ private static void UpdatePrefabStateStyleFromProperty(VisualElement element, Se
             }
         }
 
-        private static InspectorElement FindPrefabOverrideBarCompatibleParent(VisualElement field)
+        private static InspectorElement FindPrefabOverrideOrLivePropertyBarCompatibleParent(VisualElement field)
         {
-            // For now we only support these blue prefab override bars within an InspectorElement.
+            // For now we only support these blue prefab override bars and yellow live property bars within an InspectorElement.
             return field.GetFirstAncestorOfType<InspectorElement>();
         }
 
-        private static void UpdatePrefabOverrideBarStyle(VisualElement blueBar)
+        private static void UpdatePrefabOverrideOrLivePropertyBarStyle(VisualElement bar)
         {
-            var element = blueBar.userData as VisualElement;
+            var element = bar.userData as VisualElement;
 
-            var container = FindPrefabOverrideBarCompatibleParent(element);
+            var container = FindPrefabOverrideOrLivePropertyBarCompatibleParent(element);
             if (container == null)
                 return;
 
@@ -208,23 +276,29 @@ private static void UpdatePrefabOverrideBarStyle(VisualElement blueBar)
             // because most fields have a small margin.
             var bottomOffset = element.resolvedStyle.marginBottom;
 
-            blueBar.style.top = top;
-            blueBar.style.height = elementHeight + bottomOffset;
-            blueBar.style.left = 0.0f;
+            bar.style.top = top;
+            bar.style.height = elementHeight + bottomOffset;
+            bar.style.left = 0.0f;
         }
 
-        private static void UpdatePrefabOverrideBarStyleEvent(GeometryChangedEvent evt)
+        private static void UpdatePrefabOverrideOrLivePropertyBarStyleEvent(GeometryChangedEvent evt, BarType barType)
         {
             var container = evt.target as InspectorElement;
             if (container == null)
                 return;
 
-            var barContainer = container.Q(BindingExtensions.prefabOverrideBarContainerName);
+            var barContainer = barType switch
+            {
+                BarType.PrefabOverride => container.Q(BindingExtensions.prefabOverrideBarContainerName),
+                BarType.LiveProperty => container.Q(BindingExtensions.livePropertyBarContainerName),
+                _ => throw new ArgumentOutOfRangeException(nameof(barType), barType, null)
+            };
+
             if (barContainer == null)
                 return;
 
-            foreach (var bar in barContainer.Children())
-                UpdatePrefabOverrideBarStyle(bar);
+            for (var i = 0; i < barContainer.childCount; i++)
+                UpdatePrefabOverrideOrLivePropertyBarStyle(barContainer[i]);
         }
 
         internal static void RegisterRightClickMenu<TValue>(BaseField<TValue> field, SerializedProperty property)
diff --git a/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs b/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs
index faacc7f088..55c4b6f443 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Bindings/ListViewBindings.cs
@@ -10,7 +10,7 @@
 
 namespace UnityEditor.UIElements.Bindings
 {
-    class ListViewSerializedObjectBinding : SerializedObjectBindingBase
+    class ListViewSerializedObjectBinding : SerializedObjectBindingBase, IInternalListViewBinding
     {
         ListView listView
         {
@@ -54,9 +54,9 @@ private void SetListView(ListView lv)
             if (listView != null)
             {
                 if (m_BindItemSet)
-                    listView.bindItem = null;
+                    listView.SetBindItemWithoutNotify(null);
                 if (m_MakeItemSet)
-                    listView.makeItem = null;
+                    listView.SetMakeItemWithoutNotify(null);
                 if (m_UnbindItemSet)
                     listView.unbindItem = null;
 
@@ -72,25 +72,28 @@ private void SetListView(ListView lv)
             {
                 if (listView.makeItem == null)
                 {
-                    listView.makeItem = () => MakeListViewItem();
+                    listView.SetMakeItemWithoutNotify(MakeListViewItem);
                     m_MakeItemSet = true;
                 }
 
                 if (listView.bindItem == null)
                 {
-                    listView.bindItem = (v, i) => BindListViewItem(v, i);
+                    listView.SetBindItemWithoutNotify(BindListViewItem);
                     m_BindItemSet = true;
                 }
 
                 if (listView.unbindItem == null)
                 {
-                    listView.unbindItem = (v, i) => UnbindListViewItem(v, i);
+                    listView.unbindItem = UnbindListViewItem;
                     m_UnbindItemSet = true;
                 }
 
                 listView.SetViewController(new EditorListViewController());
                 listView.SetDragAndDropController(new SerializedObjectListReorderableDragAndDropController(listView));
                 listView.itemsSource = m_DataList;
+
+                if (m_ListViewArraySize == -1)
+                    UpdateArraySize();
             }
         }
 
@@ -120,8 +123,13 @@ void BindListViewItem(VisualElement ve, int index)
                 throw new InvalidOperationException("Can't find BindableElement: please provide BindableVisualElements or provide your own Listview.bindItem callback");
             }
 
-            object item = listView.itemsSource[index];
+            var item = listView.itemsSource[index];
             var itemProp = item as SerializedProperty;
+
+            // No need to rebind to the same path. We should use a Rebuild if we need to force it.
+            if (field.bindingPath == itemProp.propertyPath)
+                return;
+
             field.bindingPath = itemProp.propertyPath;
             bindingContext.ContinueBinding(ve, itemProp);
         }
@@ -142,15 +150,11 @@ void UnbindListViewItem(VisualElement ve, int index)
             }
 
             ve.Unbind();
+            field.bindingPath = null;
         }
 
         void UpdateArraySize()
         {
-            foreach (var item in listView.activeItems)
-            {
-                item.rootElement.Unbind();
-            }
-
             m_DataList.RefreshProperties(boundProperty, listView.sourceIncludesArraySize);
             m_ArraySize = m_DataList.ArraySize;
             m_ListViewArraySize = m_ArraySize.intValue;
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs
index f46d37c0a5..eda105f7f1 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerSearchBar.cs
@@ -34,6 +34,15 @@ internal class SearchResultItem
 
     internal class DebuggerSearchBar : VisualElement
     {
+        internal const string searchBarUssClassName = "unity-treeview-searchbar";
+        internal const string searchBarLabelUssClassName = searchBarUssClassName + "-label";
+        internal const string searchBarLabelHelpUssClassName = searchBarLabelUssClassName + "-help";
+        internal const string searchBarFieldUssClassName = searchBarUssClassName + "-field";
+        internal const string searchBarButtonUssClassName = searchBarUssClassName + "-button";
+        internal const string searchBarButtonPrevUssClassName = searchBarButtonUssClassName + "-prev";
+        internal const string searchBarButtonNextUssClassName = searchBarButtonUssClassName + "-next";
+        internal const string searchBarHiddenUssClassName = searchBarUssClassName + "-hidden";
+
         private List<SearchResultItem> m_FoundItems;
         private int m_SelectedIndex;
         private string m_CurrentQuery;
@@ -50,16 +59,16 @@ public DebuggerSearchBar(DebuggerTreeView parent)
             m_ParentTreeView = parent;
             m_FoundItems = new List<SearchResultItem>();
 
-            this.AddToClassList("unity-treeview-searchbar");
+            this.AddToClassList(searchBarUssClassName);
 
             m_FieldHelpLabel = new Label("Search by type, name, or class");
             m_FieldHelpLabel.pickingMode = PickingMode.Ignore;
-            m_FieldHelpLabel.AddToClassList("unity-treeview-searchbar-label");
-            m_FieldHelpLabel.AddToClassList("unity-treeview-searchbar-label-help");
+            m_FieldHelpLabel.AddToClassList(searchBarLabelUssClassName);
+            m_FieldHelpLabel.AddToClassList(searchBarLabelHelpUssClassName);
             Add(m_FieldHelpLabel);
 
             m_SearchTextField = new TextField();
-            m_SearchTextField.AddToClassList("unity-treeview-searchbar-field");
+            m_SearchTextField.AddToClassList(searchBarFieldUssClassName);
             m_SearchTextField.RegisterValueChangedCallback(PerformSearch);
             m_SearchTextField.RegisterCallback<KeyDownEvent>((e) =>
             {
@@ -82,18 +91,18 @@ public DebuggerSearchBar(DebuggerTreeView parent)
             Add(m_SearchTextField);
 
             m_CountLabel = new Label();
-            m_CountLabel.AddToClassList("unity-treeview-searchbar-label");
-            m_CountLabel.AddToClassList("unity-treeview-searchbar-hidden");
+            m_CountLabel.AddToClassList(searchBarLabelUssClassName);
+            m_CountLabel.AddToClassList(searchBarHiddenUssClassName);
             Add(m_CountLabel);
 
             var prevButton = new Button(SelectPrev) { text = "<" };
-            prevButton.AddToClassList("unity-treeview-searchbar-button");
-            prevButton.AddToClassList("unity-treeview-searchbar-button-prev");
+            prevButton.AddToClassList(searchBarButtonUssClassName);
+            prevButton.AddToClassList(searchBarButtonPrevUssClassName);
             Add(prevButton);
 
             var nextButton = new Button(SelectNext) { text = ">" };
-            nextButton.AddToClassList("unity-treeview-searchbar-button");
-            nextButton.AddToClassList("unity-treeview-searchbar-button-next");
+            nextButton.AddToClassList(searchBarButtonUssClassName);
+            nextButton.AddToClassList(searchBarButtonNextUssClassName);
             Add(nextButton);
         }
 
@@ -133,16 +142,16 @@ private void PerformSearch(ChangeEvent<string> evt)
             m_SelectedIndex = 0;
 
             m_CountLabel.text = string.Empty;
-            m_CountLabel.AddToClassList("unity-treeview-searchbar-hidden");
+            m_CountLabel.AddToClassList(searchBarHiddenUssClassName);
 
             m_ParentTreeView.ClearSearchResults();
 
-            m_FieldHelpLabel.AddToClassList("unity-treeview-searchbar-hidden");
+            m_FieldHelpLabel.AddToClassList(searchBarHiddenUssClassName);
 
             var query = evt.newValue;
             if (string.IsNullOrEmpty(query))
             {
-                m_FieldHelpLabel.RemoveFromClassList("unity-treeview-searchbar-hidden");
+                m_FieldHelpLabel.RemoveFromClassList(searchBarHiddenUssClassName);
                 return;
             }
 
@@ -194,7 +203,7 @@ private void PerformSearch(ChangeEvent<string> evt)
             if (m_FoundItems.Count == 0)
                 return;
 
-            m_CountLabel.RemoveFromClassList("unity-treeview-searchbar-hidden");
+            m_CountLabel.RemoveFromClassList(searchBarHiddenUssClassName);
             m_CountLabel.text =
                 string.Format("{0} of {1}", m_SelectedIndex + 1, m_FoundItems.Count);
 
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs
index ebf41dceaa..f84f2e1261 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/DebuggerTreeView.cs
@@ -12,6 +12,16 @@ namespace UnityEditor.UIElements.Debugger
 {
     internal class DebuggerTreeView : VisualElement
     {
+        internal const string itemContentName = "unity-treeview-item-content";
+        internal const string labelContainerUssClassName = "unity-debugger-tree-item-label-cont";
+        internal const string itemLabelUssClassName = "unity-debugger-tree-item-label";
+        internal const string itemTypeUssClassName = "unity-debugger-tree-item-type";
+        internal const string itemNameUssClassName = "unity-debugger-tree-item-name";
+        internal const string itemNameLabelUssClassName = "unity-debugger-tree-item-name-label";
+        internal const string itemClassListUssClassName = "unity-debugger-tree-item-classlist";
+        internal const string itemClassListLabelUssClassName = "unity-debugger-tree-item-classlist-label";
+        internal const string debuggerHighlightUssClassName = "unity-debugger-highlight";
+
         public bool hierarchyHasChanged { get; set; }
 
         public IList<TreeViewItemData<VisualElement>> treeRootItems => m_TreeRootItems;
@@ -89,37 +99,37 @@ private void FillItem(VisualElement element, int index)
             element.userData = target;
 
             var labelCont = new VisualElement();
-            labelCont.AddToClassList("unity-debugger-tree-item-label-cont");
+            labelCont.AddToClassList(labelContainerUssClassName);
             element.Add(labelCont);
 
             var label = new Label(target.typeName);
-            label.AddToClassList("unity-debugger-tree-item-label");
-            label.AddToClassList("unity-debugger-tree-item-type");
+            label.AddToClassList(itemLabelUssClassName);
+            label.AddToClassList(itemTypeUssClassName);
             labelCont.Add(label);
 
             if (!string.IsNullOrEmpty(target.name))
             {
                 var nameLabelCont = new VisualElement();
-                nameLabelCont.AddToClassList("unity-debugger-tree-item-label-cont");
+                nameLabelCont.AddToClassList(labelContainerUssClassName);
                 element.Add(nameLabelCont);
 
                 var nameLabel = new Label("#" + target.name);
-                nameLabel.AddToClassList("unity-debugger-tree-item-label");
-                nameLabel.AddToClassList("unity-debugger-tree-item-name");
-                nameLabel.AddToClassList("unity-debugger-tree-item-name-label");
+                nameLabel.AddToClassList(itemLabelUssClassName);
+                nameLabel.AddToClassList(itemNameUssClassName);
+                nameLabel.AddToClassList(itemNameLabelUssClassName);
                 nameLabelCont.Add(nameLabel);
             }
 
             foreach (var ussClass in target.GetClasses())
             {
                 var classLabelCont = new VisualElement();
-                classLabelCont.AddToClassList("unity-debugger-tree-item-label-cont");
+                classLabelCont.AddToClassList(labelContainerUssClassName);
                 element.Add(classLabelCont);
 
                 var classLabel = new Label("." + ussClass);
-                classLabel.AddToClassList("unity-debugger-tree-item-label");
-                classLabel.AddToClassList("unity-debugger-tree-item-classlist");
-                classLabel.AddToClassList("unity-debugger-tree-item-classlist-label");
+                classLabel.AddToClassList(itemLabelUssClassName);
+                classLabel.AddToClassList(itemClassListUssClassName);
+                classLabel.AddToClassList(itemClassListLabelUssClassName);
                 classLabelCont.Add(classLabel);
             }
         }
@@ -164,7 +174,7 @@ public void RebuildTree(IPanelDebug panelDebug)
             Func<VisualElement> makeItem = () =>
             {
                 var element = new VisualElement();
-                element.name = "unity-treeview-item-content";
+                element.name = itemContentName;
                 element.RegisterCallback<MouseEnterEvent>((e) =>
                 {
                     HighlightItemInTargetWindow(e.target as VisualElement);
@@ -184,7 +194,7 @@ public void RebuildTree(IPanelDebug panelDebug)
             m_TreeView.fixedItemHeight = 20;
             m_TreeView.style.flexGrow = 1;
             m_TreeView.horizontalScrollingEnabled = true;
-            m_TreeView.onSelectedIndicesChange += items =>
+            m_TreeView.selectedIndicesChanged += items =>
             {
                 if (m_SelectElementCallback == null)
                     return;
@@ -207,7 +217,7 @@ public void RebuildTree(IPanelDebug panelDebug)
             m_SearchBar.ClearSearch();
         }
 
-        private static bool FindElement(IEnumerable<TreeViewItemData<VisualElement>> list, VisualElement element, out TreeViewItemData<VisualElement> itemData)
+        internal static bool FindElement(IEnumerable<TreeViewItemData<VisualElement>> list, VisualElement element, out TreeViewItemData<VisualElement> itemData)
         {
             if (list == null)
             {
@@ -253,44 +263,48 @@ public void SelectElement(VisualElement element, string query, SearchHighlight s
                 return;
 
             m_TreeView.SetSelectionById(item.id);
+            m_TreeView.ScrollToItemById(item.id);
 
             if (string.IsNullOrEmpty(query))
                 return;
 
-            var selected = m_TreeView.Q(className: "unity-list-view__item--selected");
-            if (selected == null || searchHighlight == SearchHighlight.None)
-                return;
-
-            var content = selected.Q("unity-treeview-item-content");
-            var labelContainers = content.Query(classes: "unity-debugger-tree-item-label-cont").ToList();
-            foreach (var labelContainer in labelContainers)
+            schedule.Execute(() =>
             {
-                var label = labelContainer.Q<Label>();
+                var selected = m_TreeView.Q(className: BaseVerticalCollectionView.itemSelectedVariantUssClassName);
+                if (selected == null || searchHighlight == SearchHighlight.None)
+                    return;
 
-                if (label.ClassListContains("unity-debugger-tree-item-type") && searchHighlight != SearchHighlight.Type)
-                    continue;
+                var content = selected.Q(itemContentName);
+                var labelContainers = content.Query(classes: labelContainerUssClassName).ToList();
+                foreach (var labelContainer in labelContainers)
+                {
+                    var label = labelContainer.Q<Label>();
 
-                if (label.ClassListContains("unity-debugger-tree-item-name") && searchHighlight != SearchHighlight.Name)
-                    continue;
+                    if (label.ClassListContains(itemTypeUssClassName) && searchHighlight != SearchHighlight.Type)
+                        continue;
 
-                if (label.ClassListContains("unity-debugger-tree-item-classlist") && searchHighlight != SearchHighlight.Class)
-                    continue;
+                    if (label.ClassListContains(itemNameUssClassName) && searchHighlight != SearchHighlight.Name)
+                        continue;
 
-                var text = label.text;
-                var indexOf = text.IndexOf(query, StringComparison.OrdinalIgnoreCase);
-                if (indexOf < 0)
-                    continue;
+                    if (label.ClassListContains(itemClassListUssClassName) && searchHighlight != SearchHighlight.Class)
+                        continue;
 
-                var highlight = new VisualElement();
-                m_SearchResultsHightlights.Add(highlight);
-                highlight.AddToClassList("unity-debugger-highlight");
-                int letterSize = 8;
-                highlight.style.width = query.Length * letterSize;
-                highlight.style.left = indexOf * letterSize;
-                labelContainer.Insert(0, highlight);
+                    var text = label.text;
+                    var indexOf = text.IndexOf(query, StringComparison.OrdinalIgnoreCase);
+                    if (indexOf < 0)
+                        continue;
 
-                break;
-            }
+                    var highlight = new VisualElement();
+                    m_SearchResultsHightlights.Add(highlight);
+                    highlight.AddToClassList(debuggerHighlightUssClassName);
+                    var letterSize = 8.4f;
+                    highlight.style.width = query.Length * letterSize;
+                    highlight.style.left = indexOf * letterSize;
+                    labelContainer.Insert(0, highlight);
+
+                    break;
+                }
+            });
         }
 
         private void AddTreeItemsForElement(IList<TreeViewItemData<VisualElement>> items, VisualElement ve, ref int nextId)
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/Events/UIElementsEventDebugger.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/Events/UIElementsEventDebugger.cs
index 80c44da297..463e910b25 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/Events/UIElementsEventDebugger.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/Events/UIElementsEventDebugger.cs
@@ -470,7 +470,7 @@ public void Initialize(EditorWindow debuggerWindow, VisualElement root)
             m_EventsLog = (ListView)rootVisualElement.MandatoryQ("eventsLog");
             m_EventsLog.focusable = true;
             m_EventsLog.selectionType = SelectionType.Multiple;
-            m_EventsLog.onSelectionChange += OnEventsLogSelectionChanged;
+            m_EventsLog.selectionChanged += OnEventsLogSelectionChanged;
             m_EventsLog.RegisterCallback<FocusOutEvent>(OnListFocusedOut, TrickleDown.TrickleDown);
 
             m_DisplayHistogramAverageEnum = rootVisualElement.MandatoryQ<EnumField>("eventsHistogramDurationType");
@@ -935,7 +935,10 @@ void UpdateEventBaseInfo(EventDebuggerEventRecord eventBase, IEventHandler focus
             }
 
             if (eventBase.eventTypeId == KeyDownEvent.TypeId() ||
-                eventBase.eventTypeId == KeyUpEvent.TypeId())
+                eventBase.eventTypeId == KeyUpEvent.TypeId() ||
+                eventBase.eventTypeId == NavigationMoveEvent.TypeId() ||
+                eventBase.eventTypeId == NavigationSubmitEvent.TypeId() ||
+                eventBase.eventTypeId == NavigationCancelEvent.TypeId())
             {
                 m_EventBaseInfo.text += "Modifiers: " + eventBase.modifiers + "\n";
             }
@@ -1004,6 +1007,19 @@ void UpdateEventBaseInfo(EventDebuggerEventRecord eventBase, IEventHandler focus
             {
                 m_EventBaseInfo.text += "Command: " + eventBase.commandName + "\n";
             }
+
+            if (eventBase.eventTypeId == NavigationMoveEvent.TypeId() ||
+                eventBase.eventTypeId == NavigationSubmitEvent.TypeId() ||
+                eventBase.eventTypeId == NavigationCancelEvent.TypeId())
+            {
+                if (eventBase.deviceType != NavigationDeviceType.Unknown)
+                    m_EventBaseInfo.text += "Device type: " + eventBase.deviceType + "\n";
+
+                if (eventBase.eventTypeId == NavigationMoveEvent.TypeId())
+                {
+                    m_EventBaseInfo.text += "Navigation direction: " + eventBase.navigationDirection + "\n";
+                }
+            }
         }
 
         void OnFilterChange(ChangeEvent<string> e)
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/PanelDebugger.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/PanelDebugger.cs
index dea5380867..f1d025dcf5 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/PanelDebugger.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/PanelDebugger.cs
@@ -45,6 +45,7 @@ internal class PanelDebugger : IPanelDebugger
         private EditorWindow m_WindowToDebug;
 
         private IPanelChoice m_SelectedPanel;
+        internal IPanelChoice selectedPanel => m_SelectedPanel;
         protected VisualElement m_Toolbar;
         protected ToolbarMenu m_PanelSelect;
         private List<IPanelChoice> m_PanelChoices;
@@ -138,7 +139,7 @@ private void TrySelectWindow()
         {
             VisualElement root = null;
 
-            if (m_WindowToDebug is GameView)
+            if (m_WindowToDebug is PlayModeView)
             {
                 var runtimePanels = UIElementsRuntimeUtility.GetSortedPlayerPanels();
                 if (runtimePanels != null && runtimePanels.Count > 0)
@@ -201,13 +202,7 @@ private void RefreshPanelChoices()
             PopulatePanelChoices(m_PanelChoices);
 
             var menu = m_PanelSelect.menu;
-            var menuItemsCount = menu.MenuItems().Count;
-
-            // Clear previous items
-            for (int i = 0; i < menuItemsCount; i++)
-            {
-                menu.RemoveItemAt(0);
-            }
+            menu.ClearItems();
 
             foreach (var panelChoice in m_PanelChoices)
             {
diff --git a/ModuleOverrides/com.unity.ui/Editor/Debugger/UIElementsDebugger.cs b/ModuleOverrides/com.unity.ui/Editor/Debugger/UIElementsDebugger.cs
index 49c10fe304..9cf50ba01c 100644
--- a/ModuleOverrides/com.unity.ui/Editor/Debugger/UIElementsDebugger.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/Debugger/UIElementsDebugger.cs
@@ -178,9 +178,15 @@ internal class UIElementsDebugger : EditorWindow
         [SerializeField]
         private UIElementsDebuggerImpl m_DebuggerImpl;
 
+        // Used in tests.
+        internal UIElementsDebuggerImpl debuggerImpl => m_DebuggerImpl;
+
         [SerializeField]
         private DebuggerContext m_DebuggerContext;
 
+        // Used in tests.
+        internal DebuggerContext debuggerContext => m_DebuggerContext;
+
         [MenuItem(k_WindowPath, false, 3010, false)]
         private static void OpenUIElementsDebugger()
         {
@@ -546,18 +552,13 @@ public bool InterceptMouseEvent(IPanel panel, IMouseEvent ev)
             if (panel == null)
                 return false;
 
-            if (((BaseVisualElementPanel)panel).ownerObject is HostView hostView && hostView.actualView is GameView)
+            if (((BaseVisualElementPanel)panel).ownerObject is HostView hostView && hostView.actualView is PlayModeView playModeView)
             {
-                var innerArea = panel.GetRootVisualElement();
-                var gameViewPadding =
-                    (innerArea.parent.contentRect.height - innerArea.contentRect.height) * Vector2.up +
-                    innerArea.layout.position; // Measured to: gameViewPadding = new Vector2(1, 40)
-
                 // Send event to runtime panels from closest to deepest
                 var panels = UIElementsRuntimeUtility.GetSortedPlayerPanels();
                 for (var i = panels.Count - 1; i >= 0; i--)
                 {
-                    if (SendEventToRuntimePanel((BaseRuntimePanel)panels[i], evtBase, gameViewPadding))
+                    if (SendEventToRuntimePanel((BaseRuntimePanel)panels[i], evtBase, playModeView.viewPadding, playModeView.viewMouseScale))
                         return true;
                 }
 
@@ -707,7 +708,7 @@ private void SelectElement(VisualElement ve)
             }
         }
 
-        private bool SendEventToRuntimePanel(BaseRuntimePanel runtimePanel, EventBase ev, Vector2 gameViewPadding)
+        private bool SendEventToRuntimePanel(BaseRuntimePanel runtimePanel, EventBase ev, Vector2 gameViewPadding, float gameMouseScale)
         {
             if (ev.imguiEvent == null)
                 return false;
@@ -715,10 +716,12 @@ private bool SendEventToRuntimePanel(BaseRuntimePanel runtimePanel, EventBase ev
             if (!runtimePanel.ScreenToPanel(ev.imguiEvent.mousePosition - gameViewPadding, ev.imguiEvent.delta, out var panelPosition, out _))
                 return false;
 
-            if (runtimePanel.Pick(panelPosition) == null)
+            var mousePosition = panelPosition * gameMouseScale;
+
+            if (runtimePanel.Pick(mousePosition) == null)
                 return false;
 
-            using (EventBase evt = UIElementsRuntimeUtility.CreateEvent(new Event(ev.imguiEvent) { mousePosition = panelPosition }))
+            using (EventBase evt = UIElementsRuntimeUtility.CreateEvent(new Event(ev.imguiEvent) { mousePosition = mousePosition}))
             {
                 runtimePanel.visualTree.SendEvent(evt);
             }
diff --git a/ModuleOverrides/com.unity.ui/Editor/EditorUIElementsBridge.cs b/ModuleOverrides/com.unity.ui/Editor/EditorUIElementsBridge.cs
index eddc602474..43735fd331 100644
--- a/ModuleOverrides/com.unity.ui/Editor/EditorUIElementsBridge.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/EditorUIElementsBridge.cs
@@ -12,38 +12,9 @@ namespace UnityEditor.UIElements
 {
     internal class EditorUIElementsBridge : UIElementsBridge
     {
-        private static string serializedPropertyCopyName = "SerializedPropertyCopyName";
         public override void SetWantsMouseJumping(int value)
         {
             EditorGUIUtility.SetWantsMouseJumping(value);
         }
-
-        public static void RegisterSerializedPropertyBindCallback<TValueType, TField, TFieldValue>
-            (BaseCompositeField<TValueType, TField, TFieldValue>  compositeField, TField field)
-            where TField : TextValueField<TFieldValue>, new()
-        {
-            // TODO: Fix the callback since it is never received by the TField.
-            field.RegisterCallback<SerializedPropertyBindEvent>(e =>
-            {
-                if (!(field.GetProperty(serializedPropertyCopyName) is SerializedProperty property))
-                    return;
-                var propertyCopy = property.Copy();
-
-                var k = 0;
-                while (k <= compositeField.propertyIndex)
-                {
-                    propertyCopy.Next(k == 0);
-                    k++;
-                }
-
-                var f = (TField)e.target;
-                f.SetProperty(serializedPropertyCopyName, propertyCopy);
-                f.showMixedValue = propertyCopy.hasMultipleDifferentValues;
-
-                compositeField.forceUpdateDisplay = true;
-
-                compositeField.propertyIndex++;
-            });
-        }
     }
 }
diff --git a/ModuleOverrides/com.unity.ui/Editor/GameObjects/Inspector/PanelSettingsInspector.cs b/ModuleOverrides/com.unity.ui/Editor/GameObjects/Inspector/PanelSettingsInspector.cs
index 9aee7d4fba..2ae3e51fb3 100644
--- a/ModuleOverrides/com.unity.ui/Editor/GameObjects/Inspector/PanelSettingsInspector.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/GameObjects/Inspector/PanelSettingsInspector.cs
@@ -33,6 +33,8 @@ internal class PanelSettingsInspector : Editor
         private VisualElement m_ScaleModeScaleWithScreenSizeGroup;
         private VisualElement m_ScaleModeContantPhysicalSizeGroup;
 
+        private VisualElement m_ReferencePixelsPerUnit;
+
         private VisualElement m_ScreenMatchModeMatchWidthOrHeightGroup;
 
         private PropertyField m_ClearColorField;
@@ -62,6 +64,8 @@ private void ConfigureFields()
             m_ScaleModeScaleWithScreenSizeGroup = m_RootVisualElement.MandatoryQ("scale-mode-scale-with-screen-size");
             m_ScaleModeContantPhysicalSizeGroup = m_RootVisualElement.MandatoryQ("scale-mode-constant-physical-size");
 
+            m_ReferencePixelsPerUnit = m_RootVisualElement.MandatoryQ("reference-pixels-per-unit");
+
             m_ScreenMatchModeMatchWidthOrHeightGroup =
                 m_RootVisualElement.MandatoryQ("screen-match-mode-match-width-or-height");
 
diff --git a/ModuleOverrides/com.unity.ui/Editor/PanelDebug.cs b/ModuleOverrides/com.unity.ui/Editor/PanelDebug.cs
index 8cd23020a7..512d8e7f36 100644
--- a/ModuleOverrides/com.unity.ui/Editor/PanelDebug.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/PanelDebug.cs
@@ -26,6 +26,8 @@ public VisualElement debugContainer
             private set { m_DebugContainer = value; }
         }
 
+        public bool hasAttachedDebuggers => m_Debuggers.Count > 0;
+
         private PanelOwner ownerObject;
 
         private void InitializeDebuggerOverlayPanel()
diff --git a/ModuleOverrides/com.unity.ui/Editor/RetainedMode.cs b/ModuleOverrides/com.unity.ui/Editor/RetainedMode.cs
index dd6a66ebf8..e2e756a74e 100644
--- a/ModuleOverrides/com.unity.ui/Editor/RetainedMode.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/RetainedMode.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor.UIElements;
+using UnityEditor.UIElements.Bindings;
 using UnityEditor.UIElements.StyleSheets;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
@@ -25,15 +26,10 @@ static RetainedMode()
 
             Panel.initEditorUpdaterFunc = EditorPanel.InitEditorUpdater;
             Panel.loadResourceFunc = StyleSheetResourceUtil.LoadResource;
-            BaseCompositeField<Vector2, FloatField, float>.s_SerializedPropertyBindCallback = EditorUIElementsBridge.RegisterSerializedPropertyBindCallback;
-            BaseCompositeField<Vector3, FloatField, float>.s_SerializedPropertyBindCallback = EditorUIElementsBridge.RegisterSerializedPropertyBindCallback;
-            BaseCompositeField<Vector4, FloatField, float>.s_SerializedPropertyBindCallback = EditorUIElementsBridge.RegisterSerializedPropertyBindCallback;
-            BaseCompositeField<Vector2Int, IntegerField, int>.s_SerializedPropertyBindCallback = EditorUIElementsBridge.RegisterSerializedPropertyBindCallback;
-            BaseCompositeField<Vector3Int, IntegerField, int>.s_SerializedPropertyBindCallback = EditorUIElementsBridge.RegisterSerializedPropertyBindCallback;
-            BaseCompositeField<Rect, FloatField, float>.s_SerializedPropertyBindCallback = EditorUIElementsBridge.RegisterSerializedPropertyBindCallback;
-            BaseCompositeField<RectInt, IntegerField, int>.s_SerializedPropertyBindCallback = EditorUIElementsBridge.RegisterSerializedPropertyBindCallback;
             StylePropertyReader.getCursorIdFunc = UIElementsEditorUtility.GetCursorId;
             Panel.TimeSinceStartup = () => (long)(EditorApplication.timeSinceStartup * 1000.0f);
+            BindingExtensions.bindingImpl = new DefaultSerializedObjectBindingImplementation();
+            EditorWindowBackendManager.defaultWindowBackend = (model) => model is IEditorWindowModel ? new DefaultEditorWindowBackend() :  new DefaultWindowBackend();
         }
 
         static void OnBeginContainer(IMGUIContainer c)
diff --git a/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorRuntimeUtility.cs b/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorRuntimeUtility.cs
new file mode 100644
index 0000000000..a4acce7bc8
--- /dev/null
+++ b/ModuleOverrides/com.unity.ui/Editor/UIElementsEditorRuntimeUtility.cs
@@ -0,0 +1,19 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEditor.Experimental;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.UIElements
+{
+    internal static class UIElementsEditorRuntimeUtility
+    {
+        public static void CreateRuntimePanelDebug(IPanel panel)
+        {
+            var panelDebug = new PanelDebug(panel);
+            (panel as Panel).panelDebug = panelDebug;
+        }
+    }
+}
diff --git a/ModuleOverrides/com.unity.ui/Editor/UIElementsViewImporter.cs b/ModuleOverrides/com.unity.ui/Editor/UIElementsViewImporter.cs
index 922e4cd73e..3500247761 100644
--- a/ModuleOverrides/com.unity.ui/Editor/UIElementsViewImporter.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/UIElementsViewImporter.cs
@@ -508,39 +508,16 @@ void LoadTemplateNode(VisualTreeAsset vta, XElement elt, XElement child)
             }
             else if (hasSrc)
             {
-                var response = URIHelpers.ValidateAssetURL(assetPath, src);
-                var result = response.result;
-                var projectRelativePath = response.resolvedProjectRelativePath;
-
-                if (response.hasWarningMessage)
-                {
-                    logger.LogError(ImportErrorType.Semantic, ImportErrorCode.ReferenceInvalidURIProjectAssetPath,
-                        response.warningMessage, Error.Level.Warning, elt);
-                }
-
-                if (result != URIValidationResult.OK)
+                var (validationResponse, asset) = ValidateAndLoadResource(elt, vta, src);
+                if (validationResponse.result == URIValidationResult.OK)
                 {
-                    LogError(vta, ImportErrorType.Semantic, ConvertErrorCode(result), response.errorToken, elt);
-                }
-                else
-                {
-                    var asset = response.resolvedQueryAsset;
-                    if (asset && m_Context != null)
-                    {
-                        m_Context.DependsOnSourceAsset(projectRelativePath);
-                    }
-                    else
-                    {
-                        asset = DeclareDependencyAndLoad(projectRelativePath);
-                    }
-
                     if (asset is VisualTreeAsset treeAsset)
                     {
                         vta.RegisterTemplate(name, treeAsset);
                     }
                     else
                     {
-                        LogError(vta, ImportErrorType.Semantic, ImportErrorCode.ReferenceInvalidAssetType, projectRelativePath, elt);
+                        LogError(vta, ImportErrorType.Semantic, ImportErrorCode.ReferenceInvalidAssetType, validationResponse.resolvedProjectRelativePath, elt);
                     }
                 }
             }
@@ -610,6 +587,18 @@ static void AddDependency(string assetPath, XElement templateNode, List<string>
             }
         }
 
+        static void AddAssetDependency(string assetPath, string src, List<string> dependencies)
+        {
+            if (string.IsNullOrEmpty(src))
+                return;
+
+            var result = URIHelpers.ValidAssetURL(assetPath, src, out var _, out var projectRelativePath);
+            if (result != URIValidationResult.OK)
+                return;
+
+            dependencies.Add(projectRelativePath);
+        }
+
         internal static bool HasTemplateCircularDependencies(string templateAssetPath, HashSet<string> templateDependencies)
         {
             if (templateDependencies.Contains(templateAssetPath))
@@ -697,6 +686,17 @@ internal static void PopulateDependencies(string assetPath, XElement elt, List<s
                         AddDependency(assetPath, child, dependencies);
                         break;
                     default:
+                        // Find and add any asset attribute dependency.
+                        var typeName = ResolveFullType(child);
+                        var uxmlAssetAttributeDescriptions = GetAssetAttributeDescriptionForType(typeName.fullName);
+                        if (uxmlAssetAttributeDescriptions != null)
+                        {
+                            foreach (var assetAttribute in uxmlAssetAttributeDescriptions)
+                            {
+                                AddAssetDependency(assetPath, child.Attribute(assetAttribute.name)?.Value, dependencies);
+                            }
+                        }
+
                         PopulateDependencies(assetPath, child, dependencies);
                         continue;
                 }
@@ -845,9 +845,9 @@ void LoadAttributeOverridesNode(TemplateAsset templateAsset, XElement attributeO
             }
         }
 
-        VisualElementAsset ResolveType(XElement elt, VisualTreeAsset visualTreeAsset)
+        static (string elementNamespaceName, string fullName) ResolveFullType(XElement elt)
         {
-            string elementNamespaceName = elt.Name.NamespaceName;
+            var elementNamespaceName = elt.Name.NamespaceName;
 
             if (elementNamespaceName.StartsWith("UnityEditor.Experimental.UIElements") ||
                 elementNamespaceName.StartsWith("UnityEngine.Experimental.UIElements"))
@@ -859,6 +859,13 @@ VisualElementAsset ResolveType(XElement elt, VisualTreeAsset visualTreeAsset)
                 ? elt.Name.LocalName
                 : elementNamespaceName + "." + elt.Name.LocalName;
 
+            return (elementNamespaceName, fullName);
+        }
+
+        VisualElementAsset ResolveType(XElement elt, VisualTreeAsset visualTreeAsset)
+        {
+            var (elementNamespaceName, fullName) = ResolveFullType(elt);
+
             if (UxmlObjectFactoryRegistry.factories.ContainsKey(fullName))
             {
                 return new UxmlObjectAsset(fullName);
@@ -923,13 +930,101 @@ bool EnsureValidUxmlObjectChild(XElement elt, VisualElementAsset vea, VisualTree
             return true;
         }
 
+        (URIHelpers.URIValidationResponse response, Object asset) ValidateAndLoadResource(XElement elt, VisualTreeAsset vta, string src)
+        {
+            var response = URIHelpers.ValidateAssetURL(assetPath, src);
+            var result = response.result;
+            var projectRelativePath = response.resolvedProjectRelativePath;
+
+            if (response.hasWarningMessage)
+            {
+                logger.LogError(ImportErrorType.Semantic, ImportErrorCode.ReferenceInvalidURIProjectAssetPath,
+                    response.warningMessage, Error.Level.Warning, elt);
+            }
+
+            if (result != URIValidationResult.OK)
+            {
+                LogError(vta, ImportErrorType.Semantic, ConvertErrorCode(result), response.errorToken, elt);
+            }
+            else
+            {
+                var asset = response.resolvedQueryAsset;
+                if (asset && m_Context != null)
+                {
+                    m_Context.DependsOnSourceAsset(projectRelativePath);
+                }
+                else
+                {
+                    asset = DeclareDependencyAndLoad(projectRelativePath);
+                }
+
+                return (response, asset);
+            }
+
+            return (default, null);
+        }
+
+        static List<UxmlAttributeDescription> GetAssetAttributeDescriptionForType(string fullTypeName)
+        {
+            static bool IsAssetAttributeDescription(UxmlAttributeDescription desc)
+            {
+                var type = desc.GetType();
+                return type.IsGenericType && type.GetGenericTypeDefinition() == typeof(UxmlAssetAttributeDescription<>);
+            }
+
+            if (UxmlObjectFactoryRegistry.factories.TryGetValue(fullTypeName, out var uxmlObjectFactories))
+            {
+                foreach (var factory in uxmlObjectFactories)
+                {
+                    return factory.uxmlAttributesDescription.Where(IsAssetAttributeDescription)
+                        .Select(d => d as UxmlAttributeDescription).ToList();
+                }
+            }
+
+            if (VisualElementFactoryRegistry.factories.TryGetValue(fullTypeName, out var uxmlFactories))
+            {
+                foreach (var factory in uxmlFactories)
+                {
+                    return factory.uxmlAttributesDescription.Where(IsAssetAttributeDescription)
+                        .Select(d => d as UxmlAttributeDescription).ToList();
+                }
+            }
+
+            return null;
+        }
+
         bool ParseAttributes(XElement elt, VisualElementAsset res, VisualTreeAsset vta, VisualElementAsset parent)
         {
-            bool startedRule = false;
+            var startedRule = false;
+            var uxmlAssetAttributeDescriptions = GetAssetAttributeDescriptionForType(res.fullTypeName);
 
-            foreach (XAttribute xattr in elt.Attributes())
+            foreach (var xattr in elt.Attributes())
             {
-                string attrName = xattr.Name.LocalName;
+                var attrName = xattr.Name.LocalName;
+
+                if (uxmlAssetAttributeDescriptions != null)
+                {
+                    var added = false;
+                    var assetAttributeDescription = uxmlAssetAttributeDescriptions.FirstOrDefault(attrDesc => attrDesc?.name == attrName);
+                    if (assetAttributeDescription != null)
+                    {
+                        added = true;
+                        res.AddProperty(xattr.Name.LocalName, xattr.Value);
+
+                        var type = assetAttributeDescription.GetType().GetGenericArguments()[0];
+                        var (response, asset) = ValidateAndLoadResource(elt, vta, xattr.Value);
+
+                        if (response.result == URIValidationResult.OK && !vta.AssetEntryExists(xattr.Value, type))
+                        {
+                            // Force loading using correct attribute type to support cases like Texture2D vs Sprite,
+                            asset = AssetDatabase.LoadAssetAtPath(response.resolvedProjectRelativePath, type);
+                            vta.RegisterAssetEntry(xattr.Value, type, asset);
+                        }
+                    }
+
+                    if (added)
+                        continue;
+                }
 
                 // start with special cases
                 switch (attrName)
diff --git a/ModuleOverrides/com.unity.ui/Editor/UXMLSchemaGenerator.cs b/ModuleOverrides/com.unity.ui/Editor/UXMLSchemaGenerator.cs
index 86d87e6f6d..971f0ec670 100644
--- a/ModuleOverrides/com.unity.ui/Editor/UXMLSchemaGenerator.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/UXMLSchemaGenerator.cs
@@ -426,26 +426,46 @@ static XmlSchemaType AddElementTypeToXmlSchema(IUxmlFactory factory, SchemaInfo
                 restriction.AnyAttribute = anyAttribute;
             }
 
-            foreach (UxmlAttributeDescription attrDesc in factory.uxmlAttributesDescription)
+            // For user created types, they may return null for uxmlAttributeDescription, so we need to check in order not to crash.
+            if (factory.uxmlAttributesDescription != null)
             {
-                XmlQualifiedName typeName = AddAttributeTypeToXmlSchema(schemaInfo, attrDesc, factory, processingData);
-                if (typeName != null)
+                foreach (UxmlAttributeDescription attrDesc in factory.uxmlAttributesDescription)
                 {
-                    AddAttributeToXmlSchema(restriction, attrDesc, typeName);
-                    schemaInfo.importNamespaces.Add(attrDesc.typeNamespace);
+                    // For user created types, they may `yield return null` which would create an array with a null, so we need
+                    // to check in order not to crash.
+                    if (attrDesc != null)
+                    {
+                        XmlQualifiedName typeName =
+                            AddAttributeTypeToXmlSchema(schemaInfo, attrDesc, factory, processingData);
+                        if (typeName != null)
+                        {
+                            AddAttributeToXmlSchema(restriction, attrDesc, typeName);
+                            schemaInfo.importNamespaces.Add(attrDesc.typeNamespace);
+                        }
+                    }
                 }
             }
 
-            bool hasChildElements = false;
-            foreach (UxmlChildElementDescription childDesc in factory.uxmlChildElementsDescription)
+            // For user created types, they may return null for uxmlChildElementsDescription, so we need to check in order not to crash.
+            if (factory.uxmlChildElementsDescription != null)
             {
-                hasChildElements = true;
-                schemaInfo.importNamespaces.Add(childDesc.elementNamespace);
-            }
+                bool hasChildElements = false;
+                foreach (UxmlChildElementDescription childDesc in factory.uxmlChildElementsDescription)
+                {
+                    // For user created types, they may `yield return null` which would create an array with a null, so we need
+                    // to check in order not to crash.
+                    if (childDesc != null)
+                    {
+                        hasChildElements = true;
+                        schemaInfo.importNamespaces.Add(childDesc.elementNamespace);
+                    }
+                }
 
-            if (hasChildElements)
-            {
-                restriction.Particle = MakeChoiceSequence(factory.uxmlChildElementsDescription);
+                if (hasChildElements)
+                {
+                    restriction.Particle =
+                        MakeChoiceSequence(factory.uxmlChildElementsDescription.Where(x => x != null));
+                }
             }
 
             schemaInfo.schema.Items.Add(elementType);
diff --git a/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs b/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs
index 02fd57be49..ffd6d4d0b6 100644
--- a/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetChangeTrackerUpdater.cs
@@ -19,6 +19,9 @@ internal class VisualTreeAssetChangeTrackerUpdater : BaseVisualTreeUpdater, ILiv
         private struct VisualTreeAssetToTrackMappingEntry
         {
             public int m_LastDirtyCount;
+            public int m_LastElementCount;
+            public int m_LastInlinePropertiesCount;
+            public int m_LastAttributePropertiesDirtyCount;
             public HashSet<ILiveReloadAssetTracker<VisualTreeAsset>> m_Trackers;
         }
 
@@ -70,7 +73,7 @@ void OnTextAssetChange(Object asset)
         {
             // Note: due to Rich Text Tags, it's very difficult to predict if a text asset is actually in use
             // Therefore we will invalidate ALL text objects but only for panels which have Live Reload enabled
-            if (enable)
+            if (enable && (enabledTrackers & LiveReloadTrackers.Text) != 0)
             {
                 m_HasAnyTextAssetChanged = true;
                 panel.RequestUpdateAfterExternalEvent(this);
@@ -111,6 +114,8 @@ public override void OnVersionChanged(VisualElement ve, VersionChangeType versio
 
         public bool enable { get; set; }
 
+        public LiveReloadTrackers enabledTrackers { get; set; } = (LiveReloadTrackers)(~0);
+
         public void RegisterVisualTreeAssetTracker(ILiveReloadAssetTracker<VisualTreeAsset> tracker, VisualElement rootElement)
         {
             if (panel.contextType == ContextType.Editor)
@@ -224,6 +229,9 @@ private void StartVisualTreeAssetTracking(ILiveReloadAssetTracker<VisualTreeAsse
                 trackers = new VisualTreeAssetToTrackMappingEntry()
                 {
                     m_LastDirtyCount = dirtyCount,
+                    m_LastElementCount = asset.visualElementAssets.Count,
+                    m_LastInlinePropertiesCount = asset.inlineSheet.rules.Sum(r => r.properties.Length),
+                    m_LastAttributePropertiesDirtyCount = asset.GetAttributePropertiesDirtyCount(),
                     m_Trackers = new HashSet<ILiveReloadAssetTracker<VisualTreeAsset>>()
                 };
                 m_AssetToTrackerMap[asset] = trackers;
@@ -309,7 +317,19 @@ public override void Update()
                 return;
             }
 
-            UpdateTextElements();
+            // Windows can decide to enable/disable live reload of text elements,
+            // For example, the UI Builder will only refresh changes made to font assets and not the rest.
+            if ((enabledTrackers & LiveReloadTrackers.Text) != 0)
+            {
+                UpdateTextElements();
+            }
+
+            // Windows can also decide to skip document live reload, and only do text elements.
+            // The UI Builder will skip the live reload of hierarchy and styles, because it is already editing them.
+            if ((enabledTrackers & LiveReloadTrackers.Document) == 0)
+            {
+                return;
+            }
 
             // Early out: no tracker found for panel.
             if (m_EditorVisualTreeAssetTracker == null && m_RuntimeVisualTreeAssetTrackers.Count == 0)
@@ -339,6 +359,8 @@ public override void Update()
             // We update here to prevent unnecessary checking of asset changes.
             m_PreviousInMemoryAssetsVersion = UIElementsUtility.m_InMemoryAssetsVersion;
 
+            bool shouldRefreshStyles = false;
+
             // We iterate on the assets to avoid calling GetDirtyCount for the same asset more than once.
             // In Editor this seems very likely and in Runtime we're assuming there are not multiple panels going
             // around, or if there are they're not using the same UXMLs but we may have to revisit this if we ever
@@ -347,16 +369,44 @@ public override void Update()
             {
                 var trackedAsset = trackedAssetEntry.Key;
                 var trackersEntry = trackedAssetEntry.Value;
-                int dirtyCount = EditorUtility.GetDirtyCount(trackedAsset);
+                var dirtyCount = EditorUtility.GetDirtyCount(trackedAsset);
+
+                // We keep a trace of the number of elements to minimize the cost of LiveReload on Layout/Style changes.
+                // We also keep a trace of the number of inline rules, we need to recreate UI when they are added/removed.
+                // Same goes for attribute changes, we need to re-Init elements that changed, so we recreate UI to simplify things.
+                var elementCount = trackedAsset.visualElementAssets.Count;
+                var inlinePropertiesCount = trackedAsset.inlineSheet.rules.Sum(r => r.properties.Length);
+                var attributePropertiesDirtyCount = trackedAsset.GetAttributePropertiesDirtyCount();
+                bool shouldRecreateUI = false;
+
                 if (dirtyCount != trackersEntry.m_LastDirtyCount)
                 {
                     trackersEntry.m_LastDirtyCount = dirtyCount;
-                    foreach (var tracker in trackersEntry.m_Trackers)
+
+                    if (elementCount != trackersEntry.m_LastElementCount ||
+                        inlinePropertiesCount != trackersEntry.m_LastInlinePropertiesCount ||
+                        attributePropertiesDirtyCount != trackersEntry.m_LastAttributePropertiesDirtyCount)
                     {
-                        // Update the dirty count on the tracker to keep the information correct everywhere.
-                        tracker.UpdateAssetDirtyCount(trackedAsset, dirtyCount);
+                        trackersEntry.m_LastElementCount = elementCount;
+                        trackersEntry.m_LastInlinePropertiesCount = inlinePropertiesCount;
+                        trackersEntry.m_LastAttributePropertiesDirtyCount = attributePropertiesDirtyCount;
 
-                        // Add to list to make sure we only call each tracker only once.
+                        shouldRecreateUI = true;
+                    }
+                    else
+                    {
+                        shouldRefreshStyles = true;
+                    }
+                }
+
+                foreach (var tracker in trackersEntry.m_Trackers)
+                {
+                    // Update the dirty count on the tracker to keep the information correct everywhere.
+                    tracker.UpdateAssetTrackerCounts(trackedAsset, dirtyCount, elementCount, inlinePropertiesCount, attributePropertiesDirtyCount);
+
+                    // Add to list to make sure we only call each tracker only once.
+                    if (shouldRecreateUI)
+                    {
                         m_TrackersToRefresh.Add(tracker);
                     }
                 }
@@ -368,15 +418,16 @@ public override void Update()
             }
             m_TrackersToRefresh.Clear();
 
-            if (m_LiveReloadStyleSheetAssetTracker.CheckTrackedAssetsDirty())
+            if (shouldRefreshStyles || m_LiveReloadStyleSheetAssetTracker.CheckTrackedAssetsDirty())
             {
                 panel.DirtyStyleSheets();
+                panel.UpdateInlineStylesRecursively();
             }
         }
 
         public void RegisterTextElement(TextElement element)
         {
-            if (enable)
+            if ((enabledTrackers & LiveReloadTrackers.Text) != 0)
             {
                 m_TextElements.Add(element);
             }
diff --git a/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetEditor.cs b/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetEditor.cs
index 9f2b8c8b30..d5133168b3 100644
--- a/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetEditor.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/VisualTreeAssetEditor.cs
@@ -22,6 +22,9 @@ internal class VisualTreeAssetEditor : ScriptableObjectAssetEditor
         //Currently just uses a fixed size texture to minimize lag/jitter as we are not integrated in the update loop. (instead of the real preview size)
         private Vector2Int m_TextureSize = new Vector2Int(512, 512);
 
+        // Used in tests
+        internal Panel panel => m_Panel;
+
         protected void OnEnable()
         {
             m_FileTypeIcon = EditorGUIUtility.FindTexture(typeof(VisualTreeAsset));
@@ -34,6 +37,11 @@ protected void OnDisable()
             EditorApplication.update -= Update;
             if (m_Panel != null)
             {
+                if (m_Tree != null)
+                {
+                    m_Tree.RemoveFromHierarchy();
+                    m_Tree = null;
+                }
                 m_Panel.Dispose();
                 m_Panel = null;
             }
@@ -147,7 +155,8 @@ public void Render(VisualTreeAsset vta, Rect r, GUIStyle background)
             }
         }
 
-        private bool UpdatePreviewTexture(int width, int height)
+        // Also used in tests
+        internal bool UpdatePreviewTexture(int width, int height)
         {
             var vta = target as VisualTreeAsset;
             bool dirty = false;
diff --git a/ModuleOverrides/com.unity.ui/Editor/VisualTreeEditorUpdater.cs b/ModuleOverrides/com.unity.ui/Editor/VisualTreeEditorUpdater.cs
index 8c09539be8..8a48428b3a 100644
--- a/ModuleOverrides/com.unity.ui/Editor/VisualTreeEditorUpdater.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/VisualTreeEditorUpdater.cs
@@ -96,10 +96,7 @@ public void OnVersionChanged(VisualElement ve, VersionChangeType versionChangeTy
             for (int i = 0; i < (int)VisualTreeEditorUpdatePhase.Count; i++)
             {
                 var updater = m_UpdaterArray[i];
-                using (updater.profilerMarker.Auto())
-                {
-                    updater.OnVersionChanged(ve, versionChangeType);
-                }
+                updater.OnVersionChanged(ve, versionChangeType);
             }
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Editor/WindowBackends/DefaultEditorWindowBackend.cs b/ModuleOverrides/com.unity.ui/Editor/WindowBackends/DefaultEditorWindowBackend.cs
index b2655339d5..c346d9b2ad 100644
--- a/ModuleOverrides/com.unity.ui/Editor/WindowBackends/DefaultEditorWindowBackend.cs
+++ b/ModuleOverrides/com.unity.ui/Editor/WindowBackends/DefaultEditorWindowBackend.cs
@@ -354,8 +354,15 @@ void SendInitializeIfNecessary(bool duringOnCreate = false)
 
         protected void Invoke(string methodName)
         {
-            MethodInfo mi = GetPaneMethod(methodName, editorWindowModel.window);
-            mi?.Invoke(editorWindowModel.window, null);
+            try
+            {
+                MethodInfo mi = GetPaneMethod(methodName, editorWindowModel.window);
+                mi?.Invoke(editorWindowModel.window, null);
+            }
+            catch (Exception e)
+            {
+                Debug.LogException(e);
+            }
         }
 
         protected MethodInfo GetPaneMethod(string methodName, object obj)
diff --git a/Modules/AI/AssemblyInfo.cs b/Modules/AI/AssemblyInfo.cs
new file mode 100644
index 0000000000..f723209e11
--- /dev/null
+++ b/Modules/AI/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Unity.AI.HeightMesh.Tests")]
diff --git a/Modules/AI/NavMesh/NavMesh.bindings.cs b/Modules/AI/NavMesh/NavMesh.bindings.cs
index aec350bcda..5f69d1cedf 100644
--- a/Modules/AI/NavMesh/NavMesh.bindings.cs
+++ b/Modules/AI/NavMesh/NavMesh.bindings.cs
@@ -72,6 +72,7 @@ public NavMeshData(int agentTypeID)
         public extern Bounds sourceBounds { get; }
         public extern Vector3 position { get; set; }
         public extern Quaternion rotation { get; set; }
+        internal extern bool hasHeightMeshData { [NativeMethod("HasHeightMeshData")] get; }
     }
 
     public struct NavMeshDataInstance
diff --git a/Modules/AI/Public/NavMeshBuildSettings.bindings.cs b/Modules/AI/Public/NavMeshBuildSettings.bindings.cs
index 5fa6a901c4..ee17a4d857 100644
--- a/Modules/AI/Public/NavMeshBuildSettings.bindings.cs
+++ b/Modules/AI/Public/NavMeshBuildSettings.bindings.cs
@@ -25,6 +25,7 @@ public struct NavMeshBuildSettings
         public int tileSize { get { return m_TileSize; } set { m_TileSize = value; } }
         public uint maxJobWorkers { get { return m_MaxJobWorkers; } set { m_MaxJobWorkers = value; } }
         public bool preserveTilesOutsideBounds { get { return m_PreserveTilesOutsideBounds != 0; } set { m_PreserveTilesOutsideBounds = value ? 1 : 0; } }
+        public bool buildHeightMesh { get { return m_BuildHeightMesh != 0; } set { m_BuildHeightMesh = value ? 1 : 0; } }
         public NavMeshBuildDebugSettings debug { get { return m_Debug; } set { m_Debug = value; } }
 
         int m_AgentTypeID;
@@ -39,7 +40,7 @@ public struct NavMeshBuildSettings
         float m_VoxelSize;
         int m_OverrideTileSize;
         int m_TileSize;
-        int m_AccuratePlacement;        // Not exposed
+        int m_BuildHeightMesh;
         uint m_MaxJobWorkers;
         int m_PreserveTilesOutsideBounds;
 
diff --git a/Modules/AIEditor/Visualization/NavMeshVisualizationSettings.bindings.cs b/Modules/AIEditor/Visualization/NavMeshVisualizationSettings.bindings.cs
index b1e7ddcbe8..ed93d31f5f 100644
--- a/Modules/AIEditor/Visualization/NavMeshVisualizationSettings.bindings.cs
+++ b/Modules/AIEditor/Visualization/NavMeshVisualizationSettings.bindings.cs
@@ -19,6 +19,7 @@ public sealed class NavMeshVisualizationSettings
         internal static extern bool showNavMeshLinks { get; set; }
         internal static extern bool showProximityGrid { get; set; }
         internal static extern bool showHeightMeshBVTree { get; set; }
+        internal static extern bool showHeightMaps { get; set; }
         internal static extern bool hasHeightMesh
         {
             [NativeName("HasHeightMesh")]
diff --git a/Modules/AndroidJNI/AndroidJava.cs b/Modules/AndroidJNI/AndroidJava.cs
index a2d0496cb3..7017964696 100644
--- a/Modules/AndroidJNI/AndroidJava.cs
+++ b/Modules/AndroidJNI/AndroidJava.cs
@@ -486,7 +486,7 @@ protected ReturnType _Call<ReturnType>(string methodName, params object[] args)
                 else if (AndroidReflection.IsAssignableFrom(typeof(System.Array), typeof(ReturnType)))
                 {
                     IntPtr jobject = AndroidJNISafe.CallObjectMethod(m_jobject, methodID, jniArgs);
-                    return (jobject == IntPtr.Zero) ? default(ReturnType) : (ReturnType)(object)AndroidJNIHelper.ConvertFromJNIArray<ReturnType>(jobject);
+                    return FromJavaArrayDeleteLocalRef<ReturnType>(jobject);
                 }
                 else
                 {
@@ -544,7 +544,7 @@ protected FieldType _Get<FieldType>(string fieldName)
             else if (AndroidReflection.IsAssignableFrom(typeof(System.Array), typeof(FieldType)))
             {
                 IntPtr jobject = AndroidJNISafe.GetObjectField(m_jobject, fieldID);
-                return (jobject == IntPtr.Zero) ? default(FieldType) : (FieldType)(object)AndroidJNIHelper.ConvertFromJNIArray<FieldType>(jobject);
+                return FromJavaArrayDeleteLocalRef<FieldType>(jobject);
             }
             else
             {
@@ -664,7 +664,7 @@ protected ReturnType _CallStatic<ReturnType>(string methodName, params object[]
                 else if (AndroidReflection.IsAssignableFrom(typeof(System.Array), typeof(ReturnType)))
                 {
                     IntPtr jobject = AndroidJNISafe.CallStaticObjectMethod(m_jclass, methodID, jniArgs);
-                    return (jobject == IntPtr.Zero) ? default(ReturnType) : (ReturnType)(object)AndroidJNIHelper.ConvertFromJNIArray<ReturnType>(jobject);
+                    return FromJavaArrayDeleteLocalRef<ReturnType>(jobject);
                 }
                 else
                 {
@@ -723,7 +723,7 @@ protected FieldType _GetStatic<FieldType>(string fieldName)
             else if (AndroidReflection.IsAssignableFrom(typeof(System.Array), typeof(FieldType)))
             {
                 IntPtr jobject = AndroidJNISafe.GetStaticObjectField(m_jclass, fieldID);
-                return (jobject == IntPtr.Zero) ? default(FieldType) : (FieldType)(object)AndroidJNIHelper.ConvertFromJNIArray<FieldType>(jobject);
+                return FromJavaArrayDeleteLocalRef<FieldType>(jobject);
             }
             else
             {
@@ -790,6 +790,20 @@ internal static AndroidJavaClass AndroidJavaClassDeleteLocalRef(IntPtr jclass)
             try { return new AndroidJavaClass(jclass); } finally { AndroidJNISafe.DeleteLocalRef(jclass); }
         }
 
+        internal static ReturnType FromJavaArrayDeleteLocalRef<ReturnType>(IntPtr jobject)
+        {
+            if (jobject == IntPtr.Zero)
+                return default(ReturnType);
+            try
+            {
+                return (ReturnType)(object)AndroidJNIHelper.ConvertFromJNIArray<ReturnType>(jobject);
+            }
+            finally
+            {
+                AndroidJNISafe.DeleteLocalRef(jobject);
+            }
+        }
+
         //===================================================================
         protected IntPtr _GetRawObject() { return m_jobject == null ? IntPtr.Zero : m_jobject; }
         protected IntPtr _GetRawClass() { return m_jclass; }
@@ -1209,7 +1223,7 @@ public static void DeleteJNIArgArray(object[] args, jvalue[] jniArgs)
             int i = 0;
             foreach (object obj in args)
             {
-                if (obj is System.String || obj is AndroidJavaRunnable || obj is System.Array)
+                if (obj is System.String || obj is AndroidJavaRunnable || obj is AndroidJavaProxy || obj is System.Array)
                     AndroidJNISafe.DeleteLocalRef(jniArgs[i].l);
 
                 ++i;
diff --git a/Modules/Animation/ScriptBindings/AnimationLayerMixerPlayable.bindings.cs b/Modules/Animation/ScriptBindings/AnimationLayerMixerPlayable.bindings.cs
index 9939e1b9fe..963d296391 100644
--- a/Modules/Animation/ScriptBindings/AnimationLayerMixerPlayable.bindings.cs
+++ b/Modules/Animation/ScriptBindings/AnimationLayerMixerPlayable.bindings.cs
@@ -23,7 +23,12 @@ public struct AnimationLayerMixerPlayable : IPlayable, IEquatable<AnimationLayer
         static readonly AnimationLayerMixerPlayable m_NullPlayable = new AnimationLayerMixerPlayable(PlayableHandle.Null);
         public static AnimationLayerMixerPlayable Null { get { return m_NullPlayable; } }
 
-        public static AnimationLayerMixerPlayable Create(PlayableGraph graph, int inputCount = 0, bool singleLayerOptimization = true)
+        public static AnimationLayerMixerPlayable Create(PlayableGraph graph, int inputCount = 0)
+        {
+            return Create(graph, inputCount,true);
+        }
+
+        public static AnimationLayerMixerPlayable Create(PlayableGraph graph, int inputCount ,bool singleLayerOptimization)
         {
             var handle = CreateHandle(graph, inputCount);
             var mixer = new AnimationLayerMixerPlayable(handle, singleLayerOptimization);
diff --git a/Modules/Animation/ScriptBindings/AnimationStreamHandles.bindings.cs b/Modules/Animation/ScriptBindings/AnimationStreamHandles.bindings.cs
index 05cfc6c4f7..abe50848ca 100644
--- a/Modules/Animation/ScriptBindings/AnimationStreamHandles.bindings.cs
+++ b/Modules/Animation/ScriptBindings/AnimationStreamHandles.bindings.cs
@@ -124,6 +124,12 @@ private void CheckIsValidAndResolve(ref AnimationStream stream)
         public Vector3 GetLocalScale(AnimationStream stream) { CheckIsValidAndResolve(ref stream); return GetLocalScaleInternal(ref stream); }
         public void SetLocalScale(AnimationStream stream, Vector3 scale) { CheckIsValidAndResolve(ref stream); SetLocalScaleInternal(ref stream, scale); }
 
+        public Matrix4x4 GetLocalToParentMatrix(AnimationStream stream)
+        {
+            CheckIsValidAndResolve(ref stream);
+            return GetLocalToParentMatrixInternal(ref stream);
+        }
+
         public bool GetPositionReadMask(AnimationStream stream) { CheckIsValidAndResolve(ref stream); return GetPositionReadMaskInternal(ref stream); }
         public bool GetRotationReadMask(AnimationStream stream) { CheckIsValidAndResolve(ref stream); return GetRotationReadMaskInternal(ref stream); }
         public bool GetScaleReadMask(AnimationStream stream) { CheckIsValidAndResolve(ref stream); return GetScaleReadMaskInternal(ref stream); }
@@ -146,6 +152,12 @@ public void GetGlobalTR(AnimationStream stream, out Vector3 position, out Quater
             GetGlobalTRInternal(ref stream, out position, out rotation);
         }
 
+        public Matrix4x4 GetLocalToWorldMatrix(AnimationStream stream)
+        {
+            CheckIsValidAndResolve(ref stream);
+            return GetLocalToWorldMatrixInternal(ref stream);
+        }
+
         public void SetGlobalTR(AnimationStream stream, Vector3 position, Quaternion rotation, bool useMask)
         {
             CheckIsValidAndResolve(ref stream);
@@ -185,6 +197,9 @@ public void SetGlobalTR(AnimationStream stream, Vector3 position, Quaternion rot
         [NativeMethod(Name = "TransformStreamHandleBindings::SetLocalScaleInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
         private extern void SetLocalScaleInternal(ref AnimationStream stream, Vector3 scale);
 
+        [NativeMethod(Name = "TransformStreamHandleBindings::GetLocalToParentMatrixInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
+        private extern Matrix4x4 GetLocalToParentMatrixInternal(ref AnimationStream stream);
+
         [NativeMethod(Name = "TransformStreamHandleBindings::GetPositionReadMaskInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
         private extern bool GetPositionReadMaskInternal(ref AnimationStream stream);
 
@@ -203,6 +218,9 @@ public void SetGlobalTR(AnimationStream stream, Vector3 position, Quaternion rot
         [NativeMethod(Name = "TransformStreamHandleBindings::GetGlobalTRInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
         private extern void GetGlobalTRInternal(ref AnimationStream stream, out Vector3 position, out Quaternion rotation);
 
+        [NativeMethod(Name = "TransformStreamHandleBindings::GetLocalToWorldMatrixInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
+        private extern Matrix4x4 GetLocalToWorldMatrixInternal(ref AnimationStream stream);
+
         [NativeMethod(Name = "TransformStreamHandleBindings::SetGlobalTRInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
         private extern void SetGlobalTRInternal(ref AnimationStream stream, Vector3 position, Quaternion rotation, bool useMask);
     }
@@ -466,12 +484,24 @@ public void GetLocalTRS(AnimationStream stream, out Vector3 position, out Quater
             GetLocalTRSInternal(ref stream, out position, out rotation, out scale);
         }
 
+        public Matrix4x4 GetLocalToParentMatrix(AnimationStream stream)
+        {
+            CheckIsValid(ref stream);
+            return GetLocalToParentMatrixInternal(ref stream);
+        }
+
         public void GetGlobalTR(AnimationStream stream, out Vector3 position, out Quaternion rotation)
         {
             CheckIsValid(ref stream);
             GetGlobalTRInternal(ref stream, out position, out rotation);
         }
 
+        public Matrix4x4 GetLocalToWorldMatrix(AnimationStream stream)
+        {
+            CheckIsValid(ref stream);
+            return GetLocalToWorldMatrixInternal(ref stream);
+        }
+
         [Obsolete("SceneHandle is now read-only; it was problematic with the engine multithreading and determinism", true)]
         public void SetLocalScale(AnimationStream stream, Vector3 scale) {}
 
@@ -496,8 +526,14 @@ public void SetLocalScale(AnimationStream stream, Vector3 scale) {}
         [NativeMethod(Name = "TransformSceneHandleBindings::GetLocalTRSInternal", IsFreeFunction = true, IsThreadSafe = true, HasExplicitThis = true)]
         private extern void GetLocalTRSInternal(ref AnimationStream stream, out Vector3 position, out Quaternion rotation, out Vector3 scale);
 
+        [NativeMethod(Name = "TransformSceneHandleBindings::GetLocalToParentMatrixInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
+        private extern Matrix4x4 GetLocalToParentMatrixInternal(ref AnimationStream stream);
+
         [NativeMethod(Name = "TransformSceneHandleBindings::GetGlobalTRInternal", IsFreeFunction = true, IsThreadSafe = true, HasExplicitThis = true)]
         private extern void GetGlobalTRInternal(ref AnimationStream stream, out Vector3 position, out Quaternion rotation);
+
+        [NativeMethod(Name = "TransformSceneHandleBindings::GetLocalToWorldMatrixInternal", IsFreeFunction = true, HasExplicitThis = true, IsThreadSafe = true)]
+        private extern Matrix4x4 GetLocalToWorldMatrixInternal(ref AnimationStream stream);
     }
 
     [MovedFrom("UnityEngine.Experimental.Animations")]
diff --git a/Modules/Animation/ScriptBindings/Animator.bindings.cs b/Modules/Animation/ScriptBindings/Animator.bindings.cs
index 157be66e37..61ff784a99 100644
--- a/Modules/Animation/ScriptBindings/Animator.bindings.cs
+++ b/Modules/Animation/ScriptBindings/Animator.bindings.cs
@@ -965,7 +965,7 @@ extern public Quaternion targetRotation
         // Returns ture if a transform a bone controlled by human
         extern internal bool IsBoneTransform(Transform transform);
 
-        extern internal Transform avatarRoot
+        extern public Transform avatarRoot
         {
             get;
         }
diff --git a/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs b/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs
index dd8cf637fd..5e71db1311 100644
--- a/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs
+++ b/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.cs
@@ -65,20 +65,42 @@ internal enum ImportPackageOptions
         ImportDelayed = 1 << 1
     }
 
+    // keep in sync with AssetDatabasePreventExecutionChecks in AssetDatabasePreventExecution.h
     internal enum AssetDatabasePreventExecution
     {
         kNoAssetDatabaseRestriction = 0,
-        kImporting = 1 << 0,
-        kImportingAsset = 1 << 1,
+        kImportingAsset = 1 << 0,
+        kImportingInWorkerProcess = 1 << 1,
         kPreventCustomDependencyChanges = 1 << 2,
         kGatheringDependenciesFromSourceFile = 1 << 3,
-        kPreventForceReserializeAssets = 1 << 4
+        kPreventForceReserializeAssets = 1 << 4,
+        kDomainBackup = 1 << 5,
     }
 
     public struct CacheServerConnectionChangedParameters
     {
     }
 
+    [RequiredByNativeCode]
+    internal class AssetDatabaseLoadOperationHelper
+    {
+        // When the load operation completes this is invoked to hold the result so that it doesn't
+        // get garbage collected
+        [RequiredByNativeCode]
+        public static void SetAssetDatabaseLoadObjectResult(AssetDatabaseLoadOperation op, UnityEngine.Object result)
+        {
+            op.m_Result = result;
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [RequiredByNativeCode]
+    public class AssetDatabaseLoadOperation : AsyncOperation
+    {
+        internal Object m_Result;
+        public UnityEngine.Object LoadedObject { get { return m_Result; } }
+    }
+
     [NativeHeader("Modules/AssetDatabase/Editor/Public/AssetDatabase.h")]
     [NativeHeader("Modules/AssetDatabase/Editor/Public/AssetDatabaseUtility.h")]
     [NativeHeader("Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabase.bindings.h")]
@@ -145,9 +167,13 @@ public static bool IsNativeAsset(Object obj)
         extern public static string GenerateUniqueAssetPath(string path);
 
         [FreeFunction("AssetDatabase::StartAssetImporting")]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingInWorkerProcess, PreventExecutionSeverity.PreventExecution_ManagedException)]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingAsset, PreventExecutionSeverity.PreventExecution_Error)]
         extern public static void StartAssetEditing();
 
         [FreeFunction("AssetDatabase::StopAssetImporting")]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingInWorkerProcess, PreventExecutionSeverity.PreventExecution_ManagedException)]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingAsset, PreventExecutionSeverity.PreventExecution_Error)]
         extern public static void StopAssetEditing();
 
         [FreeFunction("AssetDatabase::UnloadAllFileStreams")]
@@ -228,6 +254,7 @@ public static bool DeleteAssets(string[] paths, List<string> outFailedPaths)
         [NativeThrows]
         [TypeInferenceRule(TypeInferenceRules.TypeReferencedBySecondArgument)]
         [PreventExecutionInState(AssetDatabasePreventExecution.kGatheringDependenciesFromSourceFile, PreventExecutionSeverity.PreventExecution_ManagedException, "Assets may not be loaded while dependencies are being gathered, as these assets may not have been imported yet.")]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kDomainBackup, PreventExecutionSeverity.PreventExecution_ManagedException, "Assets may not be loaded while domain backup is running, as this will change the underlying state.")]
         extern public static Object LoadAssetAtPath(string assetPath, Type type);
 
         public static T LoadAssetAtPath<T>(string assetPath) where T : Object
@@ -261,6 +288,9 @@ public static void RefreshDelayed(ImportAssetOptions options) {}
         public static void RefreshDelayed() {}
 
         [uei.ExcludeFromDocs] public static void Refresh() { Refresh(ImportAssetOptions.Default); }
+
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingInWorkerProcess, PreventExecutionSeverity.PreventExecution_ManagedException)]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingAsset, PreventExecutionSeverity.PreventExecution_Error)]
         extern public static void Refresh([uei.DefaultValue("ImportAssetOptions.Default")] ImportAssetOptions options);
 
         [FreeFunction("::CanOpenAssetInEditor")]
@@ -342,6 +372,8 @@ public static Hash128 GetAssetDependencyHash(string path)
         extern internal static Hash128 GetSourceAssetMetaFileHash(string guid);
 
         [FreeFunction("AssetDatabase::SaveAssets")]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingInWorkerProcess, PreventExecutionSeverity.PreventExecution_ManagedException)]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingAsset, PreventExecutionSeverity.PreventExecution_Error)]
         extern public static void SaveAssets();
 
         [FreeFunction("AssetDatabase::SaveAssetIfDirty")]
@@ -676,6 +708,10 @@ public static void ForceReserializeAssets()
         [FreeFunction("AssetDatabase::RemoveObjectFromAsset")]
         extern public static void RemoveObjectFromAsset([NotNull] Object objectToRemove);
 
+        [PreventExecutionInState(AssetDatabasePreventExecution.kGatheringDependenciesFromSourceFile, PreventExecutionSeverity.PreventExecution_ManagedException, "Cannot call AssetDatabase.LoadObjectAsync during the gathering of import dependencies.")]
+        [PreventExecutionInState(AssetDatabasePreventExecution.kImportingAsset, PreventExecutionSeverity.PreventExecution_ManagedException, "Cannot use AssetDatabase.LoadObjectAsync while assets are importing.")]
+        extern public static AssetDatabaseLoadOperation LoadObjectAsync(string assetPath, long localId);
+
         [FreeFunction("AssetDatabase::GUIDFromExistingAssetPath")]
         extern internal static GUID GUIDFromExistingAssetPath(string path);
 
@@ -847,6 +883,47 @@ private static void OnCacheServerConnectionChanged()
         [FreeFunction("AssetDatabase::IsAssetImportProcess")]
         public extern static bool IsAssetImportWorkerProcess();
 
+        [FreeFunction("AssetDatabase::GetImporterType")]
+        public extern static Type GetImporterType(GUID guid);
+
+        [FreeFunction("AssetDatabase::GetImporterTypes")]
+        private static extern unsafe Type[] GetImporterTypes_Internal([Span("guidsLength", isReadOnly: true)]GUID* guids, int guidsLength);
+
+        private static unsafe Type[] GetImporterTypesUnsafe_Internal(ReadOnlySpan<GUID> guids)
+        {
+            fixed (GUID* guidsPtr = guids)
+            {
+                return GetImporterTypes_Internal(guidsPtr, guids.Length);
+            }
+        }
+
+        public static Type[] GetImporterTypes(ReadOnlySpan<GUID> guids)
+        {
+            return GetImporterTypesUnsafe_Internal(guids);
+        }
+
+        //Since extern method overloads are not supported
+        //this is the name we pick, but users end up being able
+        //to call either of the overloads
+        [FreeFunction("AssetDatabase::GetImporterTypesAtPaths")]
+        private static extern Type[] GetImporterTypesAtPaths(string[] paths);
+
+        public static Type GetImporterType(string assetPath)
+        {
+            return GetImporterTypeAtPath(assetPath);
+        }
+
+        //Since extern method overloads are not supported
+        //this is the name we pick, but users end up being able
+        //to call either of the overloads
+        [FreeFunction("AssetDatabase::GetImporterTypeAtPath")]
+        private static extern Type GetImporterTypeAtPath(string assetPath);
+
+        public static Type[] GetImporterTypes(string[] paths)
+        {
+            return GetImporterTypesAtPaths(paths);
+        }
+
         [RequiredByNativeCode]
         static string[] OnSourceAssetsModified(string[] changedAssets, string[] addedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
         {
diff --git a/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabaseExperimental.bindings.cs b/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabaseExperimental.bindings.cs
index 6cfa2e61fc..5bf5b0b2d6 100644
--- a/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabaseExperimental.bindings.cs
+++ b/Modules/AssetDatabase/Editor/ScriptBindings/AssetDatabaseExperimental.bindings.cs
@@ -118,6 +118,7 @@ public struct ImportCounters
                 public Counter importedOutOfProcess;
                 public Counter refresh;
                 public Counter domainReload;
+                internal Counter fullScan;
             }
 
             public CacheServerCounters cacheServer;
diff --git a/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporter.cs b/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporter.cs
index 3b08b4b460..500aef0811 100644
--- a/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporter.cs
+++ b/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporter.cs
@@ -87,8 +87,8 @@ internal ArtifactInfoDifference(ArtifactInfoDifference other)
 
         private List<ArtifactInfoDifference> m_AllDiffs;
 
-        public static string kGlobal_artifactFormatVersion = "Global/artifactFormatVersion"; //Manual check
-        public static string kGlobal_allImporterVersion = "Global/allImporterVersion"; //Manual check
+        public static string kGlobal_artifactFormatVersion = "Global/artifactFormatVersion";
+        public static string kGlobal_allImporterVersion = "Global/allImporterVersion";
         public static string kImportParameter_ImporterType = "ImportParameter/ImporterType";
         public static string kImporterRegister_ImporterVersion = "ImporterRegistry/ImporterVersion";
         public static string kImporterRegistry_PostProcessorVersionHash = "ImporterRegistry/PostProcessorVersionHash";
@@ -98,12 +98,12 @@ internal ArtifactInfoDifference(ArtifactInfoDifference other)
         public static string kSourceAsset_MetaFileHash = "SourceAsset/MetaFileHash";
         public static string kArtifact_HashOfContent = "Artifact/HashOfContent";
         public static string kArtifact_HashOfGuidsOfChildren = "SourceAsset/HashOfGuidsOfChildren";
-        public static string kArtifact_FileIdOfMainObject = "Artifact/Property"; //Manual check
+        public static string kArtifact_FileIdOfMainObject = "Artifact/Property";
         public static string kImportParameter_Platform = "ImportParameter/Platform";
         public static string kEnvironment_TextureImportCompression = "Environment/TextureImportCompression";
         public static string kEnvironment_ColorSpace = "Environment/ColorSpace";
         public static string kEnvironment_GraphicsAPIMask = "Environment/GraphicsAPIMask";
-        public static string kEnvironment_ScriptingRuntimeVersion = "Environment/ScriptingRuntimeVersion"; //Manual check
+        public static string kEnvironment_ScriptingRuntimeVersion = "Environment/ScriptingRuntimeVersion";
         public static string kEnvironment_CustomDependency = "Environment/CustomDependency";
         public static string kImportParameter_PlatformGroup = "ImportParameter/BuildTargetPlatformGroup";
         public static string kIndeterministicImporter = "ImporterRegistry/IndeterministicImporter";
@@ -221,12 +221,15 @@ private static void PlatformGroupModified(ref ArtifactInfoDifference diff, List<
 
         private static void ArtifactFileIdOfMainObjectModified(ref ArtifactInfoDifference diff, List<string> msgsList)
         {
+            //The propertyName is special, in the sense that
+            //the key contains both the name (i.e. "Artifact/Property" and a value "SomeProperty")
+            //so we split it in order to report it in a more legible way
             var propertyName = diff.key.Split('/')[2];
             if (diff.diffType == DiffType.Modified)
             {
                 var oldVersion = diff.oldDependencies[diff.key].value;
                 var newVersion = diff.newDependencies[diff.key].value;
-                var assetName = GetAssetName(diff.newArtifactInfo);
+                var assetName = GetAssetName(diff.newDependencies);
                 diff.message = $"the property '{propertyName}' was changed from '{oldVersion}' to '{newVersion}', which is registered as a dependency of '{assetName}'";
                 msgsList.Add(diff.message);
             }
@@ -251,9 +254,18 @@ private static void GlobalAllImporterVersionModified(ref ArtifactInfoDifference
                 diff.message = $"the Global Importer version value was changed from '{oldVersion}' to '{newVersion}'";
                 msgsList.Add(diff.message);
             }
-            else
+            else if(diff.diffType == DiffType.Added)
             {
-                Debug.LogError($"{kGlobal_allImporterVersion} cannot be added or removed as a dependency");
+                var assetName = GetAssetName(diff.newDependencies);
+                var addedValue = diff.newDependencies[diff.key].value;
+                diff.message = $"a dependency on the Global AllImporter Version with value {addedValue} was added to {assetName}";
+                msgsList.Add(diff.message);
+            }
+            else if(diff.diffType == DiffType.Removed)
+            {
+                var assetName = GetAssetName(diff.oldDependencies);
+                diff.message = $"a dependency on the Global AllImporter Version was removed from {assetName}";
+                msgsList.Add(diff.message);
             }
         }
 
@@ -266,9 +278,18 @@ private static void GlobalArtifactFormatVersionModified(ref ArtifactInfoDifferen
                 diff.message = $"the global artifact format version changed from '{oldVersion}' to '{newVersion}'";
                 msgsList.Add(diff.message);
             }
-            else
+            else if(diff.diffType == DiffType.Added)
+            {
+                var assetName = GetAssetName(diff.newDependencies);
+                var addedValue = diff.newDependencies[diff.key].value;
+                diff.message = $"a dependency on the Global Artifact Format Version with value {addedValue} was added to {assetName}";
+                msgsList.Add(diff.message);
+            }
+            else if(diff.diffType == DiffType.Removed)
             {
-                Debug.LogError($"{kGlobal_artifactFormatVersion} cannot be added or removed as a dependency");
+                var assetName = GetAssetName(diff.oldDependencies);
+                diff.message = $"a dependency on the Global Artifact Format Version was removed from {assetName}";
+                msgsList.Add(diff.message);
             }
         }
 
@@ -289,7 +310,7 @@ private static void ScriptingRuntimeVersionModified(ref ArtifactInfoDifference d
             }
             else if (diff.diffType == DiffType.Removed)
             {
-                var removedVersion = diff.newDependencies[diff.key].value;
+                var removedVersion = diff.oldDependencies[diff.key].value;
                 diff.message = $"a dependency on the selected Scripting Runtime Version '{removedVersion}' was removed";
                 msgsList.Add(diff.message);
             }
@@ -324,21 +345,41 @@ private static void GraphicsAPIMaskModified(ref ArtifactInfoDifference diff, Lis
         private static void PostProcessorVersionHashModified(ref ArtifactInfoDifference diff, List<string> msgsList)
         {
             var oldPostProcessorKey = diff.oldDependencies.Keys.FirstOrDefault(key => key.StartsWith(kImporterRegistry_PostProcessorVersionHash, StringComparison.Ordinal));
-
             var newPostProcessorKey = diff.newDependencies.Keys.FirstOrDefault(key => key.StartsWith(kImporterRegistry_PostProcessorVersionHash, StringComparison.Ordinal));
 
-            if (!string.IsNullOrEmpty(oldPostProcessorKey) && !string.IsNullOrEmpty(newPostProcessorKey))
+            if (!string.IsNullOrEmpty(oldPostProcessorKey) && !string.IsNullOrEmpty(newPostProcessorKey) && oldPostProcessorKey != newPostProcessorKey)
             {
-                var assetName = GetAssetName(diff.newArtifactInfo);
-                diff.message = $"a PostProcessor associated with '{assetName}' changed from '{oldPostProcessorKey}' to '{newPostProcessorKey}'";
+                var assetName = GetAssetName(diff.newDependencies);
+                var key = newPostProcessorKey;
+                var start = key.LastIndexOf("/") + 1;
+                var newPostProcessorName = key.Substring(start, key.Length - start);
+
+                key = oldPostProcessorKey;
+                start = key.LastIndexOf("/") + 1;
+                var oldPostProcessorName = key.Substring(start, key.Length - start);
+
+                diff.message = $"a PostProcessor associated with '{assetName}' changed from '{oldPostProcessorName}' to '{newPostProcessorName}'";
+                msgsList.Add(diff.message);
+            }
+            else if (diff.diffType == DiffType.Modified)
+            {
+                var assetName = GetAssetName(diff.newDependencies);
+                var key = newPostProcessorKey;
+                var start = key.LastIndexOf("/") + 1;
+
+                var postProcessor = key.Substring(start, key.Length - start);
+
+                var oldValue = diff.oldDependencies[key].value;
+                var newValue = diff.newDependencies[key].value;
+                diff.message = $"the value for the PostProcessor '{postProcessor}' was changed from '{oldValue}' to '{newValue}'";
                 msgsList.Add(diff.message);
             }
             else
             {
                 if (diff.diffType == DiffType.Removed)
                 {
-                    var assetName = GetAssetName(diff.newArtifactInfo);
-                    var key = diff.key;
+                    var assetName = GetAssetName(diff.oldDependencies);
+                    var key = oldPostProcessorKey;
                     var start = key.LastIndexOf("/") + 1;
 
                     var postProcessor = key.Substring(start, key.Length - start);
@@ -348,8 +389,8 @@ private static void PostProcessorVersionHashModified(ref ArtifactInfoDifference
                 }
                 else if (diff.diffType == DiffType.Added)
                 {
-                    var assetName = GetAssetName(diff.newArtifactInfo);
-                    var key = diff.key;
+                    var assetName = GetAssetName(diff.newDependencies);
+                    var key = newPostProcessorKey;
                     var start = key.LastIndexOf("/") + 1;
 
                     var postProcessor = key.Substring(start, key.Length - start);
@@ -390,13 +431,13 @@ private static void GuidOfPathLocationModifiedViaHashOfSourceAsset(ref ArtifactI
         {
             if (diff.diffType == DiffType.Modified)
             {
-                var assetName = GetAssetName(diff.newArtifactInfo);
+                var assetName = GetAssetName(diff.newDependencies);
                 diff.message = $"the asset '{pathOfDependency}' was changed, which is registered as a dependency of '{assetName}'";
                 msgsList.Add(diff.message);
             }
             else if (diff.diffType == DiffType.Added)
             {
-                var assetName = GetAssetName(diff.newArtifactInfo);
+                var assetName = GetAssetName(diff.newDependencies);
                 diff.message = $"a dependency on '{pathOfDependency}' was added to '{assetName}'";
                 msgsList.Add(diff.message);
             }
@@ -438,7 +479,20 @@ private static void ImporterVersionModified(ref ArtifactInfoDifference diff, Lis
                 var oldImporterVersion = diff.oldDependencies[diff.key].value;
                 var newImporterVersion = diff.newDependencies[diff.key].value;
                 var importerName = diff.newDependencies[kImportParameter_ImporterType].value;
-                diff.message = $"The version of the importer '{importerName}' changed from '{oldImporterVersion}' to '{newImporterVersion}'";
+                diff.message = $"the version of the importer '{importerName}' changed from '{oldImporterVersion}' to '{newImporterVersion}'";
+                msgsList.Add(diff.message);
+            }
+            else if (diff.diffType == DiffType.Added)
+            {
+                var newImporterVersion = diff.newDependencies[diff.key].value;
+                var importerName = diff.newDependencies[kImportParameter_ImporterType].value;
+                diff.message = $"a dependency on the importer '{importerName}' was added, with version '{newImporterVersion}'";
+                msgsList.Add(diff.message);
+            }
+            else if (diff.diffType == DiffType.Removed)
+            {
+                var importerName = diff.oldDependencies[kImportParameter_ImporterType].value;
+                diff.message = $"a dependency on the importer '{importerName}' was removed";
                 msgsList.Add(diff.message);
             }
         }
@@ -531,7 +585,7 @@ private static void TextureCompressionModified(ref ArtifactInfoDifference diff,
         {
             if (diff.diffType == DiffType.Removed)
             {
-                var assetName = GetAssetName(diff.newArtifactInfo);
+                var assetName = GetAssetName(diff.newDependencies);
 
                 diff.message = $"the asset '{assetName}' no longer depends on texture compression";
                 msgsList.Add(diff.message);
diff --git a/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporterTesting.cs b/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporterTesting.cs
index 824a3f22ab..c1ddb56c40 100644
--- a/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporterTesting.cs
+++ b/Modules/AssetDatabase/Editor/V2/Managed/ArtifactDifferenceReporterTesting.cs
@@ -17,5 +17,60 @@ internal static void Test_GraphicsAPIMaskModified(ref ArtifactInfoDifference dif
             //Only way to test internals
             GraphicsAPIMaskModified(ref diff, msgsList);
         }
+
+        internal static void Test_GlobalArtifactFormatVersionModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            //Only way to test internals
+            GlobalArtifactFormatVersionModified(ref diff, msgsList);
+        }
+
+        internal static void Test_GlobalAllImporterVersionModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            //Only way to test internals
+            GlobalAllImporterVersionModified(ref diff, msgsList);
+        }
+
+        internal static void Test_ImporterVersionModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            //Only way to test internals
+            ImporterVersionModified(ref diff, msgsList);
+        }
+
+        internal static void Test_ArtifactFileIdOfMainObjectModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            //Only way to test internals
+            ArtifactFileIdOfMainObjectModified(ref diff, msgsList);
+        }
+
+        internal static void Test_ScriptingRuntimeVersionModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            //Only way to test internals
+            ScriptingRuntimeVersionModified(ref diff, msgsList);
+        }
+
+        internal static void Test_PlatformGroupModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            PlatformGroupModified(ref diff, msgsList);
+        }
+
+        internal static void Test_PlatformDependencyModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            PlatformDependencyModified(ref diff, msgsList);
+        }
+
+        internal static void Test_PostProcessorVersionHashModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            PostProcessorVersionHashModified(ref diff, msgsList);
+        }
+
+        internal static void Test_TextureCompressionModified(ref ArtifactInfoDifference diff, List<string> msgsList)
+        {
+            TextureCompressionModified(ref diff, msgsList);
+        }
+
+        internal static void Test_GuidOfPathLocationModifiedViaHashOfSourceAsset(ref ArtifactInfoDifference diff, List<string> msgsList, string pathOfDependency)
+        {
+            GuidOfPathLocationModifiedViaHashOfSourceAsset(ref diff, msgsList, pathOfDependency);
+        }
     }
 }
diff --git a/Modules/AssetPipelineEditor/AssetPostprocessors/FBXMaterialDescriptionPreprocessor.cs b/Modules/AssetPipelineEditor/AssetPostprocessors/FBXMaterialDescriptionPreprocessor.cs
index b72aec8074..9c81e96b10 100644
--- a/Modules/AssetPipelineEditor/AssetPostprocessors/FBXMaterialDescriptionPreprocessor.cs
+++ b/Modules/AssetPipelineEditor/AssetPostprocessors/FBXMaterialDescriptionPreprocessor.cs
@@ -12,8 +12,8 @@ namespace UnityEditor.AssetImporters
     [MovedFrom("UnityEditor.Experimental.AssetImporters")]
     public class FBXMaterialDescriptionPreprocessor : AssetPostprocessor
     {
-        static readonly uint k_Version = 1;
-        static readonly int k_Order = 1;
+        static readonly uint k_Version = 2;
+        static readonly int k_Order = -990;
         public override uint GetVersion()
         {
             return k_Version;
@@ -902,7 +902,13 @@ void CreateFromStandardMaterial(MaterialDescription description, Material materi
                 }
             }
 
-            material.SetFloat("_Glossiness", 0.0f);
+            if (description.TryGetProperty("Shininess", out float shininess))
+            {
+                var glossiness = Mathf.Sqrt(shininess * 0.01f);
+                material.SetFloat("_Glossiness", glossiness);
+            }
+            else
+                material.SetFloat("_Glossiness", 0.0f);
 
             if (PlayerSettings.colorSpace == ColorSpace.Gamma)
                 RemapAndTransformColorCurves(description, clips, "DiffuseColor", "_Color", ConvertFloatLinearToGamma);
diff --git a/Modules/AssetPipelineEditor/AssetPostprocessors/ModelImporterPostProcessor.cs b/Modules/AssetPipelineEditor/AssetPostprocessors/ModelImporterPostProcessor.cs
index f7b28f6680..2b308bdf03 100644
--- a/Modules/AssetPipelineEditor/AssetPostprocessors/ModelImporterPostProcessor.cs
+++ b/Modules/AssetPipelineEditor/AssetPostprocessors/ModelImporterPostProcessor.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -16,6 +17,11 @@ internal class ModelImporterPostProcessor : AssetPostprocessor
     {
         static bool AskedForBumpMap = false;
 
+        private static bool IsTypeOf(System.Type query, System.Type desiredType)
+        {
+            return query != null && (query.IsSubclassOf(desiredType) || query == desiredType);
+        }
+
         static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromPath)
         {
             if (!EditorPrefs.GetBool("PerformBumpMapChecks",true))
@@ -32,11 +38,14 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
             bool oneFound = false;
             try
             {
+                System.Type modelImporterType = typeof(ModelImporter);
+                System.Type speedTreeImporterType = typeof(SpeedTreeImporter);
+
                 foreach (var assetPath in importedAssets)
                 {
-                    var importer = AssetImporter.GetAtPath(assetPath);
-                    var isMaterialAsset = Path.GetExtension(assetPath) == ".mat";
-                    if (isMaterialAsset == true || importer is ModelImporter || importer is SpeedTreeImporter)
+                    var importer = AssetDatabase.GetImporterType(assetPath);
+                    var isMaterialAsset = assetPath.EndsWith(".mat", StringComparison.OrdinalIgnoreCase);
+                    if (isMaterialAsset == true || IsTypeOf(importer, modelImporterType) || IsTypeOf(importer, speedTreeImporterType))
                     {
                         if (!AssetDatabase.IsMainAssetAtPathLoaded(assetPath))
                         {
diff --git a/Modules/AssetPipelineEditor/AssetPostprocessors/SketchupMaterialDescriptionPreprocessor.cs b/Modules/AssetPipelineEditor/AssetPostprocessors/SketchupMaterialDescriptionPreprocessor.cs
index fb122440eb..82ad971385 100644
--- a/Modules/AssetPipelineEditor/AssetPostprocessors/SketchupMaterialDescriptionPreprocessor.cs
+++ b/Modules/AssetPipelineEditor/AssetPostprocessors/SketchupMaterialDescriptionPreprocessor.cs
@@ -12,8 +12,8 @@ namespace UnityEditor.AssetImporters
     [MovedFrom("UnityEditor.Experimental.AssetImporters")]
     public class SketchupMaterialDescriptionPreprocessor : AssetPostprocessor
     {
-        static readonly uint k_Version = 1;
-        static readonly int k_Order = 1;
+        static readonly uint k_Version = 2;
+        static readonly int k_Order = -990;
         public override uint GetVersion()
         {
             return k_Version;
diff --git a/Modules/AssetPipelineEditor/AssetPostprocessors/ThreeDSMaterialDescriptionPreprocessor.cs b/Modules/AssetPipelineEditor/AssetPostprocessors/ThreeDSMaterialDescriptionPreprocessor.cs
index eae41e4ddf..2b0dd163b3 100644
--- a/Modules/AssetPipelineEditor/AssetPostprocessors/ThreeDSMaterialDescriptionPreprocessor.cs
+++ b/Modules/AssetPipelineEditor/AssetPostprocessors/ThreeDSMaterialDescriptionPreprocessor.cs
@@ -12,8 +12,8 @@ namespace UnityEditor.AssetImporters
     [MovedFrom("UnityEditor.Experimental.AssetImporters")]
     public class ThreeDSMaterialDescriptionPreprocessor : AssetPostprocessor
     {
-        static readonly uint k_Version = 1;
-        static readonly int k_Order = 1;
+        static readonly uint k_Version = 2;
+        static readonly int k_Order = -990;
         public override uint GetVersion()
         {
             return k_Version;
diff --git a/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.bindings.cs b/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.bindings.cs
index 62b99e0a2c..4c62f99653 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.bindings.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.bindings.cs
@@ -4,6 +4,7 @@
 
 using UnityEngine;
 using UnityEngine.Bindings;
+using UnityEngine.Scripting;
 
 namespace UnityEditor.AssetImporters
 {
@@ -11,13 +12,13 @@ namespace UnityEditor.AssetImporters
     public abstract partial class AssetImporterEditor
     {
         [FreeFunction]
-        private static extern Object CreateOrReloadInspectorCopy(int instanceID);
+        private static extern Object CreateOrReloadInspectorCopy(int instanceID, Editor editor);
         [FreeFunction]
         private static extern void SaveUserData(int instanceID, Object userData);
         [FreeFunction]
-        private static extern bool ReleaseInspectorCopy(int instanceID);
+        private static extern bool ReleaseInspectorCopy(int instanceID, Editor editor);
         [FreeFunction]
-        private static extern void FixCacheCount(int instanceID, int count);
+        private static extern void FixCacheCount(int instanceID, int[] editors);
         [FreeFunction]
         private static extern int GetInspectorCopyCount(int instanceID);
         [FreeFunction("IsMetaDataSerializationEqual")]
@@ -28,7 +29,16 @@ public abstract partial class AssetImporterEditor
         private static extern void UpdateSavedData([NotNull] Object source);
         [FreeFunction]
         private static extern void FixSavedAssetbundleSettings(int instanceID, PropertyModification[] assetBundleProperties);
-        [FreeFunction]
-        private static extern void CheckForInspectorCopyBackingData([NotNull] Object source);
+
+        [UsedByNativeCode]
+        private static void UpdateUnsavedChangesState(Editor editor)
+        {
+            if (editor is AssetImporterEditor importerEditor)
+            {
+                importerEditor.serializedObject.Update();
+                importerEditor.extraDataSerializedObject?.Update();
+                importerEditor.hasUnsavedChanges = importerEditor.HasModified();
+            }
+        }
     }
 }
diff --git a/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.cs b/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.cs
index cfb9fad12b..9f48548260 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/AssetImporterEditor.cs
@@ -50,17 +50,6 @@ void UpdateTargetDirtyCount()
             {
                 if (m_Editor != null)
                 {
-                    // When coming back from a target reload
-                    // this is the very first place we can catch mismatching saved data and fix them.
-                    if (m_Editor.m_TargetsReloaded)
-                    {
-                        SaveTargetDirtyCount();
-                        m_Editor.m_TargetsReloaded = false;
-                        for (int i = 0; i < m_Editor.targets.Length; i++)
-                            UpdateSavedData(m_Editor.targets[i]);
-                        return;
-                    }
-
                     if (m_TargetDirtyCount != null)
                     {
                         for (int i = 0; i < m_Editor.targets.Length; i++)
@@ -117,25 +106,17 @@ void SaveTargetDirtyCount()
             }
         }
 
-        static class Styles
+        static partial class Styles
         {
             public static string localizedTitleString = L10n.Tr("{0} Import Settings");
 
-            public static string unappliedSettingTitle = L10n.Tr("Unapplied import settings");
             public static string applyButton = L10n.Tr("Apply");
-            public static string cancelButton = L10n.Tr("Cancel");
             public static string revertButton = L10n.Tr("Revert");
             public static string unappliedSettingSingleAsset = L10n.Tr("Unapplied import settings for \'{0}\'");
             public static string unappliedSettingMultipleAssets = L10n.Tr("Unapplied import settings for \'{0}\' files");
             public static string unableToAppliedMessage = L10n.Tr("Your changes might contain errors and cannot be applied. \nYou can either \'Revert\' the changes, or hit \'Cancel\' to go back and fix the errors.");
-
-            public static GUIContent ImporterSelection = EditorGUIUtility.TrTextContent("Importer");
-            public static string defaultImporterName = L10n.Tr("{0} (Default)");
         }
 
-        // list of asset hashes. We need to force reload the inspector in case the asset changed on disk.
-        Hash128[] m_AssetHashes;
-
         // Target asset values, these are the main imported object Editor and targets.
         Editor m_AssetEditor;
         protected internal Object[] assetTargets { get { return m_AssetEditor != null ? m_AssetEditor.targets : null; } }
@@ -181,42 +162,12 @@ protected ExtraDataSerializedObject extraDataSerializedObject
         // This allow Importers to ignore the Apply/Revert mechanism and save their changes each update like normal Editor.
         protected virtual bool needsApplyRevert => !m_InstantApply && !EditorUtility.IsHiddenInInspector(target);
 
-        // we need to keep a list of unreleased instances in case the user cancel the de-selection
-        // we are using these instances to keep the same apply/revert status with the forced re-selection
-        static List<int> s_UnreleasedInstances;
         List<int> m_TargetsInstanceID;
         // Check to make sure Users implemented their Inspector correctly for the Cancel deselection mechanism.
         bool m_ApplyRevertGUICalled;
         // Adding a check on OnEnable to make sure users call the base class, as it used to do nothing.
         bool m_OnEnableCalled;
 
-        bool m_CopySaved = false;
-        // Check on the Inspector status to identify the reason the AssetImporterEditor is being Disabled.
-        // If the Inspector is null, it has been closed and need to be re-created if Cancel is pressed.
-        // If the Inspector is not null but was Locked, then just force the list of locked Object back.
-        // If the Inspector is not null and not Locked, then change Selection.Object list back.
-        InspectorWindow m_Inspector;
-        bool m_HasInspectorBeenSeenLocked = false;
-        bool m_TargetsReloaded = false;
-
-        // Support for importer overrides
-        List<Type> m_AvailableImporterTypes;
-        const int k_MultipleSelectedImporterTypes = -1;
-        int m_SelectedImporterType = k_MultipleSelectedImporterTypes;
-        string[] m_AvailableImporterTypesOptions = {};
-        List<string> m_SelectedAssetsPath = new List<string>();
-
-        // Support for postprocessors display
-        struct PostprocessorInfo
-        {
-            public string Name;
-            public string[] Methods;
-            public bool Expanded;
-        }
-        List<PostprocessorInfo> m_Postprocessors;
-        ReorderableList m_PostprocessorUI;
-        SavedBool m_ProcessorsAreExpanded;
-
         // Called from ActiveEditorTracker.cpp to setup the target editor once created before Awake and OnEnable of the Editor.
         internal void InternalSetAssetImporterTargetEditor(Object editor)
         {
@@ -250,108 +201,56 @@ void CheckExtraDataArray()
             }
         }
 
-        // Called from a various number of places, like after an assembly reload or when the Editor gets created.
-        internal sealed override void InternalSetTargets(Object[] t)
+        void InitializeUnsavedChangesCache()
         {
-            base.InternalSetTargets(t);
+            var editors = Resources.FindObjectsOfTypeAll(this.GetType()).Cast<AssetImporterEditor>().ToList();
 
-            if (m_CopySaved) // coming back from an assembly reload or asset re-import
-            {
-                if (extraDataType != null && m_ExtraDataTargets != null) // we need to recreate the user custom array
-                {
-                    // just get back the data from customSerializedData array, it gets serialized and reconstructed properly
-                    m_ExtraDataTargets = extraDataSerializedObject.targetObjects;
-                }
-                ReloadTargets(AssetWasUpdated());
-            }
-            else // newly created editor
+            CheckExtraDataArray();
+            var loadedIds = new List<int>(targets.Length);
+            for (int i = 0; i < targets.Length; ++i)
             {
-                var editors = Resources.FindObjectsOfTypeAll(this.GetType()).Cast<AssetImporterEditor>();
-
-                CheckExtraDataArray();
-                var loadedIds = new List<int>(t.Length);
-                for (int i = 0; i < t.Length; ++i)
+                int instanceID = targets[i].GetInstanceID();
+                loadedIds.Add(instanceID);
+                var extraData = CreateOrReloadInspectorCopy(instanceID, this);
+                if (m_ExtraDataTargets != null)
                 {
-                    int instanceID = t[i].GetInstanceID();
-                    loadedIds.Add(instanceID);
-                    var extraData = CreateOrReloadInspectorCopy(instanceID);
-                    if (m_ExtraDataTargets != null)
+                    // we got the data from another instance
+                    if (extraData != null)
+                        m_ExtraDataTargets[i] = extraData;
+                    else
                     {
-                        // we got the data from another instance
-                        if (extraData != null)
-                            m_ExtraDataTargets[i] = extraData;
-                        else
-                        {
-                            m_ExtraDataTargets[i] = ScriptableObject.CreateInstance(extraDataType);
-                            m_ExtraDataTargets[i].hideFlags = HideFlags.DontUnloadUnusedAsset | HideFlags.DontSaveInEditor;
-                            InitializeExtraDataInstance(m_ExtraDataTargets[i], i);
-                            SaveUserData(instanceID, m_ExtraDataTargets[i]);
-                        }
+                        m_ExtraDataTargets[i] = ScriptableObject.CreateInstance(extraDataType);
+                        m_ExtraDataTargets[i].hideFlags = HideFlags.DontUnloadUnusedAsset | HideFlags.DontSaveInEditor;
+                        InitializeExtraDataInstance(m_ExtraDataTargets[i], i);
+                        SaveUserData(instanceID, m_ExtraDataTargets[i]);
                     }
+                }
 
-                    // proceed to an editor count check to make sure we have the proper number of instances saved.
-                    // If it is not the case, then a dispose was not done properly.
-                    int count = editors.Count(e => !Unsupported.IsDestroyScriptableObject(e) && e.targets.Contains(t[i]));
-                    if (s_UnreleasedInstances != null)
+                // proceed to an editor count check to make sure we have the proper number of instances saved.
+                // If it is not the case, then a dispose was not done properly.
+                // We are selecting all Editor instances already enabled and ourselves.
+                // This is because when coming back from an assembly reload,
+                // the Editors already exist but get removed from the cache in their OnDisable, so we don't count them until its their turn to be Enabled back.
+                var allEditors = editors.Where(e => e == this || (e.m_OnEnableCalled && e.targets.Contains(targets[i]))).Select(e => e.GetInstanceID()).ToArray();
+                var instances = GetInspectorCopyCount(instanceID);
+                if (allEditors.Length != instances)
+                {
+                    if (!CanEditorSurviveAssemblyReload())
                     {
-                        count += s_UnreleasedInstances.Count(id => id == instanceID);
+                        Debug.LogError(
+                            $"The previous instance of {GetType()} was not un-loaded properly. The script has to be declared in a file with the same name.");
                     }
-                    var instances = GetInspectorCopyCount(instanceID);
-                    if (count != instances)
+                    else
                     {
-                        if (!CanEditorSurviveAssemblyReload())
-                        {
-                            Debug.LogError($"The previous instance of {GetType()} was not un-loaded properly. The script has to be declared in a file with the same name.");
-                        }
-                        else
-                        {
-                            Debug.LogError($"The previous instance of {GetType()} has not been disposed correctly. Make sure you are calling base.OnDisable() in your AssetImporterEditor implementation.");
-                        }
-
-                        // Fix the cache count so it does not fail anymore.
-                        FixCacheCount(instanceID, count);
+                        Debug.LogError(
+                            $"The previous instance of {GetType()} has not been disposed correctly. Make sure you are calling base.OnDisable() in your AssetImporterEditor implementation.");
                     }
-                }
 
-                // Clean-up previous instances now that we reloaded the copies
-                if (s_UnreleasedInstances != null)
-                {
-                    for (var index = s_UnreleasedInstances.Count - 1; index >= 0; index--)
-                    {
-                        var copy = s_UnreleasedInstances[index];
-                        if (loadedIds.Contains(copy))
-                        {
-                            ReleaseInspectorCopy(copy);
-                            s_UnreleasedInstances.RemoveAt(index);
-                        }
-                    }
+                    // Fix the cache count so it does not fail anymore.
+                    FixCacheCount(instanceID, allEditors);
                 }
-
-                m_TargetsInstanceID = loadedIds;
-                m_CopySaved = true;
-            }
-        }
-
-        void FixInspectorCache()
-        {
-            bool instanceNull = false;
-            // make sure underlying data still match saved data
-            for (int i = 0; i < targets.Length; i++)
-            {
-                // targets[i] may be null if the importer/asset was destroyed during an assembly reload
-                if (targets[i] != null)
-                    CheckForInspectorCopyBackingData(targets[i]);
-                else
-                    instanceNull = true;
-            }
-
-            // case 1153082 - Do not Update the serializedObject if at least one instance is null.
-            // The editor will be destroyed and rebuilt anyway so it's fine to ignore it.
-            if (!instanceNull)
-            {
-                extraDataSerializedObject?.Update();
-                serializedObject.Update();
             }
+            m_TargetsInstanceID = loadedIds;
         }
 
         void FixImporterAssetbundleName(string arg1, string arg2)
@@ -390,12 +289,6 @@ protected virtual void InitializeExtraDataInstance(Object extraData, int targetI
             throw new NotImplementedException("InitializeExtraDataInstance must be implemented when extraDataType is overridden.");
         }
 
-        // prevent application quit if user cancel the setting changes apply/revert
-        bool ApplicationWantsToQuit()
-        {
-            return CheckForApplyOnClose();
-        }
-
         internal override string targetTitle
         {
             get
@@ -439,69 +332,6 @@ public override void DrawPreview(Rect previewArea)
         //If you want to use the Importer DrawPreview, then override useAssetDrawPreview to false.
         protected virtual bool useAssetDrawPreview { get { return true; } }
 
-        private void DrawImporterSelectionPopup()
-        {
-            if (m_AvailableImporterTypes.Count < 2)
-                return;
-            var mixed = EditorGUI.showMixedValue;
-            EditorGUI.showMixedValue = m_SelectedImporterType == k_MultipleSelectedImporterTypes;
-            GUILayout.Label(Styles.ImporterSelection);
-            var newSelection = EditorGUILayout.Popup(m_SelectedImporterType, m_AvailableImporterTypesOptions);
-            if (newSelection != m_SelectedImporterType)
-            {
-                if (CheckForApplyOnClose(false))
-                {
-                    // TODO : this should probably be handled by the AssetDatabase code when restoring selection?
-                    m_SelectedAssetsPath = assetTargets.Select(AssetDatabase.GetAssetPath).ToList();
-                    EditorApplication.delayCall += () =>
-                    {
-                        var loaded = m_SelectedAssetsPath.Select(AssetDatabase.LoadMainAssetAtPath);
-                        if (m_HasInspectorBeenSeenLocked)
-                            m_Inspector.SetObjectsLocked(loaded.ToList());
-                        else
-                            Selection.objects = loaded.ToArray();
-                    };
-                    AssetDatabase.StartAssetEditing();
-
-                    foreach (var importer in targets.Cast<AssetImporter>())
-                    {
-                        Undo.RegisterImporterUndo(importer.assetPath, string.Empty);
-                        //When selecting an override, set it as an override, when selecting the default importer, clear the override
-                        if(m_AvailableImporterTypes[newSelection] != AssetDatabase.GetDefaultImporter(importer.assetPath))
-                            AssetDatabase.SetImporterOverrideInternal(importer.assetPath, m_AvailableImporterTypes[newSelection]);
-                        else
-                            AssetDatabase.ClearImporterOverride(importer.assetPath);
-                    }
-
-                    AssetDatabase.StopAssetEditing();
-                    GUIUtility.ExitGUI();
-                }
-            }
-            EditorGUI.showMixedValue = mixed;
-        }
-
-        void InitializeAvailableImporters()
-        {
-            m_AvailableImporterTypes = new List<Type>(1);
-
-            if (assetTarget == null)
-                return;
-
-            var targetsPaths = targets.OfType<AssetImporter>().Select(t => t.assetPath);
-
-            var typeLists = targetsPaths.Select(AssetDatabase.GetAvailableImporters).ToList();
-            m_AvailableImporterTypes.AddRange(typeLists.Aggregate(
-                new HashSet<Type>(typeLists.First()),
-                (h, e) =>
-                {
-                    h.IntersectWith(e);
-                    return h;
-                }));
-
-            var defaultImporter = targetsPaths.Select(AssetDatabase.GetDefaultImporter).First();
-            m_AvailableImporterTypesOptions = m_AvailableImporterTypes.Select(a => a == defaultImporter ? string.Format(Styles.defaultImporterName, defaultImporter.FullName) : a.FullName).ToArray();
-        }
-
         internal override void OnHeaderControlsGUI()
         {
             DrawImporterSelectionPopup();
@@ -527,31 +357,22 @@ internal override void OnHeaderIconGUI(Rect iconRect)
         // Let asset importers decide if the imported object should be shown as a separate editor or not
         public virtual bool showImportedObject { get { return true; } }
 
+        protected virtual void Awake()
+        {
+        }
+
         public virtual void OnEnable()
         {
-            EditorApplication.wantsToQuit += ApplicationWantsToQuit;
-            AssemblyReloadEvents.afterAssemblyReload += FixInspectorCache;
             AssetImporterEditorPostProcessAsset.OnAssetbundleNameChanged += FixImporterAssetbundleName;
 
             InitializeAvailableImporters();
-            if (m_AvailableImporterTypes.Count > 0)
-            {
-                var selection = targets
-                    .Select(t => t.GetType())
-                    .Select(t => m_AvailableImporterTypes.IndexOf(t))
-                    .Distinct();
-                if (selection.Count() > 1)
-                {
-                    m_SelectedImporterType = k_MultipleSelectedImporterTypes;
-                }
-                else
-                {
-                    m_SelectedImporterType = selection.First();
-                }
-            }
-
+            InitializeUnsavedChangesCache();
             InitializePostprocessors();
 
+            saveChangesMessage = targets.Length == 1
+                ? string.Format(Styles.unappliedSettingSingleAsset, GetAssetPaths().First())
+                : string.Format(Styles.unappliedSettingMultipleAssets, targets.Length);
+
             m_OnEnableCalled = true;
             // Forces the inspector as dirty allows us to make sure the OnInspectorGUI has been called
             // at least once in the OnDisable in order to show the ApplyRevertGUI error.
@@ -560,8 +381,6 @@ public virtual void OnEnable()
 
         public virtual void OnDisable()
         {
-            EditorApplication.wantsToQuit -= ApplicationWantsToQuit;
-            AssemblyReloadEvents.afterAssemblyReload -= FixInspectorCache;
             AssetImporterEditorPostProcessAsset.OnAssetbundleNameChanged -= FixImporterAssetbundleName;
 
             if (!m_OnEnableCalled)
@@ -576,119 +395,20 @@ public virtual void OnDisable()
                 Debug.LogError($"{this.GetType().Name}.OnInspectorGUI must call ApplyRevertGUI to avoid unexpected behaviour.");
             }
 
-            // When destroying the inspector check if we have any unapplied modifications
-            // and apply them.
-            if (Unsupported.IsDestroyScriptableObject(this))
-            {
-                if (!CheckForApplyOnClose())
-                {
-                    // we need to force back the current tracker to our assetTargets
-                    if (!IsClosingInspector())
-                    {
-                        if (m_HasInspectorBeenSeenLocked)
-                            m_Inspector.SetObjectsLocked(new List<Object>(assetTargets));
-                        else
-                            Selection.objects = assetTargets;
-                        // For some reason the InspectorWindow does not repaint after this change anymore if the selection was reverted from null.
-                        EditorApplication.delayCall += InspectorWindow.RefreshInspectors;
-                    }
-                    else
-                    {
-                        var inspector = ScriptableObject.CreateInstance<InspectorWindow>();
-                        if (m_HasInspectorBeenSeenLocked)
-                            inspector.SetObjectsLocked(new List<Object>(assetTargets));
-                        else
-                            Selection.objects = assetTargets;
-                        inspector.Show(true);
-                    }
-
-                    if (s_UnreleasedInstances == null)
-                    {
-                        s_UnreleasedInstances = new List<int>();
-                    }
-                    foreach (var t in m_TargetsInstanceID)
-                    {
-                        s_UnreleasedInstances.Add(t);
-                    }
-                }
-                else
-                {
-                    foreach (var t in m_TargetsInstanceID)
-                    {
-                        ReleaseInspectorCopy(t);
-                    }
-                }
-            }
-
             m_OnEnableCalled = false;
             m_ApplyRevertGUICalled = false;
-        }
-
-        private void InitializePostprocessors()
-        {
-            /*
-             * Combine Dynamic and Static Postprocessors into one ordered list - the user is unlikely to be interested in *how* we're registering the Assets Postprocessors under the hood.
-             */
-            SortedSet<AssetPostprocessor.PostprocessorInfo> allAssetImportProcessors = new SortedSet<AssetPostprocessor.PostprocessorInfo>(new AssetPostprocessingInternal.CompareAssetImportPriority());
-            allAssetImportProcessors.UnionWith(((AssetImporter)target).GetDynamicPostprocessors());
-            allAssetImportProcessors.UnionWith(AssetImporter.GetStaticPostprocessors(target.GetType()).Where(t => t.Type.Assembly != typeof(AssetImporter).Assembly));
-
-            m_Postprocessors = new List<PostprocessorInfo>();
-            foreach (var processor in allAssetImportProcessors)
-            {
-                m_Postprocessors.Add(new PostprocessorInfo()
-                {
-                    Expanded = false,
-                    Methods = processor.Methods,
-                    Name = processor.Type.FullName
-                });
-            }
-
-            m_ProcessorsAreExpanded = new SavedBool("AssetImporterEditor_DisplayProcessors", true);
-            m_PostprocessorUI = new ReorderableList(m_Postprocessors, typeof(string), false, true, false, false)
-            {
-                elementHeightCallback = index => m_Postprocessors[index].Expanded ? EditorGUIUtility.singleLineHeight * (m_Postprocessors[index].Methods.Length + 1) + 3f : EditorGUIUtility.singleLineHeight + 3f,
-                drawElementCallback = DrawPostprocessorElement,
-                headerHeight = ReorderableList.Defaults.minHeaderHeight,
-                m_IsEditable = false,
-                multiSelect = false,
-                footerHeight = ReorderableList.Defaults.minHeaderHeight,
-            };
-        }
-
-        void DrawPostprocessorElement(Rect rect, int index, bool active, bool focused)
-        {
-            EditorGUI.indentLevel++;
 
-            var processor = m_Postprocessors[index];
-            rect.yMax = rect.yMin + EditorGUIUtility.singleLineHeight;
-            if (Event.current.type == EventType.ContextClick && rect.Contains(Event.current.mousePosition))
+            foreach (var t in m_TargetsInstanceID)
             {
-                Event.current.Use();
-                GenericMenu pm = new GenericMenu();
-                pm.AddItem(new GUIContent("Copy"), false, RightClickPostprocessor, processor.Name);
-                pm.ShowAsContext();
+                ReleaseInspectorCopy(t, this);
             }
 
-            processor.Expanded = EditorGUI.Foldout(rect, processor.Expanded, m_Postprocessors[index].Name, true);
-            if (processor.Expanded)
+            // Let's make sure everything get forced apply in case the Editor instance is destroyed with pending changes.
+            // The changes are made in the Importer instance already anyway and will be pickup at a random time otherwise.
+            if (hasUnsavedChanges)
             {
-                EditorGUI.indentLevel++;
-                foreach (var method in processor.Methods)
-                {
-                    rect.y += EditorGUIUtility.singleLineHeight;
-                    EditorGUI.LabelField(rect, method);
-                }
-                EditorGUI.indentLevel--;
+                SaveChanges();
             }
-            m_Postprocessors[index] = processor;
-
-            EditorGUI.indentLevel--;
-        }
-
-        static void RightClickPostprocessor(object userdata)
-        {
-            EditorGUIUtility.systemCopyBuffer = (string)userdata;
         }
 
         bool CanEditorSurviveAssemblyReload()
@@ -701,100 +421,6 @@ bool CanEditorSurviveAssemblyReload()
             }
         }
 
-        bool IsClosingInspector()
-        {
-            return m_ApplyRevertGUICalled && (m_Inspector == null || !InspectorWindow.GetInspectors().Contains(m_Inspector));
-        }
-
-        bool CheckForApplyOnClose(bool isQuitting = false)
-        {
-            if (!needsApplyRevert)
-                return true;
-
-            // I've tried to do a smart system that only apply/re-import changed files
-            // But because users can override HasModified and have custom changes to any selected files
-            // We cannot make sure only some files changed and not all...
-            // So we are selecting the list of files we may have to re-import (last inspector and hash not changed)
-            // and ask the user to save/discard only those ones.
-            var diskModifiedAssets = AssetWasUpdated().Reverse().ToList();
-            List<string> assetPaths = new List<string>(targets.Length);
-            for (int i = 0; i < targets.Length; i++)
-            {
-                // skip any asset that is part of the disk modified ones
-                if (diskModifiedAssets.Count > 0 && i == diskModifiedAssets[diskModifiedAssets.Count - 1])
-                {
-                    // make sure we are cancelling the changes here so that asset will re-import with previous values.
-                    ResetHash(i);
-                    ReloadAssetData(i);
-                    diskModifiedAssets.RemoveAt(diskModifiedAssets.Count - 1);
-                    continue;
-                }
-                var importer = targets[i] as AssetImporter;
-                // Importer may be null if the selected asset was destroyed
-                if (importer != null)
-                {
-                    int copyCount = GetInspectorCopyCount(importer.GetInstanceID());
-                    if (isQuitting || copyCount == 1)
-                    {
-                        assetPaths.Add(importer.assetPath);
-                    }
-                }
-            }
-
-            if (assetPaths.Count > 0 && HasModified())
-            {
-                // Forces the Reset button action when in batchmode instead of cancel, or the application may not leave when running tests...
-                if (Application.isBatchMode || !Application.isHumanControllingUs)
-                {
-                    ResetValues();
-                    return true;
-                }
-
-                return ShowUnappliedAssetsPopup(assetPaths);
-            }
-            return true;
-        }
-
-        bool ShowUnappliedAssetsPopup(List<string> assetPaths)
-        {
-            var dialogText = assetPaths.Count == 1
-                ? string.Format(Styles.unappliedSettingSingleAsset, assetPaths[0])
-                : string.Format(Styles.unappliedSettingMultipleAssets, assetPaths.Count);
-
-            if (CanApply())
-            {
-                var userChoice = EditorUtility.DisplayDialogComplex(Styles.unappliedSettingTitle, dialogText, Styles.applyButton, Styles.cancelButton, Styles.revertButton);
-                switch (userChoice)
-                {
-                    case 0:
-                        Apply(); // we need to call Apply before re-importing in case the user overridden it.
-                        ImportAssets(assetPaths.ToArray());
-                        break;
-                    case 1:
-                        return false;
-                    case 2:
-                        ResetValues();
-                        break;
-                }
-            }
-            else
-            {
-                dialogText = dialogText + "\n" + Styles.unableToAppliedMessage;
-                if (EditorUtility.DisplayDialog(Styles.unappliedSettingTitle, dialogText, Styles.revertButton, Styles.cancelButton))
-                {
-                    ResetValues();
-                    return true;
-                }
-                return false;
-            }
-            return true;
-        }
-
-        protected virtual void Awake()
-        {
-            ResetHash();
-        }
-
         public override void OnInspectorGUI()
         {
             DoDrawDefaultInspector(serializedObject);
@@ -808,27 +434,6 @@ IEnumerable<string> GetAssetPaths()
             return targets.OfType<AssetImporter>().Select(i => i.assetPath);
         }
 
-        private void ReloadAssetData(int index)
-        {
-            if (extraDataSerializedObject != null)
-            {
-                extraDataSerializedObject.SetIsDifferentCacheDirty();
-                InitializeExtraDataInstance(m_ExtraDataTargets[index], index);
-                extraDataSerializedObject.Update();
-            }
-            UpdateSavedData(targets[index]);
-        }
-
-        protected virtual void ResetValues()
-        {
-            serializedObject.SetIsDifferentCacheDirty();
-            extraDataSerializedObject?.SetIsDifferentCacheDirty();
-            for (int i = 0; i < targets.Length; ++i)
-                RevertObject(targets[i]);
-            extraDataSerializedObject?.Update();
-            serializedObject.Update();
-        }
-
         public virtual bool HasModified()
         {
             serializedObject.ApplyModifiedProperties();
@@ -852,54 +457,57 @@ protected virtual void Apply()
                 UpdateSavedData(targets[i]);
         }
 
-        IEnumerable<int> AssetWasUpdated()
+        public override void SaveChanges()
         {
+            base.SaveChanges();
+
+            Apply();
+            ImportAssets(GetAssetPaths());
+            // Re-import of assets may change settings dur AssetPostprocessors
+            // We have to make sure we update the saved data after the import is done
+            // so users see the real state of the importer once the import is finished.
             for (int i = 0; i < targets.Length; i++)
             {
-                var importer = targets[i] as AssetImporter;
-                // check for AssetImporter being null as it may have been destroyed when closing...
-                if (importer != null && m_AssetHashes[i] != AssetDatabase.GetAssetDependencyHash(importer.assetPath))
-                    yield return i;
+                UpdateSavedData(targets[i]);
             }
         }
 
-        private void ResetHash()
+        [Obsolete("UnityUpgradeable () -> SaveChanges")]
+        protected internal void ApplyAndImport()
         {
-            m_AssetHashes = new Hash128[targets.Length];
-            for (int i = 0; i < targets.Length; i++)
-            {
-                ResetHash(i);
-            }
+            SaveChanges();
         }
 
-        private void ResetHash(int index)
+        public override void DiscardChanges()
         {
-            m_AssetHashes[index] = AssetDatabase.GetAssetDependencyHash(((AssetImporter)targets[index]).assetPath);
+            base.DiscardChanges();
+
+            serializedObject.SetIsDifferentCacheDirty();
+            extraDataSerializedObject?.SetIsDifferentCacheDirty();
+            for (int i = 0; i < targets.Length; ++i)
+                RevertObject(targets[i]);
+            extraDataSerializedObject?.Update();
+            serializedObject.Update();
         }
 
-        protected internal void ApplyAndImport()
+        [Obsolete("UnityUpgradeable () -> DiscardChanges")]
+        protected virtual void ResetValues()
         {
-            Apply();
-            ImportAssets(GetAssetPaths());
-            // Re-import of assets may change settings dur AssetPostprocessors
-            // We have to make sure we update the saved data after the import is done
-            // so users see the real state of the importer once the import is finished.
-            for (int i = 0; i < targets.Length; i++)
-            {
-                UpdateSavedData(targets[i]);
-            }
+            DiscardChanges();
         }
 
         static void ImportAssets(IEnumerable<string> paths)
         {
             // When using the cache server we have to write all import settings to disk first.
             // Then perform the import (Otherwise the cache server will not be used for the import)
+            List<string> toReimport = new List<string>();
             foreach (var path in paths)
             {
-                AssetDatabase.WriteImportSettingsIfDirty(path);
+                if (AssetDatabase.WriteImportSettingsIfDirty(path))
+                    toReimport.Add(path);
             }
             AssetDatabase.StartAssetEditing();
-            foreach (string path in paths)
+            foreach (string path in toReimport)
                 AssetDatabase.ImportAsset(path);
             AssetDatabase.StopAssetEditing();
         }
@@ -909,8 +517,7 @@ protected void RevertButton()
             if (GUILayout.Button(Styles.revertButton))
             {
                 GUI.FocusControl(null);
-                ResetHash();
-                ResetValues();
+                DiscardChanges();
                 if (HasModified())
                     Debug.LogError("Importer reports modified values after reset.");
             }
@@ -918,18 +525,21 @@ protected void RevertButton()
 
         protected bool ApplyButton()
         {
-            if (GUILayout.Button(Styles.applyButton))
+            using (new EditorGUI.DisabledScope(!CanApply()))
             {
-                GUI.FocusControl(null);
-                ApplyAndImport();
-                return true;
+                if (GUILayout.Button(Styles.applyButton))
+                {
+                    GUI.FocusControl(null);
+                    SaveChanges();
+                    return true;
+                }
             }
             return false;
         }
 
         protected virtual bool OnApplyRevertGUI()
         {
-            using (new EditorGUI.DisabledScope(!HasModified()))
+            using (new EditorGUI.DisabledScope(!hasUnsavedChanges))
             {
                 RevertButton();
                 return ApplyButton();
@@ -940,6 +550,8 @@ protected void ApplyRevertGUI()
         {
             m_ApplyRevertGUICalled = true;
 
+            hasUnsavedChanges = HasModified();
+
             if (serializedObject.hasModifiedProperties)
             {
                 Debug.LogWarning("OnInspectorGUI should call serializedObject.Update() at its beginning and serializedObject.ApplyModifiedProperties() before calling ApplyRevertGUI() method.");
@@ -956,32 +568,16 @@ protected void ApplyRevertGUI()
 
             if (needsApplyRevert)
             {
-                if (m_Inspector == null)
-                    m_Inspector = InspectorWindow.GetInspectors().Find(i => i.tracker.activeEditors.Contains(this));
-
-                if (m_Inspector != null)
-                    m_HasInspectorBeenSeenLocked = m_Inspector.isLocked;
-
                 EditorGUILayout.Space();
                 using (new EditorGUILayout.HorizontalScope())
                 {
                     GUILayout.FlexibleSpace();
-
-                    var applied = OnApplyRevertGUI();
-
-                    // If the .meta file was modified on disk, reload UI
-                    var updatedAssets = AssetWasUpdated();
-                    if (updatedAssets.Any() && Event.current.type != EventType.Layout)
-                    {
-                        ReloadTargets(updatedAssets);
-                        applied = false;
-                    }
-
-                    // asset has changed...
                     // need to start rendering again.
-                    if (applied)
-                        //Prevent subsequent GUI calls because the Editor may be running on invalidated data at this point.
+                    if (OnApplyRevertGUI())
+                    {
+                        // If applied is pressed, let's kill the GUI execution to avoid following action obsolete asset data.
                         GUIUtility.ExitGUI();
+                    }
                 }
             }
             else
@@ -990,10 +586,109 @@ protected void ApplyRevertGUI()
                     Apply(); // user may have extra data that needs to be applied back to the target.
             }
 
+            DrawAssetPostprocessors();
+        }
+    }
+
+    [MovedFrom("UnityEditor.Experimental.AssetImporters")]
+    internal class AssetImporterEditorPostProcessAsset : AssetPostprocessor
+    {
+        public static event Action<string, string> OnAssetbundleNameChanged;
+
+        void OnPostprocessAssetbundleNameChanged(string assetPath, string oldName, string newName)
+        {
+            OnAssetbundleNameChanged?.Invoke(assetPath, newName);
+        }
+    }
+
+    // Part of the class handling the AssetPostprocessor UI
+    public abstract partial class AssetImporterEditor
+    {
+        // Support for postprocessors display
+        struct PostprocessorInfo
+        {
+            public string Name;
+            public string[] Methods;
+            public bool Expanded;
+        }
+        List<PostprocessorInfo> m_Postprocessors;
+        ReorderableList m_PostprocessorUI;
+        SavedBool m_ProcessorsAreExpanded;
+
+        private void InitializePostprocessors()
+        {
+            /*
+             * Combine Dynamic and Static Postprocessors into one ordered list - the user is unlikely to be interested in *how* we're registering the Assets Postprocessors under the hood.
+             */
+            SortedSet<AssetPostprocessor.PostprocessorInfo> allAssetImportProcessors = new SortedSet<AssetPostprocessor.PostprocessorInfo>(new AssetPostprocessingInternal.CompareAssetImportPriority());
+            allAssetImportProcessors.UnionWith(((AssetImporter)target).GetDynamicPostprocessors());
+            allAssetImportProcessors.UnionWith(AssetImporter.GetStaticPostprocessors(target.GetType()).Where(t => t.Type.Assembly != typeof(AssetImporter).Assembly));
+
+            m_Postprocessors = new List<PostprocessorInfo>();
+            foreach (var processor in allAssetImportProcessors)
+            {
+                m_Postprocessors.Add(new PostprocessorInfo()
+                {
+                    Expanded = false,
+                    Methods = processor.Methods,
+                    Name = processor.Type.FullName
+                });
+            }
+
+            m_ProcessorsAreExpanded = new SavedBool("AssetImporterEditor_DisplayProcessors", true);
+            m_PostprocessorUI = new ReorderableList(m_Postprocessors, typeof(string), false, true, false, false)
+            {
+                elementHeightCallback = index => m_Postprocessors[index].Expanded ? EditorGUIUtility.singleLineHeight * (m_Postprocessors[index].Methods.Length + 1) + 3f : EditorGUIUtility.singleLineHeight + 3f,
+                drawElementCallback = DrawPostprocessorElement,
+                headerHeight = ReorderableList.Defaults.minHeaderHeight,
+                m_IsEditable = false,
+                multiSelect = false,
+                footerHeight = ReorderableList.Defaults.minHeaderHeight,
+            };
+        }
+
+        void DrawPostprocessorElement(Rect rect, int index, bool active, bool focused)
+        {
+            EditorGUI.indentLevel++;
+
+            var processor = m_Postprocessors[index];
+            rect.yMax = rect.yMin + EditorGUIUtility.singleLineHeight;
+            if (Event.current.type == EventType.ContextClick && rect.Contains(Event.current.mousePosition))
+            {
+                Event.current.Use();
+                GenericMenu pm = new GenericMenu();
+                pm.AddItem(new GUIContent("Copy"), false, RightClickPostprocessor, processor.Name);
+                pm.ShowAsContext();
+            }
+
+            processor.Expanded = EditorGUI.Foldout(rect, processor.Expanded, m_Postprocessors[index].Name, true);
+            if (processor.Expanded)
+            {
+                EditorGUI.indentLevel++;
+                foreach (var method in processor.Methods)
+                {
+                    rect.y += EditorGUIUtility.singleLineHeight;
+                    EditorGUI.LabelField(rect, method);
+                }
+                EditorGUI.indentLevel--;
+            }
+            m_Postprocessors[index] = processor;
+
+            EditorGUI.indentLevel--;
+        }
+
+        static void RightClickPostprocessor(object userdata)
+        {
+            EditorGUIUtility.systemCopyBuffer = (string)userdata;
+        }
+
+        private void DrawAssetPostprocessors()
+        {
             if (m_Postprocessors.Count > 0)
             {
                 EditorGUILayout.Space();
-                m_ProcessorsAreExpanded.value = EditorGUILayout.BeginFoldoutHeaderGroup(m_ProcessorsAreExpanded.value, GUIContent.Temp("Asset PostProcessors"));
+                m_ProcessorsAreExpanded.value = EditorGUILayout.BeginFoldoutHeaderGroup(m_ProcessorsAreExpanded.value,
+                    GUIContent.Temp("Asset PostProcessors"));
                 EditorGUI.EndFoldoutHeaderGroup();
                 if (m_ProcessorsAreExpanded)
                 {
@@ -1001,35 +696,94 @@ protected void ApplyRevertGUI()
                 }
             }
         }
+    }
+
+    // Part of the class handling the ImporterSelection
+    public abstract partial class AssetImporterEditor
+    {
+        static partial class Styles
+        {
+            public static GUIContent ImporterSelection = EditorGUIUtility.TrTextContent("Importer");
+            public static string defaultImporterName = L10n.Tr("{0} (Default)");
+        }
+
+        // Support for importer overrides
+        List<Type> m_AvailableImporterTypes;
+        const int k_MultipleSelectedImporterTypes = -1;
+        int m_SelectedImporterType = k_MultipleSelectedImporterTypes;
+        string[] m_AvailableImporterTypesOptions = {};
 
-        void ReloadTargets(IEnumerable<int> targetIndices)
+        private void DrawImporterSelectionPopup()
         {
-            if (targetIndices.Any())
+            if (m_AvailableImporterTypes.Count < 2)
+                return;
+            var mixed = EditorGUI.showMixedValue;
+            EditorGUI.showMixedValue = m_SelectedImporterType == k_MultipleSelectedImporterTypes;
+            GUILayout.Label(Styles.ImporterSelection);
+            var newSelection = EditorGUILayout.Popup(m_SelectedImporterType, m_AvailableImporterTypesOptions);
+            if (newSelection != m_SelectedImporterType)
             {
-                if (preview != null)
+                // cancel any pending changes if we are switching the importer.
+                // It's going to do a full import with new settings anyway.
+                if (hasUnsavedChanges)
                 {
-                    ReloadPreviewInstances();
-                    Repaint();
+                    DiscardChanges();
                 }
 
-                foreach (var index in targetIndices)
+                AssetDatabase.StartAssetEditing();
+                foreach (var importer in targets.Cast<AssetImporter>())
                 {
-                    ResetHash(index);
-                    ReloadAssetData(index);
+                    Undo.RegisterImporterUndo(importer.assetPath, string.Empty);
+                    //When selecting an override, set it as an override, when selecting the default importer, clear the override
+                    if(m_AvailableImporterTypes[newSelection] != AssetDatabase.GetDefaultImporter(importer.assetPath))
+                        AssetDatabase.SetImporterOverrideInternal(importer.assetPath, m_AvailableImporterTypes[newSelection]);
+                    else
+                        AssetDatabase.ClearImporterOverride(importer.assetPath);
                 }
-                m_TargetsReloaded = true;
+                AssetDatabase.StopAssetEditing();
+                GUIUtility.ExitGUI();
             }
+            EditorGUI.showMixedValue = mixed;
         }
-    }
 
-    [MovedFrom("UnityEditor.Experimental.AssetImporters")]
-    internal class AssetImporterEditorPostProcessAsset : AssetPostprocessor
-    {
-        public static event Action<string, string> OnAssetbundleNameChanged;
-
-        void OnPostprocessAssetbundleNameChanged(string assetPath, string oldName, string newName)
+        void InitializeAvailableImporters()
         {
-            OnAssetbundleNameChanged?.Invoke(assetPath, newName);
+            m_AvailableImporterTypes = new List<Type>(1);
+            if (assetTarget == null)
+                return;
+
+            var targetsPaths = targets.OfType<AssetImporter>().Select(t => t.assetPath);
+
+            var typeLists = targetsPaths.Select(AssetDatabase.GetAvailableImporters).ToList();
+            m_AvailableImporterTypes.AddRange(typeLists.Aggregate(
+                new HashSet<Type>(typeLists.First()),
+                (h, e) =>
+                {
+                    h.IntersectWith(e);
+                    return h;
+                }));
+
+            var defaultImporter = targetsPaths.Select(AssetDatabase.GetDefaultImporter).First();
+            m_AvailableImporterTypesOptions = m_AvailableImporterTypes.Select(a => a == defaultImporter ? string.Format(Styles.defaultImporterName, defaultImporter.FullName) : a.FullName).ToArray();
+
+
+            if (m_AvailableImporterTypes.Count > 0)
+            {
+                var selection = targets
+                    .Select(t => t.GetType())
+                    .Select(t => m_AvailableImporterTypes.IndexOf(t))
+                    .Distinct();
+                if (selection.Count() > 1)
+                {
+                    m_SelectedImporterType = k_MultipleSelectedImporterTypes;
+                }
+                else
+                {
+                    m_SelectedImporterType = selection.First();
+                }
+            }
+
         }
     }
+
 }
diff --git a/Modules/AssetPipelineEditor/ImportSettings/AssetImporterTabbedEditor.cs b/Modules/AssetPipelineEditor/ImportSettings/AssetImporterTabbedEditor.cs
index cbae74cff9..1a81bfe2e2 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/AssetImporterTabbedEditor.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/AssetImporterTabbedEditor.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using UnityEditor.AssetImporters;
 using UnityEngine;
 
@@ -49,9 +50,15 @@ void OnDestroy()
             }
         }
 
+        [Obsolete("UnityUpgradeable () -> DiscardChanges")]
         protected override void ResetValues()
         {
-            base.ResetValues();
+            DiscardChanges();
+        }
+
+        public override void DiscardChanges()
+        {
+            base.DiscardChanges();
 
             if (m_Tabs != null)
             {
diff --git a/Modules/AssetPipelineEditor/ImportSettings/AudioImporterInspector.cs b/Modules/AssetPipelineEditor/ImportSettings/AudioImporterInspector.cs
index 091315a0b4..f3337a3c27 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/AudioImporterInspector.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/AudioImporterInspector.cs
@@ -104,11 +104,11 @@ private void SyncSettingsToBackend()
                     {
                         if (setting.isOverridden)
                         {
-                            audioImporter.SetOverrideSampleSettings(setting.platform.ToString(), setting.settings);
+                            audioImporter.SetOverrideSampleSettings(setting.platform, setting.settings);
                         }
-                        else if (audioImporter.ContainsSampleSettingsOverride(setting.platform.ToString()))
+                        else if (audioImporter.ContainsSampleSettingsOverride(setting.platform))
                         {
-                            audioImporter.ClearSampleSettingOverride(setting.platform.ToString());
+                            audioImporter.ClearSampleSettingOverride(setting.platform);
                         }
                     }
                 }
diff --git a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterClipEditor.cs b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterClipEditor.cs
index 600a0c41f7..d22daf4a16 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterClipEditor.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterClipEditor.cs
@@ -303,8 +303,7 @@ private void SetupDefaultClips()
 
                 arrayElemProp.Next(false);
                 AnimationClipInfoProperties info = new AnimationClipInfoProperties(arrayElemProp);
-                info.name = uniqueName;
-                InitAnimationClipInfoProperties(info, takeInfo);
+                InitAnimationClipInfoProperties(info, takeInfo,uniqueName,0);
             }
             UpdateList();
 
@@ -898,16 +897,23 @@ void AddClip(TakeInfo takeInfo)
             m_ClipAnimations.InsertArrayElementAtIndex(m_ClipAnimations.arraySize);
             var property = m_ClipAnimations.GetArrayElementAtIndex(m_ClipAnimations.arraySize - 1);
             AnimationClipInfoProperties info = new AnimationClipInfoProperties(property);
-
-            info.name = uniqueName;
-            InitAnimationClipInfoProperties(info, takeInfo);
+            InitAnimationClipInfoProperties(info, takeInfo, uniqueName, m_ClipAnimations.arraySize - 1);
             UpdateList();
         }
 
-        void InitAnimationClipInfoProperties(AnimationClipInfoProperties info, TakeInfo takeInfo)
+        void InitAnimationClipInfoProperties(AnimationClipInfoProperties info, TakeInfo takeInfo,string uniqueName,int clipOffset)
         {
             SetupTakeNameAndFrames(info, takeInfo);
-            info.internalID = 0L;
+
+            var animationClipType = UnityType.FindTypeByName("AnimationClip");
+
+            long id = ImportSettingInternalID.FindInternalID(serializedObject, animationClipType, uniqueName);
+
+            info.internalID = id == 0L
+                ? AssetImporter.MakeLocalFileIDWithHash(animationClipType.persistentTypeID, uniqueName, clipOffset)
+                : id;
+
+            info.name = uniqueName;
             info.wrapMode = (int)WrapMode.Default;
             info.loop = false;
             info.orientationOffsetY = 0;
@@ -1050,17 +1056,17 @@ void RegisterListeners()
         {
             //Ensures that the ClipList and the Serialized copy of the clip remain in sync when an Undo/Redo is performed.
             if (!serializedObject.isEditingMultipleObjects)
-                Undo.undoRedoPerformed += HandleUndo;
+                Undo.undoRedoEvent += HandleUndo;
         }
 
         void UnregisterListeners()
         {
             //Ensures that the ClipList and the Serialized copy of the clip remain in sync when an Undo/Redo is performed.
             if (!serializedObject.isEditingMultipleObjects)
-                Undo.undoRedoPerformed -= HandleUndo;
+                Undo.undoRedoEvent -= HandleUndo;
         }
 
-        void HandleUndo()
+        void HandleUndo(in UndoRedoInfo info)
         {
             //Update animations serialization in-case something has changed
             m_ClipAnimations.serializedObject.UpdateIfRequiredOrScript();
diff --git a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs
index b5e146dfb8..39d9a0a38a 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterMaterialEditor.cs
@@ -156,15 +156,20 @@ internal override void OnEnable()
                 EvaluateMaterialExtractionState();
             }
 
-            Undo.undoRedoPerformed += ResetValues;
+            Undo.undoRedoEvent += OnUndoRedo;
         }
 
         internal override void OnDisable()
         {
-            Undo.undoRedoPerformed -= ResetValues;
+            Undo.undoRedoEvent -= OnUndoRedo;
             base.OnDisable();
         }
 
+        private void OnUndoRedo(in UndoRedoInfo info)
+        {
+            ResetValues();
+        }
+
         private void BuildMaterialsCache()
         {
             // do not set if multiple selection.
diff --git a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterRigEditor.cs b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterRigEditor.cs
index e848303885..4bba0e574c 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/ModelImporterRigEditor.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/ModelImporterRigEditor.cs
@@ -145,7 +145,7 @@ static class Styles
             };
             public static GUIContent MaxBonesPerVertex = EditorGUIUtility.TrTextContent("Max Bones/Vertex", "Number of bones that can affect each vertex.");
             public static GUIContent MinBoneWeight = EditorGUIUtility.TrTextContent("Min Bone Weight", "Bone weights smaller than this value are rejected. The remaining weights are scaled to add up to 1.0.");
-            public static GUIContent OptimizeBones = EditorGUIUtility.TrTextContent("Optimize Bones", "Only import bones where they are connected to vertices.");
+            public static GUIContent OptimizeBones = EditorGUIUtility.TrTextContent("Strip Bones", "Only adds bones to SkinnedMeshRenderers that have skin weights assigned to them.");
 
             public static GUIContent UpdateReferenceClips = EditorGUIUtility.TrTextContent("Update reference clips", "Click on this button to update all the @convention files referencing this file. Should set all these files to Copy From Other Avatar, set the source Avatar to this one and reimport all these files.");
 
diff --git a/Modules/AssetPipelineEditor/ImportSettings/PluginImporterInspector.cs b/Modules/AssetPipelineEditor/ImportSettings/PluginImporterInspector.cs
index 1f63306f0d..96f77fab27 100644
--- a/Modules/AssetPipelineEditor/ImportSettings/PluginImporterInspector.cs
+++ b/Modules/AssetPipelineEditor/ImportSettings/PluginImporterInspector.cs
@@ -313,13 +313,22 @@ private void ResetCompatability(ref Compatibility value, Func<PluginImporter, bo
             }
         }
 
+        [Obsolete("UnityUpgradeable () -> DiscardChanges")]
         protected override void ResetValues()
         {
-            base.ResetValues();
+            DiscardChanges();
+        }
+
+        public override void DiscardChanges()
+        {
+            base.DiscardChanges();
 
             m_HasModified = false;
             m_DefineConstraintState.Clear();
 
+            // making sure we apply any serialized changes to the targets so accessing pluginImporter.DefineConstraints will have the updated values
+            serializedObject.ApplyModifiedProperties();
+
             var minSizeOfDefines = importers.Min(x => x.DefineConstraints.Length);
             string[] baseImporterDefineConstraints = importer.DefineConstraints;
 
@@ -410,6 +419,7 @@ public override bool HasModified()
 
         protected override void Apply()
         {
+            serializedObject.ApplyModifiedProperties();
             var constraints = m_DefineConstraintState.Where(x => x.displayValue > Compatibility.Mixed).Select(x => x.name).ToArray();
             foreach (var imp in importers)
             {
@@ -471,14 +481,15 @@ protected override void Awake()
             m_DesktopExtension = new DesktopPluginImporterExtension();
 
             base.Awake();
-
-            ResetValues();
         }
 
         public override void OnEnable()
         {
             base.OnEnable();
 
+            // this method is doing a lot of setup and it used to be called in awake for some old reasons, which is not the case anymore.
+            DiscardChanges();
+
             m_DefineConstraints = new ReorderableList(m_DefineConstraintState, typeof(DefineConstraint), true, false, true, true);
             m_DefineConstraints.drawElementCallback = DrawDefineConstraintListElement;
             m_DefineConstraints.onRemoveCallback = RemoveDefineConstraintListElement;
diff --git a/Modules/AssetPipelineEditor/Public/AudioImporter.bindings.cs b/Modules/AssetPipelineEditor/Public/AudioImporter.bindings.cs
index 006fe24b8d..38cfe5fd70 100644
--- a/Modules/AssetPipelineEditor/Public/AudioImporter.bindings.cs
+++ b/Modules/AssetPipelineEditor/Public/AudioImporter.bindings.cs
@@ -65,6 +65,12 @@ public bool ContainsSampleSettingsOverride(string platform)
                 Internal_ContainsSampleSettingsOverride(platformGroup) :
                 false;
         }
+        public bool ContainsSampleSettingsOverride(BuildTargetGroup platformGroup)
+        {
+            return ValidatePlatform(platformGroup, "AudioImporter.ContainsSampleSettingsOverride") ?
+                Internal_ContainsSampleSettingsOverride(platformGroup) :
+                false;
+        }
 
         [NativeName("ContainsSampleSettingsOverride")]
         internal extern bool Internal_ContainsSampleSettingsOverride(BuildTargetGroup platformGroup);
@@ -75,6 +81,12 @@ public AudioImporterSampleSettings GetOverrideSampleSettings(string platform)
                 Internal_GetOverrideSampleSettings(platformGroup) :
                 defaultSampleSettings;
         }
+        public AudioImporterSampleSettings GetOverrideSampleSettings(BuildTargetGroup platformGroup)
+        {
+            return ValidatePlatform(platformGroup, "AudioImporter.GetOverrideSampleSettings") ?
+                Internal_GetOverrideSampleSettings(platformGroup) :
+                defaultSampleSettings;
+        }
 
         [NativeName("GetTranslatedSettingsForPlatform")]
         internal extern AudioImporterSampleSettings Internal_GetOverrideSampleSettings(BuildTargetGroup platformGroup);
@@ -85,6 +97,13 @@ public bool SetOverrideSampleSettings(string platform, AudioImporterSampleSettin
                 Internal_SetOverrideSampleSettings(platformGroup, settings) :
                 false;
         }
+        public bool SetOverrideSampleSettings(BuildTargetGroup platformGroup, AudioImporterSampleSettings settings)
+        {
+            return ValidatePlatform(platformGroup, "AudioImporter.SetOverrideSampleSettings") ?
+                Internal_SetOverrideSampleSettings(platformGroup, settings) :
+                false;
+        }
+
 
         [NativeName("SetSampleSettingsForPlatform")]
         internal extern bool Internal_SetOverrideSampleSettings(BuildTargetGroup platformGroup, AudioImporterSampleSettings settings);
@@ -95,19 +114,30 @@ public bool ClearSampleSettingOverride(string platform)
                 Internal_ClearSampleSettingOverride(platformGroup) :
                 false;
         }
+        public bool ClearSampleSettingOverride(BuildTargetGroup platformGroup)
+        {
+            return ValidatePlatform(platformGroup, "AudioImporter.ClearSampleSettingOverride") ?
+                Internal_ClearSampleSettingOverride(platformGroup) :
+                false;
+        }
+
+        private static bool ValidatePlatform(string platformName, string methodName, out BuildTargetGroup group)
+        {
+            group = BuildPipeline.GetBuildTargetGroupByName(platformName);
+            return ValidatePlatform(group, methodName);
+        }
 
-        private static bool ValidatePlatform(string platform, string methodName, out BuildTargetGroup group)
+        private static bool ValidatePlatform(BuildTargetGroup platformGroup, string methodName)
         {
-            group = BuildPipeline.GetBuildTargetGroupByName(platform);
-            if (group != BuildTargetGroup.Unknown)
+            if (platformGroup != BuildTargetGroup.Unknown)
                 return true;
 
-            Debug.LogErrorFormat("Unknown platform passed to {0} ({1})", methodName, platform);
+            Debug.LogErrorFormat("Unknown platform passed to {0} ({1})", methodName, platformGroup);
             return false;
         }
 
         [NativeName("ClearSampleSettingOverride")]
-        internal extern bool Internal_ClearSampleSettingOverride(BuildTargetGroup platform);
+        internal extern bool Internal_ClearSampleSettingOverride(BuildTargetGroup platformGroup);
 
         // Force this clip to mono?
         public extern bool forceToMono { get; set; }
diff --git a/Modules/AssetPipelineEditor/Public/PluginImporter.bindings.cs b/Modules/AssetPipelineEditor/Public/PluginImporter.bindings.cs
index 2b852033a5..80e06f26f4 100644
--- a/Modules/AssetPipelineEditor/Public/PluginImporter.bindings.cs
+++ b/Modules/AssetPipelineEditor/Public/PluginImporter.bindings.cs
@@ -2,8 +2,11 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using UnityEditor.Callbacks;
 using UnityEditor.Modules;
 using UnityEditorInternal;
@@ -245,20 +248,75 @@ public string GetPlatformData(string platformName, string key)
 
         extern public string GetEditorData(string key);
 
-        public extern  bool isNativePlugin
+        public extern bool isNativePlugin
         {
             [NativeMethod("IsNativePlugin")]
             get;
         }
 
-        internal extern  DllType dllType
+        internal extern DllType dllType
         {
             get;
         }
 
-        extern public static  PluginImporter[] GetAllImporters();
+        internal extern AssemblyFullName assemblyFullName
+        {
+            get;
+        }
+
+        extern public static PluginImporter[] GetAllImporters();
 
         public extern void SetIcon([NotNull] string className, Texture2D icon);
         public extern Texture2D GetIcon([NotNull] string className);
+
+        private static void LogIgnoredDuplicateAssembly(PluginImporter usedPluginImporter, PluginImporter ignoredPluginImporter)
+        {
+            var assemblyName = Path.GetFileName(usedPluginImporter.assetPath);
+
+            // keep this message here in sync with PrecompiledAssemblies.cpp LogIgnoredDuplicateAssembly
+            var message = $"Duplicate assembly '{assemblyName}' with different versions detected, using '{usedPluginImporter.assetPath}, Version={usedPluginImporter.assemblyFullName.Version}' and ignoring '{ignoredPluginImporter.assetPath}, Version={ignoredPluginImporter.assemblyFullName.Version}'.";
+            Console.WriteLine(message);
+        }
+
+        internal static IEnumerable<PluginImporter> FilterAssembliesByAssemblyVersion(IEnumerable<PluginImporter> plugins)
+        {
+            var managedPlugins = new Dictionary<string, List<(PluginImporter PluginImporter, AssemblyFullName AssemblyFullName)>>();
+            foreach (var plugin in plugins)
+            {
+                if (plugin.dllType == DllType.Native || plugin.dllType == DllType.Unknown)
+                {
+                    yield return plugin;
+                    continue;
+                }
+
+                var assemblyFullName = plugin.assemblyFullName;
+                var assemblyKey = plugin.assemblyFullName.Name;
+                if (!managedPlugins.TryGetValue(assemblyKey, out var list))
+                {
+                    list = new List<(PluginImporter PluginImporter, AssemblyFullName AssemblyFullName)>();
+                    managedPlugins[assemblyKey] = list;
+                }
+                list.Add((plugin, assemblyFullName));
+            }
+
+            foreach (var managedPlugin in managedPlugins.Values)
+            {
+                var bestCandidate = managedPlugin[0];
+                for (int i = 1; i < managedPlugin.Count; i++)
+                {
+                    var currentCandidate = managedPlugin[i];
+                    if (currentCandidate.AssemblyFullName.Version > bestCandidate.AssemblyFullName.Version)
+                    {
+                        LogIgnoredDuplicateAssembly(currentCandidate.PluginImporter, bestCandidate.PluginImporter);
+                        bestCandidate = currentCandidate;
+                    }
+                    else if (currentCandidate.AssemblyFullName.Version != bestCandidate.AssemblyFullName.Version)
+                    {
+                        LogIgnoredDuplicateAssembly(bestCandidate.PluginImporter, currentCandidate.PluginImporter);
+                    }
+                }
+                yield return bestCandidate.PluginImporter;
+            }
+        }
     }
 }
diff --git a/Modules/AssetPipelineEditor/Public/RoslynAdditionalFiles.binding.cs b/Modules/AssetPipelineEditor/Public/RoslynAdditionalFiles.binding.cs
new file mode 100644
index 0000000000..7dcd23fe28
--- /dev/null
+++ b/Modules/AssetPipelineEditor/Public/RoslynAdditionalFiles.binding.cs
@@ -0,0 +1,21 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.IO;
+using UnityEditor.Utils;
+using UnityEngine;
+using UnityEngine.Bindings;
+
+namespace UnityEditor
+{
+    [NativeHeader("Editor/Src/ScriptCompilation/RoslynAnalyzers.bindings.h")]
+    [ExcludeFromPreset]
+    internal sealed class RoslynAdditionalFiles
+    {
+        [FreeFunction("GetAllCachedRoslynAdditionalFilePaths")] internal static extern string[] GetFilePaths();
+        [FreeFunction("GetAllRoslynAdditionalFilePaths")] internal static extern string[] GetAnalyzerAdditionalFilesForTargetAssembly(string analyzerPath, string targetAssemblyPath);
+        [FreeFunction("CacheRoslynAdditionalFiles")] internal static extern void AddAdditionalFiles(string[] additionalFiles);
+    }
+}
diff --git a/Modules/AssetPipelineEditor/Public/RoslynAnalyzerConfig.binding.cs b/Modules/AssetPipelineEditor/Public/RoslynAnalyzerConfig.binding.cs
new file mode 100644
index 0000000000..3f38975735
--- /dev/null
+++ b/Modules/AssetPipelineEditor/Public/RoslynAnalyzerConfig.binding.cs
@@ -0,0 +1,27 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.IO;
+using UnityEditor.Utils;
+using UnityEngine;
+using UnityEngine.Bindings;
+
+namespace UnityEditor
+{
+    [NativeHeader("Editor/Src/ScriptCompilation/RoslynAnalyzerConfig.h")]
+    [ExcludeFromPreset]
+    internal sealed class RoslynAnalyzerConfigFiles
+    {
+        [FreeFunction] internal static extern string[] GetAllAnalyzerConfigs();
+        [FreeFunction("GetAnalyzerConfigRootFolder")] internal static extern string ConfigForRootFolder(string assemblyName);
+        [FreeFunction] internal static extern string GetAnalyzerConfigForAssembly(string assemblyPath);
+
+        internal static string GetAnalyzerConfigRootFolder(string assemblyName)
+        {
+            var ret = ConfigForRootFolder(assemblyName);
+            return ret;
+        }
+    }
+}
diff --git a/Modules/AssetPipelineEditor/Public/RuleSetCache.bindings.cs b/Modules/AssetPipelineEditor/Public/RuleSetCache.bindings.cs
index 289a162fe5..82e8631e75 100644
--- a/Modules/AssetPipelineEditor/Public/RuleSetCache.bindings.cs
+++ b/Modules/AssetPipelineEditor/Public/RuleSetCache.bindings.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using UnityEditor.Utils;
 using UnityEngine;
 using UnityEngine.Bindings;
diff --git a/Modules/Audio/Public/ScriptBindings/Audio.bindings.cs b/Modules/Audio/Public/ScriptBindings/Audio.bindings.cs
index 437abcfec1..296b10e01a 100644
--- a/Modules/Audio/Public/ScriptBindings/Audio.bindings.cs
+++ b/Modules/Audio/Public/ScriptBindings/Audio.bindings.cs
@@ -127,6 +127,7 @@ public enum GamepadSpeakerOutputType
     {
         Speaker = 0,
         Vibration = 1,
+        SecondaryVibration = 2
     }
 
 
diff --git a/Modules/BuildPipeline/Editor/Managed/BuildOutput.cs b/Modules/BuildPipeline/Editor/Managed/BuildOutput.cs
index 710cc54e35..ed037c9043 100644
--- a/Modules/BuildPipeline/Editor/Managed/BuildOutput.cs
+++ b/Modules/BuildPipeline/Editor/Managed/BuildOutput.cs
@@ -47,6 +47,23 @@ public struct ObjectSerializedInfo
         public SerializedLocation rawData { get { return m_RawData; } }
     }
 
+    [Serializable]
+    [UsedByNativeCode]
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ExternalFileReference
+    {
+        [NativeName("filePath")]
+        internal string m_filePath;
+        public string filePath { get { return m_filePath; } }
+
+        [NativeName("type")]
+        internal int m_type;
+        public int type { get { return m_type; } }
+
+        [NativeName("guid")]
+        internal GUID m_guid;
+        public GUID guid { get { return m_guid; } }
+    }
 
     [Serializable]
     [UsedByNativeCode]
@@ -68,5 +85,9 @@ public struct WriteResult
         [NativeName("includedSerializeReferenceFQN")]
         internal String[] m_IncludedSerializeReferenceFQN;
         public ReadOnlyCollection<String> includedSerializeReferenceFQN { get { return Array.AsReadOnly(m_IncludedSerializeReferenceFQN); } }
+
+        [NativeName("externalFileReferences")]
+        internal ExternalFileReference[] m_ExternalFileReferences;
+        public ReadOnlyCollection<ExternalFileReference> externalFileReferences { get { return Array.AsReadOnly(m_ExternalFileReferences); } }
     }
 }
diff --git a/Modules/BuildPipeline/Editor/Managed/BuildPlayerDataGenerator.cs b/Modules/BuildPipeline/Editor/Managed/BuildPlayerDataGenerator.cs
index 3313ce9c98..f6449f1581 100644
--- a/Modules/BuildPipeline/Editor/Managed/BuildPlayerDataGenerator.cs
+++ b/Modules/BuildPipeline/Editor/Managed/BuildPlayerDataGenerator.cs
@@ -35,10 +35,10 @@ public static List<string> GetStaticSearchPaths(BuildTarget buildTarget)
         {
             var unityAssembliesInternal =
                 EditorCompilationInterface.Instance.PrecompiledAssemblyProvider.GetUnityAssemblies(true, buildTarget);
-            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
+            var namedBuildTarget = NamedBuildTarget.FromActiveSettings(buildTarget);
             var systemReferenceDirectories =
                 MonoLibraryHelpers.GetSystemReferenceDirectories(
-                    PlayerSettings.GetApiCompatibilityLevel(buildTargetGroup));
+                    PlayerSettings.GetApiCompatibilityLevel(namedBuildTarget));
 
             var searchPaths = unityAssembliesInternal.Select(x => Path.GetDirectoryName(x.Path))
                 .Distinct().ToList();
diff --git a/Modules/BuildPipeline/Editor/Managed/ContentBuildInterface.bindings.cs b/Modules/BuildPipeline/Editor/Managed/ContentBuildInterface.bindings.cs
index feec5b941f..9f41d12b51 100644
--- a/Modules/BuildPipeline/Editor/Managed/ContentBuildInterface.bindings.cs
+++ b/Modules/BuildPipeline/Editor/Managed/ContentBuildInterface.bindings.cs
@@ -178,6 +178,7 @@ public static WriteResult WriteSerializedFile(string outputFolder, WriteParamete
             return WriteSerializedFile_Internal(outputFolder, parameters.writeCommand, parameters.settings, parameters.globalUsage, parameters.usageSet, parameters.referenceMap, parameters.preloadInfo, parameters.bundleInfo);
         }
 
+        [NativeThrows]
         static extern WriteResult WriteSerializedFile_Internal(string outputFolder, WriteCommand writeCommand, BuildSettings settings, BuildUsageTagGlobal globalUsage, BuildUsageTagSet usageSet, BuildReferenceMap referenceMap, PreloadInfo preloadInfo, AssetBundleInfo bundleInfo);
 
         public static WriteResult WriteSceneSerializedFile(string outputFolder, WriteSceneParameters parameters)
@@ -194,6 +195,7 @@ public static WriteResult WriteSceneSerializedFile(string outputFolder, WriteSce
             return WriteSceneSerializedFile_Internal(outputFolder, parameters.scenePath, parameters.writeCommand, parameters.settings, parameters.globalUsage, parameters.usageSet, parameters.referenceMap, parameters.preloadInfo, parameters.sceneBundleInfo);
         }
 
+        [NativeThrows]
         static extern WriteResult WriteSceneSerializedFile_Internal(string outputFolder, string scenePath, WriteCommand writeCommand, BuildSettings settings, BuildUsageTagGlobal globalUsage, BuildUsageTagSet usageSet, BuildReferenceMap referenceMap, PreloadInfo preloadInfo, SceneBundleInfo sceneBundleInfo);
 
         public static WriteResult WriteGameManagersSerializedFile(string outputFolder, WriteManagerParameters parameters)
diff --git a/Modules/CloudServicesSettingsEditor/CrashReporting/Managed/CrashReporting.cs b/Modules/CloudServicesSettingsEditor/CrashReporting/Managed/CrashReporting.cs
index 910642e10e..7cade733ff 100644
--- a/Modules/CloudServicesSettingsEditor/CrashReporting/Managed/CrashReporting.cs
+++ b/Modules/CloudServicesSettingsEditor/CrashReporting/Managed/CrashReporting.cs
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Runtime.InteropServices;
 using System.Text;
 using UnityEditor.Connect;
 using UnityEditor.Utils;
@@ -128,7 +129,8 @@ static UploadPlatformConfig GetUploadPlatformConfig()
             }
             else if (Application.platform == RuntimePlatform.OSXEditor)
             {
-                config.UsymtoolPath = Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "macosx", "usymtool");
+                string usymtoolFileName = RuntimeInformation.ProcessArchitecture.ToString().ToLower() == "arm64" ? "usymtoolarm64" :"usymtool";
+                config.UsymtoolPath = Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "macosx", usymtoolFileName);
                 config.LzmaPath = Paths.Combine(EditorApplication.applicationContentsPath, "Tools", "lzma");
                 config.LogFilePath = Paths.Combine(Environment.GetEnvironmentVariable("HOME"), "Library", "Logs", "Unity", "symbol_upload.log");
             }
diff --git a/Modules/ContentLoad/Public/ContentLoad.bindings.cs b/Modules/ContentLoad/Public/ContentLoad.bindings.cs
new file mode 100644
index 0000000000..d6d0c74c25
--- /dev/null
+++ b/Modules/ContentLoad/Public/ContentLoad.bindings.cs
@@ -0,0 +1,201 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+
+using System;
+using System.Runtime.InteropServices;
+using Unity.Collections;
+using UnityEngine.Bindings;
+using UnityEngine;
+using Unity.Jobs;
+using UnityEngine.SceneManagement;
+using Unity.Content;
+
+namespace Unity.Loading
+{
+    enum ContentFileReservedID
+    {
+        None = 0,
+        ResolveReferencesWithPM = 1
+    }
+
+    public enum LoadingStatus
+    {
+        InProgress,
+        Completed,
+        Failed
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ContentFileUnloadHandle
+    {
+        internal JobHandle jobHandle;
+        public bool IsCompleted { get { return jobHandle.IsCompleted; } }
+        public bool WaitForCompletion(int timeoutMs) { return ContentLoadInterface.WaitForJobCompletion(jobHandle, timeoutMs); }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    unsafe public struct ContentFile
+    {
+        internal UInt64 Id;
+
+
+        public ContentFileUnloadHandle UnloadAsync()
+        {
+            ThrowIfInvalidHandle();
+            return ContentLoadInterface.ContentFile_UnloadAsync(this);
+        }
+
+        public UnityEngine.Object[] GetObjects()
+        {
+            ThrowIfNotComplete();
+            return ContentLoadInterface.ContentFile_GetObjects(this);
+        }
+
+        public UnityEngine.Object GetObject(UInt64 localIdentifierInFile)
+        {
+            ThrowIfNotComplete();
+            return ContentLoadInterface.ContentFile_GetObject(this, localIdentifierInFile);
+        }
+
+        private void ThrowIfInvalidHandle()
+        {
+            if (!IsValid)
+                throw new Exception("The ContentFile operation cannot be performed because the handle is invalid. Did you already unload it?");
+        }
+
+        private void ThrowIfNotComplete()
+        {
+            LoadingStatus status = LoadingStatus;
+            if (status == LoadingStatus.Failed)
+                throw new Exception("Cannot use a failed ContentFile operation.");
+            if (status == LoadingStatus.InProgress)
+                throw new Exception("This ContentFile functionality is not supported while loading is in progress");
+        }
+
+        public bool IsValid { get { return ContentLoadInterface.ContentFile_IsHandleValid(this); } }
+
+        public LoadingStatus LoadingStatus {
+            get {
+                ThrowIfInvalidHandle();
+                return ContentLoadInterface.ContentFile_GetLoadingStatus(this);
+            }
+        }
+
+        public bool WaitForCompletion(int timeoutMs)
+        {
+            ThrowIfInvalidHandle();
+            return ContentLoadInterface.WaitForLoadCompletion(this, timeoutMs);
+        }
+
+        public static ContentFile GlobalTableDependency
+        {
+            get { return new ContentFile { Id = (int)ContentFileReservedID.ResolveReferencesWithPM }; }
+        }
+    }
+
+    public enum SceneLoadingStatus
+    {
+        InProgress,
+        WaitingForIntegrate,
+        WillIntegrateNextFrame,
+        Complete,
+        Failed
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ContentSceneParameters
+    {
+        [NativeName("LoadSceneMode")]
+        internal LoadSceneMode m_LoadSceneMode;
+        [NativeName("LocalPhysicsMode")]
+        internal LocalPhysicsMode m_LocalPhysicsMode;
+        [NativeName("AutoIntegrate")]
+        internal bool m_AutoIntegrate;
+
+        public LoadSceneMode loadSceneMode { get { return m_LoadSceneMode; } set { m_LoadSceneMode = value; } }
+        public LocalPhysicsMode localPhysicsMode { get { return m_LocalPhysicsMode; } set { m_LocalPhysicsMode = value; } }
+        public bool autoIntegrate { get { return m_AutoIntegrate; } set { m_AutoIntegrate = value; } }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct ContentSceneFile
+    {
+        internal UInt64 Id;
+        public Scene Scene { get { ThrowIfInvalidHandle(); return ContentLoadInterface.ContentSceneFile_GetScene(this); } }
+
+        public void IntegrateAtEndOfFrame() { ThrowIfInvalidHandle(); ContentLoadInterface.ContentSceneFile_IntegrateAtEndOfFrame(this); }
+        public SceneLoadingStatus Status { get { ThrowIfInvalidHandle(); return ContentLoadInterface.ContentSceneFile_GetStatus(this); } }
+
+        public bool UnloadAtEndOfFrame() { ThrowIfInvalidHandle(); return ContentLoadInterface.ContentSceneFile_UnloadAtEndOfFrame(this); }
+        public bool WaitForLoadCompletion(int timeoutMs) { ThrowIfInvalidHandle(); return ContentLoadInterface.ContentSceneFile_WaitForCompletion(this, timeoutMs); }
+
+        public bool IsValid { get { return ContentLoadInterface.ContentSceneFile_IsHandleValid(this); } }
+
+        private void ThrowIfInvalidHandle()
+        {
+            if (!IsValid)
+                throw new Exception("The ContentSceneFile operation cannot be performed because the handle is invalid. Did you already unload it?");
+        }
+    }
+
+    [NativeHeader("Modules/ContentLoad/Public/ContentLoadFrontend.h")]
+    [StaticAccessor("GetContentLoadFrontend()", StaticAccessorType.Dot)]
+    public static class ContentLoadInterface
+    {
+
+        [NativeThrows]
+        unsafe internal static extern ContentFile LoadContentFileAsync(ContentNamespace nameSpace, string filename, void *dependencies, int dependencyCount, JobHandle dependentFence);
+
+        [NativeThrows]
+        internal extern static ContentFileUnloadHandle ContentFile_UnloadAsync(ContentFile handle);
+
+        internal extern static UnityEngine.Object ContentFile_GetObject(ContentFile handle, UInt64 localIdentifierInFile);
+
+        internal extern static UnityEngine.Object [] ContentFile_GetObjects(ContentFile handle);
+
+        internal extern static LoadingStatus ContentFile_GetLoadingStatus(ContentFile handle);
+
+        internal extern static bool ContentFile_IsHandleValid(ContentFile handle);
+
+        internal extern static ThreadPriority LoadingPriority { get; set; }
+
+        internal extern static bool WaitForLoadCompletion(ContentFile handle, int timeoutMs);
+
+        internal extern static bool WaitForJobCompletion(JobHandle handle, int timeoutMs);
+
+
+        [NativeThrows]
+        extern unsafe internal static ContentSceneFile LoadSceneAsync(ContentNamespace nameSpace, string filename, string sceneName, ContentSceneParameters sceneParams, ContentFile *dependencies, int dependencyCount, JobHandle dependentFence);
+
+        extern internal static Scene ContentSceneFile_GetScene(ContentSceneFile handle);
+        extern internal static SceneLoadingStatus ContentSceneFile_GetStatus(ContentSceneFile handle);
+        [NativeThrows]
+        extern internal static void ContentSceneFile_IntegrateAtEndOfFrame(ContentSceneFile handle);
+
+        extern internal static bool ContentSceneFile_UnloadAtEndOfFrame(ContentSceneFile handle);
+        internal extern static bool ContentSceneFile_IsHandleValid(ContentSceneFile handle);
+        internal extern static bool ContentSceneFile_WaitForCompletion(ContentSceneFile handle, int timeoutMs);
+
+        public static ContentSceneFile LoadSceneAsync(ContentNamespace nameSpace, string filename, string sceneName, ContentSceneParameters sceneParams, NativeArray<ContentFile> dependencies, JobHandle dependentFence = new JobHandle())
+        {
+            unsafe
+            {
+                return LoadSceneAsync(nameSpace, filename, sceneName, sceneParams, (ContentFile*)dependencies.m_Buffer, dependencies.Length, dependentFence);
+            }
+        }
+
+
+        public static ContentFile LoadContentFileAsync(ContentNamespace nameSpace, string filename, NativeArray<ContentFile> dependencies, JobHandle dependentFence = new JobHandle())
+        {
+            unsafe
+            {
+                return ContentLoadInterface.LoadContentFileAsync(nameSpace, filename, dependencies.m_Buffer, dependencies.Length, dependentFence);
+            }
+        }
+
+        public static extern ContentFile[] GetContentFiles(ContentNamespace nameSpace);
+        public static extern ContentSceneFile[] GetSceneFiles(ContentNamespace nameSpace);
+    }
+}
diff --git a/Modules/CrashReporting/CrashReporter.bindings.cs b/Modules/CrashReporting/CrashReporter.bindings.cs
index 05f8972176..9e410baa8d 100644
--- a/Modules/CrashReporting/CrashReporter.bindings.cs
+++ b/Modules/CrashReporting/CrashReporter.bindings.cs
@@ -3,8 +3,11 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Runtime.CompilerServices;
 using UnityEngine.Bindings;
 
+[assembly: InternalsVisibleTo("Unity.Services.CloudDiagnostics")]
+[assembly: InternalsVisibleTo("Unity.Services.CloudDiagnostics.Tests")]
 namespace UnityEngine.CrashReportHandler
 {
     [NativeHeader("Modules/CrashReporting/Public/CrashReporter.h")]
@@ -21,6 +24,9 @@ private CrashReportHandler()
         [NativeThrows]
         public static extern UInt32 logBufferSize { get; set; }
 
+        [NativeThrows]
+        internal static extern string installationIdentifier { get; set; }
+
         [NativeThrows]
         public static extern string GetUserMetadata(string key);
 
diff --git a/Modules/DeviceSimulatorEditor/DeviceListPopup.cs b/Modules/DeviceSimulatorEditor/DeviceListPopup.cs
index 3dab69363a..52f1d0d237 100644
--- a/Modules/DeviceSimulatorEditor/DeviceListPopup.cs
+++ b/Modules/DeviceSimulatorEditor/DeviceListPopup.cs
@@ -10,6 +10,51 @@
 
 namespace UnityEditor.DeviceSimulation
 {
+    internal enum DeviceButtonVisibility { Enabled, Disabled, Hidden}
+
+    internal struct DevicePackageInstallButtonState
+    {
+        public DevicePackageStatus PackageStatus;
+        public Action OnPressed;
+
+        public DeviceButtonVisibility Visibility
+        {
+            get
+            {
+                switch (PackageStatus)
+                {
+                    case DevicePackageStatus.Unavailable:
+                    case DevicePackageStatus.Outdated:
+                        return DeviceButtonVisibility.Enabled;
+                    case DevicePackageStatus.Adding:
+                    case DevicePackageStatus.Updating:
+                        return DeviceButtonVisibility.Disabled;
+                    default:
+                        return DeviceButtonVisibility.Hidden;
+                }
+            }
+        }
+
+        public string Text
+        {
+            get
+            {
+                switch (PackageStatus)
+                {
+                    case DevicePackageStatus.Unavailable:
+                        return "Install Additional Devices";
+                    case DevicePackageStatus.Outdated:
+                        return "Update Devices";
+                    case DevicePackageStatus.Adding:
+                    case DevicePackageStatus.Updating:
+                        return "In Progress...";
+                    default:
+                        return "Invisible Button";
+                }
+            }
+        }
+    }
+
     internal class DeviceListPopup : PopupWindowContent
     {
         private struct IndexedDevice
@@ -48,8 +93,11 @@ public IndexedDevice(int index, DeviceInfo device)
 
         public Action<string> OnSearchInput { get; set; }
 
-        public DeviceListPopup(DeviceInfoAsset[] deviceList, int selectedDeviceIndex, int maximumVisibleDeviceCount, string lastSearchContent)
+        public DevicePackageInstallButtonState DeviceButtonState;
+
+        public DeviceListPopup(DeviceInfoAsset[] deviceList, int selectedDeviceIndex, int maximumVisibleDeviceCount, string lastSearchContent, DevicePackageInstallButtonState deviceButtonState)
         {
+            DeviceButtonState = deviceButtonState;
             m_DeviceList = deviceList;
             m_SelectedDeviceIndex = selectedDeviceIndex;
             m_MaximumVisibleDeviceCount = maximumVisibleDeviceCount;
@@ -102,8 +150,9 @@ private void CalculateScrollPosition()
 
         public override Vector2 GetWindowSize()
         {
+            var buttonVisible = DeviceButtonState.Visibility != DeviceButtonVisibility.Hidden;
             // Add 1 for search filter.
-            return new Vector2(220, (GetVisibleDeviceCount() + 1) * (k_ItemHeight + k_SpaceHeight) + 5);
+            return new Vector2(220, (GetVisibleDeviceCount() + 1 + (buttonVisible ? 1 : 0)) * (k_ItemHeight + k_SpaceHeight) + (buttonVisible ? 10 : 5));
         }
 
         private int GetVisibleDeviceCount()
@@ -149,6 +198,18 @@ public override void OnGUI(Rect rect)
                 EditorGUILayout.EndHorizontal();
             }
             GUI.EndScrollView();
+
+            if (m_FilteredDevices.Count > 0)
+            {
+                EditorGUILayout.Space(visibleRect.height);
+            }
+
+            if (DeviceButtonState.Visibility == DeviceButtonVisibility.Disabled)
+                GUI.enabled = false;
+            if(DeviceButtonState.Visibility != DeviceButtonVisibility.Hidden && GUILayout.Button(new GUIContent(DeviceButtonState.Text, "Install the latest available version of Device Simulator Devices package (com.unity.device-simulator.devices)")))
+                DeviceButtonState.OnPressed?.Invoke();
+
+            GUI.enabled = true;
         }
 
         private void OnDeviceListGUI(int startIndex, int drawDeviceCount, Rect totalRect)
diff --git a/Modules/DeviceSimulatorEditor/DevicePackage.cs b/Modules/DeviceSimulatorEditor/DevicePackage.cs
new file mode 100644
index 0000000000..1021fe7cc1
--- /dev/null
+++ b/Modules/DeviceSimulatorEditor/DevicePackage.cs
@@ -0,0 +1,119 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Linq;
+using UnityEditor.PackageManager;
+using UnityEditor.PackageManager.Requests;
+using UnityEngine;
+
+namespace UnityEditor.DeviceSimulation
+{
+    internal enum DevicePackageStatus { Available, Unavailable, Outdated, Adding, Updating, Unknown, Error }
+
+    internal static class DevicePackage
+    {
+        private static bool s_Initialized;
+        private static DevicePackageStatus s_CurrentStatus = DevicePackageStatus.Unknown;
+
+        private static ListRequest s_ListRequest;
+        private static AddRequest s_AddRequest;
+
+        private static Action<DevicePackageStatus> m_OnPackageStatus;
+        public static event Action<DevicePackageStatus> OnPackageStatus
+        {
+            add
+            {
+                m_OnPackageStatus += value;
+
+                if (!s_Initialized)
+                {
+                    s_Initialized = true;
+                    PackageManager.Events.registeredPackages += OnPackageRegistration;
+                }
+
+                if (s_CurrentStatus != DevicePackageStatus.Unknown)
+                {
+                    m_OnPackageStatus?.Invoke(s_CurrentStatus);
+                }
+                else if (s_ListRequest == null && s_AddRequest == null)
+                {
+                    s_ListRequest = Client.List();
+                    EditorApplication.update += HandleList;
+                }
+            }
+            remove => m_OnPackageStatus -= value;
+        }
+
+        public static void Add()
+        {
+            s_AddRequest = Client.Add("com.unity.device-simulator.devices");
+            EditorApplication.update += HandleAdd;
+
+            SetStatus(DevicePackageStatus.Adding);
+        }
+
+        private static void OnPackageRegistration(PackageRegistrationEventArgs args)
+        {
+            if (args.removed.Any(package => package.name == "com.unity.device-simulator.devices"))
+                SetStatus(DevicePackageStatus.Unavailable);
+
+            var package = args.added.Concat(args.changedTo).FirstOrDefault(package => package.name == "com.unity.device-simulator.devices");
+            if (package != null)
+                SetStatus(GetDevicePackageStatus(package));
+        }
+
+        private static void HandleList()
+        {
+            if (!s_ListRequest.IsCompleted)
+                return;
+
+            EditorApplication.update -= HandleList;
+
+            if (s_ListRequest.Status == StatusCode.Success)
+            {
+                var package = s_ListRequest.Result.FirstOrDefault(package => package.name == "com.unity.device-simulator.devices");
+                SetStatus(GetDevicePackageStatus(package));
+            }
+            else if (s_ListRequest.Status == StatusCode.Failure)
+            {
+                SetStatus(DevicePackageStatus.Error);
+            }
+
+            s_ListRequest = null;
+        }
+
+        private static void HandleAdd()
+        {
+            if (!s_AddRequest.IsCompleted)
+                return;
+
+            EditorApplication.update -= HandleAdd;
+
+            if (s_AddRequest.Status == StatusCode.Success)
+                SetStatus(DevicePackageStatus.Available);
+            else if (s_AddRequest.Status == StatusCode.Failure)
+            {
+                Debug.LogError("Failed installing Device Simulator Devices (com.unity.device-simulator.devices) package. Try installing it from the Package Manager window.");
+                SetStatus(DevicePackageStatus.Error);
+            }
+
+            s_AddRequest = null;
+        }
+
+        private static void SetStatus(DevicePackageStatus newStatus)
+        {
+            s_CurrentStatus = newStatus;
+            m_OnPackageStatus?.Invoke(s_CurrentStatus);
+        }
+
+        private static DevicePackageStatus GetDevicePackageStatus(PackageManager.PackageInfo packageInfo)
+        {
+            if (packageInfo == null)
+                return DevicePackageStatus.Unavailable;
+            return packageInfo.version == packageInfo.versions.latestCompatible ? DevicePackageStatus.Available : DevicePackageStatus.Outdated;
+        }
+
+    }
+}
diff --git a/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs b/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs
index 6c3f5b1178..5035e6683b 100644
--- a/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs
+++ b/Modules/DeviceSimulatorEditor/DeviceSimulatorMain.cs
@@ -22,6 +22,7 @@ internal class DeviceSimulatorMain : IDisposable
         public PlayModeView playModeView { get; }
 
         public Vector2 targetSize => new Vector2(m_ScreenSimulation.currentResolution.width, m_ScreenSimulation.currentResolution.height);
+        public ScreenSimulation ScreenSimulation => m_ScreenSimulation;
 
         public RenderTexture displayTexture
         {
@@ -115,6 +116,7 @@ public void InitSimulation()
             m_TouchInput.SetDevice(m_ScreenSimulation, currentDevice.deviceInfo.IsAndroidDevice());
 
             m_UserInterface.OnSimulationStart(m_ScreenSimulation);
+            m_ScreenSimulation.ApplyChanges();
             InitScreenUI();
 
             m_ApplicationSimulation.OnSimulationStart(currentDevice.deviceInfo);
diff --git a/Modules/DeviceSimulatorEditor/Shims/ScreenSimulation.cs b/Modules/DeviceSimulatorEditor/Shims/ScreenSimulation.cs
index da07c7a776..8ad953b68b 100644
--- a/Modules/DeviceSimulatorEditor/Shims/ScreenSimulation.cs
+++ b/Modules/DeviceSimulatorEditor/Shims/ScreenSimulation.cs
@@ -14,6 +14,13 @@ internal class ScreenSimulation : ScreenShimBase
         // Reasonable maximum resolution, tested on an Android device and game crashes when set beyond
         private const int k_MaxResolution = 8192;
 
+        private int m_RequestedWidth;
+        private int m_RequestedHeight;
+        private ScreenOrientation m_RequestedOrientation;
+        private bool m_RequestedFullScreen;
+        private bool m_RequestDefaultResolution;
+        private bool m_RequestInsetUpdate;
+
         private SimulationPlayerSettings m_PlayerSettings;
         private DeviceInfo m_DeviceInfo;
         private ScreenData m_Screen;
@@ -70,7 +77,7 @@ public int DeviceRotation
 
         public bool IsRenderingLandscape => SimulatorUtilities.IsLandscape(m_RenderedOrientation);
 
-        public event Action<bool> OnOrientationChanged;
+        public event Action OnOrientationChanged;
         public event Action OnAllowedOrientationChanged;
         public event Action<int, int> OnResolutionChanged;
         public event Action<bool> OnFullScreenChanged;
@@ -93,6 +100,7 @@ public ScreenSimulation(DeviceInfo device, SimulationPlayerSettings playerSettin
 
             // Set the full screen mode.
             m_IsFullScreen = !m_DeviceInfo.IsAndroidDevice() || m_PlayerSettings.androidStartInFullscreen;
+            m_RequestedFullScreen = m_IsFullScreen;
             m_IsRenderingOutsideSafeArea = !m_DeviceInfo.IsAndroidDevice() || m_PlayerSettings.androidRenderOutsideSafeArea;
 
             // Calculate the right orientation.
@@ -105,37 +113,29 @@ public ScreenSimulation(DeviceInfo device, SimulationPlayerSettings playerSettin
             else if (m_SupportedOrientations.ContainsKey(settingOrientation))
             {
                 m_AutoRotation = false;
-                ForceNewOrientation(settingOrientation);
+                RequestOrientation(settingOrientation);
             }
             else
             {
                 // The real iPhone X responds to this absolute corner case by crashing, we will not do that.
                 m_AutoRotation = false;
-                ForceNewOrientation(m_SupportedOrientations.Keys.ToArray()[0]);
+                RequestOrientation(m_SupportedOrientations.Keys.ToArray()[0]);
             }
 
-            InitResolution();
-            ShimManager.UseShim(this);
-        }
+            m_RequestInsetUpdate = true;
+            m_RequestDefaultResolution = true;
 
-        private void InitResolution()
-        {
-            m_WasResolutionSet = false;
-            CalculateInsets();
-            CalculateResolutionWithInsets(out m_CurrentWidth, out m_CurrentHeight);
-            CalculateSafeAreaAndCutouts();
+            ShimManager.UseShim(this);
         }
 
         public void ChangeScreen(int screenIndex)
         {
             m_Screen = m_DeviceInfo.screens[screenIndex];
-
             FindSupportedOrientations();
 
             if (!m_WasResolutionSet)
             {
-                CalculateResolutionWithInsets(out int tempWidth, out int tempHeight);
-                SetResolution(tempWidth, tempHeight);
+                m_RequestDefaultResolution = true;
             }
         }
 
@@ -152,40 +152,136 @@ private void ApplyAutoRotation()
         {
             if (!m_AutoRotation) return;
 
-            if (m_DeviceOrientation != m_RenderedOrientation && m_SupportedOrientations.ContainsKey(m_DeviceOrientation) && m_AllowedAutoRotation[m_DeviceOrientation])
+            if (m_DeviceOrientation != m_RequestedOrientation && m_SupportedOrientations.ContainsKey(m_DeviceOrientation) && m_AllowedAutoRotation[m_DeviceOrientation])
             {
-                ForceNewOrientation(m_DeviceOrientation);
+                RequestOrientation(m_DeviceOrientation);
             }
-            else
+        }
+
+        private void RequestOrientation(ScreenOrientation orientation)
+        {
+            m_RequestedOrientation = orientation;
+        }
+
+        private void SetAutoRotationOrientation(ScreenOrientation orientation, bool value)
+        {
+            m_AllowedAutoRotation[orientation] = value;
+
+            if (!m_AutoRotation)
             {
-                OnOrientationChanged?.Invoke(m_AutoRotation);
+                OnAllowedOrientationChanged?.Invoke();
+                return;
             }
+
+            // If the current auto rotation is disabled we need to rotate to another allowed orientation
+            if (!value && orientation == m_RequestedOrientation)
+            {
+                SetFirstAvailableAutoOrientation();
+            }
+            else if (value)
+            {
+                ApplyAutoRotation();
+            }
+
+            OnAllowedOrientationChanged?.Invoke();
         }
 
-        private void ForceNewOrientation(ScreenOrientation orientation)
+        private void SetFirstAvailableAutoOrientation()
         {
-            // Swap resolution Width and Height if changing from Portrait to Landscape or vice versa
-            if ((orientation == ScreenOrientation.Portrait || orientation == ScreenOrientation.PortraitUpsideDown) && IsRenderingLandscape ||
-                (orientation == ScreenOrientation.LandscapeLeft || orientation == ScreenOrientation.LandscapeRight) && !IsRenderingLandscape)
+            foreach (var newOrientation in m_SupportedOrientations.Keys)
             {
-                var temp = m_CurrentHeight;
-                m_CurrentHeight = m_CurrentWidth;
-                m_CurrentWidth = temp;
-                OnResolutionChanged?.Invoke(m_CurrentWidth, m_CurrentHeight);
+                if (m_AllowedAutoRotation[newOrientation])
+                {
+                    RequestOrientation(newOrientation);
+                    return;
+                }
             }
-            m_RenderedOrientation = orientation;
-            OnOrientationChanged?.Invoke(m_AutoRotation);
+        }
 
-            CalculateInsets();
+        public void ApplyChanges()
+        {
+            var updateSafeArea = false;
 
-            // We only change the resolution if we never set the resolution by calling Screen.SetResolution().
-            if (!m_WasResolutionSet)
+            var orientationEvent = false;
+            var resolutionEvent = false;
+            var fullScreenEvent = false;
+            var screenSpaceSafeAreaEvent = false;
+            var insetsEvent = false;
+
+            if (m_RequestedOrientation != m_RenderedOrientation)
             {
-                CalculateResolutionWithInsets(out int tempWidth, out int tempHeight);
-                SetResolution(tempWidth, tempHeight);
+                if (m_RequestedOrientation.IsLandscape() != m_RenderedOrientation.IsLandscape())
+                {
+                    // Swap resolution Width and Height if changing from Portrait to Landscape or vice versa
+                    if(m_WasResolutionSet)
+                        (m_RequestedHeight, m_RequestedWidth) = (m_RequestedWidth, m_RequestedHeight);
+                    else
+                        m_RequestDefaultResolution = true;
+                }
+
+                m_RenderedOrientation = m_RequestedOrientation;
+                orientationEvent = true;
+                m_RequestInsetUpdate = true;
+                updateSafeArea = true;
             }
 
-            CalculateSafeAreaAndCutouts();
+            if(m_RequestedFullScreen != m_IsFullScreen)
+            {
+                m_IsFullScreen = m_RequestedFullScreen;
+                m_RequestInsetUpdate = true;
+
+                // We only change the resolution if we never set the resolution by calling Screen.SetResolution().
+                if (!m_WasResolutionSet)
+                {
+                    m_RequestDefaultResolution = true;
+                }
+
+                updateSafeArea = true;
+                fullScreenEvent = true;
+            }
+
+            if (m_RequestInsetUpdate)
+            {
+                CalculateInsets();
+                insetsEvent = true;
+            }
+
+            if((m_RequestedWidth != m_CurrentWidth || m_RequestedHeight != m_CurrentHeight) && m_WasResolutionSet)
+            {
+                m_CurrentWidth = m_RequestedWidth;
+                m_CurrentHeight = m_RequestedHeight;
+                updateSafeArea = true;
+                resolutionEvent = true;
+            }
+            else if (m_RequestDefaultResolution)
+            {
+                CalculateResolutionWithInsets();
+                updateSafeArea = true;
+                resolutionEvent = true;
+            }
+
+            if (updateSafeArea)
+            {
+                CalculateSafeAreaAndCutouts();
+                screenSpaceSafeAreaEvent = true;
+            }
+
+            if(orientationEvent)
+                OnOrientationChanged?.Invoke();
+            if(resolutionEvent)
+                OnResolutionChanged?.Invoke(m_CurrentWidth, m_CurrentHeight);
+            if(fullScreenEvent)
+                OnFullScreenChanged?.Invoke(m_IsFullScreen);
+            if(screenSpaceSafeAreaEvent)
+                OnScreenSpaceSafeAreaChanged?.Invoke(ScreenSpaceSafeArea);
+            if(insetsEvent)
+                OnInsetsChanged?.Invoke(Insets);
+
+            m_RequestDefaultResolution = false;
+            m_RequestedOrientation = m_RenderedOrientation;
+            m_RequestedHeight = m_CurrentHeight;
+            m_RequestedWidth = m_CurrentWidth;
+            m_RequestInsetUpdate = false;
         }
 
         private void CalculateSafeAreaAndCutouts()
@@ -233,7 +329,6 @@ private void CalculateSafeAreaAndCutouts()
             }
 
             ScreenSpaceSafeArea = onScreenSafeArea;
-            OnScreenSpaceSafeAreaChanged?.Invoke(ScreenSpaceSafeArea);
 
             var screenWidthInOrientation = IsRenderingLandscape ? m_Screen.height : m_Screen.width;
             var screenHeightInOrientation = IsRenderingLandscape ? m_Screen.width : m_Screen.height;
@@ -339,70 +434,9 @@ private void CalculateInsets()
                 }
             }
             Insets = inset;
-            OnInsetsChanged?.Invoke(inset);
         }
 
-        private void SetAutoRotationOrientation(ScreenOrientation orientation, bool value)
-        {
-            m_AllowedAutoRotation[orientation] = value;
-
-            if (!m_AutoRotation)
-            {
-                OnAllowedOrientationChanged?.Invoke();
-                return;
-            }
-
-            // If the current auto rotation is disabled we need to rotate to another allowed orientation
-            if (!value && orientation == m_RenderedOrientation)
-            {
-                SetFirstAvailableAutoOrientation();
-            }
-            else if (value)
-            {
-                ApplyAutoRotation();
-            }
-
-            OnAllowedOrientationChanged?.Invoke();
-        }
-
-        private void SetFirstAvailableAutoOrientation()
-        {
-            foreach (var newOrientation in m_SupportedOrientations.Keys)
-            {
-                if (m_AllowedAutoRotation[newOrientation])
-                {
-                    ForceNewOrientation(newOrientation);
-                }
-            }
-        }
-
-        private void SetResolution(int width, int height)
-        {
-            if (width > k_MaxResolution || height > k_MaxResolution || width < 0 || height < 0)
-            {
-                Debug.LogError($"Failed to change resolution. Make sure that both width and height are at least 0 and less than {k_MaxResolution}.");
-                return;
-            }
-
-            if (width == 0 && height == 0)
-            {
-                InitResolution();
-                return;
-            }
-
-            if (width == 0)
-                width = 1;
-            else if (height == 0)
-                height = 1;
-
-            m_CurrentWidth = width;
-            m_CurrentHeight = height;
-            CalculateSafeAreaAndCutouts();
-
-            OnResolutionChanged?.Invoke(m_CurrentWidth, m_CurrentHeight);
-        }
-
-        private void CalculateResolutionWithInsets(out int width, out int height)
+        private void CalculateResolutionWithInsets()
         {
             var screenWidthInOrientation = IsRenderingLandscape ? m_Screen.height : m_Screen.width;
             var screenHeightInOrientation = IsRenderingLandscape ? m_Screen.width : m_Screen.height;
@@ -416,8 +450,8 @@ private void CalculateResolutionWithInsets(out int width, out int height)
             if (m_PlayerSettings.resolutionScalingMode == ResolutionScalingMode.FixedDpi && m_PlayerSettings.targetDpi < m_Screen.dpi)
                 dpiRatio = m_PlayerSettings.targetDpi / m_Screen.dpi;
 
-            width = Mathf.RoundToInt(widthInOrientation * dpiRatio);
-            height = Mathf.RoundToInt(heightInOrientation * dpiRatio);
+            m_CurrentWidth = Mathf.RoundToInt(widthInOrientation * dpiRatio);
+            m_CurrentHeight = Mathf.RoundToInt(heightInOrientation * dpiRatio);
         }
 
         public void Enable()
@@ -464,7 +498,7 @@ public override ScreenOrientation orientation
                 else if (m_SupportedOrientations.ContainsKey(value))
                 {
                     m_AutoRotation = false;
-                    ForceNewOrientation(value);
+                    RequestOrientation(value);
                 }
             }
         }
@@ -496,7 +530,28 @@ public override bool autorotateToLandscapeRight
         public override void SetResolution(int width, int height, FullScreenMode fullScreenMode, int refreshRate)
         {
             m_WasResolutionSet = true;
-            SetResolution(width, height);
+
+            if (width > k_MaxResolution || height > k_MaxResolution || width < 0 || height < 0)
+            {
+                Debug.LogError($"Failed to change resolution. Make sure that both width and height are at least 0 and less than {k_MaxResolution}.");
+                return;
+            }
+
+            if (width == 0 && height == 0)
+            {
+                m_WasResolutionSet = false;
+                m_RequestDefaultResolution = true;
+                return;
+            }
+
+            if (width == 0)
+                width = 1;
+            else if (height == 0)
+                height = 1;
+
+            m_RequestedWidth = width;
+            m_RequestedHeight = height;
+
             fullScreen = (fullScreenMode != FullScreenMode.Windowed); // Tested on Pixel 2 that all other three types go into full screen mode.
         }
 
@@ -508,21 +563,7 @@ public override bool fullScreen
                 if (!m_DeviceInfo.IsAndroidDevice() || m_IsFullScreen == value)
                     return;
 
-                m_IsFullScreen = value;
-                CalculateInsets();
-
-                // We only change the resolution if we never set the resolution by calling Screen.SetResolution().
-                if (!m_WasResolutionSet)
-                {
-                    CalculateResolutionWithInsets(out int tempWidth, out int tempHeight);
-                    SetResolution(tempWidth, tempHeight);
-                }
-                else
-                {
-                    CalculateSafeAreaAndCutouts();
-                }
-
-                OnFullScreenChanged?.Invoke(m_IsFullScreen);
+                m_RequestedFullScreen = value;
             }
         }
 
diff --git a/Modules/DeviceSimulatorEditor/SimulatorUtilities.cs b/Modules/DeviceSimulatorEditor/SimulatorUtilities.cs
index 78025deeae..e74ff47c8e 100644
--- a/Modules/DeviceSimulatorEditor/SimulatorUtilities.cs
+++ b/Modules/DeviceSimulatorEditor/SimulatorUtilities.cs
@@ -10,7 +10,8 @@ namespace UnityEditor.DeviceSimulation
     internal enum ResolutionScalingMode
     {
         Disabled = 0,
-        FixedDpi = 1
+        FixedDpi = 1,
+        Letterboxed = 2
     }
 
     internal enum SimulationState{ Enabled, Disabled }
@@ -57,7 +58,7 @@ public static ScreenOrientation RotationToScreenOrientation(int angle)
             return orientation;
         }
 
-        public static bool IsLandscape(ScreenOrientation orientation)
+        public static bool IsLandscape(this ScreenOrientation orientation)
         {
             if (orientation == ScreenOrientation.LandscapeLeft || orientation == ScreenOrientation.LandscapeRight)
                 return true;
diff --git a/Modules/DeviceSimulatorEditor/SimulatorWindow.cs b/Modules/DeviceSimulatorEditor/SimulatorWindow.cs
index 4e539f57f6..76a4c52193 100644
--- a/Modules/DeviceSimulatorEditor/SimulatorWindow.cs
+++ b/Modules/DeviceSimulatorEditor/SimulatorWindow.cs
@@ -26,9 +26,42 @@ internal class SimulatorWindow : PlayModeView, IHasCustomMenu, ISerializationCal
         private bool m_PlayFocused = false;
         private bool m_VsyncEnabled = false;
 
+        private Vector2 simulatorViewPadding
+        {
+            get
+            {
+                var rotation = m_Main.userInterface.Rotation;
+                Vector2 borderPadding;
+                switch (rotation)
+                {
+                    case 90:
+                        borderPadding = new Vector2(m_Main.userInterface.DeviceView.borderSize.y,
+                            m_Main.userInterface.DeviceView.borderSize.z);
+                        break;
+                    case 180:
+                        borderPadding = new Vector2(m_Main.userInterface.DeviceView.borderSize.z,
+                            m_Main.userInterface.DeviceView.borderSize.w);
+                        break;
+                    case 270:
+                        borderPadding = new Vector2(m_Main.userInterface.DeviceView.borderSize.w,
+                            m_Main.userInterface.DeviceView.borderSize.x);
+                        break;
+                    default:
+                        borderPadding = new Vector2(m_Main.userInterface.DeviceView.borderSize.x,
+                            m_Main.userInterface.DeviceView.borderSize.y);
+                        break;
+                }
+
+                borderPadding = borderPadding * m_Main.userInterface.DeviceView.Scale;
+                return m_Main.userInterface.DeviceView.worldBound.position + borderPadding;
+            }
+        }
+
+        private float simulatorViewMouseScale => 1f / m_Main.userInterface.DeviceView.Scale;
 
         public bool playFocused { get => m_PlayFocused; set => m_PlayFocused = value; }
         public bool vSyncEnabled { get => m_VsyncEnabled; set => m_VsyncEnabled = value; }
+        public DeviceSimulatorMain main => m_Main;
 
         [MenuItem("Window/General/Device Simulator", false, 2000)]
         public static void ShowWindow()
@@ -51,6 +84,8 @@ void OnEnable()
             m_Main = new DeviceSimulatorMain(m_SimulatorState, rootVisualElement, this);
             s_SimulatorInstances.Add(this);
             InitPlayModeViewSwapMenu();
+
+            DevicePackage.OnPackageStatus += OnDevicePackageStatus;
         }
 
         private void InitPlayModeViewSwapMenu()
@@ -71,6 +106,8 @@ private void OnDisable()
             s_SimulatorInstances.Remove(this);
             m_Main.Dispose();
 
+            DevicePackage.OnPackageStatus -= OnDevicePackageStatus;
+
             PlayModeAnalytics.SimulatorDisableEvent();
         }
 
@@ -102,8 +139,12 @@ private void OnGUI()
             var type = Event.current.type;
             if (type == EventType.Repaint)
             {
+                m_Main.ScreenSimulation.ApplyChanges();
                 targetSize = m_Main.targetSize;
                 m_Main.displayTexture = RenderView(m_Main.mousePositionInUICoordinates, false);
+
+                viewPadding = simulatorViewPadding;
+                viewMouseScale = simulatorViewMouseScale;
             }
         }
 
@@ -170,5 +211,14 @@ public void OnPlayPopupSelection(int indexClicked, object objectSelected)
             }
             OnEnterPlayModeBehaviorChange();
         }
+
+        private void OnDevicePackageStatus(DevicePackageStatus status)
+        {
+            m_Main.userInterface.DeviceButtonState = new DevicePackageInstallButtonState
+            {
+                PackageStatus = status,
+                OnPressed = DevicePackage.Add
+            };
+        }
     }
 }
diff --git a/Modules/DeviceSimulatorEditor/UserInterfaceController.cs b/Modules/DeviceSimulatorEditor/UserInterfaceController.cs
index 63eab31e56..ba6793b0c2 100644
--- a/Modules/DeviceSimulatorEditor/UserInterfaceController.cs
+++ b/Modules/DeviceSimulatorEditor/UserInterfaceController.cs
@@ -18,10 +18,10 @@ internal class UserInterfaceController
         private ScreenSimulation m_ScreenSimulation;
 
         private int m_Rotation;
-        private int Rotation
+        internal int Rotation
         {
             get => m_Rotation;
-            set
+            private set
             {
                 m_Rotation = value % 360;
                 m_DeviceView.Rotation = m_Rotation;
@@ -67,6 +67,17 @@ private bool HighlightSafeArea
         private const int kScaleMax = 100;
         private bool m_FitToScreenEnabled = true;
 
+        private DevicePackageInstallButtonState m_DeviceButtonState = new DevicePackageInstallButtonState { PackageStatus = DevicePackageStatus.Unknown};
+        public DevicePackageInstallButtonState DeviceButtonState
+        {
+            set
+            {
+                m_DeviceButtonState = value;
+                if(m_DeviceListPopup != null)
+                    m_DeviceListPopup.DeviceButtonState = m_DeviceButtonState;
+            }
+        }
+
         // Controls for the toolbar
         private string m_DeviceSearchContent;
         private VisualElement m_DeviceListMenu;
@@ -96,6 +107,7 @@ private bool HighlightSafeArea
         private float m_ControlPanelWidth;
         private readonly Dictionary<string, Foldout> m_PluginFoldouts = new Dictionary<string, Foldout>();
         private VisualElement m_ControlPanel;
+        private DeviceListPopup m_DeviceListPopup;
 
         public UserInterfaceController(DeviceSimulatorMain deviceSimulatorMain, VisualElement rootVisualElement, SimulatorState serializedState, PluginController pluginController, TouchEventManipulator touchEventManipulator)
         {
@@ -225,7 +237,7 @@ public void OnSimulationStart(ScreenSimulation screenSimulation)
 
             m_SelectedDeviceName.text = m_Main.currentDevice.deviceInfo.friendlyName;
 
-            m_ScreenSimulation.OnOrientationChanged += autoRotate => m_DeviceView.ScreenOrientation = m_ScreenSimulation.orientation;
+            m_ScreenSimulation.OnOrientationChanged += () => m_DeviceView.ScreenOrientation = m_ScreenSimulation.orientation;
             m_ScreenSimulation.OnInsetsChanged += insets => m_DeviceView.ScreenInsets = insets;
             m_ScreenSimulation.OnScreenSpaceSafeAreaChanged += safeArea => m_DeviceView.SafeArea = safeArea;
 
@@ -330,13 +342,13 @@ private int ClampScale(int scale)
         private void ShowDeviceInfoList()
         {
             var rect = new Rect(m_DeviceListMenu.worldBound.position + new Vector2(1, m_DeviceListMenu.worldBound.height), new Vector2());
-            var maximumVisibleDeviceCount = 10;
+            var maximumVisibleDeviceCount = 15;
 
-            var deviceListPopup = new DeviceListPopup(m_Main.devices, m_Main.deviceIndex, maximumVisibleDeviceCount, m_DeviceSearchContent);
-            deviceListPopup.OnDeviceSelected += OnDeviceSelected;
-            deviceListPopup.OnSearchInput += OnSearchInput;
+            m_DeviceListPopup = new DeviceListPopup(m_Main.devices, m_Main.deviceIndex, maximumVisibleDeviceCount, m_DeviceSearchContent, m_DeviceButtonState);
+            m_DeviceListPopup.OnDeviceSelected += OnDeviceSelected;
+            m_DeviceListPopup.OnSearchInput += OnSearchInput;
 
-            PopupWindow.Show(rect, deviceListPopup);
+            PopupWindow.Show(rect, m_DeviceListPopup);
         }
 
         private void ShowOnPlayBehaviorSelector()
diff --git a/Modules/DeviceSimulatorEditor/VisualElements/DeviceView.cs b/Modules/DeviceSimulatorEditor/VisualElements/DeviceView.cs
index 7ddd5125a8..ffb98edaf1 100644
--- a/Modules/DeviceSimulatorEditor/VisualElements/DeviceView.cs
+++ b/Modules/DeviceSimulatorEditor/VisualElements/DeviceView.cs
@@ -39,6 +39,8 @@ internal class DeviceView : IMGUIContainer
         private bool m_OverlayMeshDirty = true;
         private bool m_ProceduralOverlayMeshDirty = true;
 
+        internal Vector4 borderSize => m_BorderSize;
+
         public int Rotation
         {
             set
@@ -51,7 +53,7 @@ public int Rotation
 
         public float Scale
         {
-            private get => m_Scale;
+            internal get => m_Scale;
             set
             {
                 m_Scale = value;
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/ComponentToolButton.cs b/Modules/EditorToolbar/Controls/ComponentToolButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/ComponentToolButton.cs
rename to Modules/EditorToolbar/Controls/ComponentToolButton.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/ComponentToolContextButton.cs b/Modules/EditorToolbar/Controls/ComponentToolContextButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/ComponentToolContextButton.cs
rename to Modules/EditorToolbar/Controls/ComponentToolContextButton.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarButton.cs b/Modules/EditorToolbar/Controls/EditorToolbarButton.cs
similarity index 71%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarButton.cs
rename to Modules/EditorToolbar/Controls/EditorToolbarButton.cs
index ebc54d24c4..89e864a4fc 100644
--- a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarButton.cs
+++ b/Modules/EditorToolbar/Controls/EditorToolbarButton.cs
@@ -14,13 +14,30 @@ public class EditorToolbarButton : ToolbarButton
         internal const string textClassName = EditorToolbar.elementLabelClassName;
         internal const string iconClassName = EditorToolbar.elementIconClassName;
 
-        readonly TextElement m_TextElement;
         readonly Image m_IconElement;
+        TextElement m_TextElement;
 
         public new string text
         {
-            get => m_TextElement.text;
-            set => m_TextElement.text = value;
+            get => m_TextElement?.text;
+
+            set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    m_TextElement?.RemoveFromHierarchy();
+                    m_TextElement = null;
+                    return;
+                }
+
+                if (m_TextElement == null)
+                {
+                    Insert(IndexOf(m_IconElement)+1, m_TextElement = new TextElement());
+                    m_TextElement.AddToClassList(textClassName);
+                }
+
+                m_TextElement.text = value;
+            }
         }
 
         public Texture2D icon
@@ -44,11 +61,7 @@ public EditorToolbarButton(string text, Texture2D icon, Action clickEvent) : bas
             m_IconElement.AddToClassList(iconClassName);
             this.icon = icon;
             Add(m_IconElement);
-
-            m_TextElement = new TextElement();
-            m_TextElement.AddToClassList(textClassName);
-            m_TextElement.text = text;
-            Add(m_TextElement);
+            this.text = text;
         }
     }
 }
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarDropdown.cs b/Modules/EditorToolbar/Controls/EditorToolbarDropdown.cs
similarity index 94%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarDropdown.cs
rename to Modules/EditorToolbar/Controls/EditorToolbarDropdown.cs
index ac7cfc3375..8f01c9a80d 100644
--- a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarDropdown.cs
+++ b/Modules/EditorToolbar/Controls/EditorToolbarDropdown.cs
@@ -33,8 +33,6 @@ public EditorToolbarDropdown(string text, Texture2D icon, Action clickEvent) : b
             var arrow = new VisualElement();
             arrow.AddToClassList(arrowClassName);
             Add(arrow);
-
-            this.Q(className: textClassName).style.flexGrow = 1;
         }
     }
 }
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarDropdownToggle.cs b/Modules/EditorToolbar/Controls/EditorToolbarDropdownToggle.cs
similarity index 86%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarDropdownToggle.cs
rename to Modules/EditorToolbar/Controls/EditorToolbarDropdownToggle.cs
index 20e52194a9..f006dcf00b 100644
--- a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarDropdownToggle.cs
+++ b/Modules/EditorToolbar/Controls/EditorToolbarDropdownToggle.cs
@@ -21,9 +21,9 @@ public class EditorToolbarDropdownToggle : BaseField<bool>
         internal static readonly string toggleNoDropdownClassName = toggleClassName + "-no-dropdown";
 
         readonly Image m_IconElement;
-        readonly TextElement m_TextElement;
         readonly Button m_Toggle;
         readonly Button m_DropdownButton;
+        TextElement m_TextElement;
 
         public event Action dropdownClicked
         {
@@ -45,9 +45,22 @@ public Texture2D icon
 
         public string text
         {
-            get => m_TextElement.text;
+            get => m_TextElement?.text;
+
             set
             {
+                if (string.IsNullOrEmpty(value))
+                {
+                    m_TextElement?.RemoveFromHierarchy();
+                    m_TextElement = null;
+                    return;
+                }
+
+                if (m_TextElement == null)
+                    m_Toggle.Add(m_TextElement = new TextElement());
+
+                m_TextElement.AddToClassList(toggleTextClassName);
+                m_TextElement.AddToClassList(EditorToolbar.elementLabelClassName);
                 m_TextElement.text = value;
                 UpdateIconState();
             }
@@ -75,11 +88,6 @@ public EditorToolbarDropdownToggle(string text, Texture2D icon, Action dropdownC
             m_IconElement.pickingMode = PickingMode.Ignore;
             m_Toggle.Add(m_IconElement);
 
-            m_TextElement = new TextElement {text = text};
-            m_TextElement.AddToClassList(toggleTextClassName);
-            m_TextElement.AddToClassList(EditorToolbar.elementLabelClassName);
-            m_Toggle.Add(m_TextElement);
-
             m_DropdownButton = new Button(dropdownClickEvent);
             m_DropdownButton.AddToClassList(dropdownClassName);
 
@@ -90,16 +98,15 @@ public EditorToolbarDropdownToggle(string text, Texture2D icon, Action dropdownC
 
             Add(m_Toggle);
             Add(m_DropdownButton);
+
+            this.text = text;
         }
 
         void UpdateIconState()
         {
-            if (icon == null && (text != null && text != string.Empty))
-            {
-                if (!m_IconElement.ClassListContains(toggleNoIconClassName))
-                    m_IconElement.AddToClassList(toggleNoIconClassName);
-            }
-            else if (icon && m_IconElement.ClassListContains(toggleNoIconClassName))
+            if (icon == null && !string.IsNullOrEmpty(text))
+                m_IconElement.AddToClassList(toggleNoIconClassName);
+            else if (icon)
                 m_IconElement.RemoveFromClassList(toggleNoIconClassName);
         }
 
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarToggle.cs b/Modules/EditorToolbar/Controls/EditorToolbarToggle.cs
similarity index 85%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarToggle.cs
rename to Modules/EditorToolbar/Controls/EditorToolbarToggle.cs
index 8fba46db76..f587734d1f 100644
--- a/Modules/UIServiceEditor/EditorToolbar/Controls/EditorToolbarToggle.cs
+++ b/Modules/EditorToolbar/Controls/EditorToolbarToggle.cs
@@ -18,14 +18,28 @@ public class EditorToolbarToggle : ToolbarToggle
         Texture2D m_OnIcon;
         Texture2D m_OffIcon;
 
-        readonly TextElement m_TextElement;
+        TextElement m_TextElement;
         readonly Image m_IconElement;
 
         public new string text
         {
-            get => m_TextElement.text;
+            get => m_TextElement?.text;
+
             set
             {
+                if (string.IsNullOrEmpty(value))
+                {
+                    m_TextElement?.RemoveFromHierarchy();
+                    m_TextElement = null;
+                    return;
+                }
+
+                if (m_TextElement == null)
+                {
+                    Insert(IndexOf(m_IconElement)+1, m_TextElement = new TextElement());
+                    m_TextElement.AddToClassList(textClassName);
+                }
+
                 m_TextElement.text = value;
                 UpdateIconState();
             }
@@ -76,10 +90,6 @@ public EditorToolbarToggle(string text, Texture2D onIcon, Texture2D offIcon)
             m_IconElement.AddToClassList(iconClassName);
             input.Add(m_IconElement);
 
-            m_TextElement = new TextElement();
-            m_TextElement.AddToClassList(textClassName);
-            input.Add(m_TextElement);
-
             this.text = text;
             m_OnIcon = onIcon;
             m_OffIcon = offIcon;
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/LastCustomToolButton.cs b/Modules/EditorToolbar/Controls/LastCustomToolButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/LastCustomToolButton.cs
rename to Modules/EditorToolbar/Controls/LastCustomToolButton.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/ToolButton.cs b/Modules/EditorToolbar/Controls/ToolButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/ToolButton.cs
rename to Modules/EditorToolbar/Controls/ToolButton.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/Controls/ToolContextButton.cs b/Modules/EditorToolbar/Controls/ToolContextButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/Controls/ToolContextButton.cs
rename to Modules/EditorToolbar/Controls/ToolContextButton.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/AccountDropdown.cs b/Modules/EditorToolbar/ToolbarElements/AccountDropdown.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/AccountDropdown.cs
rename to Modules/EditorToolbar/ToolbarElements/AccountDropdown.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/BuiltinToolSettings.cs b/Modules/EditorToolbar/ToolbarElements/BuiltinToolSettings.cs
similarity index 90%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/BuiltinToolSettings.cs
rename to Modules/EditorToolbar/ToolbarElements/BuiltinToolSettings.cs
index 7252e38495..1183e39027 100644
--- a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/BuiltinToolSettings.cs
+++ b/Modules/EditorToolbar/ToolbarElements/BuiltinToolSettings.cs
@@ -46,10 +46,6 @@ void PivotModeChanged()
             text = content.text;
             tooltip = content.tooltip;
             icon = content.image as Texture2D;
-
-            //Ensuring constant size of the text area
-            var textElement = this.Q<TextElement>(className: EditorToolbar.elementLabelClassName);
-            textElement.style.width = 40;
         }
 
         void AttachedToPanel(AttachToPanelEvent evt)
@@ -102,10 +98,6 @@ void PivotRotationChanged()
             text = content.text;
             tooltip = content.tooltip;
             icon = content.image as Texture2D;
-
-            //Ensuring constant size of the text area
-            var textElement = this.Q<TextElement>(className: EditorToolbar.elementLabelClassName);
-            textElement.style.width = 40;
         }
 
         void AttachedToPanel(AttachToPanelEvent evt)
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/BuiltinTools.cs b/Modules/EditorToolbar/ToolbarElements/BuiltinTools.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/BuiltinTools.cs
rename to Modules/EditorToolbar/ToolbarElements/BuiltinTools.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/CloudButton.cs b/Modules/EditorToolbar/ToolbarElements/CloudButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/CloudButton.cs
rename to Modules/EditorToolbar/ToolbarElements/CloudButton.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/ComponentTools.cs b/Modules/EditorToolbar/ToolbarElements/ComponentTools.cs
similarity index 88%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/ComponentTools.cs
rename to Modules/EditorToolbar/ToolbarElements/ComponentTools.cs
index f0d1d9d0ac..9f0173027f 100644
--- a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/ComponentTools.cs
+++ b/Modules/EditorToolbar/ToolbarElements/ComponentTools.cs
@@ -13,7 +13,7 @@ namespace UnityEditor.Toolbars
     [EditorToolbarElement("Tools/Component Tools")]
     sealed class ComponentToolsStrip : VisualElement
     {
-        static List<EditorTool> s_EditorToolModes = new List<EditorTool>();
+        static List<EditorTool> s_EditorTools = new List<EditorTool>();
         static Dictionary<UObject, List<EditorTool>> s_SortedTools = new Dictionary<UObject, List<EditorTool>>();
 
         public ComponentToolsStrip()
@@ -32,7 +32,7 @@ void OnAttachedToPanel(AttachToPanelEvent evt)
         void OnDetachFromPanel(DetachFromPanelEvent evt)
         {
             EditorToolManager.availableComponentToolsChanged -= Refresh;
-            s_EditorToolModes.Clear();
+            s_EditorTools.Clear();
         }
 
         void Refresh()
@@ -45,12 +45,17 @@ void Refresh()
             if ((EditorToolManager.GetCustomEditorToolsCount(false) + EditorToolManager.availableComponentContextCount) < 1)
                 return;
 
-            EditorToolManager.GetComponentToolsForSharedTracker(s_EditorToolModes);
+            EditorToolManager.GetComponentToolsForSharedTracker(s_EditorTools);
             s_SortedTools.Clear();
 
-            foreach (var tool in s_EditorToolModes)
+            // Display available tools grouped by their target component
+            foreach (var tool in s_EditorTools)
             {
                 var component = tool.target;
+
+                if (component == null)
+                    continue;
+
                 if (!s_SortedTools.TryGetValue(component, out List<EditorTool> editorTools))
                 {
                     editorTools = new List<EditorTool>();
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/LayersDropdown.cs b/Modules/EditorToolbar/ToolbarElements/LayersDropdown.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/LayersDropdown.cs
rename to Modules/EditorToolbar/ToolbarElements/LayersDropdown.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/LayoutDropdown.cs b/Modules/EditorToolbar/ToolbarElements/LayoutDropdown.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/LayoutDropdown.cs
rename to Modules/EditorToolbar/ToolbarElements/LayoutDropdown.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/ModesDropdown.cs b/Modules/EditorToolbar/ToolbarElements/ModesDropdown.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/ModesDropdown.cs
rename to Modules/EditorToolbar/ToolbarElements/ModesDropdown.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/PlayModeButtons.cs b/Modules/EditorToolbar/ToolbarElements/PlayModeButtons.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/PlayModeButtons.cs
rename to Modules/EditorToolbar/ToolbarElements/PlayModeButtons.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/PreviewPackagesInUseDropdown.cs b/Modules/EditorToolbar/ToolbarElements/PreviewPackagesInUseDropdown.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/PreviewPackagesInUseDropdown.cs
rename to Modules/EditorToolbar/ToolbarElements/PreviewPackagesInUseDropdown.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/SearchButton.cs b/Modules/EditorToolbar/ToolbarElements/SearchButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/SearchButton.cs
rename to Modules/EditorToolbar/ToolbarElements/SearchButton.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/SnapSettings.cs b/Modules/EditorToolbar/ToolbarElements/SnapSettings.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/SnapSettings.cs
rename to Modules/EditorToolbar/ToolbarElements/SnapSettings.cs
diff --git a/Modules/UIServiceEditor/EditorToolbar/ToolbarElements/UndoButton.cs b/Modules/EditorToolbar/ToolbarElements/UndoButton.cs
similarity index 100%
rename from Modules/UIServiceEditor/EditorToolbar/ToolbarElements/UndoButton.cs
rename to Modules/EditorToolbar/ToolbarElements/UndoButton.cs
diff --git a/Modules/GenericRemoteEditor/Public/GenericRemote.bindings.cs b/Modules/GenericRemoteEditor/Public/GenericRemote.bindings.cs
new file mode 100644
index 0000000000..e11bd811db
--- /dev/null
+++ b/Modules/GenericRemoteEditor/Public/GenericRemote.bindings.cs
@@ -0,0 +1,47 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using UnityEngine.Bindings;
+using UnityEngine.Scripting;
+using UnityEngine;
+
+namespace UnityEditor.Remote
+{
+    [NativeHeader("Modules/GenericRemoteEditor/Public/GenericRemote.bindings.h")]
+    internal static class GenericRemote
+    {
+        // We're keeping a separate list of C# delegates so that they get lost
+        // en bloc in domain reload. Simplifies the handling of that as opposed
+        // to having GenericRemote.cpp having these delegates directly on its list.
+        private static List<Func<IntPtr, bool>> s_Handlers = new List<Func<IntPtr, bool>>();
+
+        public static void AddMessageHandler(Func<IntPtr, bool> handler)
+        {
+            s_Handlers.Add(handler);
+        }
+
+        public static void RemoveMessageHandler(Func<IntPtr, bool> handler)
+        {
+            s_Handlers.Remove(handler);
+        }
+
+        [RequiredByNativeCode]
+        internal static bool CallMessageHandlers(IntPtr messageData)
+        {
+            foreach (var handler in s_Handlers)
+            {
+                if (handler(messageData))
+                    return true;
+            }
+            return false;
+        }
+
+        public static extern void SetGyroEnabled(bool enabled);
+        public static extern void SetGyroUpdateInterval(float interval);
+    }
+}
diff --git a/Modules/GraphViewEditor/Views/GraphView.cs b/Modules/GraphViewEditor/Views/GraphView.cs
index 82e3202b74..193854b433 100644
--- a/Modules/GraphViewEditor/Views/GraphView.cs
+++ b/Modules/GraphViewEditor/Views/GraphView.cs
@@ -365,7 +365,7 @@ internal void RestorePersitentSelectionForElement(GraphElement element)
             }
         }
 
-        private void UndoRedoPerformed()
+        private void UndoRedoPerformed(in UndoRedoInfo info)
         {
             RestoreSavedSelection(m_GraphViewUndoRedoSelection);
         }
@@ -773,7 +773,7 @@ protected override void ExecuteDefaultAction(EventBase evt)
                 if (dtpe.destinationPanel == null)
                 {
                     Undo.ClearUndo(m_GraphViewUndoRedoSelection);
-                    Undo.undoRedoPerformed -= UndoRedoPerformed;
+                    Undo.undoRedoEvent -= UndoRedoPerformed;
                     ScriptableObject.DestroyImmediate(m_GraphViewUndoRedoSelection);
                     m_GraphViewUndoRedoSelection = null;
 
@@ -787,7 +787,7 @@ protected override void ExecuteDefaultAction(EventBase evt)
 
                 if (atpe.originPanel == null)
                 {
-                    Undo.undoRedoPerformed += UndoRedoPerformed;
+                    Undo.undoRedoEvent += UndoRedoPerformed;
                     m_GraphViewUndoRedoSelection = ScriptableObject.CreateInstance<GraphViewUndoRedoSelection>();
                     m_GraphViewUndoRedoSelection.hideFlags = HideFlags.HideAndDontSave;
                 }
diff --git a/Modules/UIServiceEditor/GridAndSnap/GridSettingsWindow.cs b/Modules/GridAndSnap/GridSettingsWindow.cs
similarity index 100%
rename from Modules/UIServiceEditor/GridAndSnap/GridSettingsWindow.cs
rename to Modules/GridAndSnap/GridSettingsWindow.cs
diff --git a/Modules/UIServiceEditor/GridAndSnap/LinkedVector3Field.cs b/Modules/GridAndSnap/LinkedVector3Field.cs
similarity index 100%
rename from Modules/UIServiceEditor/GridAndSnap/LinkedVector3Field.cs
rename to Modules/GridAndSnap/LinkedVector3Field.cs
diff --git a/Modules/UIServiceEditor/GridAndSnap/SnapSettingsWindow.cs b/Modules/GridAndSnap/SnapSettingsWindow.cs
similarity index 100%
rename from Modules/UIServiceEditor/GridAndSnap/SnapSettingsWindow.cs
rename to Modules/GridAndSnap/SnapSettingsWindow.cs
diff --git a/Modules/IMGUI/GUI.bindings.cs b/Modules/IMGUI/GUI.bindings.cs
index 3ec65b46fd..d1e24a096d 100644
--- a/Modules/IMGUI/GUI.bindings.cs
+++ b/Modules/IMGUI/GUI.bindings.cs
@@ -20,6 +20,7 @@ partial class GUI
         public static extern int depth { get; set; }
 
         internal static extern bool usePageScrollbars { get; }
+        internal static extern bool isInsideList { get; set; }
         internal static extern Material blendMaterial {[FreeFunction("GetGUIBlendMaterial")] get; }
         internal static extern Material blitMaterial {[FreeFunction("GetGUIBlitMaterial")] get; }
         internal static extern Material roundedRectMaterial {[FreeFunction("GetGUIRoundedRectMaterial")] get; }
diff --git a/Modules/IMGUI/GUIUtility.bindings.cs b/Modules/IMGUI/GUIUtility.bindings.cs
index 5b3edac744..5c570ea6d2 100644
--- a/Modules/IMGUI/GUIUtility.bindings.cs
+++ b/Modules/IMGUI/GUIUtility.bindings.cs
@@ -51,9 +51,18 @@ public static extern string systemCopyBuffer
             [FreeFunction("SetCopyBuffer")] set;
         }
 
-        [StaticAccessor("GetGUIState()", StaticAccessorType.Dot)]
-        public static extern int GetControlID(int hint, FocusType focusType, Rect rect);
-
+        [FreeFunction("GetGUIState().GetControlID")]
+        static extern int Internal_GetControlID(int hint, FocusType focusType, Rect rect);
+
+        // Control counting is required by ReorderableList. Element rendering callbacks can change and use
+        // different number of controls to represent an element each frame. We need a way to be able to track
+        // if the control count changed from the last frame so we can recache those elements.
+        internal static int s_ControlCount = 0;
+        public static int GetControlID(int hint, FocusType focusType, Rect rect)
+        {
+            s_ControlCount++;
+            return Internal_GetControlID(hint, focusType, rect);
+        }
 
         internal static extern void BeginContainerFromOwner(ScriptableObject owner);
 
diff --git a/Modules/IMGUI/TextEditingUtilities.cs b/Modules/IMGUI/TextEditingUtilities.cs
index f2872c78cc..8913553db7 100644
--- a/Modules/IMGUI/TextEditingUtilities.cs
+++ b/Modules/IMGUI/TextEditingUtilities.cs
@@ -34,6 +34,11 @@ internal class TextEditingUtilities
         bool m_IsCompositionActive;
         bool m_UpdateImeWindowPosition;
 
+        internal bool revealCursor
+        {
+            get { return m_TextSelectingUtility.revealCursor; }
+            set { m_TextSelectingUtility.revealCursor = value; }
+        }
         private int cursorIndex
         {
             get { return m_TextSelectingUtility.cursorIndex; }
@@ -146,7 +151,7 @@ internal bool HandleKeyEvent(Event e, bool textIsReadOnly)
 
         bool PerformOperation(TextEditOp operation, bool textIsReadOnly)
         {
-            m_TextSelectingUtility.revealCursor = true;
+            revealCursor = true;
 
             switch (operation)
             {
@@ -558,5 +563,11 @@ static string ReplaceNewlinesWithSpaces(string value)
             value = value.Replace('\r', ' ');
             return value;
         }
+
+        internal void OnBlur()
+        {
+            revealCursor = false;
+            m_TextSelectingUtility.SelectNone();
+        }
     }
 }
diff --git a/Modules/IMGUI/TextSelectingUtilities.cs b/Modules/IMGUI/TextSelectingUtilities.cs
index 4796890115..a53a47ec9c 100644
--- a/Modules/IMGUI/TextSelectingUtilities.cs
+++ b/Modules/IMGUI/TextSelectingUtilities.cs
@@ -12,31 +12,20 @@ internal class TextSelectingUtilities
     {
         public DblClickSnapping dblClickSnap = DblClickSnapping.WORDS;
         public int iAltCursorPos = -1;
-        public bool hasFocus;
         public event Action OnTextChanged;
-        public Vector2 graphicalCursorPos;
-        public Vector2 graphicalSelectCursorPos;
         public bool multiline = false;
         public bool hasHorizontalCursorPos = false;
-        public Vector2 scrollOffset = Vector2.zero; // The text field can have a scroll offset in order to display its contents
 
         private int m_CursorIndex = 0;
         private int m_SelectIndex = 0;
         private string m_Text;
-        private Rect m_Position;
         private bool m_bJustSelected = false;
         private bool m_MouseDragSelectsWholeWords = false;
         private int m_DblClickInitPos = 0;
-        private Rect localPosition => position;
         TextHandle m_TextHandle;
         private const int kMoveDownHeight = 5;
         private const char kNewLineChar = '\n';
 
-        // TODO: Remove once style is changed
-        public GUIContent m_Content;
-        // TODO: Interface for GUIStyle
-        public GUIStyle style;
-
         /// Does this text field has a selection
         public bool hasSelection { get { return cursorIndex != selectIndex; } }
 
@@ -113,23 +102,6 @@ public string selectedText
             }
         }
 
-        public Rect position
-        {
-            get { return m_Position; }
-            set
-            {
-                if (m_Position == value)
-                    return;
-
-                // Reset the scrollOffset to force its recomputation.
-                scrollOffset = Vector2.zero;
-
-                m_Position = value;
-
-                UpdateScrollOffset();
-            }
-        }
-
         public TextSelectingUtilities(TextHandle textHandle)
         {
             m_TextHandle = textHandle;
@@ -148,68 +120,6 @@ public void ClearCursorPos()
             iAltCursorPos = -1;
         }
 
-        public void UpdateScrollOffset()
-        {
-            int cursorPos = cursorIndex;
-            graphicalCursorPos = style.GetCursorPixelPosition(new Rect(0, 0, position.width, position.height), m_Content, cursorPos);
-
-            // The rectangle inside which the text is displayed.
-            Rect viewRect = style.padding.Remove(position);
-
-            // Position of the cursor in the viewRect coordinate system.
-            var localGraphicalCursorPos = graphicalCursorPos;
-            localGraphicalCursorPos.x -= style.padding.left;
-            localGraphicalCursorPos.y -= style.padding.top;
-
-            // The size of the text, without any padding.
-            Vector2 contentSize = new Vector2(style.CalcSize(m_Content).x, style.CalcHeight(m_Content, position.width));
-            contentSize.x -= (style.padding.left + style.padding.right);
-            contentSize.y -= (style.padding.top + style.padding.bottom);
-
-            // If there is plenty of room, simply show entire string
-            if (contentSize.x < viewRect.width)
-            {
-                scrollOffset.x = 0;
-            }
-            else if (revealCursor)
-            {
-                //go right
-                if (localGraphicalCursorPos.x + 1 > scrollOffset.x + viewRect.width)
-                    // do we want html or apple behavior? this is html behavior
-                    scrollOffset.x = localGraphicalCursorPos.x - viewRect.width + 1;
-                //go left
-                if (localGraphicalCursorPos.x < scrollOffset.x)
-                    scrollOffset.x = localGraphicalCursorPos.x;
-            }
-            // ... and height/y as well
-            // If there is plenty of room, simply show entire string
-            if (contentSize.y < viewRect.height)
-            {
-                scrollOffset.y = 0;
-            }
-            else if (revealCursor)
-            {
-                //go down
-                if (localGraphicalCursorPos.y + style.lineHeight > scrollOffset.y + viewRect.height)
-                    scrollOffset.y = localGraphicalCursorPos.y - viewRect.height + style.lineHeight;
-                //go up
-                if (localGraphicalCursorPos.y < scrollOffset.y)
-                    scrollOffset.y = localGraphicalCursorPos.y;
-            }
-
-            // This case takes many words to explain:
-            // 1. Text field has more text than it can fit vertically, and the cursor is at the very bottom (text field is scrolled down)
-            // 2. user e.g. deletes some lines of text at the bottom (backspace or select+delete)
-            // 3. now suddenly we have space at the bottom of text field, that is now not filled with any content
-            // 4. scroll text field up to fill in that space (this is what other text editors do)
-            if (scrollOffset.y > 0 && contentSize.y - scrollOffset.y < viewRect.height)
-                scrollOffset.y = contentSize.y - viewRect.height;
-
-            scrollOffset.y = scrollOffset.y < 0 ? 0 : scrollOffset.y;
-
-            revealCursor = false;
-        }
-
         public void OnFocus(bool selectAll = true)
         {
             if (selectAll)
@@ -217,15 +127,6 @@ public void OnFocus(bool selectAll = true)
             else
                 cursorIndex = selectIndex = 0;
             revealCursor = true;
-            hasFocus = true;
-        }
-
-        public void OnLostFocus()
-        {
-            hasFocus = false;
-            revealCursor = false;
-            scrollOffset = Vector2.zero;
-            SelectNone();
         }
 
         /// Select all the text
@@ -652,26 +553,14 @@ protected internal void MoveCursorToPosition_Internal(Vector2 cursorPosition, bo
             }
         }
 
-        public void MoveAltCursorToPosition(Vector2 cursorPosition)
-        {
-            int index = m_TextHandle.GetCursorIndexFromPosition(cursorPosition + scrollOffset);
-            iAltCursorPos = Mathf.Min(text.Length, index);
-        }
-
-        public bool IsOverSelection(Vector2 cursorPosition)
-        {
-            int p = m_TextHandle.GetCursorIndexFromPosition(cursorPosition + scrollOffset);
-            return ((p < Mathf.Max(cursorIndex, selectIndex)) && (p > Mathf.Min(cursorIndex, selectIndex)));
-        }
-
         // Do a drag selection. Used to expand the selection in MouseDrag events.
         public void SelectToPosition(Vector2 cursorPosition)
         {
             if (!m_MouseDragSelectsWholeWords)
-                cursorIndex = m_TextHandle.GetCursorIndexFromPosition(cursorPosition + scrollOffset);
+                cursorIndex = m_TextHandle.GetCursorIndexFromPosition(cursorPosition);
             else // snap to words/paragraphs
             {
-                int p = m_TextHandle.GetCursorIndexFromPosition(cursorPosition + scrollOffset);
+                int p = m_TextHandle.GetCursorIndexFromPosition(cursorPosition);
 
                 EnsureValidCodePointIndex(ref p);
                 EnsureValidCodePointIndex(ref m_DblClickInitPos);
@@ -928,15 +817,5 @@ CharacterType ClassifyChar(int index)
                 return CharacterType.LetterLike;
             return CharacterType.Symbol;
         }
-
-        void GrabGraphicalCursorPos()
-        {
-            if (!hasHorizontalCursorPos)
-            {
-                graphicalCursorPos = m_TextHandle.GetCursorPositionFromStringIndexUsingLineHeight(cursorIndex);
-                graphicalSelectCursorPos = m_TextHandle.GetCursorPositionFromStringIndexUsingLineHeight(selectIndex);
-                hasHorizontalCursorPos = false;
-            }
-        }
     }
 }
diff --git a/Modules/Input/Private/InputModule.bindings.cs b/Modules/Input/Private/InputModule.bindings.cs
index b20adf3a68..7364fa639e 100644
--- a/Modules/Input/Private/InputModule.bindings.cs
+++ b/Modules/Input/Private/InputModule.bindings.cs
@@ -49,17 +49,13 @@ public static void SetUpdateMask(NativeInputUpdateType mask)
         {
         }
 
-        [StaticAccessor("InputModuleBindings::Android", StaticAccessorType.DoubleColon)]
-        internal class Android
-        {
-            /// <summary>
-            /// Allows processing of input events from null devices.
-            /// Events coming from Android's instrumentation will sometimes have MotionEvent.GetDevice return null. For ex., happens on NVIDIA Shield
-            /// Primary usage are tests, where we want our events to be handled.
-            /// By default, this behavior is disabled, since Gear VR expects Unity to ignore such events.
-            /// </summary>
-            [NativeProperty("AllowNullInputDevices")]
-            internal static extern bool allowNullDevices { get; set; }
-        }
+        /// <summary>
+        /// Allows creation of input devices from events.
+        /// Primarily used by input simulation package (on Android and Windows), where we can send the simulated events.
+        /// Input simulation package doesn't create input devices, thus we must ask backend to created those when required.
+        /// By default, such behavior is disabled, since for ex., on Android Gear VR expects Unity to ignore such events.
+        /// </summary>
+        [NativeProperty("AllowInputDeviceCreationFromEvents")]
+        internal static extern bool allowInputDeviceCreationFromEvents { get; set; }
     }
 }
diff --git a/Modules/InputLegacy/Input.bindings.cs b/Modules/InputLegacy/Input.bindings.cs
index 04a395d706..3a854b3b29 100644
--- a/Modules/InputLegacy/Input.bindings.cs
+++ b/Modules/InputLegacy/Input.bindings.cs
@@ -527,5 +527,7 @@ public static AccelerationEvent[] accelerationEvents
                 return events;
             }
         }
+
+        internal extern static bool CheckDisabled();
     }
 }
diff --git a/Modules/InputLegacy/MouseEvents.cs b/Modules/InputLegacy/MouseEvents.cs
index ee4b031c9d..03429ef004 100644
--- a/Modules/InputLegacy/MouseEvents.cs
+++ b/Modules/InputLegacy/MouseEvents.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
 using UnityEngine.Scripting;
 using UnityEngine;
@@ -43,6 +44,44 @@ public static bool Compare(HitInfo lhs, HitInfo rhs)
         static readonly HitInfo[] m_CurrentHit = { new HitInfo(), new HitInfo(), new HitInfo() };
         static Camera[] m_Cameras;
 
+        public enum LeftMouseButtonState
+        {
+            NotPressed = 0,
+            Pressed = 1,
+            PressedThisFrame = 2,
+        }
+
+        public static Func<KeyValuePair<int, Vector2>> s_GetMouseState;
+
+        private static Vector2 s_MousePosition;
+        private static bool s_MouseButtonPressedThisFrame;
+        private static bool s_MouseButtonIsPressed;
+
+        private static void UpdateMouse()
+        {
+            if (s_GetMouseState != null)
+            {
+                // Allow handler to override input from UnityEngine.Input.
+                // Tuple value would be more elegant here but is .NET 5+.
+                var state = s_GetMouseState();
+                s_MousePosition = state.Value;
+                s_MouseButtonPressedThisFrame = (state.Key == (int)LeftMouseButtonState.PressedThisFrame);
+                s_MouseButtonIsPressed = state.Key != (int)LeftMouseButtonState.NotPressed;
+            }
+            else if (!UnityEngine.Input.CheckDisabled())
+            {
+                s_MousePosition = Input.mousePosition;
+                s_MouseButtonPressedThisFrame = Input.GetMouseButtonDown(0);
+                s_MouseButtonIsPressed = Input.GetMouseButton(0);
+            }
+            else
+            {
+                s_MousePosition = default;
+                s_MouseButtonPressedThisFrame = default;
+                s_MouseButtonIsPressed = default;
+            }
+        }
+
         [RequiredByNativeCode]
         static void SetMouseMoved()
         {
@@ -52,7 +91,8 @@ static void SetMouseMoved()
         [RequiredByNativeCode]
         static void DoSendMouseEvents(int skipRTCameras)
         {
-            var mousePosition = Input.mousePosition;
+            UpdateMouse();
+            var mousePosition = s_MousePosition;
 
             int camerasCount = Camera.allCamerasCount;
             if (m_Cameras == null || m_Cameras.Length != camerasCount)
@@ -177,8 +217,8 @@ static void DoSendMouseEvents(int skipRTCameras)
         static void SendEvents(int i, HitInfo hit)
         {
             // Handle MouseDown, MouseDrag, MouseUp
-            bool mouseDownThisFrame = Input.GetMouseButtonDown(0);
-            bool mousePressed = Input.GetMouseButton(0);
+            bool mouseDownThisFrame = s_MouseButtonPressedThisFrame;
+            bool mousePressed = s_MouseButtonIsPressed;
 
             if (mouseDownThisFrame)
             {
diff --git a/Modules/LicensingLegacy/LicenseManagementWindow.bindings.cs b/Modules/LicensingLegacy/LicenseManagementWindow.bindings.cs
deleted file mode 100644
index 8dc0407152..0000000000
--- a/Modules/LicensingLegacy/LicenseManagementWindow.bindings.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using UnityEngine.Bindings;
-
-namespace UnityEditor
-{
-    [NativeHeader("Modules/LicensingLegacy/LicenseInfo.h")]
-    [StaticAccessor("LicensingLegacy::LicenseInfo::Get()", StaticAccessorType.Arrow)]
-    internal partial class LicenseManagementWindow
-    {
-        [NativeName("QueryLicenseUpdateChecked")]
-        public static extern void CheckForUpdates();
-        [NativeName("NewActivation")]
-        public static extern void ActivateNewLicense();
-        public static extern void ManualActivation();
-        public static extern void ReturnLicense();
-    }
-}
diff --git a/Modules/LicensingLegacy/LicenseManagementWindow.cs b/Modules/LicensingLegacy/LicenseManagementWindow.cs
deleted file mode 100644
index bbd3b86b42..0000000000
--- a/Modules/LicensingLegacy/LicenseManagementWindow.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using UnityEngine;
-using UnityEditor;
-
-namespace UnityEditor
-{
-    internal partial class LicenseManagementWindow : EditorWindow
-    {
-        static private int width = 600;
-        static private int height = 350;
-        static private int left = 0;
-        static private int top = 0;
-        static private int offsetX = 50;
-        static private int offsetY = 25;
-        static private int buttonWidth = 140;
-
-        static private Rect windowArea;
-        static private Rect rectArea = new Rect(offsetX, offsetY, width - offsetX * 2, height - offsetY * 2);
-        static LicenseManagementWindow win = null;
-
-        private static LicenseManagementWindow Window
-        {
-            get
-            {
-                if (win == null)
-                    win = EditorWindow.GetWindowWithRect<LicenseManagementWindow>(windowArea, true, "License Management");
-
-                return win;
-            }
-        }
-
-        static void ShowWindow()
-        {
-            Resolution res = Screen.currentResolution;
-            left = (res.width - width) / 2;
-            top = (res.height - height) / 2;
-            windowArea = new Rect(left, top, width, height);
-            win = Window;
-            win.position = windowArea;
-            win.Show();
-        }
-
-        void OnGUI()
-        {
-            GUILayout.BeginArea(rectArea);
-            GUILayout.FlexibleSpace();
-
-            GUILayout.BeginHorizontal();
-            if (GUILayout.Button("Check for updates", GUILayout.ExpandHeight(true), GUILayout.Width(buttonWidth)))
-                CheckForUpdates();
-            GUI.skin.label.wordWrap = true;
-            GUILayout.Label("Checks for updates to the currently installed license. If you have purchased "
-                + "addons you can install them by pressing this button (Internet access required)");
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(15);
-
-            GUILayout.BeginHorizontal();
-            if (GUILayout.Button("Activate new license", GUILayout.ExpandHeight(true), GUILayout.Width(buttonWidth)))
-            {
-                ActivateNewLicense();
-                Window.Close();
-            }
-            GUILayout.Label("Activate Unity with a different serial number, switch to a free serial or start "
-                + "a trial period if you are eligible for it (Internet access required).");
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(15);
-
-            GUILayout.BeginHorizontal();
-            if (GUILayout.Button("Return license", GUILayout.ExpandHeight(true), GUILayout.Width(buttonWidth)))
-                ReturnLicense();
-            GUILayout.Label("Return this license and free an activation for the serial it is using. You can then"
-                + " reuse the activation on another machine (Internet access required).");
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(15);
-
-            GUILayout.BeginHorizontal();
-            if (GUILayout.Button("Manual activation", GUILayout.ExpandHeight(true), GUILayout.Width(buttonWidth)))
-                ManualActivation();
-            GUILayout.Label("Start the manual activation process, you can save this machines license activation "
-                + "request file or deploy a license file you have already activated manually.");
-            GUILayout.EndHorizontal();
-
-            GUILayout.Space(15);
-
-            GUILayout.BeginHorizontal();
-            if (GUILayout.Button("Unity FAQ", GUILayout.ExpandHeight(true), GUILayout.Width(buttonWidth)))
-                Application.OpenURL("http://unity3d.com/unity/faq");
-            GUILayout.Label("Open the Unity FAQ web page, where you can find information about Unity's license system.");
-            GUILayout.EndHorizontal();
-
-            GUILayout.FlexibleSpace();
-            GUILayout.EndArea();
-        }
-    }
-}
diff --git a/Modules/PackageManager/Editor/Managed/Client.cs b/Modules/PackageManager/Editor/Managed/Client.cs
index bf669e7570..bbdb9f9ac0 100644
--- a/Modules/PackageManager/Editor/Managed/Client.cs
+++ b/Modules/PackageManager/Editor/Managed/Client.cs
@@ -114,7 +114,14 @@ internal static GetCachedPackagesRequest GetCachedPackages(string registryId)
         internal static GetCacheRootRequest GetCacheRoot()
         {
             long operationId;
-            var status = GetCacheRoot(out operationId);
+            var status = GetCacheRoot(out operationId, ConfigSource.Unknown);
+            return new GetCacheRootRequest(operationId, status);
+        }
+
+        internal static GetCacheRootRequest GetDefaultCacheRoot()
+        {
+            long operationId;
+            var status = GetCacheRoot(out operationId, ConfigSource.Default);
             return new GetCacheRootRequest(operationId, status);
         }
 
@@ -150,9 +157,6 @@ public static SearchRequest Search(string packageIdOrName, bool offlineMode)
             if (string.IsNullOrWhiteSpace(packageIdOrName))
                 throw new ArgumentException("Package id or name cannot be null, empty or whitespace", nameof(packageIdOrName));
 
-            if (string.IsNullOrWhiteSpace(packageIdOrName))
-                throw new ArgumentNullException(nameof(packageIdOrName));
-
             long operationId;
             var status = GetPackageInfo(out operationId, packageIdOrName, offlineMode);
             return new SearchRequest(operationId, status, packageIdOrName);
diff --git a/Modules/PackageManager/Editor/Managed/PackageInfo.cs b/Modules/PackageManager/Editor/Managed/PackageInfo.cs
index 6bcbbeed42..e9e1f48a0e 100644
--- a/Modules/PackageManager/Editor/Managed/PackageInfo.cs
+++ b/Modules/PackageManager/Editor/Managed/PackageInfo.cs
@@ -81,7 +81,7 @@ public sealed partial class PackageInfo
 
         [SerializeField]
         [NativeName("versions")]
-        private VersionsInfo m_Versions = new VersionsInfo(null, null, null);
+        private VersionsInfo m_Versions = new VersionsInfo(null, null, null, null);
 
         [SerializeField]
         [NativeName("dependencies")]
@@ -155,6 +155,14 @@ public sealed partial class PackageInfo
         [NativeName("signature")]
         private SignatureInfo m_Signature = new SignatureInfo();
 
+        [SerializeField]
+        [NativeName("isDeprecated")]
+        private bool m_IsDeprecated = false;
+
+        [SerializeField]
+        [NativeName("deprecationMessage")]
+        private string m_DeprecationMessage = "";
+
         internal PackageInfo() {}
 
         public string packageId { get { return m_PackageId;  } }
@@ -189,6 +197,8 @@ internal PackageInfo() {}
         internal string upmReserved { get { return m_UpmReserved; } }
         public RegistryInfo registry { get { return m_Registry; } }
         internal SignatureInfo signature { get { return m_Signature ; } }
+        public bool isDeprecated { get { return m_IsDeprecated; } }
+        public string deprecationMessage { get { return m_DeprecationMessage; } }
 
         public DateTime? datePublished
         {
@@ -240,14 +250,7 @@ public static PackageInfo FindForAssembly(Assembly assembly)
                 return FindForAssetPath(asmdefPath);
 
             // No asmdef - this is a precompiled DLL.
-            // Do a scan through all packages for one that owns the directory in which it is.
-            foreach (var package in GetAllRegisteredPackages())
-            {
-                if (fullPath.StartsWith(package.resolvedPath + Path.DirectorySeparatorChar))
-                    return package;
-            }
-
-            return null;
+            return FindForAssetPath(fullPath);
         }
 
         internal static List<PackageInfo> GetForAssemblyFilePaths(List<string> assemblyPaths)
diff --git a/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs b/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
index a6732a0a14..64bdb77c08 100644
--- a/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
+++ b/Modules/PackageManager/Editor/Managed/PackageManager.bindings.cs
@@ -35,7 +35,7 @@ public static partial class Client
         private static extern NativeStatusCode GetCachedPackages([Out] out long operationId, string registryId);
 
         [FreeFunction("PackageManager::GetCacheRoot::StartOperation")]
-        private static extern NativeStatusCode GetCacheRoot([Out] out long operationId);
+        private static extern NativeStatusCode GetCacheRoot([Out] out long operationId, ConfigSource source);
 
         [FreeFunction("PackageManager::GetPackageInfo::StartOperation")]
         private static extern NativeStatusCode GetPackageInfo([Out] out long operationId, string packageId, bool offlineMode);
diff --git a/Modules/PackageManager/Editor/Managed/VersionsInfo.cs b/Modules/PackageManager/Editor/Managed/VersionsInfo.cs
index 31f0712a76..02b4382739 100644
--- a/Modules/PackageManager/Editor/Managed/VersionsInfo.cs
+++ b/Modules/PackageManager/Editor/Managed/VersionsInfo.cs
@@ -21,6 +21,7 @@ public class VersionsInfo
         [SerializeField]
         [NativeName("all")]
         private string[] m_All;
+
         [SerializeField]
         [NativeName("compatible")]
         private string[] m_Compatible;
@@ -29,21 +30,28 @@ public class VersionsInfo
         [NativeName("verified")]
         private string m_Verified;
 
+        [SerializeField]
+        [NativeName("deprecated")]
+        private string[] m_Deprecated;
+
         private VersionsInfo() {}
 
         internal VersionsInfo(
             IEnumerable<string> all,
             IEnumerable<string> compatible,
-            string verified)
+            string verified,
+            IEnumerable<string> deprecated)
         {
             m_All = (all ?? new string[] {}).ToArray();
             m_Compatible = (compatible ?? new string[] {}).ToArray();
             m_Verified = verified ?? string.Empty;
+            m_Deprecated = (deprecated ?? new string[] {}).ToArray();
         }
 
         public string[] all { get { return m_All; } }
         public string[] compatible { get { return m_Compatible; } }
         public string verified { get { return m_Verified; } }
+        public string[] deprecated { get { return m_Deprecated; } }
 
         [Obsolete("'recommended' is obsolete; use 'verified' instead. (UnityUpgradable) -> verified", false)]
         public string recommended { get { return m_Verified; } }
diff --git a/Modules/PackageManagerUI/Editor/Extensions/InputDropdownArgs.cs b/Modules/PackageManagerUI/Editor/Extensions/InputDropdownArgs.cs
index 083ebbe197..c65f8ead67 100644
--- a/Modules/PackageManagerUI/Editor/Extensions/InputDropdownArgs.cs
+++ b/Modules/PackageManagerUI/Editor/Extensions/InputDropdownArgs.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.PackageManager.UI
@@ -16,5 +17,6 @@ internal struct InputDropdownArgs
         public string submitButtonText;
         public string defaultValue;
         public Action<string> onInputSubmitted;
+        public Vector2? windowSize;
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/External/EditorGameServiceExtension.cs b/Modules/PackageManagerUI/Editor/External/EditorGameServiceExtension.cs
index 465032515f..b6430ed076 100644
--- a/Modules/PackageManagerUI/Editor/External/EditorGameServiceExtension.cs
+++ b/Modules/PackageManagerUI/Editor/External/EditorGameServiceExtension.cs
@@ -34,24 +34,12 @@ internal class CloudProjectSettings : ICloudProjectSettings
         const string k_ProjectGuid = "ProjectGuid";
         const string k_PageContentType = "packages and features";
         internal const string k_ServicesConfigPath = "Resources/services.json";
-
-        internal const int k_ToolsPriority = 100;
         internal const int k_ServicesPriority = 200;
 
         internal static Dictionary<string, int> groupIndexes = new Dictionary<string, int>();
         static Dictionary<string, string> s_GroupMap = new Dictionary<string, string>();
         internal static ICloudProjectSettings cloudProjectSettings = new CloudProjectSettings();
 
-        internal static bool FilterToolsPackage(IPackage package)
-        {
-            return package?.Is(PackageType.Unity) == true && !FilterServicesPackage(package);
-        }
-
-        internal static string GetToolsPackageGroupName(IPackage package)
-        {
-            return package?.Is(PackageType.Feature) == true ? L10n.Tr("Features") : L10n.Tr("Packages");
-        }
-
         internal static bool FilterServicesPackage(IPackage package)
         {
             return !string.IsNullOrWhiteSpace(GetServicesPackageGroupName(package));
@@ -91,10 +79,7 @@ public void OnWindowCreated(WindowCreatedArgs args)
 
             var pageManager = ServicesContainer.instance.Resolve<PageManager>();
 
-            pageManager.AddSubPage(PackageFilterTab.UnityRegistry, "tools", L10n.Tr("Tools"), L10n.Tr(k_PageContentType), k_ToolsPriority, FilterToolsPackage, GetToolsPackageGroupName);
             pageManager.AddSubPage(PackageFilterTab.UnityRegistry, "services", L10n.Tr("Services"), L10n.Tr(k_PageContentType), k_ServicesPriority,  FilterServicesPackage, GetServicesPackageGroupName, CompareGroup);
-
-            pageManager.AddSubPage(PackageFilterTab.InProject, "tools", L10n.Tr("Tools"), L10n.Tr(k_PageContentType), k_ToolsPriority, FilterToolsPackage, GetToolsPackageGroupName);
             pageManager.AddSubPage(PackageFilterTab.InProject, "services", L10n.Tr("Services"), L10n.Tr(k_PageContentType), k_ServicesPriority, FilterServicesPackage, GetServicesPackageGroupName, CompareGroup);
 
             m_ConfigureButton = args.window.AddPackageActionButton();
diff --git a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageCacheManagementAnalytics.cs b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageCacheManagementAnalytics.cs
new file mode 100644
index 0000000000..e22499b66a
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageCacheManagementAnalytics.cs
@@ -0,0 +1,46 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    [Serializable]
+    internal struct PackageCacheManagementAnalytics
+    {
+        private const string k_EventName = "packageCacheManagementUserAction";
+
+        public string action;
+        public string type;
+        public string[] old_path_statuses;
+        public string[] new_path_statuses;
+
+        public static void SendAssetStoreEvent(string action, string[] oldPathStatuses, string[] newPathStatuses = null)
+        {
+            SendEvent(action, "AssetStore", oldPathStatuses, newPathStatuses);
+        }
+
+        public static void SendUpmEvent(string action, string[] oldPathStatuses, string[] newPathStatuses = null)
+        {
+            SendEvent(action, "UPM", oldPathStatuses, newPathStatuses);
+        }
+
+        private static void SendEvent(string action, string type, string[] oldPathStatuses, string[] newPathStatuses)
+        {
+            var editorAnalyticsProxy = ServicesContainer.instance.Resolve<EditorAnalyticsProxy>();
+            if (!editorAnalyticsProxy.RegisterEvent(k_EventName))
+                return;
+
+            var parameters = new PackageCacheManagementAnalytics
+            {
+                action = action,
+                type = type,
+                old_path_statuses = oldPathStatuses,
+                new_path_statuses = newPathStatuses
+            };
+
+            editorAnalyticsProxy.SendEventWithLimit(k_EventName, parameters);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerDialogAnalytics.cs b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerDialogAnalytics.cs
new file mode 100644
index 0000000000..fcd3e46751
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerDialogAnalytics.cs
@@ -0,0 +1,35 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    [Serializable]
+    internal struct PackageManagerDialogAnalytics
+    {
+        private const string k_EventName = "packageManagerDialogs";
+
+        public string id;
+        public string title;
+        public string message;
+        public string user_response;
+
+        public static void SendEvent(string id, string title, string message, string userResponse)
+        {
+            var editorAnalyticsProxy = ServicesContainer.instance.Resolve<EditorAnalyticsProxy>();
+            if (!editorAnalyticsProxy.RegisterEvent(k_EventName))
+                return;
+
+            var parameters = new PackageManagerDialogAnalytics
+            {
+                id = id,
+                title = title,
+                message = message,
+                user_response = userResponse
+            };
+            editorAnalyticsProxy.SendEventWithLimit(k_EventName, parameters);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerFiltersAnalytics.cs b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerFiltersAnalytics.cs
new file mode 100644
index 0000000000..3d96cfd4a8
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerFiltersAnalytics.cs
@@ -0,0 +1,40 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    [Serializable]
+    internal struct PackageManagerFiltersAnalytics
+    {
+        private const string k_EventName = "packageManagerWindowFilters";
+
+        public string filter_tab;
+        public string order_by;
+        public string status;
+        public string[] categories;
+        public string[] labels;
+
+        public static void SendEvent(PageFilters filters)
+        {
+            var servicesContainer = ServicesContainer.instance;
+            var editorAnalyticsProxy = servicesContainer.Resolve<EditorAnalyticsProxy>();
+            if (!editorAnalyticsProxy.RegisterEvent(k_EventName))
+                return;
+
+            var filterTab = PackageManagerWindowAnalytics.GetFilterNameWithSubPage(servicesContainer.Resolve<PackageFiltering>(), servicesContainer.Resolve<PageManager>());
+            var orderBy = filters.isReverseOrder ? $"{filters.orderBy} (reversed)" : filters.orderBy;
+            var parameters = new PackageManagerFiltersAnalytics
+            {
+                filter_tab = filterTab,
+                order_by = orderBy,
+                status = filters.status,
+                categories = filters.categories.ToArray(),
+                labels = filters.labels.ToArray()
+            };
+            editorAnalyticsProxy.SendEventWithLimit(k_EventName, parameters);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerOperationErrorAnalytics.cs b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerOperationErrorAnalytics.cs
new file mode 100644
index 0000000000..22c1dda31a
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerOperationErrorAnalytics.cs
@@ -0,0 +1,40 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    [Serializable]
+    internal struct PackageManagerOperationErrorAnalytics
+    {
+        private const string k_EventName = "packageManagerWindowOperationError";
+
+        public string operation_type;
+        public string message;
+        public string error_type;
+        public int status_code;
+        public string[] attributes;
+        public string read_more_url;
+
+        public static void SendEvent(string operationType, UIError error)
+        {
+            var servicesContainer = ServicesContainer.instance;
+            var editorAnalyticsProxy = servicesContainer.Resolve<EditorAnalyticsProxy>();
+            if (!editorAnalyticsProxy.RegisterEvent(k_EventName))
+                return;
+
+            var parameters = new PackageManagerOperationErrorAnalytics
+            {
+                operation_type = operationType,
+                message = error.message,
+                error_type = error.errorCode.ToString(),
+                status_code = error.operationErrorCode,
+                attributes = error.attribute == UIError.Attribute.None ? new string[0] : error.attribute.ToString().Split(','),
+                read_more_url = error.readMoreURL ?? string.Empty
+            };
+            editorAnalyticsProxy.SendEventWithLimit(k_EventName, parameters);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs
index 342a3df8f2..414e0178af 100644
--- a/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Analytics/PackageManagerWindowAnalytics.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
@@ -11,55 +12,60 @@ namespace UnityEditor.PackageManager.UI.Internal
     [Serializable]
     internal struct PackageManagerWindowAnalytics
     {
+        private const string k_EventName = "packageManagerWindowUserAction";
+
         public string action;
         public string package_id;
+        public string[] package_ids;
         public string search_text;
         public string filter_name;
+        public string details_tab;
         public bool window_docked;
         public bool dependencies_visible;
         public bool preview_visible;
-        public long t_since_start;  // in microseconds
-        public long ts;             // in milliseconds
 
-        public static void Setup()
+        public static string GetFilterNameWithSubPage(PackageFiltering packageFiltering, PageManager pageManager)
         {
-            int maxEventsPerHour = 1000;
-            int maxNumberOfElementInStruct = 100;
-            string vendorKey = "unity.package-manager-ui";
-
-            EditorAnalytics.RegisterEventWithLimit("packageManagerWindowUserAction", maxEventsPerHour, maxNumberOfElementInStruct, vendorKey);
+            var filterName = packageFiltering.currentFilterTab.ToString();
+            var page = pageManager.GetCurrentPage();
+            var subPage = page.subPages.Skip(1).Any() ? page.currentSubPage : null;
+            // Add the name of the sub page into the filter name for now
+            if (!string.IsNullOrEmpty(subPage?.name))
+                filterName += "/" + subPage.name;
+            return filterName;
         }
 
-        public static void SendEvent(string action, string packageId = null)
+        public static void SendEvent(string action, string packageId = null, IEnumerable<string> packageIds = null)
         {
+            var servicesContainer = ServicesContainer.instance;
+            var editorAnalyticsProxy = servicesContainer.Resolve<EditorAnalyticsProxy>();
+            if (!editorAnalyticsProxy.RegisterEvent(k_EventName))
+                return;
+
             // remove sensitive part of the id: file path or url is not tracked
             if (!string.IsNullOrEmpty(packageId))
                 packageId = Regex.Replace(packageId, "(?<package>[^@]+)@(?<protocol>[^:]+):.+", "${package}@${protocol}");
 
-            var servicesContainer = ServicesContainer.instance;
             var packageFiltering = servicesContainer.Resolve<PackageFiltering>();
+            var packageManagerPrefs = servicesContainer.Resolve<PackageManagerPrefs>();
             var settingsProxy = servicesContainer.Resolve<PackageManagerProjectSettingsProxy>();
-
-            // Add the name of the sub page into the filter name for now
-            var filterName = packageFiltering.currentFilterTab.ToString();
-            var page = servicesContainer.Resolve<PageManager>().GetCurrentPage();
-            var subPage = page.subPages.Skip(1).Any() ? page.currentSubPage : null;
-            if (!string.IsNullOrEmpty(subPage?.name))
-                filterName += "/" + subPage.name;
+            var filterName = GetFilterNameWithSubPage(packageFiltering, servicesContainer.Resolve<PageManager>());
 
             var parameters = new PackageManagerWindowAnalytics
             {
                 action = action,
                 package_id = packageId ?? string.Empty,
+                package_ids = packageIds?.ToArray() ?? new string[0],
                 search_text = packageFiltering.currentSearchText,
                 filter_name = filterName,
+                details_tab = packageManagerPrefs.selectedPackageDetailsTabIdentifier ?? string.Empty,
                 window_docked = EditorWindow.GetWindowDontShow<PackageManagerWindow>()?.docked ?? false,
-                dependencies_visible = settingsProxy.enablePackageDependencies,
-                preview_visible = settingsProxy.enablePreReleasePackages,
-                t_since_start = (long)(EditorApplication.timeSinceStartup * 1E6),
-                ts = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond
+                // packages installed as dependency are always visible
+                // we keep the dependencies_visible to not break the analytics
+                dependencies_visible = true,
+                preview_visible = settingsProxy.enablePreReleasePackages
             };
-            EditorAnalytics.SendEventWithLimit("packageManagerWindowUserAction", parameters);
+            editorAnalyticsProxy.SendEventWithLimit(k_EventName, parameters);
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs
index 06993cee92..3dae51be1b 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreCache.cs
@@ -22,8 +22,6 @@ internal class AssetStoreCache : ISerializationCallbackReceiver
 
         private Dictionary<string, AssetStoreLocalInfo> m_LocalInfos = new Dictionary<string, AssetStoreLocalInfo>();
 
-        private Texture2D m_MissingTexture;
-
         [SerializeField]
         private string[] m_SerializedKeys = new string[0];
 
@@ -124,7 +122,7 @@ public virtual Texture2D LoadImage(long productId, string url)
             }
             catch (System.IO.IOException e)
             {
-                Debug.Log($"[Package Manager] Cannot load image: {e.Message}");
+                Debug.Log($"[Package Manager Window] Cannot load image: {e.Message}");
             }
 
             return null;
@@ -147,17 +145,12 @@ public virtual void SaveImage(long productId, string url, Texture2D texture)
             }
             catch (System.IO.IOException e)
             {
-                Debug.Log($"[Package Manager] Cannot save image: {e.Message}");
+                Debug.Log($"[Package Manager Window] Cannot save image: {e.Message}");
             }
         }
 
         public virtual void DownloadImageAsync(long productID, string url, Action<long, Texture2D> doneCallbackAction = null)
         {
-            if (m_MissingTexture == null)
-            {
-                m_MissingTexture = (Texture2D)EditorGUIUtility.LoadRequired("Icons/UnityLogo.png");
-            }
-
             var texture = LoadImage(productID, url);
             if (texture != null)
             {
@@ -175,7 +168,7 @@ public virtual void DownloadImageAsync(long productID, string url, Action<long,
                     return;
                 }
 
-                doneCallbackAction?.Invoke(productID, m_MissingTexture);
+                doneCallbackAction?.Invoke(productID, null);
             };
             httpRequest.Begin();
         }
@@ -188,7 +181,6 @@ public virtual void ClearCache()
             m_PurchaseInfos.Clear();
             m_ProductInfos.Clear();
             m_LocalInfos.Clear();
-            m_MissingTexture = null;
         }
 
         public virtual AssetStorePurchaseInfo GetPurchaseInfo(string productIdString)
@@ -255,10 +247,7 @@ public virtual void SetLocalInfos(IEnumerable<AssetStoreLocalInfo> localInfos)
                 if (localInfoUpdated)
                     addedOrUpdatedLocalInfos.Add(info);
                 else
-                {
-                    info.updateInfoFetched = oldInfo.updateInfoFetched;
-                    info.canUpdate = oldInfo.canUpdate;
-                }
+                    info.updateStatus = oldInfo.updateStatus;
             }
             if (addedOrUpdatedLocalInfos.Any() || oldLocalInfos.Any())
                 onLocalInfosChanged?.Invoke(addedOrUpdatedLocalInfos, oldLocalInfos.Values);
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClient.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClient.cs
index 31717a4c05..6a32a96b0d 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClient.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreClient.cs
@@ -353,22 +353,37 @@ public virtual void CheckUpdate(IEnumerable<string> productIds, Action doneCallb
                 }
                 else
                 {
+                    // If an asset store package is disabled, we won't get properly update info from the server (the id field will be transformed to something else)
+                    // in the past we consider this case as `updateInfo` not checked and that causes the Package Manager to check update indefinitely.
+                    // Now we want to mark all packages that we called `CheckUpdate` on as updateInfoFetched to avoid unnecessary calls on disabled packages.
+                    foreach (var localInfo in productIds.Select(id => m_AssetStoreCache.GetLocalInfo(id)).Where(info => info != null))
+                        localInfo.updateStatus |= AssetStoreLocalInfo.UpdateStatus.UpdateChecked;
+
                     var results = updateDetails.GetList<IDictionary<string, object>>("results") ?? Enumerable.Empty<IDictionary<string, object>>();
+                    var updatedLocalInfos = new List<AssetStoreLocalInfo>();
                     foreach (var updateDetail in results)
                     {
                         var id = updateDetail.GetString("id");
                         var localInfo = m_AssetStoreCache.GetLocalInfo(id);
                         if (localInfo != null)
                         {
-                            localInfo.updateInfoFetched = true;
-                            var newValue = updateDetail.Get("can_update", 0L) != 0L;
-                            if (localInfo.canUpdate != newValue)
+                            var oldUpdateStatus = localInfo.updateStatus;
+                            localInfo.updateStatus &= ~(AssetStoreLocalInfo.UpdateStatus.CanUpdate | AssetStoreLocalInfo.UpdateStatus.CanDowngrade);
+                            if (updateDetail.Get("can_update", 0L) != 0L)
                             {
-                                localInfo.canUpdate = newValue;
-                                OnLocalInfosChanged(new[] { localInfo }, null);
+                                var recommendVersionCompare = updateDetail.Get("recommend_version_compare", 0L);
+                                if (recommendVersionCompare < 0L)
+                                    localInfo.updateStatus |= AssetStoreLocalInfo.UpdateStatus.CanDowngrade;
+                                else
+                                    localInfo.updateStatus |= AssetStoreLocalInfo.UpdateStatus.CanUpdate;
                             }
+
+                            if (oldUpdateStatus != localInfo.updateStatus)
+                                updatedLocalInfos.Add(localInfo);
                         }
                     }
+                    if (updatedLocalInfos.Any())
+                       OnLocalInfosChanged(updatedLocalInfos, null);
                     onUpdateChecked?.Invoke(productIds);
                 }
                 doneCallbackAction?.Invoke();
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs
index 57c03f75e5..a02684455c 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadManager.cs
@@ -280,7 +280,8 @@ private void OnAssetStoreCacheConfigChange(CachePathConfig config)
             if ((config.status == ConfigStatus.Success || config.status == ConfigStatus.ReadOnly) && IsAnyDownloadInProgressOrPause())
             {
                 if (!m_Application.isBatchMode)
-                    m_Application.DisplayDialog(L10n.Tr("Package Manager"),
+                    m_Application.DisplayDialog("assetCacheLocationChanged",
+                        L10n.Tr("Assets Cache location changed"),
                         L10n.Tr("The Assets Cache location has been changed, all current downloads will be aborted."),
                         L10n.Tr("Ok"));
 
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadOperation.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadOperation.cs
index da2b142c1a..b569c549ce 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreDownloadOperation.cs
@@ -40,11 +40,11 @@ internal class AssetStoreDownloadOperation : IOperation
 
         public bool isOfflineMode => false;
 
-        public bool isInProgress => (state & DownloadState.InProgress) != 0;
+        public virtual bool isInProgress => (state & DownloadState.InProgress) != 0;
 
         public bool isInPause => (state & DownloadState.InPause) != 0;
 
-        public bool isProgressVisible => (state & ~DownloadState.DownloadRequested & (DownloadState.InPause | DownloadState.InProgress)) != 0;
+        public virtual bool isProgressVisible => (state & ~DownloadState.DownloadRequested & (DownloadState.InPause | DownloadState.InProgress)) != 0;
 
         public bool isProgressTrackable => true;
 
@@ -65,7 +65,7 @@ internal class AssetStoreDownloadOperation : IOperation
 
         [SerializeField]
         private DownloadState m_State;
-        public DownloadState state => m_State;
+        public virtual DownloadState state => m_State;
 
         [SerializeField]
         private string m_ErrorMessage;
@@ -90,7 +90,7 @@ public void ResolveDependencies(AssetStoreUtils assetStoreUtils,
             m_AssetStoreCachePathProxy = assetStoreCachePathProxy;
         }
 
-        private AssetStoreDownloadOperation()
+        public AssetStoreDownloadOperation()
         {
         }
 
@@ -155,18 +155,22 @@ private void OnErrorMessage(string errorMessage, int operationErrorCode = -1, UI
             else
                 Debug.LogError($"{k_ConsoleLogPrefix} {errorMessage}");
 
+            attr |= UIError.Attribute.IsDetailInConsole;
             if (operationErrorCode == 403)
             {
                 m_ErrorMessage = k_ForbiddenErrorMessage;
             }
             else
             {
-                attr |= UIError.Attribute.IsDetailInConsole | UIError.Attribute.IsClearable;
+                attr |= UIError.Attribute.IsClearable;
                 m_ErrorMessage = k_DownloadErrorMessage;
             }
 
-            onOperationError?.Invoke(this, new UIError(UIErrorCode.AssetStoreOperationError, m_ErrorMessage, attr, operationErrorCode));
+            var error = new UIError(UIErrorCode.AssetStoreOperationError, m_ErrorMessage, attr, operationErrorCode);
+            onOperationError?.Invoke(this, error);
             onOperationFinalized?.Invoke(this);
+
+            PackageManagerOperationErrorAnalytics.SendEvent(GetType().Name, error);
         }
 
         public void Pause()
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs
index 3ebb2bc80a..72e9f4071b 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreListOperation.cs
@@ -34,6 +34,8 @@ internal class AssetStoreListOperation : IOperation
 
         public bool isProgressVisible => false;
 
+        public bool isInPause => false;
+
         public RefreshOptions refreshOptions => RefreshOptions.Purchased;
 
         public bool isProgressTrackable => false;
@@ -197,6 +199,8 @@ private void OnOperationError(UIError error)
         {
             onOperationError?.Invoke(this, error);
             FinalizedOperation();
+
+            PackageManagerOperationErrorAnalytics.SendEvent(GetType().Name, error);
         }
 
         private void FinalizedOperation()
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs
index 0dfacf2350..62a34043ec 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreLocalInfo.cs
@@ -10,17 +10,30 @@ namespace UnityEditor.PackageManager.UI.Internal
     [Serializable]
     internal class AssetStoreLocalInfo
     {
+        [Flags]
+        internal enum UpdateStatus
+        {
+            None            = 0,
+            UpdateChecked   = 1 << 0,
+            CanUpdate       = 1 << 1,
+            CanDowngrade    = 1 << 2
+        }
+
         public string id;
         public string versionString;
         public string versionId;
+        public string uploadId;
         public string publishedDate;
         public string supportedVersion;
         public string packagePath;
         public string publishNotes;
         public string firstPublishedDate;
 
-        public bool updateInfoFetched;
-        public bool canUpdate;
+        public UpdateStatus updateStatus;
+        public bool updateInfoFetched => (updateStatus & UpdateStatus.UpdateChecked) != 0;
+        public bool canUpdateOrDowngrade => (updateStatus & (UpdateStatus.CanUpdate | UpdateStatus.CanDowngrade)) != 0;
+        public bool canUpdate => (updateStatus & UpdateStatus.CanUpdate) != 0;
+        public bool canDowngrade => (updateStatus & UpdateStatus.CanDowngrade) != 0;
 
         public static AssetStoreLocalInfo ParseLocalInfo(UnityEditor.PackageInfo localInfo)
         {
@@ -40,11 +53,11 @@ public static AssetStoreLocalInfo ParseLocalInfo(UnityEditor.PackageInfo localIn
                     packagePath = localInfo.packagePath ?? string.Empty,
                     versionString = jsonInfo.GetString("version") ?? string.Empty,
                     versionId = jsonInfo.GetString("version_id") ?? string.Empty,
+                    uploadId = jsonInfo.GetString("upload_id") ?? string.Empty,
                     publishedDate = jsonInfo.GetString("pubdate") ?? string.Empty,
                     supportedVersion = jsonInfo.GetString("unity_version") ?? string.Empty,
                     publishNotes = jsonInfo.GetString("publishnotes") ?? string.Empty,
-                    updateInfoFetched = false,
-                    canUpdate = false
+                    updateStatus = UpdateStatus.None
                 };
             }
             catch (Exception)
@@ -60,7 +73,8 @@ public Dictionary<string, string> ToDictionary()
                 ["local_path"] = packagePath ?? string.Empty,
                 ["id"] = id ?? string.Empty,
                 ["version"] = versionString ?? string.Empty,
-                ["version_id"] = versionId ?? string.Empty
+                ["version_id"] = versionId ?? string.Empty,
+                ["upload_id"] = uploadId ?? string.Empty
             };
         }
     }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackage.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackage.cs
index 0ecc3649eb..10ef52b2b6 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackage.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackage.cs
@@ -12,6 +12,10 @@ namespace UnityEditor.PackageManager.UI.Internal
     [Serializable]
     internal class AssetStorePackage : BasePackage
     {
+        public static readonly string k_IncompatibleWarningMessage = L10n.Tr("The downloaded version of this package is intended for Unity {0} and higher." +
+            " This version might not work with your current version of Unity." +
+            " Click Update to download a compatible version of the package.");
+
         [SerializeField]
         private string m_ProductId;
         public override string uniqueId => m_ProductId;
@@ -110,11 +114,17 @@ public AssetStorePackage(AssetStoreUtils assetStoreUtils, IOProxy ioProxy, Asset
                 var latestVersion = new AssetStorePackageVersion(assetStoreUtils, ioProxy, productInfo);
                 if (localInfo != null)
                 {
-                    // When no update is available, we just ignore most of the info in the `localInfo` and only take the path
-                    if (!localInfo.canUpdate)
-                        latestVersion.SetLocalPath(localInfo.packagePath);
-                    else
+                    if (localInfo.canUpdate)
                         m_VersionList.AddVersion(new AssetStorePackageVersion(assetStoreUtils, ioProxy, productInfo, localInfo));
+                    else
+                    {
+                        latestVersion.SetLocalPath(localInfo.packagePath);
+                        if (localInfo.canDowngrade)
+                        {
+                            var warningMessage = string.Format(k_IncompatibleWarningMessage, localInfo.supportedVersion);
+                            AddError(new UIError(UIErrorCode.AssetStorePackageError, warningMessage, UIError.Attribute.IsWarning));
+                        }
+                    }
                 }
                 m_VersionList.AddVersion(latestVersion);
             }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs
index 99e666f42e..b7823128df 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStorePackageVersion.cs
@@ -109,7 +109,7 @@ public void SetLocalPath(string path)
             }
             catch (System.IO.IOException e)
             {
-                Debug.Log($"[Package Manager] Cannot determine local path for {packageUniqueId}: {e.Message}");
+                Debug.Log($"[Package Manager Window] Cannot determine local path for {packageUniqueId}: {e.Message}");
                 m_IsAvailableOnDisk = false;
             }
         }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreProductInfo.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreProductInfo.cs
index 24ebdac008..8924f55324 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreProductInfo.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreProductInfo.cs
@@ -68,7 +68,7 @@ private AssetStoreProductInfo(AssetStoreUtils assetStoreUtils, string productId,
 
             packageName = productDetail.GetString("packageName") ?? string.Empty;
             category = productDetail.GetDictionary("category")?.GetString("name") ?? string.Empty;
-            publishNotes = productDetail.GetString("publishNotes") ?? string.Empty;
+            publishNotes = CleanUpHtml(productDetail.GetString("publishNotes") ?? string.Empty, false);
             firstPublishedDate = productDetail.GetDictionary("properties")?.GetString("firstPublishedDate");
 
             var versionInfo = productDetail.GetDictionary("version");
@@ -99,14 +99,18 @@ public static AssetStoreProductInfo ParseProductInfo(AssetStoreUtils assetStoreU
             return new AssetStoreProductInfo(assetStoreUtils, productId, productDetail);
         }
 
-        internal static string CleanUpHtml(string source)
+        internal static string CleanUpHtml(string source, bool removeEndOfLine = true)
         {
             if (string.IsNullOrEmpty(source))
                 return source;
 
-            // first we remove all end of line, html tags will reformat properly
-            var result = source.Replace("\n", "");
-            result = result.Replace("\r", "");
+            var result = source;
+            if (removeEndOfLine)
+            {
+                // first we remove all end of line, html tags will reformat properly
+                result = result.Replace("\n", "");
+                result = result.Replace("\r", "");
+            }
 
             // then we add all \n from html tgs we want to support
             result = Regex.Replace(result, "</?br */?>", "\n", RegexOptions.IgnoreCase);
@@ -152,7 +156,7 @@ internal static string CleanUpHtml(string source)
 
         private List<PackageImage> GetImagesFromProductDetails(IDictionary<string, object> productDetail)
         {
-            int imageLimit = 3;
+            int imageLimit = 4;
             int imagesLoaded = 0;
 
             var result = new List<PackageImage>();
@@ -196,17 +200,20 @@ private List<PackageImage> GetImagesFromProductDetails(IDictionary<string, objec
                 else if (type == "vimeo")
                     imageType = PackageImage.ImageType.Vimeo;
 
+                // for now we only use screenshot types
                 var imageUrl = image.GetString("imageUrl");
                 if (imageType == PackageImage.ImageType.Screenshot)
+                {
                     imageUrl = "http:" + imageUrl;
 
-                result.Add(new PackageImage
-                {
-                    type = imageType,
-                    thumbnailUrl = "http:" + thumbnailUrl,
-                    url = imageUrl
-                });
-                ++imagesLoaded;
+                    result.Add(new PackageImage
+                    {
+                        type = imageType,
+                        thumbnailUrl = "http:" + thumbnailUrl,
+                        url = imageUrl
+                    });
+                    ++imagesLoaded;
+                }
             }
             return result;
         }
@@ -222,11 +229,11 @@ private List<PackageLink> GetLinksFromProductDetails(IDictionary<string, object>
             {
                 var url = publisher.GetString("url");
                 if (!string.IsNullOrEmpty(url) && Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute))
-                    result.Add(GetPackageLink("Publisher Website", url));
+                    result.Add(GetPackageLink(L10n.Tr("Publisher Website"), url, "viewPublisherWebsite"));
 
                 var supportUrl = publisher.GetString("supportUrl");
                 if (!string.IsNullOrEmpty(supportUrl) && Uri.IsWellFormedUriString(supportUrl, UriKind.RelativeOrAbsolute))
-                    result.Add(GetPackageLink("Publisher Support", supportUrl));
+                    result.Add(GetPackageLink(L10n.Tr("Publisher Support"), supportUrl, "viewPublisherSupport"));
             }
             return result;
         }
@@ -236,7 +243,7 @@ private PackageLink GetAssetStoreLinkFromProductDetails(IDictionary<string, obje
             var slug = productDetail.GetString("slug") ?? productDetail.GetString("id");
             var packagePath = $"/packages/p/{slug}";
 
-            return GetPackageLink("View in the Asset Store", packagePath);
+            return GetPackageLink(L10n.Tr("View in the Asset Store"), packagePath, "viewProductInAssetStore");
         }
 
         private List<PackageSizeInfo> GetSizeInfoFromProductDetails(IDictionary<string, object> productDetail)
@@ -270,11 +277,11 @@ private List<PackageSizeInfo> GetSizeInfoFromProductDetails(IDictionary<string,
             return result;
         }
 
-        private PackageLink GetPackageLink(string name, string url)
+        private PackageLink GetPackageLink(string name, string url, string analyticsEventName)
         {
             if (!url.StartsWith("http:", StringComparison.InvariantCulture) && !url.StartsWith("https:", StringComparison.InvariantCulture))
                 url = m_AssetStoreUtils.assetStoreUrl + url;
-            return new PackageLink { name = name, url = url };
+            return new PackageLink { name = name, url = url, analyticsEventName = analyticsEventName};
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs
index 633ef6d427..b13119f681 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreRestAPI.cs
@@ -267,7 +267,7 @@ void DoHttpRequest(Action<int> retryCallbackAction)
                             var responseCode = request.responseCode;
                             if (responseCode == 0)
                             {
-                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, k_ErrorMessage, responseCode));
+                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, k_ErrorMessage, operationErrorCode: responseCode));
                                 return;
                             }
 
@@ -281,7 +281,7 @@ void DoHttpRequest(Action<int> retryCallbackAction)
                             {
                                 var errorMessage = k_KnownErrors[k_GeneralClientError];
                                 k_KnownErrors.TryGetValue(request.responseCode, out errorMessage);
-                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, $"{responseCode} {errorMessage}. {k_ErrorMessage}", responseCode));
+                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, $"{responseCode} {errorMessage}. {k_ErrorMessage}", operationErrorCode: responseCode));
                                 return;
                             }
 
@@ -293,7 +293,7 @@ void DoHttpRequest(Action<int> retryCallbackAction)
                                 if (parsedResult.ContainsKey("errorMessage"))
                                 {
                                     var operationErrorCode = parsedResult.ContainsKey("errorCode") ? int.Parse(parsedResult.GetString("errorCode")) : -1;
-                                    errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, parsedResult.GetString("errorMessage"), operationErrorCode));
+                                    errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, parsedResult.GetString("errorMessage"), operationErrorCode: operationErrorCode));
                                 }
                                 else
                                     doneCallbackAction?.Invoke(parsedResult);
@@ -314,10 +314,10 @@ void RetryCallbackAction(int lastResponseCode)
                             {
                                 var errorMessage = k_KnownErrors[k_GeneralServerError];
                                 k_KnownErrors.TryGetValue(lastResponseCode, out errorMessage);
-                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, $"{lastResponseCode} {errorMessage}. {k_ErrorMessage}", lastResponseCode));
+                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, $"{lastResponseCode} {errorMessage}. {k_ErrorMessage}", operationErrorCode: lastResponseCode));
                             }
                             else
-                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, k_ErrorMessage, lastResponseCode));
+                                errorCallbackAction?.Invoke(new UIError(UIErrorCode.AssetStoreRestApiError, k_ErrorMessage, operationErrorCode: lastResponseCode));
                         }
                     }
 
diff --git a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs
index bdbba74188..4c38d10045 100644
--- a/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs
+++ b/Modules/PackageManagerUI/Editor/Services/AssetStore/AssetStoreVersionList.cs
@@ -34,6 +34,11 @@ internal class AssetStoreVersionList : IVersionList
 
         public bool hasLifecycleVersion => false;
 
+        public IPackageVersion GetUpdateTarget(IPackageVersion version)
+        {
+            return recommended;
+        }
+
         public AssetStoreVersionList(AssetStoreUtils assetStoreUtils, IOProxy ioProxy)
         {
             ResolveDependencies(assetStoreUtils, ioProxy);
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/BasePackage.cs b/Modules/PackageManagerUI/Editor/Services/Common/BasePackage.cs
index 5ef7590888..37a4c3d33b 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/BasePackage.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/BasePackage.cs
@@ -28,7 +28,7 @@ public PackageState state
                 foreach (var error in GetAllErrorsInPackageAndVersions())
                 {
                     ++numErrors;
-                    if (error.attribute == UIError.Attribute.IsWarning)
+                    if (error.HasAttribute(UIError.Attribute.IsWarning))
                         ++numWarnings;
                     else if (!error.HasAttribute(UIError.Attribute.IsClearable))
                         return PackageState.Error;
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs b/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs
index 3c7945b7d8..04efe67dc2 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/PlaceholderVersionList.cs
@@ -36,6 +36,11 @@ internal class PlaceholderVersionList : IVersionList
 
         public bool hasLifecycleVersion => false;
 
+        public IPackageVersion GetUpdateTarget(IPackageVersion version)
+        {
+            return recommended;
+        }
+
         public PlaceholderVersionList(PlaceholderPackageVersion version)
         {
             m_Versions = new[] { version };
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/PlayModeDownload.cs b/Modules/PackageManagerUI/Editor/Services/Common/PlayModeDownload.cs
index 4e9d855356..6cf109504b 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/PlayModeDownload.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/PlayModeDownload.cs
@@ -34,11 +34,12 @@ private static void PlayModeStateChanged(PlayModeStateChange state)
             if (state == PlayModeStateChange.ExitingEditMode)
             {
                 var assetStoreDownloadManager = ServicesContainer.instance.Resolve<AssetStoreDownloadManager>();
+                var applicationProxy = ServicesContainer.instance.Resolve<ApplicationProxy>();
                 if (assetStoreDownloadManager.IsAnyDownloadInProgress())
                 {
                     var title = L10n.Tr("Package download in progress");
                     var message = L10n.Tr("Please note that entering Play Mode while Unity is downloading a package may impact performance");
-                    var accept = EditorUtility.DisplayDialog(title, message, k_DefaultGotItButtonText, k_DefaultCancelButtonText);
+                    var accept = applicationProxy.DisplayDialog("enterPlayModeWhenDownloadInProgress", title, message, k_DefaultGotItButtonText, k_DefaultCancelButtonText);
 
                     if (accept)
                     {
@@ -63,9 +64,11 @@ public static bool CanBeginDownload()
         {
             if (!EditorApplication.isPlaying || PlayModeDownloadState.instance.skipShowDialog)
                 return true;
+
+            var applicationProxy = ServicesContainer.instance.Resolve<ApplicationProxy>();
             var title = L10n.Tr("Play Mode in progress");
             var message = L10n.Tr("Please note that making changes in the Package Manager while in Play Mode may impact performance.");
-            var accept = EditorUtility.DisplayDialog(title, message, k_DefaultGotItButtonText, k_DefaultCancelButtonText);
+            var accept = applicationProxy.DisplayDialog("startDownloadWhenInPlayMode", title, message, k_DefaultGotItButtonText, k_DefaultCancelButtonText);
 
             if (accept)
                 SetSkipDialog();
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs b/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs
index abc0c42e48..8996c38103 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/ResourceLoader.cs
@@ -34,17 +34,19 @@ internal static class StyleSheetPath
 
             internal static readonly string packageManagerCommon = "StyleSheets/PackageManager/Common.uss";
             internal static readonly string[] packageManagerComponents = {
-                "StyleSheets/PackageManager/PackageDependencies.uss",
+                "StyleSheets/PackageManager/PackageDetailsDependenciesTab.uss",
                 "StyleSheets/PackageManager/PackageDetails.uss",
                 "StyleSheets/PackageManager/PackageItem.uss",
                 "StyleSheets/PackageManager/PackageList.uss",
                 "StyleSheets/PackageManager/PackageLoadBar.uss",
-                "StyleSheets/PackageManager/PackageSampleList.uss",
+                "StyleSheets/PackageManager/PackageDetailsSamplesTab.uss",
+                "StyleSheets/PackageManager/PackageDetailsReleasesTab.uss",
+                "StyleSheets/PackageManager/PackageDetailsVersionsTab.uss",
                 "StyleSheets/PackageManager/PackageStatusBar.uss",
                 "StyleSheets/PackageManager/PackageToolbar.uss",
                 "StyleSheets/PackageManager/ProgressBar.uss",
                 "StyleSheets/PackageManager/FeatureDependencies.uss",
-                "StyleSheets/PackageManager/PackagePlatformList.uss"
+                "StyleSheets/PackageManager/PackageDetailsHeader.uss"
             };
 
             internal static readonly string filtersDropdown = "StyleSheets/PackageManager/Filters.uss";
diff --git a/Modules/PackageManagerUI/Editor/Services/Common/UIError.cs b/Modules/PackageManagerUI/Editor/Services/Common/UIError.cs
index 31e642d29d..43e90d5f20 100644
--- a/Modules/PackageManagerUI/Editor/Services/Common/UIError.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Common/UIError.cs
@@ -3,33 +3,37 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Text.RegularExpressions;
 using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
     [Serializable]
-    internal class UIError : Error
+    internal class UIError
     {
-        private static readonly string k_EntitlementErrorMessage = L10n.Tr("This package is not available to use because there is no license registered for your user. Please sign in with a licensed account. If the problem persists, please contact your administrator.");
+        private static readonly string k_EntitlementErrorMessage = L10n.Tr("An error occurred: This package isn't available because its license isn't registered to your user account. If you're licensed to use this package, go to Unity Hub > Preferences > Licenses and click Refresh. Otherwise, contact your administrator.");
         internal static readonly string k_InvalidSignatureWarningMessage = L10n.Tr("This package version doesn't have a valid signature. For your security, install a different version or report a bug to Unity.");
         internal static readonly string k_UnsignedUnityPackageWarningMessage = L10n.Tr("This package version has no signature. For your security, install a different version or review your scoped registry and load the package from the Unity registry.");
-        internal static readonly string k_readMoreDocsUrl = "https://docs.unity3d.com/Manual/upm-errors.html";
+        internal static readonly string k_ReadMoreDocsUrl = "https://docs.unity3d.com/Manual/upm-errors.html";
         public static readonly UIError k_EntitlementError = new UIError(UIErrorCode.Forbidden, k_EntitlementErrorMessage);
         public static readonly UIError k_EntitlementWarning = new UIError(UIErrorCode.Forbidden, k_EntitlementErrorMessage, Attribute.IsWarning);
         internal static readonly UIError k_InvalidSignatureWarning = new UIError(
             UIErrorCode.UpmError_InvalidSignature,
             k_InvalidSignatureWarningMessage,
             Attribute.IsWarning,
-            readMoreUrl: k_readMoreDocsUrl);
+            readMoreUrl: k_ReadMoreDocsUrl);
 
         internal static readonly UIError k_UnsignedUnityPackageWarning = new UIError(
             UIErrorCode.UpmError_UnsignedUnityPackage,
             k_UnsignedUnityPackageWarningMessage,
             Attribute.IsWarning,
-            readMoreUrl: k_readMoreDocsUrl);
+            readMoreUrl: k_ReadMoreDocsUrl);
 
         [SerializeField]
-        private UIErrorCode m_UIErrorCode;
+        private UIErrorCode m_ErrorCode;
+
+        [SerializeField]
+        private string m_Message;
 
         [SerializeField]
         private Attribute m_Attribute;
@@ -51,22 +55,47 @@ internal enum Attribute
             IsClearable         = 1 << 2
         }
 
-        public new UIErrorCode errorCode => m_UIErrorCode;
+        public UIErrorCode errorCode => m_ErrorCode;
+
+        public string message => m_Message;
 
         public int operationErrorCode => m_OperationErrorCode;
 
-        public Attribute attribute => m_Attribute;
+        public Attribute attribute
+        {
+            get => m_Attribute;
+            set => m_Attribute = value;
+        }
 
         public bool HasAttribute(Attribute attribute)
         {
             return (m_Attribute & attribute) != 0;
         }
 
-        public UIError(UIErrorCode errorCode, string message, int operationErrorCode) : this(errorCode, message, Attribute.None, operationErrorCode) {}
+        public UIError(Error error, Attribute attribute = Attribute.None) : this((UIErrorCode)error.errorCode, error.message, attribute)
+        {
+            // Currently the `Error` object we got from the Upm Client does not contain the status code (to be done in https://jira.unity3d.com/browse/PAK-2312)
+            // For now we want to extract it from the error message string as a workaround
+            const string errorMessageWithStatusCode = "failed with status code";
+            var index = message.IndexOf(errorMessageWithStatusCode);
+            if (index >= 0)
+            {
+                try
+                {
+                    var errorCodeString = Regex.Match(message.Substring(index), @"\d+").Value;
+                    m_OperationErrorCode = int.Parse(errorCodeString);
+                }
+                catch (Exception)
+                {
+                    m_OperationErrorCode = -1;
+                }
+            }
+        }
 
-        public UIError(UIErrorCode errorCode, string message, Attribute attribute = Attribute.None, int operationErrorCode = -1, string readMoreUrl = "") : base(NativeErrorCode.Unknown, message)
+        public UIError(UIErrorCode errorCode, string message, Attribute attribute = Attribute.None, int operationErrorCode = -1, string readMoreUrl = "")
         {
-            m_UIErrorCode = errorCode;
+            m_ErrorCode = errorCode;
+            m_Message = message;
             m_Attribute = attribute;
             m_OperationErrorCode = operationErrorCode;
             m_ReadMoreUrl = readMoreUrl;
diff --git a/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs b/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs
index 5984223ab9..b978b8b52f 100644
--- a/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Interfaces/IOperation.cs
@@ -25,6 +25,7 @@ internal interface IOperation
         long lastSuccessTimestamp { get; }
         bool isOfflineMode { get; }
         bool isInProgress { get; }
+        bool isInPause { get; }
         bool isProgressVisible { get; }
 
         bool isProgressTrackable { get; }
diff --git a/Modules/PackageManagerUI/Editor/Services/Interfaces/IVersionList.cs b/Modules/PackageManagerUI/Editor/Services/Interfaces/IVersionList.cs
index 5f5bb69001..203e62a56c 100644
--- a/Modules/PackageManagerUI/Editor/Services/Interfaces/IVersionList.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Interfaces/IVersionList.cs
@@ -28,5 +28,7 @@ internal interface IVersionList : IEnumerable<IPackageVersion>
         bool isNonLifecycleVersionInstalled { get; }
 
         bool hasLifecycleVersion { get; }
+
+        IPackageVersion GetUpdateTarget(IPackageVersion version);
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/PackageDatabase.cs b/Modules/PackageManagerUI/Editor/Services/Packages/PackageDatabase.cs
index ad963feeaf..1e39d02359 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/PackageDatabase.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/PackageDatabase.cs
@@ -215,7 +215,7 @@ public virtual IEnumerable<IPackageVersion> GetReverseDependencies(IPackageVersi
                 => (directDependenciesOnly ? p.dependencies : p.resolvedDependencies)?.Any(r => r.name == version.name) ?? false);
         }
 
-        public virtual IEnumerable<IPackageVersion> GetFeatureDependents(IPackageVersion version)
+        public virtual IEnumerable<IPackageVersion> GetFeaturesThatUseThisPackage(IPackageVersion version)
         {
             return GetReverseDependencies(version, true)?.Where(p => p.HasTag(PackageTag.Feature)) ?? Enumerable.Empty<IPackageVersion>();
         }
@@ -383,20 +383,21 @@ private void OnDownloadProgress(IOperation operation)
 
         private void OnDownloadFinalized(IOperation operation)
         {
+            // We want to call RefreshLocal() before calling GetPackage(operation.packageUniqueId),
+            // because if we call GetPackage first, we might get an old instance of the package.
+            // This is due to RefreshLocal potentially replacing the instance in the database with a new one.
+            var downloadOperation = operation as AssetStoreDownloadOperation;
+            if (downloadOperation?.state == DownloadState.Completed)
+                m_AssetStoreClient.RefreshLocal();
+
             var package = GetPackage(operation.packageUniqueId);
             if (package == null)
                 return;
 
-            var downloadOperation = operation as AssetStoreDownloadOperation;
-            if (downloadOperation != null)
-            {
-                if (downloadOperation.state == DownloadState.Error)
-                    AddPackageError(package, new UIError(UIErrorCode.AssetStoreOperationError, downloadOperation.errorMessage, UIError.Attribute.IsClearable));
-                else if (downloadOperation.state == DownloadState.Aborted)
-                    AddPackageError(package, new UIError(UIErrorCode.AssetStoreOperationError, downloadOperation.errorMessage ?? L10n.Tr("Download aborted"), UIError.Attribute.IsWarning | UIError.Attribute.IsClearable));
-                else if (downloadOperation.state == DownloadState.Completed)
-                    m_AssetStoreClient.RefreshLocal();
-            }
+            if (downloadOperation?.state == DownloadState.Error)
+                AddPackageError(package, new UIError(UIErrorCode.AssetStoreOperationError, downloadOperation.errorMessage, UIError.Attribute.IsClearable));
+            else if (downloadOperation?.state == DownloadState.Aborted)
+                AddPackageError(package, new UIError(UIErrorCode.AssetStoreOperationError, downloadOperation.errorMessage ?? L10n.Tr("Download aborted"), UIError.Attribute.IsWarning | UIError.Attribute.IsClearable));
 
             SetPackageProgress(package, PackageProgress.None);
         }
@@ -808,7 +809,7 @@ public virtual void Import(IPackage package)
             }
             catch (System.IO.IOException e)
             {
-                Debug.Log($"[Package Manager] Cannot import package {package.displayName}: {e.Message}");
+                Debug.Log($"[Package Manager Window] Cannot import package {package.displayName}: {e.Message}");
             }
         }
     }
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/PackageFiltering.cs b/Modules/PackageManagerUI/Editor/Services/Packages/PackageFiltering.cs
index 3599f4c7e4..de07135341 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/PackageFiltering.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/PackageFiltering.cs
@@ -67,7 +67,7 @@ public void ResolveDependencies(UnityConnectProxy unityConnect, PackageManagerPr
             m_SettingsProxy = settingsProxy;
         }
 
-        internal static bool FilterByTab(IPackage package, PackageFilterTab tab, bool showDependencies, bool isLoggedIn)
+        internal static bool FilterByTab(IPackage package, PackageFilterTab tab, bool isLoggedIn)
         {
             switch (tab)
             {
@@ -78,7 +78,7 @@ internal static bool FilterByTab(IPackage package, PackageFilterTab tab, bool sh
                 case PackageFilterTab.MyRegistries:
                     return package.Is(PackageType.Installable) && (package.Is(PackageType.ScopedRegistry) || package.Is(PackageType.MainNotUnity)) && (package.isDiscoverable || (package.versions.installed?.isDirectDependency ?? false));
                 case PackageFilterTab.InProject:
-                    return !package.Is(PackageType.BuiltIn) && (package.progress == PackageProgress.Installing || (package.versions.installed != null && (showDependencies || package.versions.installed.isDirectDependency)));
+                    return !package.Is(PackageType.BuiltIn) && (package.progress == PackageProgress.Installing || package.versions.installed != null);
                 case PackageFilterTab.AssetStore:
                     return isLoggedIn && package.Is(PackageType.AssetStore);
                 default:
@@ -143,7 +143,7 @@ public virtual bool FilterByCurrentSearchText(IPackage package)
 
         public virtual bool FilterByCurrentTab(IPackage package)
         {
-            return FilterByTab(package, currentFilterTab, m_SettingsProxy.enablePackageDependencies, m_UnityConnect.isUserLoggedIn);
+            return FilterByTab(package, currentFilterTab, m_UnityConnect.isUserLoggedIn);
         }
 
         public virtual void SetCurrentFilterTabWithoutNotify(PackageFilterTab tab)
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/PackageLink.cs b/Modules/PackageManagerUI/Editor/Services/Packages/PackageLink.cs
index 5ae0228508..5e2245826b 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/PackageLink.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/PackageLink.cs
@@ -11,5 +11,6 @@ internal class PackageLink
     {
         public string name;
         public string url;
+        public string analyticsEventName;
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/Services/Packages/PackageSample.cs b/Modules/PackageManagerUI/Editor/Services/Packages/PackageSample.cs
index bead052ace..f1221be951 100644
--- a/Modules/PackageManagerUI/Editor/Services/Packages/PackageSample.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Packages/PackageSample.cs
@@ -74,7 +74,7 @@ public bool isImported
                 }
                 catch (IOException e)
                 {
-                    Debug.Log($"[Package Manager] Cannot determine if sample {displayName} is imported: {e.Message}");
+                    Debug.Log($"[Package Manager Window] Cannot determine if sample {displayName} is imported: {e.Message}");
                     return false;
                 }
             }
@@ -135,11 +135,16 @@ internal static IEnumerable<Sample> FindByPackage(PackageInfo package, UpmCache
                         string.IsNullOrEmpty(displayName) ? string.Empty : IOUtils.SanitizeFileName(displayName)
                     );
                     return new Sample(ioProxy, assetDatabaseProxy, displayName, description, resolvedSamplePath, importPath, interactiveImport);
-                }) ?? Enumerable.Empty<Sample>();
+                }).ToArray() ?? Enumerable.Empty<Sample>();
             }
             catch (IOException e)
             {
-                Debug.Log($"[Package Manager] Cannot find samples for package {package.displayName}: {e.Message}");
+                Debug.Log($"[Package Manager Window] Cannot find samples for package {package.displayName}: {e}");
+                return Enumerable.Empty<Sample>();
+            }
+            catch (InvalidCastException e)
+            {
+                Debug.Log($"[Package Manager Window] Invalid sample data for package {package.displayName}: {e}");
                 return Enumerable.Empty<Sample>();
             }
             catch (Exception)
@@ -214,7 +219,7 @@ public bool Import(ImportOptions options = ImportOptions.None)
             }
             catch (IOException e)
             {
-                Debug.Log($"[Package Manager] Cannot import sample {displayName}: {e.Message}");
+                Debug.Log($"[Package Manager Window] Cannot import sample {displayName}: {e.Message}");
                 return false;
             }
         }
@@ -246,7 +251,7 @@ internal List<string> previousImports
                         }
                         catch (IOException e)
                         {
-                            Debug.Log($"[Package Manager] Cannot get previous import for sample {displayName}: {e.Message}");
+                            Debug.Log($"[Package Manager Window] Cannot get previous import for sample {displayName}: {e.Message}");
                         }
                     }
                 }
@@ -272,7 +277,7 @@ internal string size
                     }
                     catch (IOException e)
                     {
-                        Debug.Log($"[Package Manager] Cannot determine sample {displayName} size: {e.Message}");
+                        Debug.Log($"[Package Manager Window] Cannot determine sample {displayName} size: {e.Message}");
                         m_Size = "- KB";
                     }
                 }
diff --git a/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettings.cs b/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettings.cs
index 116206cc93..69b5327db7 100644
--- a/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettings.cs
+++ b/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettings.cs
@@ -13,7 +13,6 @@ namespace UnityEditor.PackageManager.UI.Internal
     internal class PackageManagerProjectSettings : ScriptableSingleton<PackageManagerProjectSettings>
     {
         public event Action<bool> onEnablePreReleasePackagesChanged = delegate {};
-        public event Action<bool> onEnablePackageDependenciesChanged = delegate {};
         public event Action<bool> onAdvancedSettingsFoldoutChanged = delegate {};
         public event Action<bool> onScopedRegistriesSettingsFoldoutChanged = delegate {};
         public event Action<bool> onSeeAllVersionsChanged = delegate {};
@@ -36,22 +35,6 @@ public bool enablePreReleasePackages
             }
         }
 
-        [SerializeField]
-        private bool m_EnablePackageDependencies;
-
-        public bool enablePackageDependencies
-        {
-            get { return m_EnablePackageDependencies; }
-            set
-            {
-                if (value != m_EnablePackageDependencies)
-                {
-                    m_EnablePackageDependencies = value;
-                    onEnablePackageDependenciesChanged?.Invoke(m_EnablePackageDependencies);
-                }
-            }
-        }
-
         [SerializeField]
         private bool m_AdvancedSettingsExpanded = true;
         public virtual bool advancedSettingsExpanded
diff --git a/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettingsProvider.cs b/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettingsProvider.cs
index a358860ca1..4dd8125ba2 100644
--- a/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettingsProvider.cs
+++ b/Modules/PackageManagerUI/Editor/Services/ProjectSettings/PackageManagerProjectSettingsProvider.cs
@@ -96,7 +96,7 @@ public PackageManagerProjectSettingsProvider(string path, SettingsScope scopes,
                         var saveIt = true;
                         if (newValue && !m_SettingsProxy.oneTimeWarningShown)
                         {
-                            if (EditorUtility.DisplayDialog(L10n.Tr("Package Manager"), k_Message, L10n.Tr("I understand"), L10n.Tr("Cancel")))
+                            if (m_ApplicationProxy.DisplayDialog("showPreReleasePackages", L10n.Tr("Show pre-release packages"), k_Message, L10n.Tr("I understand"), L10n.Tr("Cancel")))
                                 m_SettingsProxy.oneTimeWarningShown = true;
                             else
                                 saveIt = false;
@@ -112,20 +112,6 @@ public PackageManagerProjectSettingsProvider(string path, SettingsScope scopes,
                     enablePreReleasePackages.SetValueWithoutNotify(m_SettingsProxy.enablePreReleasePackages);
                 });
 
-                enablePackageDependencies.SetValueWithoutNotify(m_SettingsProxy.enablePackageDependencies);
-                enablePackageDependencies.RegisterValueChangedCallback(changeEvent =>
-                {
-                    enablePackageDependencies.SetValueWithoutNotify(changeEvent.newValue);
-                    var newValue = changeEvent.newValue;
-
-                    if (newValue != m_SettingsProxy.enablePackageDependencies)
-                    {
-                        m_SettingsProxy.enablePackageDependencies = newValue;
-                        m_SettingsProxy.Save();
-                        PackageManagerWindowAnalytics.SendEvent("toggleDependencies");
-                    }
-                });
-
                 UIUtils.SetElementDisplay(seeAllPackageVersions, Unsupported.IsDeveloperBuild());
                 seeAllPackageVersions.SetValueWithoutNotify(m_SettingsProxy.seeAllPackageVersions);
 
@@ -174,7 +160,6 @@ private void OnScopedRegistriesSettingsFoldoutChanged(bool expanded)
 
         private HelpBox preReleaseInfoBox { get { return cache.Get<HelpBox>("preReleaseInfoBox"); } }
         private Toggle enablePreReleasePackages { get { return rootVisualElement.Q<Toggle>("enablePreReleasePackages"); } }
-        private Toggle enablePackageDependencies { get { return rootVisualElement.Q<Toggle>("enableDependencies"); } }
         private Foldout advancedSettingsFoldout { get { return rootVisualElement.Q<Foldout>("advancedSettingsFoldout"); } }
         private Foldout scopedRegistriesSettingsFoldout { get { return rootVisualElement.Q<Foldout>("scopedRegistriesSettingsFoldout"); } }
         private Toggle seeAllPackageVersions { get { return rootVisualElement.Q<Toggle>("seeAllVersions"); } }
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/ApplicationProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/ApplicationProxy.cs
index 4a08e44cbf..cb70663c36 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/ApplicationProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/ApplicationProxy.cs
@@ -6,10 +6,12 @@
 using UnityEditorInternal;
 using UnityEngine;
 using Object = UnityEngine.Object;
+using System.Diagnostics.CodeAnalysis;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
     [Serializable]
+    [ExcludeFromCodeCoverage]
     internal class ApplicationProxy
     {
         [SerializeField]
@@ -132,14 +134,18 @@ public virtual string OpenFolderPanel(string title, string folder)
             return EditorUtility.OpenFolderPanel(title, folder, string.Empty);
         }
 
-        public virtual bool DisplayDialog(string title, string message, string ok, string cancel = "")
+        public virtual bool DisplayDialog(string idForAnalytics, string title, string message, string ok, string cancel = "")
         {
-            return EditorUtility.DisplayDialog(title, message, ok, cancel);
+            var result = EditorUtility.DisplayDialog(title, message, ok, cancel);
+            PackageManagerDialogAnalytics.SendEvent(idForAnalytics, title, message, result ? ok : cancel);
+            return result;
         }
 
-        public virtual int DisplayDialogComplex(string title, string message, string ok, string cancel, string alt)
+        public virtual int DisplayDialogComplex(string idForAnalytics, string title, string message, string ok, string cancel, string alt)
         {
-            return EditorUtility.DisplayDialogComplex(title, message, ok, cancel, alt);
+            var result = EditorUtility.DisplayDialogComplex(title, message, ok, cancel, alt);
+            PackageManagerDialogAnalytics.SendEvent(idForAnalytics, title, message, result == 1 ? cancel : (result == 2 ? alt : ok));
+            return result;
         }
 
         public virtual T Load<T>(string path) where T : Object
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs
index 46faf6c542..c56445aabc 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/AssetDatabaseProxy.cs
@@ -2,10 +2,12 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System.Diagnostics.CodeAnalysis;
 using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
+    [ExcludeFromCodeCoverage]
     internal class AssetDatabaseProxy
     {
         public virtual void ImportPackage(string packagePath, bool interactive)
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/ClientProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/ClientProxy.cs
index ac71cdc1e8..c77586e75a 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/ClientProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/ClientProxy.cs
@@ -2,10 +2,12 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System.Diagnostics.CodeAnalysis;
 using UnityEditor.PackageManager.Requests;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
+    [ExcludeFromCodeCoverage]
     internal class ClientProxy
     {
         public virtual void Resolve(bool force = true)
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/EditorAnalyticsProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/EditorAnalyticsProxy.cs
new file mode 100644
index 0000000000..2c63ec14fb
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/EditorAnalyticsProxy.cs
@@ -0,0 +1,57 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using UnityEngine.Analytics;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class EditorAnalyticsProxy
+    {
+        private const int k_MaxEventsPerHour = 1000;
+        private const int k_MaxNumberOfElementInStruct = 100;
+        private const string k_VendorKey = "unity.package-manager-ui";
+
+        private readonly HashSet<string> m_RegisteredEvents = new HashSet<string>();
+
+        public virtual bool RegisterEvent(string eventName)
+        {
+            if (UnityEditorInternal.InternalEditorUtility.inBatchMode)
+                return false;
+
+            if (!EditorAnalytics.enabled)
+            {
+                Console.WriteLine("[Package Manager Window] Editor analytics are disabled");
+                return false;
+            }
+
+            if (m_RegisteredEvents.Contains(eventName))
+                return true;
+
+            var result = EditorAnalytics.RegisterEventWithLimit(eventName, k_MaxEventsPerHour, k_MaxNumberOfElementInStruct, k_VendorKey);
+            switch (result)
+            {
+                case AnalyticsResult.Ok:
+                case AnalyticsResult.TooManyRequests:
+                    {
+                        m_RegisteredEvents.Add(eventName);
+                        return true;
+                    }
+                default:
+                    {
+                        Console.WriteLine($"[Package Manager Window] Failed to register analytics event '{eventName}'. Result: '{result}'");
+                        break;
+                    }
+            }
+
+            return false;
+        }
+
+        public virtual AnalyticsResult SendEventWithLimit(string eventName, object parameters)
+        {
+            return EditorAnalytics.SendEventWithLimit(eventName, parameters);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs
index 31b029ca89..0a001a28f9 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/HttpClientFactory.cs
@@ -2,8 +2,11 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace UnityEditor.PackageManager.UI.Internal
 {
+    [ExcludeFromCodeCoverage]
     internal class HttpClientFactory
     {
         public virtual IAsyncHTTPClient GetASyncHTTPClient(string url)
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/IOProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/IOProxy.cs
index 2a4d626dad..397adc4185 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/IOProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/IOProxy.cs
@@ -5,12 +5,14 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
     using NiceIO;
 
+    [ExcludeFromCodeCoverage]
     internal class IOProxy
     {
         // Need to re-create this method since Unity's FileUtil equivalent (with overwrite) is internal only.
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs
index 39f1f857f0..cf546ada6e 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/PackageManagerProjectSettingsProxy.cs
@@ -4,13 +4,14 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
+    [ExcludeFromCodeCoverage]
     internal class PackageManagerProjectSettingsProxy
     {
         public event Action<bool> onEnablePreReleasePackagesChanged = delegate {};
-        public event Action<bool> onEnablePackageDependenciesChanged = delegate {};
         public event Action<bool> onAdvancedSettingsFoldoutChanged = delegate {};
         public event Action<bool> onScopedRegistriesSettingsFoldoutChanged = delegate {};
         public event Action<bool> onSeeAllVersionsChanged = delegate {};
@@ -29,12 +30,6 @@ public virtual bool enablePreReleasePackages
             set => PackageManagerProjectSettings.instance.enablePreReleasePackages = value;
         }
 
-        public virtual bool enablePackageDependencies
-        {
-            get => PackageManagerProjectSettings.instance.enablePackageDependencies;
-            set => PackageManagerProjectSettings.instance.enablePackageDependencies = value;
-        }
-
         public virtual bool advancedSettingsExpanded
         {
             get => PackageManagerProjectSettings.instance.advancedSettingsExpanded;
@@ -105,7 +100,6 @@ public virtual void SelectRegistry(string name)
         public void OnEnable()
         {
             PackageManagerProjectSettings.instance.onEnablePreReleasePackagesChanged += OnEnablePreReleasePackagesChanged;
-            PackageManagerProjectSettings.instance.onEnablePackageDependenciesChanged += OnEnablePackageDependenciesChanged;
             PackageManagerProjectSettings.instance.onAdvancedSettingsFoldoutChanged += OnAdvancedSettingsFoldoutChanged;
             PackageManagerProjectSettings.instance.onScopedRegistriesSettingsFoldoutChanged += OnScopedRegistriesSettingsFoldoutChanged;
             PackageManagerProjectSettings.instance.onSeeAllVersionsChanged += OnSeeAllPackageVersionsChanged;
@@ -116,7 +110,6 @@ public void OnEnable()
         public void OnDisable()
         {
             PackageManagerProjectSettings.instance.onEnablePreReleasePackagesChanged -= OnEnablePreReleasePackagesChanged;
-            PackageManagerProjectSettings.instance.onEnablePackageDependenciesChanged -= OnEnablePackageDependenciesChanged;
             PackageManagerProjectSettings.instance.onAdvancedSettingsFoldoutChanged -= OnAdvancedSettingsFoldoutChanged;
             PackageManagerProjectSettings.instance.onScopedRegistriesSettingsFoldoutChanged -= OnScopedRegistriesSettingsFoldoutChanged;
             PackageManagerProjectSettings.instance.onSeeAllVersionsChanged -= OnSeeAllPackageVersionsChanged;
@@ -139,11 +132,6 @@ private void OnEnablePreReleasePackagesChanged(bool enablePreReleasePackages)
             onEnablePreReleasePackagesChanged?.Invoke(enablePreReleasePackages);
         }
 
-        private void OnEnablePackageDependenciesChanged(bool enablePackageDependencies)
-        {
-            onEnablePackageDependenciesChanged?.Invoke(enablePackageDependencies);
-        }
-
         private void OnAdvancedSettingsFoldoutChanged(bool advancedSettingsExpanded)
         {
             onAdvancedSettingsFoldoutChanged?.Invoke(advancedSettingsExpanded);
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/SelectionProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/SelectionProxy.cs
index 1ccde24a36..cf4218ea74 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/SelectionProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/SelectionProxy.cs
@@ -3,9 +3,11 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
+    [ExcludeFromCodeCoverage]
     internal class SelectionProxy
     {
         public virtual event Action onSelectionChanged = delegate {};
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/UnityConnectProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/UnityConnectProxy.cs
index 30da767412..f8820e0e83 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/UnityConnectProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/UnityConnectProxy.cs
@@ -3,12 +3,14 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using UnityEditor.Connect;
 using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
     [Serializable]
+    [ExcludeFromCodeCoverage]
     internal class UnityConnectProxy
     {
         [SerializeField]
diff --git a/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs b/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs
index 75e628073a..036525471b 100644
--- a/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Proxies/UnityOAuthProxy.cs
@@ -3,10 +3,12 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using UnityEditor.Connect;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
+    [ExcludeFromCodeCoverage]
     internal class UnityOAuthProxy
     {
         public virtual void GetAuthorizationCodeAsync(string clientId, Action<UnityOAuth.AuthCodeResponse> callback)
diff --git a/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs b/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs
index 98bcd77d0e..5f47f5cb97 100644
--- a/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs
+++ b/Modules/PackageManagerUI/Editor/Services/ServicesContainer.cs
@@ -4,11 +4,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using UnityEngine;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
     [Serializable]
+    [ExcludeFromCodeCoverage]
     internal sealed class ServicesContainer : ScriptableSingleton<ServicesContainer>, ISerializationCallbackReceiver
     {
         // Some services are stateless, hence no serialization needed
@@ -20,6 +22,8 @@ internal sealed class ServicesContainer : ScriptableSingleton<ServicesContainer>
 
         private readonly AssetDatabaseProxy m_AssetDatabaseProxy;
 
+        private readonly EditorAnalyticsProxy m_EditorAnalyticsProxy;
+
         private readonly IOProxy m_IOProxy;
 
         private readonly PackageManagerProjectSettingsProxy m_SettingsProxy;
@@ -108,6 +112,7 @@ public ServicesContainer()
             m_AssetDatabaseProxy = new AssetDatabaseProxy();
             m_UnityConnectProxy = new UnityConnectProxy();
             m_ApplicationProxy = new ApplicationProxy();
+            m_EditorAnalyticsProxy = new EditorAnalyticsProxy();
             m_IOProxy = new IOProxy();
             m_SettingsProxy = new PackageManagerProjectSettingsProxy();
             m_ClientProxy = new ClientProxy();
@@ -232,6 +237,7 @@ public void RegisterDefaultServices()
             Register(m_AssetDatabaseProxy);
             Register(m_ResourceLoader);
             Register(m_ExtensionManager);
+            Register(m_EditorAnalyticsProxy);
             Register(m_IOProxy);
             Register(m_SettingsProxy);
             Register(m_ClientProxy);
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddAndRemoveOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddAndRemoveOperation.cs
index 14af102bd5..2ef9913ac0 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddAndRemoveOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddAndRemoveOperation.cs
@@ -15,6 +15,15 @@ internal class UpmAddAndRemoveOperation : UpmBaseOperation<AddAndRemoveRequest>
     {
         public override RefreshOptions refreshOptions => RefreshOptions.None;
 
+        protected override string operationErrorMessage
+        {
+            get
+            {
+                var packageIds = packageIdsToAdd.Concat(packagesNamesToRemove);
+                return string.Format(L10n.Tr("Error adding/removing packages: {0}."), string.Join(",", packageIds.ToArray()));
+            }
+        }
+
         [SerializeField]
         protected string[] m_PackageIdsToReset = new string[0];
         public IEnumerable<string> packageIdsToReset => m_PackageIdsToReset;
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddOperation.cs
index 94ae95388d..da6ad28e0e 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmAddOperation.cs
@@ -24,6 +24,15 @@ internal class UpmAddOperation : UpmBaseOperation<AddRequest>
 
         public override RefreshOptions refreshOptions => RefreshOptions.None;
 
+        protected override string operationErrorMessage
+        {
+            get
+            {
+                var packageId = string.IsNullOrEmpty(this.packageId) ? specialUniqueId : this.packageId;
+                return string.Format(L10n.Tr("Error adding package: {0}."), packageId);
+            }
+        }
+
         public void Add(string packageId, string packageUniqueId = null)
         {
             m_PackageId = packageId;
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs
index d9bf855f19..2a21a5648b 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmBaseOperation.cs
@@ -51,15 +51,23 @@ public string packageName
         protected bool m_OfflineMode = false;
         public bool isOfflineMode { get { return m_OfflineMode; } }
 
+        [SerializeField]
+        protected bool m_LogErrorInConsole = false;
+        public bool logErrorInConsole { get => m_LogErrorInConsole; set => m_LogErrorInConsole = value; }
+
         public abstract bool isInProgress { get; }
 
+        public bool isInPause => false;
+
         public bool isProgressVisible => false;
 
         public bool isProgressTrackable => false;
 
         public float progressPercentage => 0;
 
-        public UIError error { get; protected set; }        // Keep last error
+        // Each type of operation can have an operation specific human readable error message.
+        // This message should be user friendly and not as technical as the error we receive from the UPM Client.
+        protected virtual string operationErrorMessage => string.Empty;
 
         public abstract RefreshOptions refreshOptions { get; }
 
@@ -108,13 +116,11 @@ protected void Start()
             else if (m_Timestamp == 0)
                 m_Timestamp = DateTime.Now.Ticks - (long)(EditorApplication.timeSinceStartup * TimeSpan.TicksPerSecond);
 
-            error = null;
-
             if (!m_ApplicationProxy.isUpmRunning)
             {
                 EditorApplication.delayCall += () =>
                 {
-                    OnError(new UIError(UIErrorCode.UpmError, "UPM server is not running"));
+                    OnError(new UIError(UIErrorCode.UpmError, L10n.Tr("UPM server is not running")));
                     Cancel();
                 };
                 return;
@@ -148,7 +154,7 @@ protected void Progress()
                 if (m_Request.Status == StatusCode.Success)
                     OnSuccess();
                 else if (m_Request.Status >= StatusCode.Failure)
-                    OnError(new UIError((UIErrorCode)m_Request.Error.errorCode, m_Request.Error.message, UIError.Attribute.IsDetailInConsole));
+                    OnError(new UIError(m_Request.Error));
                 else
                     Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] Unsupported progress state {0}."), m_Request.Status));
                 OnFinalize();
@@ -163,12 +169,23 @@ public void RestoreProgress()
 
         private void OnError(UIError error)
         {
-            this.error = error;
-            var message = L10n.Tr("Cannot perform upm operation");
-            message += string.IsNullOrEmpty(error.message) ? "." : $": {error.message} [{error.errorCode}].";
-
-            Debug.LogError($"{L10n.Tr("[Package Manager Window]")} {message}");
+            if (logErrorInConsole && !error.HasAttribute(UIError.Attribute.IsDetailInConsole))
+            {
+                var consoleErrorMessage = operationErrorMessage ?? string.Empty;
+                if (error.operationErrorCode >= 500 && error.operationErrorCode < 600)
+                {
+                    if (!string.IsNullOrEmpty(consoleErrorMessage))
+                        consoleErrorMessage += " ";
+                    consoleErrorMessage += L10n.Tr("An error occurred, likely on the server. Please try again later.");
+                }
+                if (!string.IsNullOrEmpty(error.message))
+                    consoleErrorMessage += !string.IsNullOrEmpty(consoleErrorMessage) ? $"\n{error.message}" : error.message;
+                Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] {0}"), consoleErrorMessage));
+                error.attribute |= UIError.Attribute.IsDetailInConsole;
+            }
             onOperationError?.Invoke(this, error);
+
+            PackageManagerOperationErrorAnalytics.SendEvent(GetType().Name, error);
         }
 
         private void OnSuccess()
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs
index cb3094cb4a..f238cae21c 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmClient.cs
@@ -168,11 +168,7 @@ public virtual void AddById(string packageId)
         private void SetupAddOperation()
         {
             addOperation.onProcessResult += (request) => OnProcessAddResult(addOperation, request);
-            addOperation.onOperationError += (op, error) =>
-            {
-                var packageId = string.IsNullOrEmpty(addOperation.packageId) ? addOperation.specialUniqueId : addOperation.packageId;
-                Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] Error adding package: {0}."), packageId));
-            };
+            addOperation.logErrorInConsole = true;
             onAddOperation?.Invoke(addOperation);
         }
 
@@ -220,7 +216,7 @@ public virtual bool AddByPath(string path, out string tempPackageId)
             }
             catch (System.IO.IOException e)
             {
-                Debug.Log($"[Package Manager] Cannot add package {path}: {e.Message}");
+                Debug.Log($"[Package Manager Window] Cannot add package {path}: {e.Message}");
                 return false;
             }
         }
@@ -269,11 +265,7 @@ public virtual void ResetDependencies(string packageId, IEnumerable<string> depe
         private void SetupAddAndRemoveOperation()
         {
             addAndRemoveOperation.onProcessResult += OnProcessAddAndRemoveResult;
-            addAndRemoveOperation.onOperationError += (op, error) =>
-            {
-                var packageIds = addAndRemoveOperation.packageIdsToAdd.Concat(addAndRemoveOperation.packagesNamesToRemove);
-                Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] Error adding/removing packages: {0}."), string.Join(",", packageIds.ToArray())));
-            };
+            addAndRemoveOperation.logErrorInConsole = true;
             onAddAndRemoveOperation?.Invoke(addAndRemoveOperation);
         }
 
@@ -301,13 +293,12 @@ public virtual void List(bool offlineMode = false)
             var operation = offlineMode ? listOfflineOperation : listOperation;
             if (operation.isInProgress)
                 operation.Cancel();
-            var errorMessage = offlineMode ? L10n.Tr("Error fetching package list offline.") : L10n.Tr("Error fetching package list.");
             if (offlineMode)
                 operation.ListOffline(listOperation.lastSuccessTimestamp);
             else
                 operation.List();
             operation.onProcessResult += request => OnProcessListResult(request, offlineMode);
-            operation.onOperationError += (op, error) => Debug.LogError($"{L10n.Tr("[Package Manager Window]")} {errorMessage}");
+            operation.logErrorInConsole = true;
             onListOperation(operation);
         }
 
@@ -331,7 +322,7 @@ public virtual void EmbedByName(string packageName)
         private void SetupEmbedOperation()
         {
             embedOperation.onProcessResult += (request) => OnProcessAddResult(embedOperation, request);
-            embedOperation.onOperationError += (op, error) => Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] Error embedding package: {0}."), embedOperation.packageName));
+            embedOperation.logErrorInConsole = true;
             onEmbedOperation?.Invoke(embedOperation);
         }
 
@@ -361,7 +352,7 @@ public virtual void RemoveEmbeddedByName(string packageName)
                 }
                 catch (System.IO.IOException e)
                 {
-                    Debug.Log($"[Package Manager] Cannot remove embedded package {packageName}: {e.Message}");
+                    Debug.Log($"[Package Manager Window] Cannot remove embedded package {packageName}: {e.Message}");
                 }
             }
         }
@@ -369,7 +360,7 @@ public virtual void RemoveEmbeddedByName(string packageName)
         private void SetupRemoveOperation()
         {
             removeOperation.onProcessResult += OnProcessRemoveResult;
-            removeOperation.onOperationError += (op, error) => Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] Error removing package: {0}."), removeOperation.packageName));
+            removeOperation.logErrorInConsole = true;
             onRemoveOperation?.Invoke(removeOperation);
         }
 
@@ -395,13 +386,12 @@ public virtual void SearchAll(bool offlineMode = false)
             var operation = offlineMode ? searchOfflineOperation : searchOperation;
             if (operation.isInProgress)
                 operation.Cancel();
-            var errorMessage = offlineMode ? L10n.Tr("Error searching for packages offline.") : L10n.Tr("Error searching for packages.");
             if (offlineMode)
                 operation.SearchAllOffline(searchOperation.lastSuccessTimestamp);
             else
                 operation.SearchAll();
             operation.onProcessResult += request => OnProcessSearchAllResult(request, offlineMode);
-            operation.onOperationError += (op, error) => Debug.LogError($"{L10n.Tr("[Package Manager Window]")} {errorMessage}");
+            operation.logErrorInConsole = true;
             onSearchAllOperation(operation);
         }
 
@@ -721,7 +711,10 @@ public virtual void Resolve()
 
         public virtual bool IsUnityPackage(PackageInfo packageInfo)
         {
-            if (!(packageInfo?.registry?.isDefault ?? false) || string.IsNullOrEmpty(packageInfo.registry?.url) || !packageInfo.versions.all.Any())
+            if (packageInfo?.source == PackageSource.BuiltIn)
+                return true;
+
+            if (packageInfo == null || packageInfo.source != PackageSource.Registry || packageInfo.registry?.isDefault != true || string.IsNullOrEmpty(packageInfo.registry?.url) || !packageInfo.versions.all.Any())
                 return false;
 
             if (m_RegistriesUrl.TryGetValue(packageInfo.registry.url, out var isUnityRegistry))
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmEmbedOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmEmbedOperation.cs
index 1f23466142..34c6ce6738 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmEmbedOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmEmbedOperation.cs
@@ -12,6 +12,8 @@ internal class UpmEmbedOperation : UpmBaseOperation<EmbedRequest>
     {
         public override RefreshOptions refreshOptions => RefreshOptions.None;
 
+        protected override string operationErrorMessage => string.Format(L10n.Tr("Error embedding package: {0}."), packageName);
+
         public void Embed(string packageName, string packageUniqueId = null)
         {
             m_PackageName = packageName;
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmListOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmListOperation.cs
index 28e9bda8a8..76e90c4926 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmListOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmListOperation.cs
@@ -12,6 +12,8 @@ internal class UpmListOperation : UpmBaseOperation<ListRequest>
     {
         public override RefreshOptions refreshOptions => isOfflineMode ? RefreshOptions.UpmListOffline : RefreshOptions.UpmList;
 
+        protected override string operationErrorMessage => isOfflineMode ? L10n.Tr("Error fetching package list offline.") : L10n.Tr("Error fetching package list.");
+
         public void List()
         {
             m_OfflineMode = false;
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs
index 7cb5c1b35f..af691a6bc2 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageDocs.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using UnityEngine.Networking;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
@@ -16,12 +17,93 @@ internal class UpmPackageDocs
         // the link in the description text.
         internal const string k_BuiltinPackageDocsUrlKey = "Scripting API: ";
 
-        public static string[] SplitBuiltinDescription(UpmPackageVersion version)
+        public static string[] FetchUrlsFromDescription(UpmPackageVersion version)
         {
-            if (string.IsNullOrEmpty(version?.packageInfo?.description))
-                return new string[] { string.Format(L10n.Tr("This built in package controls the presence of the {0} module."), version.displayName) };
-            else
-                return version.packageInfo.description.Split(new[] { k_BuiltinPackageDocsUrlKey }, StringSplitOptions.None);
+            var applicationProxy = ServicesContainer.instance.Resolve<ApplicationProxy>();
+            List<string> urls = new List<string>();
+
+            var descriptionSlitWithUrl = version.packageInfo.description.Split(new[] { $"{k_BuiltinPackageDocsUrlKey}https://docs.unity3d.com/" }, StringSplitOptions.None);
+            if (descriptionSlitWithUrl.Length > 1)
+                urls.Add($"https://docs.unity3d.com/{applicationProxy.shortUnityVersion}/Documentation/" + descriptionSlitWithUrl[1]);
+
+            var descriptionSlitWithoutUrl = version.packageInfo.description.Split(new[] { k_BuiltinPackageDocsUrlKey }, StringSplitOptions.None);
+            if (descriptionSlitWithoutUrl.Length > 1)
+                urls.Add(descriptionSlitWithoutUrl[1]);
+
+            return urls.ToArray();
+        }
+
+        public static string FetchBuiltinDescription(UpmPackageVersion version)
+        {
+            return string.IsNullOrEmpty(version?.packageInfo?.description) ?
+                string.Format(L10n.Tr("This built in package controls the presence of the {0} module."), version.displayName) :
+                version.packageInfo.description.Split(new[] { k_BuiltinPackageDocsUrlKey }, StringSplitOptions.None)[0];
+        }
+
+        public static void HandleInvalidOrUnreachableOnlineUrl(string onlineUrl,  string offlineDocPath, string docType, string analyticsEvent, IPackageVersion version, IPackage package, ApplicationProxy applicationProxy)
+        {
+            if (!string.IsNullOrEmpty(offlineDocPath))
+            {
+                applicationProxy.RevealInFinder(offlineDocPath);
+
+                PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}OnDisk", version?.uniqueId);
+                return;
+            }
+
+            if (!string.IsNullOrEmpty(onlineUrl))
+            {
+                // With the current `UpmPackageDocs.GetDocumentationUrl` implementation,
+                // We'll get invalid url links for non-unity packages on unity3d.com
+                // We want to avoiding opening these kinds of links to avoid confusion.
+                if (!UpmClient.IsUnityUrl(onlineUrl) || package.Is(PackageType.Unity) || version.packageUniqueId.StartsWith("com.unity."))
+                {
+                    applicationProxy.OpenURL(onlineUrl);
+
+                    PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}UnreachableOrInvalidUrl", version?.uniqueId);
+                    return;
+                }
+            }
+
+            PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}NotFound", version?.uniqueId);
+
+            Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] Unable to find valid {0} for this {1}."), docType, package.GetDescriptor()));
+        }
+
+        public static void OpenWebUrl(string onlineUrl, IPackageVersion version, ApplicationProxy applicationProxy, string analyticsEvent, Action errorCallback)
+        {
+            var request = UnityWebRequest.Head(onlineUrl);
+            try
+            {
+                var operation = request.SendWebRequest();
+                operation.completed += (op) =>
+                {
+                    if (request.responseCode >= 200 && request.responseCode < 300)
+                    {
+                        applicationProxy.OpenURL(onlineUrl);
+                        PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}ValidUrl", version?.uniqueId);
+                    }
+                    else
+                        errorCallback?.Invoke();
+                };
+            }
+            catch (InvalidOperationException e)
+            {
+                if (e.Message != "Insecure connection not allowed")
+                    throw e;
+            }
+        }
+
+        public static void ViewUrl(string onlineUrl, string offlineDocPath, string docType, string analyticsEvent, IPackageVersion version, IPackage package, ApplicationProxy applicationProxy)
+        {
+            if (!string.IsNullOrEmpty(onlineUrl) && applicationProxy.isInternetReachable)
+            {
+                OpenWebUrl(onlineUrl, version, applicationProxy, analyticsEvent, () =>
+                {
+                    HandleInvalidOrUnreachableOnlineUrl(onlineUrl, offlineDocPath, docType, analyticsEvent, version, package, applicationProxy);
+                });
+                return;
+            }
+            HandleInvalidOrUnreachableOnlineUrl(onlineUrl, offlineDocPath, docType, analyticsEvent, version, package, applicationProxy);
         }
 
         public static string GetOfflineDocumentation(IOProxy IOProxy, IPackageVersion version)
@@ -47,22 +129,25 @@ public static string GetOfflineDocumentation(IOProxy IOProxy, IPackageVersion ve
             return string.Empty;
         }
 
-        public static string GetDocumentationUrl(IPackageVersion version)
+        public static string[] GetDocumentationUrl(IPackageVersion version)
         {
             var upmVersion = version as UpmPackageVersion;
             if (upmVersion == null)
-                return string.Empty;
+                return new string[] { };
 
             if (!string.IsNullOrEmpty(upmVersion.documentationUrl))
-                return upmVersion.documentationUrl;
+                return new string[] { upmVersion.documentationUrl };
 
             if (upmVersion.HasTag(PackageTag.BuiltIn) && !string.IsNullOrEmpty(upmVersion.description))
-            {
-                var split = SplitBuiltinDescription(upmVersion);
-                if (split.Length > 1)
-                    return split[1];
-            }
-            return $"https://docs.unity3d.com/Packages/{upmVersion.shortVersionId}/index.html";
+                return FetchUrlsFromDescription(upmVersion);
+
+            return new string[] { $"https://docs.unity3d.com/Packages/{upmVersion.shortVersionId}/index.html" };
+        }
+
+        public static string GetQuickStartUrl(IPackageVersion version, UpmCache upmCache)
+        {
+            var upmReserved = upmCache.ParseUpmReserved(version?.packageInfo);
+            return upmReserved?.GetString("quickstart") ?? string.Empty;
         }
 
         public static string GetChangelogUrl(IPackageVersion version)
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs
index b0b1fe4a50..1a69d6142a 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmPackageVersion.cs
@@ -40,17 +40,7 @@ internal class UpmPackageVersion : BasePackageVersion
 
         [SerializeField]
         private bool m_IsUnityPackage;
-        public override bool isUnityPackage
-        {
-            get
-            {
-                if (HasTag(PackageTag.Bundled))
-                    return true;
-                if (HasTag(PackageTag.Git | PackageTag.Local | PackageTag.Custom))
-                    return false;
-                return m_IsUnityPackage;
-            }
-        }
+        public override bool isUnityPackage => m_IsUnityPackage;
 
         public bool isRegistryPackage => m_PackageInfo?.source == PackageSource.Registry;
         public bool isFromScopedRegistry => isRegistryPackage && m_PackageInfo?.registry?.isDefault == false;
@@ -137,7 +127,7 @@ internal void UpdatePackageInfo(PackageInfo newPackageInfo, bool isUnityPackage)
             m_Author = this.isUnityPackage ? k_UnityAuthor : m_PackageInfo.author?.name ?? string.Empty;
 
             if (HasTag(PackageTag.BuiltIn))
-                m_Description = UpmPackageDocs.SplitBuiltinDescription(this)[0];
+                m_Description = UpmPackageDocs.FetchBuiltinDescription(this);
 
             if (m_IsFullyFetched)
             {
@@ -260,7 +250,7 @@ public static string FormatPackageId(string name, string version)
         private void ProcessSignatureErrors(PackageInfo info)
         {
             // Setup the initial value for errors
-            m_Errors = hasEntitlementsError ? new List<UIError> {UIError.k_EntitlementError} : info.errors.Select(error => new UIError((UIErrorCode)error.errorCode, error.message)).ToList();
+            m_Errors = hasEntitlementsError ? new List<UIError> {UIError.k_EntitlementError} : info.errors.Select(error => new UIError(error)).ToList();
 
             if (info.signature.status == SignatureStatus.Invalid)
             {
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmRegistryClient.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmRegistryClient.cs
index f515e9b0be..5faa5ec604 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmRegistryClient.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmRegistryClient.cs
@@ -128,7 +128,7 @@ public void CheckRegistriesChanged()
                 getRegistriesOperation.Cancel();
             getRegistriesOperation.GetRegistries();
             getRegistriesOperation.onProcessResult += OnProcessGetRegistriesResult;
-            getRegistriesOperation.onOperationError += (op, error) => Debug.LogError(error);
+            getRegistriesOperation.logErrorInConsole = true;
         }
 
         private void OnProcessGetRegistriesResult(GetRegistriesRequest request)
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveOperation.cs
index d301b6792b..0a642e22ac 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveOperation.cs
@@ -12,6 +12,8 @@ internal class UpmRemoveOperation : UpmBaseOperation<RemoveRequest>
     {
         public override RefreshOptions refreshOptions => RefreshOptions.None;
 
+        protected override string operationErrorMessage => string.Format(L10n.Tr("Error removing package: {0}."), packageName);
+
         public void Remove(string packageName, string packageUniqueId = null)
         {
             m_PackageName = packageName;
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveRegistryOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveRegistryOperation.cs
index 2175aca673..0492dd81f7 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveRegistryOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmRemoveRegistryOperation.cs
@@ -17,6 +17,8 @@ internal class UpmRemoveRegistryOperation : UpmBaseOperation<RemoveScopedRegistr
 
         public override RefreshOptions refreshOptions => RefreshOptions.None;
 
+        protected override string operationErrorMessage => string.Format(L10n.Tr("Error removing registry: {0}."), registryName);
+
         public void Remove(string name)
         {
             m_RegistryName = name;
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs
index 89f2d58b29..001969f6db 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmSearchOperation.cs
@@ -13,6 +13,8 @@ internal class UpmSearchOperation : UpmBaseOperation<SearchRequest>
     {
         public override RefreshOptions refreshOptions => isOfflineMode ? RefreshOptions.UpmSearchOffline : RefreshOptions.UpmSearch;
 
+        protected override string operationErrorMessage => isOfflineMode ? L10n.Tr("Error searching for packages offline.") : L10n.Tr("Error searching for packages.");
+
         [SerializeField]
         private string m_PackageNameOrId;
 
diff --git a/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs b/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs
index ad7bac5b3c..bc9de0ece1 100644
--- a/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs
+++ b/Modules/PackageManagerUI/Editor/Services/Upm/UpmVersionList.cs
@@ -198,6 +198,13 @@ internal static bool CheckIsNonLifecycleVersionInstalled(IPackageVersion install
 
         public bool hasLifecycleVersion => m_LifecycleVersion != null || m_LifecycleNextVersion != null;
 
+        public IPackageVersion GetUpdateTarget(IPackageVersion version)
+        {
+            if (version?.isInstalled == true && version != recommended)
+                return key.LastOrDefault() ?? version;
+            return version;
+        }
+
         internal void UpdateVersion(UpmPackageVersion version)
         {
             for (var i = 0; i < m_Versions.Count; ++i)
diff --git a/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs b/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs
index a6d96b96a3..f5b80025a9 100644
--- a/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs
+++ b/Modules/PackageManagerUI/Editor/Services/UserSettings/PackageManagerUserSettingsProvider.cs
@@ -30,8 +30,11 @@ internal class PackageManagerUserSettingsProvider : SettingsProvider
 
         [NonSerialized]
         private CachePathConfig m_CurrentAssetStoreConfig = new CachePathConfig();
+        private string currentAssetStoreNormalizedPath => m_CurrentAssetStoreConfig?.path.NormalizePath() ?? string.Empty;
+
         [NonSerialized]
         private CacheRootConfig m_CurrentPackagesConfig = new CacheRootConfig();
+        private string currentPackagesNormalizedPath => m_CurrentPackagesConfig?.path.NormalizePath() ?? string.Empty;
 
         private ResourceLoader m_ResourceLoader;
         private AssetStoreCachePathProxy m_AssetStoreCachePathProxy;
@@ -86,7 +89,7 @@ private PackageManagerUserSettingsProvider(string path, IEnumerable<string> keyw
                     m_UpmCacheRootClient.onSetCacheRootOperationError -= OnPackagesSetCacheRootOperationError;
                     m_UpmCacheRootClient.onSetCacheRootOperationResult -= OnPackagesSetCacheRootOperationResult;
                     m_UpmCacheRootClient.onClearCacheRootOperationError -= OnPackagesClearCacheRootOperationError;
-                    m_UpmCacheRootClient.onClearCacheRootOperationResult -= OnPackagesSetCacheRootOperationResult;
+                    m_UpmCacheRootClient.onClearCacheRootOperationResult -= OnPackagesClearCacheRootOperationResult;
                 }
 
                 if (m_AssetStoreCachePathProxy != null)
@@ -112,13 +115,14 @@ private void DisplayPackagesCacheSetting()
             var packagesCacheDropdownMenu = new DropdownMenu();
             packagesCacheDropdownMenu.AppendAction(k_OpenFolder, action =>
             {
-                if (!string.IsNullOrWhiteSpace(packagesCachePath.text))
-                    m_ApplicationProxy.RevealInFinder(packagesCachePath.text);
+                if (!string.IsNullOrWhiteSpace(currentPackagesNormalizedPath))
+                    m_ApplicationProxy.RevealInFinder(currentPackagesNormalizedPath);
             }, action => DropdownMenuAction.Status.Normal, "openLocation");
             packagesCacheDropdownMenu.AppendAction(k_ChangeLocation, action =>
             {
-                var path = m_ApplicationProxy.OpenFolderPanel("Select Packages Cache Location", packagesCachePath.text);
-                if (!string.IsNullOrWhiteSpace(path) && string.CompareOrdinal(path, m_CurrentPackagesConfig.path) != 0)
+                var path = m_ApplicationProxy.OpenFolderPanel(L10n.Tr("Select Packages Cache Location"), currentPackagesNormalizedPath);
+                path = path.NormalizePath();
+                if (!string.IsNullOrWhiteSpace(path) && string.CompareOrdinal(path, currentPackagesNormalizedPath) != 0)
                     m_UpmCacheRootClient.SetCacheRoot(path);
             }, action => m_CurrentPackagesConfig.source != ConfigSource.Environment ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled, "selectLocation");
             packagesCacheDropdownMenu.AppendAction(k_ResetToDefaultLocation, action =>
@@ -132,11 +136,11 @@ private void DisplayPackagesCacheSetting()
             m_UpmCacheRootClient.onSetCacheRootOperationError += OnPackagesSetCacheRootOperationError;
             m_UpmCacheRootClient.onSetCacheRootOperationResult += OnPackagesSetCacheRootOperationResult;
             m_UpmCacheRootClient.onClearCacheRootOperationError += OnPackagesClearCacheRootOperationError;
-            m_UpmCacheRootClient.onClearCacheRootOperationResult += OnPackagesSetCacheRootOperationResult;
+            m_UpmCacheRootClient.onClearCacheRootOperationResult += OnPackagesClearCacheRootOperationResult;
 
             if (!m_ApplicationProxy.isBatchMode && m_ApplicationProxy.isUpmRunning)
             {
-                packagesCachePath.SetValueWithoutNotify(string.Empty);
+                packagesCachePath.text = string.Empty;
                 packagesCacheDropdown.SetEnabled(false);
 
                 UIUtils.SetElementDisplay(packagesCacheErrorBox, false);
@@ -145,7 +149,7 @@ private void DisplayPackagesCacheSetting()
             }
             else
             {
-                packagesCachePath.SetValueWithoutNotify(string.Empty);
+                packagesCachePath.text = string.Empty;
                 packagesCacheDropdown.SetEnabled(false);
 
                 DisplayPackagesCacheErrorBox(HelpBoxMessageType.Error, L10n.Tr("Cannot get the Packages Cache location, UPM server is not running."));
@@ -155,30 +159,38 @@ private void DisplayPackagesCacheSetting()
         private void DisplayAssetStoreCachePathSetting()
         {
             assetsCacheLocationInfo.enableRichText = true;
-            assetsCacheLocationInfo.text = string.Format(L10n.Tr("Your assets will be store in <b>{0}</b> subfolder."), k_AssetStoreFolder);
+            assetsCacheLocationInfo.text = string.Format(L10n.Tr("Your assets will be stored in <b>{0}</b> subfolder."), k_AssetStoreFolder);
             assetsCacheDropdown.SetIcon("folder");
             var assetsCacheDropdownMenu = new DropdownMenu();
             assetsCacheDropdownMenu.AppendAction(k_OpenFolder, action =>
             {
-                if (!string.IsNullOrWhiteSpace(assetsCachePath.text))
-                    m_ApplicationProxy.RevealInFinder(Paths.Combine(assetsCachePath.text, k_AssetStoreFolder));
+                if (!string.IsNullOrWhiteSpace(currentAssetStoreNormalizedPath))
+                    m_ApplicationProxy.RevealInFinder(Paths.Combine(currentAssetStoreNormalizedPath, k_AssetStoreFolder));
             }, action => m_CurrentAssetStoreConfig.status == AssetStoreCachePathManager.ConfigStatus.InvalidPath ? DropdownMenuAction.Status.Disabled : DropdownMenuAction.Status.Normal, "openLocation");
             assetsCacheDropdownMenu.AppendAction(k_ChangeLocation, action =>
             {
-                var path = m_ApplicationProxy.OpenFolderPanel("Select Assets Cache Location", Paths.Combine(assetsCachePath.text, k_AssetStoreFolder));
+                var path = m_ApplicationProxy.OpenFolderPanel(L10n.Tr("Select Assets Cache Location"), Paths.Combine(currentAssetStoreNormalizedPath, k_AssetStoreFolder));
                 if (!string.IsNullOrWhiteSpace(path))
                 {
                     path = path.NormalizePath();
                     if (path.EndsWith(Path.DirectorySeparatorChar + k_AssetStoreFolder))
                         path = path.Substring(0, path.Length - k_AssetStoreFolder.Length - 1);
 
-                    if (string.CompareOrdinal(path, m_CurrentAssetStoreConfig.path.NormalizePath()) == 0)
+                    if (string.CompareOrdinal(path, currentAssetStoreNormalizedPath) == 0)
                         return;
 
                     if (!CancelDownloadInProgress())
                         return;
 
+                    var oldStatus = m_CurrentAssetStoreConfig?.status.ToString() ?? string.Empty;
+                    var oldSource = m_CurrentAssetStoreConfig?.source.ToString() ?? string.Empty;
                     var status = m_AssetStoreCachePathProxy.SetConfig(path);
+
+                    // Send analytics
+                    PackageCacheManagementAnalytics.SendAssetStoreEvent("changePath",
+                        new []{ oldSource, oldStatus },
+                        new []{ m_CurrentAssetStoreConfig.source.ToString(), m_CurrentAssetStoreConfig.status.ToString() });
+
                     if (status == AssetStoreCachePathManager.ConfigStatus.Failed)
                         DisplayAssetsCacheErrorBox(HelpBoxMessageType.Error, L10n.Tr($"Cannot set the Assets Cache location, \"{path}\" is invalid or inaccessible."));
                 }
@@ -188,7 +200,15 @@ private void DisplayAssetStoreCachePathSetting()
                 if (!CancelDownloadInProgress())
                     return;
 
+                var oldStatus = m_CurrentAssetStoreConfig?.status.ToString() ?? string.Empty;
+                var oldSource = m_CurrentAssetStoreConfig?.source.ToString() ?? string.Empty;
                 var status = m_AssetStoreCachePathProxy.ResetConfig();
+
+                // Send analytics
+                PackageCacheManagementAnalytics.SendAssetStoreEvent("resetPath",
+                    new []{ oldSource, oldStatus },
+                    new []{ m_CurrentAssetStoreConfig.source.ToString(), m_CurrentAssetStoreConfig.status.ToString()});
+
                 if (status == AssetStoreCachePathManager.ConfigStatus.Failed)
                     DisplayAssetsCacheErrorBox(HelpBoxMessageType.Error, L10n.Tr("Cannot reset the Assets Cache location to default."));
             }, action => m_CurrentAssetStoreConfig.source == ConfigSource.User ? DropdownMenuAction.Status.Normal : DropdownMenuAction.Status.Disabled, "resetLocation");
@@ -203,7 +223,8 @@ private bool CancelDownloadInProgress()
             if (!m_AssetStoreDownloadManager.IsAnyDownloadInProgressOrPause())
                 return true;
 
-            if (m_ApplicationProxy.isBatchMode || !m_ApplicationProxy.DisplayDialog(L10n.Tr("Package Manager"),
+            if (m_ApplicationProxy.isBatchMode || !m_ApplicationProxy.DisplayDialog("abortDownloadBeforeChangeAssetsCacheLocation",
+                L10n.Tr("Changing Assets Cache location"),
                 L10n.Tr("Changing the Assets Cache location will abort all downloads in progress."),
                 L10n.Tr("Continue"), L10n.Tr("Cancel")))
                 return false;
@@ -220,7 +241,7 @@ private void GetAssetStoreCacheConfig()
         private void RefreshAssetStoreCachePathConfig(CachePathConfig config)
         {
             m_CurrentAssetStoreConfig = config;
-            assetsCachePath.SetValueWithoutNotify(m_CurrentAssetStoreConfig.path.NormalizePath());
+            assetsCachePath.text = currentAssetStoreNormalizedPath.EscapeBackslashes();
             UIUtils.SetElementDisplay(assetsCacheErrorBox, false);
 
             if (m_CurrentAssetStoreConfig.source == ConfigSource.Environment)
@@ -262,6 +283,22 @@ private void OnPackagesGetCacheRootOperationResult(CacheRootConfig config)
 
         private void OnPackagesSetCacheRootOperationResult(CacheRootConfig config)
         {
+            // Send analytics
+            PackageCacheManagementAnalytics.SendUpmEvent("changePath",
+                new []{ m_CurrentPackagesConfig.source.ToString() },
+                new []{ config.source.ToString()});
+
+            RefreshCurrentPackagesConfig(config);
+            m_ClientProxy.Resolve();
+        }
+
+        private void OnPackagesClearCacheRootOperationResult(CacheRootConfig config)
+        {
+            // Send analytics
+            PackageCacheManagementAnalytics.SendUpmEvent("resetPath",
+                new []{ m_CurrentPackagesConfig.source.ToString() },
+                new []{ config.source.ToString()});
+
             RefreshCurrentPackagesConfig(config);
             m_ClientProxy.Resolve();
         }
@@ -269,7 +306,7 @@ private void OnPackagesSetCacheRootOperationResult(CacheRootConfig config)
         private void RefreshCurrentPackagesConfig(CacheRootConfig config)
         {
             m_CurrentPackagesConfig = config;
-            packagesCachePath.SetValueWithoutNotify(m_CurrentPackagesConfig.path.NormalizePath());
+            packagesCachePath.text = currentPackagesNormalizedPath.EscapeBackslashes();
             packagesCacheDropdown.SetEnabled(true);
             UIUtils.SetElementDisplay(packagesCacheErrorBox, false);
         }
diff --git a/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs b/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs
index 58f39c47c7..55c310e435 100644
--- a/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs
+++ b/Modules/PackageManagerUI/Editor/UI/AddPackageByNameDropdown.cs
@@ -53,8 +53,8 @@ private void Init(EditorWindow anchorWindow)
             m_AnchorWindow = anchorWindow;
 
             packageNameField.RegisterCallback<ChangeEvent<string>>(OnTextFieldChange);
-            packageNameField.visualInput.RegisterCallback<KeyDownEvent>(OnKeyDownShortcut);
-            packageVersionField.visualInput.RegisterCallback<KeyDownEvent>(OnKeyDownShortcut);
+            packageNameField.RegisterCallback<KeyDownEvent>(OnKeyDownShortcut);
+            packageVersionField.RegisterCallback<KeyDownEvent>(OnKeyDownShortcut);
 
             m_PackageNamePlaceholder = new TextFieldPlaceholder(packageNameField, L10n.Tr("Name"));
             m_PackageVersionPlaceholder = new TextFieldPlaceholder(packageVersionField, L10n.Tr("Version (optional)"));
@@ -71,9 +71,9 @@ internal override void OnDropdownShown()
                 m_AnchorWindow?.rootVisualElement?.SetEnabled(false);
 
             if (string.IsNullOrEmpty(errorInfoBox.text) || packageNameField.ClassListContains("error"))
-                packageNameField.visualInput.Focus();
+                packageNameField.Focus();
             else
-                packageVersionField.visualInput.Focus();
+                packageVersionField.Focus();
             submitButton.SetEnabled(!string.IsNullOrWhiteSpace(packageNameField.value));
         }
 
@@ -83,8 +83,8 @@ internal override void OnDropdownClosed()
             m_PackageVersionPlaceholder.OnDisable();
 
             packageNameField.UnregisterCallback<ChangeEvent<string>>(OnTextFieldChange);
-            packageNameField.visualInput.UnregisterCallback<KeyDownEvent>(OnKeyDownShortcut);
-            packageVersionField.visualInput.UnregisterCallback<KeyDownEvent>(OnKeyDownShortcut);
+            packageNameField.UnregisterCallback<KeyDownEvent>(OnKeyDownShortcut);
+            packageVersionField.UnregisterCallback<KeyDownEvent>(OnKeyDownShortcut);
 
             if (m_ExtraFetchOperation != null)
             {
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/Alert.cs b/Modules/PackageManagerUI/Editor/UI/Common/Alert.cs
index fbb41c8ba0..30ff2ac62f 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/Alert.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/Alert.cs
@@ -42,19 +42,22 @@ private void ReadMoreLinkClick()
 
         public void SetError(UIError error, IPackageVersion packageVersion = null)
         {
-            var state = error.HasAttribute(UIError.Attribute.IsWarning) ? PackageState.Warning : PackageState.Error;
-            var message = state == PackageState.Warning ? L10n.Tr("A warning occurred") : L10n.Tr("An error occurred");
-
+            var message = string.Empty;
             if (!string.IsNullOrEmpty(error.message))
-                message = string.Format("{0}: {1}", message, error.message);
+                message = error.message;
             if (error.HasAttribute(UIError.Attribute.IsDetailInConsole))
                 message = string.Format(L10n.Tr("{0} See console for more details."), message);
 
-            var addClass = state == PackageState.Warning ? "warning" : "error";
-            var removeFromClass = state == PackageState.Warning ? "error" : "warning";
-
-            alertContainer.RemoveFromClassList(removeFromClass);
-            alertContainer.AddClasses(addClass);
+            if (error.HasAttribute(UIError.Attribute.IsWarning))
+            {
+                alertContainer.RemoveFromClassList("error");
+                alertContainer.AddClasses("warning");
+            }
+            else
+            {
+                alertContainer.RemoveFromClassList("warning");
+                alertContainer.AddClasses("error");
+            }
 
             if (!string.IsNullOrEmpty(error.readMoreURL))
             {
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs b/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs
index f9d2745ecf..16703d301e 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/BasePage.cs
@@ -159,30 +159,6 @@ public IEnumerable<VisualState> GetSelectedVisualStates()
             return m_Selection.Select(s => GetVisualState(s)).Where(v => v != null);
         }
 
-        private void UpdateVisualStatesExpandableAndTriggerChangeEvent(int numOldSelections, int numNewSelections)
-        {
-            bool expandable;
-            if (numOldSelections == 1 && numNewSelections > 1)
-                expandable = false;
-            else if (numOldSelections > 1 && numNewSelections == 1)
-                expandable = true;
-            else
-                return;
-
-            var updatedVisualStates = new List<VisualState>();
-            foreach (var visualState in visualStates)
-            {
-                if (visualState.expandable != expandable)
-                {
-                    visualState.expandable = expandable;
-                    visualState.expanded &= expandable;
-                    updatedVisualStates.Add(visualState);
-                }
-            }
-            if (updatedVisualStates.Any())
-                TriggerOnVisualStateChange(updatedVisualStates);
-        }
-
         public virtual bool SetNewSelection(IEnumerable<PackageAndVersionIdPair> packageAndVersionIds)
         {
             var numOldSelections = m_Selection.Count;
@@ -190,7 +166,6 @@ public virtual bool SetNewSelection(IEnumerable<PackageAndVersionIdPair> package
                 return false;
 
             TriggerOnSelectionChanged();
-            UpdateVisualStatesExpandableAndTriggerChangeEvent(numOldSelections, m_Selection.Count);
             return true;
         }
 
@@ -201,7 +176,6 @@ public virtual bool AmendSelection(IEnumerable<PackageAndVersionIdPair> toAddOrU
                 return false;
 
             TriggerOnSelectionChanged();
-            UpdateVisualStatesExpandableAndTriggerChangeEvent(numOldSelections, m_Selection.Count);
             return true;
         }
 
@@ -212,17 +186,9 @@ public virtual bool ToggleSelection(string packageUniqueId)
                 return false;
 
             TriggerOnSelectionChanged();
-            UpdateVisualStatesExpandableAndTriggerChangeEvent(numOldSelections, m_Selection.Count);
             return true;
         }
 
-        public void SetExpanded(IPackage package, bool value)
-        {
-            SetExpanded(package?.uniqueId, value);
-        }
-
-        public abstract void SetExpanded(string packageUniqueId, bool value);
-
         public void SetSeeAllVersions(IPackage package, bool value)
         {
             SetSeeAllVersions(package?.uniqueId, value);
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/DictionaryExtensions.cs b/Modules/PackageManagerUI/Editor/UI/Common/DictionaryExtensions.cs
index 4532ddff67..0cabe5e000 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/DictionaryExtensions.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/DictionaryExtensions.cs
@@ -2,6 +2,7 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,26 +13,38 @@ internal static class DictionaryExtensions
     {
         public static T Get<T>(this IDictionary<string, object> dict, string key) where T : class
         {
-            object result;
-            return dict.TryGetValue(key, out result)  ? (T)result : null;
+            var result = dict.TryGetValue(key, out var value);
+            try
+            {
+                return result ? (T)value : null;
+            }
+            catch (InvalidCastException)
+            {
+                throw new IncorrectFieldTypeException(key, typeof(T), value.GetType());
+            }
         }
 
         public static T Get<T>(this IDictionary<string, object> dict, string key, T fallbackValue = default(T)) where T : struct
         {
-            object result;
-            return dict.TryGetValue(key, out result) ? (T)result : fallbackValue;
+            var result = dict.TryGetValue(key, out var value);
+            try
+            {
+                return result ? (T)value: fallbackValue;
+            }
+            catch (InvalidCastException)
+            {
+                throw new IncorrectFieldTypeException(key, typeof(T), value.GetType());
+            }
         }
 
         public static T Get<T>(this IDictionary<string, T> dict, string key) where T : class
         {
-            T result;
-            return dict.TryGetValue(key, out result) ? result : null;
+            return dict.TryGetValue(key, out var result) ? result : null;
         }
 
         public static T Get<T>(this IDictionary<string, T> dict, string key, T fallbackValue = default(T)) where T : struct
         {
-            T result;
-            return dict.TryGetValue(key, out result) ? result : fallbackValue;
+            return dict.TryGetValue(key, out var result) ? result : fallbackValue;
         }
 
         public static IDictionary<string, object> GetDictionary(this IDictionary<string, object> dict, string key)
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/IOUtils.cs b/Modules/PackageManagerUI/Editor/UI/Common/IOUtils.cs
index 5587c99916..03e4daaf76 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/IOUtils.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/IOUtils.cs
@@ -17,5 +17,10 @@ public static string SanitizeFileName(string name)
                 name = name.Replace(c, '_');
             return name.Trim();
         }
+
+        public static string EscapeBackslashes(this string path)
+        {
+            return path.Replace(@"\", @"\\");
+        }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/IncorrectFieldTypeException.cs b/Modules/PackageManagerUI/Editor/UI/Common/IncorrectFieldTypeException.cs
new file mode 100644
index 0000000000..45f99b8a27
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/Common/IncorrectFieldTypeException.cs
@@ -0,0 +1,16 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class IncorrectFieldTypeException : InvalidCastException
+    {
+        public IncorrectFieldTypeException(string fieldName, Type expectedType, Type actualType)
+            : base($"Unable to cast {actualType.Name} to {expectedType.Name} for the field {fieldName}.")
+        {
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/LoadingSpinner.cs b/Modules/PackageManagerUI/Editor/UI/Common/LoadingSpinner.cs
index 4837d6b974..22be9938c3 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/LoadingSpinner.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/LoadingSpinner.cs
@@ -16,10 +16,10 @@ internal class LoadingSpinner : VisualElement
         public bool started { get; private set; }
 
         private const int k_RotationSpeed = 360; // Euler degrees per second
-        private int m_Rotation;
-        private double m_LastRotationTime;
+        private const double k_PaintInterval = 0.125f; // Time interval to repaint
+        static private int s_Rotation;
+        static private double s_LastRotationTime;
         private static readonly List<LoadingSpinner> s_CurrentSpinners = new List<LoadingSpinner>();
-
         public LoadingSpinner()
         {
             started = false;
@@ -29,22 +29,22 @@ public LoadingSpinner()
             var innerElement = new VisualElement();
             innerElement.AddToClassList("image");
             Add(innerElement);
+            style.transformOrigin = new TransformOrigin(0, 0, 0);
         }
 
         private static void UpdateProgress()
         {
-            foreach (var spinner in s_CurrentSpinners)
+            var currentTime = EditorApplication.timeSinceStartup;
+            var deltaTime = currentTime - s_LastRotationTime;
+            if (deltaTime >= k_PaintInterval)
             {
-                var currentTime = EditorApplication.timeSinceStartup;
-                var deltaTime = currentTime - spinner.m_LastRotationTime;
-
-                spinner.style.transformOrigin = new TransformOrigin(0, 0, 0);
-                spinner.transform.rotation = Quaternion.Euler(0, 0, spinner.m_Rotation);
-                spinner.m_Rotation += (int)(k_RotationSpeed * deltaTime);
-                spinner.m_Rotation %= 360;
-                if (spinner.m_Rotation < 0) spinner.m_Rotation += 360;
-
-                spinner.m_LastRotationTime = currentTime;
+                var q = Quaternion.Euler(0, 0, s_Rotation);
+                foreach (var spinner in s_CurrentSpinners)
+                    spinner.transform.rotation = q;
+                s_Rotation += (int)(k_RotationSpeed * deltaTime);
+                s_Rotation %= 360;
+                if (s_Rotation < 0) s_Rotation += 360;
+                s_LastRotationTime = currentTime;
             }
         }
 
@@ -53,8 +53,10 @@ public void Start()
             if (started)
                 return;
 
-            m_Rotation = 0;
-            m_LastRotationTime = EditorApplication.timeSinceStartup;
+            s_Rotation = 0;
+
+            // we remove k_PaintInterval from timeSinceStartup to make sure we start the animation the first time
+            s_LastRotationTime = EditorApplication.timeSinceStartup - k_PaintInterval;
 
             started = true;
             UIUtils.SetElementDisplay(this, true);
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs b/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs
index 3ad015e7ce..64f7b8ce12 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/PageManager.cs
@@ -226,6 +226,7 @@ private IPage CreatePageFromTab(PackageFilterTab? tab = null)
                     requireUserLoggedIn = false,
                     supportLocalReordering = true,
                     requireNetwork = false,
+                    supportFilters = true,
                     orderingValues = new[]
                     {
                         new PageCapability.Ordering("Name (asc)", "displayName", PageCapability.Order.Ascending),
@@ -391,16 +392,7 @@ public virtual bool UpdateSelectionIfCurrentSelectionIsInvalid()
                 m_PackageDatabase.GetPackageAndVersion(item, out var package, out var version);
                 var visualState = page.GetVisualState(item.packageUniqueId);
                 if (package == null || visualState?.visible != true)
-                {
                     toRemove.Add(item);
-                    continue;
-                }
-
-                // Re-select the primary version of a package if the package item is no longer expanded,
-                // or if the previous selected version could not be found anymore (while the package could still be found)
-                // This could happen when we uninstall a package or when we change from placeholder version to the real version.
-                if (!string.IsNullOrEmpty(item.versionUniqueId) && (version == null || !visualState.expanded))
-                    toAddOrUpdate.Add(new PackageAndVersionIdPair(item.packageUniqueId));
             }
 
             if (selection.Count > 0 && toAddOrUpdate.Count + toRemove.Count == 0)
@@ -439,11 +431,6 @@ public virtual void SetSeeAllVersions(IPackage package, bool value)
             GetPageFromTab().SetSeeAllVersions(package, value);
         }
 
-        public virtual void SetExpanded(IPackage package, bool value)
-        {
-            GetPageFromTab().SetExpanded(package, value);
-        }
-
         public virtual bool IsGroupExpanded(string groupName)
         {
             return GetPageFromTab().IsGroupExpanded(groupName);
@@ -534,14 +521,6 @@ private static void UpdateSearchTextOnPage(IPage page, string searchText)
             page.UpdateFilters(filters);
         }
 
-        private void OnShowDependenciesChanged(bool value)
-        {
-            if (m_PackageFiltering.currentFilterTab != PackageFilterTab.InProject)
-                return;
-            var page = GetPageFromTab();
-            page.Rebuild();
-        }
-
         private void OnPackagesChanged(PackagesChangeArgs args)
         {
             GetPageFromTab().OnPackagesChanged(args);
@@ -727,8 +706,6 @@ public void OnEnable()
             m_PackageFiltering.onFilterTabChanged += OnFilterChanged;
             m_PackageFiltering.onSearchTextChanged += OnSearchTextChanged;
 
-            m_SettingsProxy.onEnablePackageDependenciesChanged += OnShowDependenciesChanged;
-
             m_UnityConnect.onUserLoginStateChange += OnUserLoginStateChange;
             m_Selection.onSelectionChanged += OnEditorSelectionChanged;
         }
@@ -750,8 +727,6 @@ public void OnDisable()
             m_PackageFiltering.onFilterTabChanged -= OnFilterChanged;
             m_PackageFiltering.onSearchTextChanged -= OnSearchTextChanged;
 
-            m_SettingsProxy.onEnablePackageDependenciesChanged -= OnShowDependenciesChanged;
-
             m_UnityConnect.onUserLoginStateChange -= OnUserLoginStateChange;
             m_Selection.onSelectionChanged -= OnEditorSelectionChanged;
         }
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/PaginatedPage.cs b/Modules/PackageManagerUI/Editor/UI/Common/PaginatedPage.cs
index 9510df1692..5ba64f086b 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/PaginatedPage.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/PaginatedPage.cs
@@ -268,12 +268,6 @@ public override bool Contains(string packageUniqueId)
             return m_VisualStateList?.Contains(packageUniqueId) ?? false;
         }
 
-        public override void SetExpanded(string packageUniqueId, bool value)
-        {
-            if (m_VisualStateList.SetExpanded(packageUniqueId, value))
-                TriggerOnVisualStateChange(new[] { GetVisualState(packageUniqueId) });
-        }
-
         public override void SetSeeAllVersions(string packageUniqueId, bool value)
         {
             if (m_VisualStateList.SetSeeAllVersions(packageUniqueId, value))
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/ProgressBar.cs b/Modules/PackageManagerUI/Editor/UI/Common/ProgressBar.cs
index a2b7f3d584..33b859346a 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/ProgressBar.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/ProgressBar.cs
@@ -13,6 +13,10 @@ internal class ProgressBar : VisualElement
         internal new class UxmlFactory : UxmlFactory<ProgressBar> {}
 
         private ResourceLoader m_ResourceLoader;
+
+        static private double s_LastWidthTime;
+        private const double k_PaintInterval = 1f; // Time interval to repaint
+
         private void ResolveDependencies()
         {
             var container = ServicesContainer.instance;
@@ -31,7 +35,6 @@ public ProgressBar()
 
             cache = new VisualElementCache(root);
 
-            currentProgressText.text = string.Empty;
             currentProgressBar.style.width = Length.Percent(0);
         }
 
@@ -41,17 +44,30 @@ public bool UpdateProgress(IOperation operation)
             UIUtils.SetElementDisplay(this, showProgressBar);
             if (showProgressBar)
             {
-                var percentage = Mathf.Clamp01(operation.progressPercentage);
+                var currentTime = EditorApplication.timeSinceStartup;
+                var deltaTime = currentTime - s_LastWidthTime;
+                if (deltaTime >= k_PaintInterval)
+                {
+                    var percentage = Mathf.Clamp01(operation.progressPercentage);
+
+                    currentProgressBar.style.width = Length.Percent(percentage * 100.0f);
+                    currentProgressBar.MarkDirtyRepaint();
+
+                    s_LastWidthTime = currentTime;
+                }
 
-                currentProgressText.text = percentage.ToString("P1", CultureInfo.InvariantCulture);
-                currentProgressBar.style.width = Length.Percent(percentage * 100.0f);
-                currentProgressBar.MarkDirtyRepaint();
+                if (operation.isInPause)
+                    currentProgressState.text = L10n.Tr("Paused");
+                else if(operation.isInProgress)
+                    currentProgressState.text = L10n.Tr("Downloading");
+                else
+                    currentProgressState.text = string.Empty;
             }
             return showProgressBar;
         }
 
         private VisualElementCache cache { get; }
-        private Label currentProgressBar { get { return cache.Get<Label>("currentProgressBar"); } }
-        private Label currentProgressText { get { return cache.Get<Label>("currentProgressText"); } }
+        private VisualElement currentProgressBar { get { return cache.Get<VisualElement>("progressBarForeground"); } }
+        private Label currentProgressState { get { return cache.Get<Label>("currentProgressState"); } }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/SelectableLabel.cs b/Modules/PackageManagerUI/Editor/UI/Common/SelectableLabel.cs
index 35fb8199ec..32c26975d9 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/SelectableLabel.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/SelectableLabel.cs
@@ -6,21 +6,41 @@
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
-    internal class SelectableLabel : TextField
+    internal class SelectableLabel : Label
     {
         internal new class UxmlFactory : UxmlFactory<SelectableLabel, UxmlTraits>
         {
             public override VisualElement Create(IUxmlAttributes bag, CreationContext cc)
             {
                 var result = base.Create(bag, cc) as SelectableLabel;
-                result.isReadOnly = true;
+                result.SetAsSelectableAndElided();
                 return result;
             }
         }
 
         public SelectableLabel()
         {
-            isReadOnly = true;
+            SetAsSelectableAndElided();
+        }
+
+        public void SetAsSelectableAndElided()
+        {
+            selection.isSelectable = true;
+            focusable = true;
+            displayTooltipWhenElided = true;
+        }
+
+        public void SetValueWithoutNotify(string value)
+        {
+            text = value;
+        }
+
+        public bool multiline { get; set; }
+
+        public string value
+        {
+            get => text;
+            set => text = value;
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/SimplePage.cs b/Modules/PackageManagerUI/Editor/UI/Common/SimplePage.cs
index 33b9e3514e..7b6c02798f 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/SimplePage.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/SimplePage.cs
@@ -112,10 +112,7 @@ public override void ResetUserUnlockedState()
         {
             var unlockedVisualStates = visualStates.Where(v => v.userUnlocked);
             foreach (var visualState in unlockedVisualStates)
-            {
                 visualState.userUnlocked = false;
-                visualState.expanded = false;
-            }
             TriggerOnVisualStateChange(unlockedVisualStates);
         }
 
@@ -200,7 +197,7 @@ private void RebuildOrderedVisualStates()
         public override bool GetDefaultLockState(IPackage package)
         {
             return package.versions.installed?.isDirectDependency != true &&
-                m_PackageDatabase.GetFeatureDependents(package.versions.installed)?.Any() == true;
+                m_PackageDatabase.GetFeaturesThatUseThisPackage(package.versions.installed)?.Any() == true;
         }
 
         private void RefreshVisualStates()
@@ -219,12 +216,6 @@ private void RefreshVisualStates()
                     stateChanged = true;
                 }
 
-                if (state.expandable != expandable)
-                {
-                    state.expandable = expandable;
-                    stateChanged = true;
-                }
-
                 if (stateChanged)
                     changedVisualStates.Add(state);
             }
@@ -238,12 +229,6 @@ public override VisualState GetVisualState(string packageUniqueId)
             return m_VisualStateList.GetVisualState(packageUniqueId);
         }
 
-        public override void SetExpanded(string packageUniqueId, bool value)
-        {
-            if (m_VisualStateList.SetExpanded(packageUniqueId, value))
-                TriggerOnVisualStateChange(new[] { m_VisualStateList.GetVisualState(packageUniqueId) });
-        }
-
         public override void SetSeeAllVersions(string packageUniqueId, bool value)
         {
             if (m_VisualStateList.SetSeeAllVersions(packageUniqueId, value))
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/Tabs/BaseTabElement.cs b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/BaseTabElement.cs
new file mode 100644
index 0000000000..71deb67716
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/BaseTabElement.cs
@@ -0,0 +1,18 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal abstract class BaseTabElement : VisualElement, ITabElement
+    {
+        protected string m_DisplayName;
+        public virtual string displayName => m_DisplayName;
+
+        protected string m_Id;
+        public virtual string id => m_Id;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/Tabs/BaseTabView.cs b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/BaseTabView.cs
new file mode 100644
index 0000000000..bb178d2658
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/BaseTabView.cs
@@ -0,0 +1,125 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal abstract class BaseTabView<T> : VisualElement, ITabView<T> where T : BaseTabElement
+    {
+        protected VisualElement m_HeaderContainer;
+        protected VisualElement m_BodyContainer;
+
+        protected Dictionary<string, Button> m_HeaderButtons;
+        protected Dictionary<string, T> m_TabElements;
+
+        protected string m_SelectedTabId;
+        public string selectedTabId => m_SelectedTabId;
+
+        public virtual event Action<T, T> onTabSwitched = delegate {};
+
+        public IEnumerable<T> tabs => m_TabElements.Values;
+
+        public BaseTabView()
+        {
+            m_HeaderContainer = new VisualElement();
+            m_HeaderContainer.AddClasses("tabsHeaderContainer container row");
+            m_BodyContainer = new VisualElement();
+            m_BodyContainer.AddClasses("tabsBodyContainer");
+
+            m_HeaderButtons = new Dictionary<string, Button>();
+            m_TabElements = new Dictionary<string, T>();
+
+            Add(m_HeaderContainer);
+            Add(m_BodyContainer);
+        }
+
+        public void AddTab(T tab)
+        {
+            if (m_TabElements.ContainsKey(tab.id))
+                return;
+
+            var headerButton = CreateHeaderButtonForTab(tab);
+
+            m_HeaderButtons.Add(tab.id, headerButton);
+            m_TabElements.Add(tab.id, tab);
+
+            m_HeaderContainer.Add(headerButton);
+            m_BodyContainer.Add(tab);
+        }
+
+        public void RemoveTab(T tab)
+        {
+            m_TabElements.Remove(tab.id);
+            m_BodyContainer.Remove(tab);
+
+            if (m_HeaderButtons.TryGetValue(tab.id, out var header))
+            {
+                m_HeaderButtons.Remove(tab.id);
+                m_HeaderContainer.Remove(header);
+            }
+        }
+
+        public void ClearTabs()
+        {
+            m_HeaderButtons.Clear();
+            m_TabElements.Clear();
+
+            m_HeaderContainer.Clear();
+            m_BodyContainer.Clear();
+        }
+
+        private Button CreateHeaderButtonForTab(T tab)
+        {
+            var headerButton = new Button();
+            headerButton.name = $"{tab.id}Button";
+            headerButton.text = L10n.Tr(tab.displayName);
+            headerButton.clicked += () => OnTabHeaderClicked(tab);
+            return headerButton;
+        }
+
+        public T GetTab(string tabIdentifier = "")
+        {
+            return !string.IsNullOrEmpty(tabIdentifier) && m_TabElements.TryGetValue(tabIdentifier, out var result) ? result : null;
+        }
+
+        public A GetTab<A>(string tabIdentifier) where A : T
+        {
+            return GetTab(tabIdentifier) as A;
+        }
+
+        // return boolean indicating whether selection was successful or not
+        public bool SelectTab(string id)
+        {
+            return SelectTab(GetTab(id));
+        }
+
+        protected virtual void OnTabHeaderClicked(T tab)
+        {
+            SelectTab(tab);
+        }
+
+        public virtual bool SelectTab(T tabToSelect)
+        {
+            if (tabToSelect is null || !m_HeaderButtons.ContainsKey(tabToSelect.id) || tabToSelect.id == selectedTabId)
+                return false;
+
+            var previousSelectedTab = GetTab(selectedTabId);
+            if (previousSelectedTab != null)
+            {
+                m_HeaderButtons[previousSelectedTab.id].RemoveFromClassList("tabHeaderSelected");
+                UIUtils.SetElementDisplay(previousSelectedTab, false);
+            }
+
+            m_HeaderButtons[tabToSelect.id].AddClasses("tabHeaderSelected");
+            UIUtils.SetElementDisplay(tabToSelect, true);
+            m_SelectedTabId = tabToSelect.id;
+
+            onTabSwitched.Invoke(previousSelectedTab, tabToSelect);
+            return true;
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/Features/FeatureState.cs b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/ITabElement.cs
similarity index 69%
rename from Modules/PackageManagerUI/Editor/UI/Features/FeatureState.cs
rename to Modules/PackageManagerUI/Editor/UI/Common/Tabs/ITabElement.cs
index 244f3289b4..b0c55bb3da 100644
--- a/Modules/PackageManagerUI/Editor/UI/Features/FeatureState.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/ITabElement.cs
@@ -4,10 +4,10 @@
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
-    internal enum FeatureState
+    internal interface ITabElement
     {
-        None,
-        Info,
-        Customized
+        string displayName { get; }
+
+        string id { get; }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/Tabs/ITabView.cs b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/ITabView.cs
new file mode 100644
index 0000000000..f0cbe6756a
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/Common/Tabs/ITabView.cs
@@ -0,0 +1,32 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal interface ITabView<T> where T : ITabElement
+    {
+        event Action<T, T> onTabSwitched;
+
+        IEnumerable<T> tabs { get; }
+
+        string selectedTabId { get; }
+
+        void AddTab(T tab);
+
+        void RemoveTab(T tab);
+
+        void ClearTabs();
+
+        T GetTab(string id);
+
+        A GetTab<A>(string id) where A : T;
+
+        // return boolean indicating whether selection was successful or not; mostly for handling case of
+        //  trying to select a serialized tab which is not present in the selected package
+        bool SelectTab(string id);
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/TagLabelList.cs b/Modules/PackageManagerUI/Editor/UI/Common/TagLabelList.cs
new file mode 100644
index 0000000000..b587fc73fd
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/Common/TagLabelList.cs
@@ -0,0 +1,91 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class TagLabelList : VisualElement
+    {
+        internal new class UxmlFactory : UxmlFactory<TagLabelList> {}
+
+        public TagLabelList()
+        {
+            m_ListNameLabel = new SelectableLabel
+            {
+                name = "listNameLabel",
+                focusable = true
+            };
+            Add(m_ListNameLabel);
+
+            m_TagsList = new VisualElement { name = "tagsList" };
+            Add(m_TagsList);
+
+            m_ShowAllButton = new Button
+            {
+                name = "showAllButton",
+                classList = { "link", "moreless" },
+                text = "Show all"
+            };
+            m_ShowLessButton = new Button
+            {
+                name = "showLessButton",
+                classList = { "link", "moreless" },
+                text = "Show less"
+            };
+            m_ShowAllButton.clickable.clicked += ShowAllClicked;
+            m_ShowLessButton.clickable.clicked += ShowLessClicked;
+        }
+
+        public void Refresh(string listName, IEnumerable<string> tagNames)
+        {
+            m_ListNameLabel.text = listName;
+
+            m_TagsList.Clear();
+            foreach (var tagName in tagNames)
+                m_TagsList.Add(new PackageTagLabel { text = tagName });
+
+            if (tagNames.Count() < 5)
+                return;
+
+            m_TagsList.Add(m_ShowAllButton);
+            m_TagsList.Add(m_ShowLessButton);
+            ShowLessClicked();
+        }
+
+        private void ShowAllClicked()
+        {
+            UIUtils.SetElementDisplay(m_ShowAllButton, false);
+            UIUtils.SetElementDisplay(m_ShowLessButton, true);
+            RefreshTagsList(true);
+        }
+
+        private void ShowLessClicked()
+        {
+            UIUtils.SetElementDisplay(m_ShowAllButton, true);
+            UIUtils.SetElementDisplay(m_ShowLessButton, false);
+            RefreshTagsList(false);
+        }
+
+        private void RefreshTagsList(bool showMore)
+        {
+            var tagLabelEnumerable = m_TagsList.Children().OfType<PackageTagLabel>();
+            foreach (var (tagLabel, i) in tagLabelEnumerable.Select((tagLabel, i) => ( tagLabel, i )))
+            {
+                // We skip the first 3 because we want them to be always visible.
+                if (i < 3)
+                    continue;
+
+                UIUtils.SetElementDisplay(tagLabel, showMore);
+            }
+        }
+
+        private Label m_ListNameLabel;
+        private VisualElement m_TagsList;
+        private Button m_ShowAllButton;
+        private Button m_ShowLessButton;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/UIUtils.cs b/Modules/PackageManagerUI/Editor/UI/Common/UIUtils.cs
index 1b6abf6646..61924b2f35 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/UIUtils.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/UIUtils.cs
@@ -22,16 +22,6 @@ public static void SetElementDisplay(VisualElement element, bool value)
             element.style.visibility = value ? Visibility.Visible : Visibility.Hidden;
         }
 
-        public static void SetElementDisplayNonEmpty(TextElement element)
-        {
-            if (element == null)
-                return;
-
-            var nonEmpty = !String.IsNullOrEmpty(element.text);
-            element.style.display = nonEmpty ? DisplayStyle.Flex : DisplayStyle.None;
-            element.style.visibility = nonEmpty ? Visibility.Visible : Visibility.Hidden;
-        }
-
         public static bool IsElementVisible(VisualElement element)
         {
             return element?.resolvedStyle.visibility == Visibility.Visible && element.resolvedStyle.display != DisplayStyle.None;
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/VisualState.cs b/Modules/PackageManagerUI/Editor/UI/Common/VisualState.cs
index 5f45f9b31e..447c02a7f4 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/VisualState.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/VisualState.cs
@@ -12,11 +12,9 @@ internal class VisualState : IEquatable<VisualState>
         public string packageUniqueId;
         public string groupName;
         public bool visible;
-        public bool expanded;
         public bool seeAllVersions;
         public bool lockedByDefault;
         public bool userUnlocked;
-        public bool expandable;
 
         public bool isLocked => lockedByDefault && !userUnlocked;
 
@@ -26,22 +24,18 @@ public VisualState(string packageUniqueId, string groupName, bool lockedByDefaul
             this.groupName = groupName;
             this.lockedByDefault = lockedByDefault;
             visible = true;
-            expanded = false;
             seeAllVersions = false;
             userUnlocked = false;
-            expandable = true;
         }
 
         public bool Equals(VisualState other)
         {
             return packageUniqueId == other.packageUniqueId
-                && groupName == other.groupName
-                && visible == other.visible
-                && expanded == other.expanded
-                && seeAllVersions == other.seeAllVersions
-                && lockedByDefault == other.lockedByDefault
-                && userUnlocked == other.userUnlocked
-                && expandable == other.expandable;
+                   && groupName == other.groupName
+                   && visible == other.visible
+                   && seeAllVersions == other.seeAllVersions
+                   && lockedByDefault == other.lockedByDefault
+                   && userUnlocked == other.userUnlocked;
         }
 
         public VisualState Clone()
diff --git a/Modules/PackageManagerUI/Editor/UI/Common/VisualStateList.cs b/Modules/PackageManagerUI/Editor/UI/Common/VisualStateList.cs
index f86cf7982f..23b9337f8e 100644
--- a/Modules/PackageManagerUI/Editor/UI/Common/VisualStateList.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Common/VisualStateList.cs
@@ -60,19 +60,6 @@ public virtual VisualState GetVisualState(string packageUniqueId)
             return null;
         }
 
-        public bool SetExpanded(string packageUniqueId, bool value)
-        {
-            var state = GetVisualState(packageUniqueId);
-            if (state != null && state.expanded != value)
-            {
-                state.expanded = value;
-                if (!value)
-                    state.seeAllVersions = false;
-                return true;
-            }
-            return false;
-        }
-
         public bool SetSeeAllVersions(string packageUniqueId, bool value)
         {
             var state = GetVisualState(packageUniqueId);
diff --git a/Modules/PackageManagerUI/Editor/UI/Features/FeatureDependencyItem.cs b/Modules/PackageManagerUI/Editor/UI/Features/FeatureDependencyItem.cs
deleted file mode 100644
index 08ea1d34f3..0000000000
--- a/Modules/PackageManagerUI/Editor/UI/Features/FeatureDependencyItem.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using UnityEngine.UIElements;
-
-namespace UnityEditor.PackageManager.UI.Internal
-{
-    internal class FeatureDependencyItem : VisualElement
-    {
-        public IPackageVersion packageVersion { get; private set; }
-        public string packageName { get; private set; }
-
-        public FeatureDependencyItem(IPackageVersion featureVersion, IPackageVersion featureDependencyVersion, FeatureState state = FeatureState.None)
-        {
-            packageVersion = featureDependencyVersion;
-            packageName = featureDependencyVersion.packageUniqueId;
-
-            m_Name = new Label { name = "name" };
-            m_Name.text = featureDependencyVersion?.displayName ?? string.Empty;
-            Add(m_Name);
-
-            m_State = new VisualElement { name = "versionState" };
-            if (state == FeatureState.Customized && featureVersion.isInstalled)
-            {
-                m_State.AddToClassList(state.ToString().ToLower());
-                m_State.tooltip = L10n.Tr("This package has been manually customized");
-            }
-
-            Add(m_State);
-        }
-
-        public FeatureDependencyItem(string dependencyName)
-        {
-            packageName = dependencyName;
-
-            m_Name = new Label { name = "name" };
-            m_Name.text = dependencyName;
-            Add(m_Name);
-        }
-
-        private Label m_Name;
-        private VisualElement m_State;
-    }
-}
diff --git a/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs b/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs
index 602f321292..e6d07e8ba2 100644
--- a/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Filters/AssetStoreFiltersWindow.cs
@@ -29,20 +29,15 @@ internal class AssetStoreFiltersWindow : PackageManagerFiltersWindow
 
         private AssetStoreClient m_AssetStoreClient;
         private AssetStoreCallQueue m_AssetStoreCallQueue;
-        private void ResolveDependencies()
+        protected override void ResolveDependencies()
         {
+            base.ResolveDependencies();
             var container = ServicesContainer.instance;
             m_AssetStoreClient = container.Resolve<AssetStoreClient>();
             m_AssetStoreCallQueue = container.Resolve<AssetStoreCallQueue>();
         }
 
-        protected override void OnEnable()
-        {
-            base.OnEnable();
-            ResolveDependencies();
-        }
-
-        protected override Vector2 GetSize()
+        protected override Vector2 GetSize(IPage page)
         {
             var height = k_FoldOutHeight + k_Statuses.Length * k_ToggleHeight;
 
@@ -66,12 +61,12 @@ private float GetLabelsHeight()
             return height;
         }
 
-        protected override void Init(Rect rect, PageFilters filters)
+        protected override void Init(Rect rect, IPage page)
         {
             m_AssetStoreClient.ListCategories(categories =>
             {
                 m_Categories = categories ?? new List<string>();
-                base.Init(rect, filters);
+                base.Init(rect, page);
 
                 // Defer display of labels
                 m_AssetStoreClient.ListLabels(labels =>
@@ -132,7 +127,7 @@ protected override void ApplyFilters()
             }
         }
 
-        protected override void DoDisplay()
+        protected override void DoDisplay(IPage page)
         {
             m_StatusFoldOut = new Foldout {text = L10n.Tr("Status"), name = k_StatusFoldOutName, classList = {k_FoldoutClass}};
             foreach (var status in k_Statuses)
diff --git a/Modules/PackageManagerUI/Editor/UI/Filters/UpmFiltersWindow.cs b/Modules/PackageManagerUI/Editor/UI/Filters/UpmFiltersWindow.cs
index 6c8df8b320..23d8d7432d 100644
--- a/Modules/PackageManagerUI/Editor/UI/Filters/UpmFiltersWindow.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Filters/UpmFiltersWindow.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -11,15 +12,24 @@ namespace UnityEditor.PackageManager.UI.Internal
 {
     internal class UpmFiltersWindow : PackageManagerFiltersWindow
     {
-        internal static readonly string[] k_Statuses =
+        private PackageDatabase m_PackageDatabase;
+        protected override void ResolveDependencies()
         {
-            PageFilters.k_UpdateAvailableStatus,
-            PageFilters.k_SubscriptionBasedStatus
-        };
+            base.ResolveDependencies();
+            var container = ServicesContainer.instance;
+            m_PackageDatabase = container.Resolve<PackageDatabase>();
+        }
+
+        private IEnumerable<string> GetStatuses(IPage page)
+        {
+            yield return PageFilters.k_UpdateAvailableStatus;
+            if (page.visualStates.Any(v => m_PackageDatabase.GetPackage(v.packageUniqueId)?.hasEntitlements == true))
+                yield return PageFilters.k_SubscriptionBasedStatus;
+        }
 
-        protected override Vector2 GetSize()
+        protected override Vector2 GetSize(IPage page)
         {
-            var height = k_FoldOutHeight + k_Statuses.Length * k_ToggleHeight;
+            var height = k_FoldOutHeight + GetStatuses(page).Count() * k_ToggleHeight;
             return new Vector2(k_Width, Math.Min(height, k_MaxHeight));
         }
 
@@ -29,10 +39,10 @@ protected override void ApplyFilters()
                 toggle.SetValueWithoutNotify(toggle.name == m_Filters.status);
         }
 
-        protected override void DoDisplay()
+        protected override void DoDisplay(IPage page)
         {
             m_StatusFoldOut = new Foldout {text = L10n.Tr("Status"), name = k_StatusFoldOutName, classList = {k_FoldoutClass}};
-            foreach (var status in k_Statuses)
+            foreach (var status in GetStatuses(page))
             {
                 var toggle = new Toggle(status) {name = status.ToLower(), classList = {k_ToggleClass}};
                 toggle.RegisterValueChangedCallback(evt =>
diff --git a/Modules/PackageManagerUI/Editor/UI/GenericInputDropdown.cs b/Modules/PackageManagerUI/Editor/UI/GenericInputDropdown.cs
index c064678a25..536e8b7810 100644
--- a/Modules/PackageManagerUI/Editor/UI/GenericInputDropdown.cs
+++ b/Modules/PackageManagerUI/Editor/UI/GenericInputDropdown.cs
@@ -11,7 +11,10 @@ namespace UnityEditor.PackageManager.UI.Internal
     internal class GenericInputDropdown : DropdownContent
     {
         public static readonly string k_DefaultSubmitButtonText = L10n.Tr("Submit");
-        internal override Vector2 windowSize => new Vector2(320, 50);
+        private static readonly Vector2 k_DefaultWindowSize = new Vector2(320, 50);
+
+        private Vector2 m_WindowSize;
+        internal override Vector2 windowSize => m_WindowSize;
 
         public Action<string> submitClicked { get; set; }
 
@@ -39,7 +42,7 @@ public GenericInputDropdown(ResourceLoader resourceLoader, EditorWindow anchorWi
 
         internal override void OnDropdownShown()
         {
-            inputTextField.visualInput.Focus();
+            inputTextField.Focus();
             m_AnchorWindow?.rootVisualElement?.SetEnabled(false);
         }
 
@@ -48,7 +51,7 @@ internal override void OnDropdownClosed()
             m_InputPlaceholder.OnDisable();
 
             inputTextField.UnregisterCallback<ChangeEvent<string>>(OnTextFieldChange);
-            inputTextField.visualInput.UnregisterCallback<KeyDownEvent>(OnKeyDownShortcut);
+            inputTextField.UnregisterCallback<KeyDownEvent>(OnKeyDownShortcut);
 
             submitButton.clickable.clicked -= SubmitClicked;
 
@@ -67,9 +70,11 @@ private void Init(EditorWindow anchorWindow, InputDropdownArgs args)
         {
             m_AnchorWindow = anchorWindow;
 
+            m_WindowSize = args.windowSize ?? k_DefaultWindowSize;
+
             inputTextField.value = args.defaultValue ?? string.Empty;
             inputTextField.RegisterCallback<ChangeEvent<string>>(OnTextFieldChange);
-            inputTextField.visualInput.RegisterCallback<KeyDownEvent>(OnKeyDownShortcut);
+            inputTextField.RegisterCallback<KeyDownEvent>(OnKeyDownShortcut);
 
             m_InputPlaceholder = new TextFieldPlaceholder(inputTextField);
             m_InputPlaceholder.text = args.placeholderText ?? string.Empty;
diff --git a/Modules/PackageManagerUI/Editor/UI/Interfaces/IPackageListView.cs b/Modules/PackageManagerUI/Editor/UI/Interfaces/IPackageListView.cs
index 0ef0650d1c..56509dbea1 100644
--- a/Modules/PackageManagerUI/Editor/UI/Interfaces/IPackageListView.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Interfaces/IPackageListView.cs
@@ -15,8 +15,6 @@ internal interface IPackageListView
         void OnListRebuild(IPage page);
         void OnListUpdate(ListUpdateArgs args);
         void OnFilterTabChanged(PackageFilterTab filterTab);
-        void OnSeeAllPackageVersionsChanged(bool value);
-
         void OnKeyDownShortcut(KeyDownEvent evt);
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/Interfaces/IPage.cs b/Modules/PackageManagerUI/Editor/UI/Interfaces/IPage.cs
index d9df06e3ed..68e0c9b9d8 100644
--- a/Modules/PackageManagerUI/Editor/UI/Interfaces/IPage.cs
+++ b/Modules/PackageManagerUI/Editor/UI/Interfaces/IPage.cs
@@ -64,9 +64,6 @@ internal interface IPage
         bool AmendSelection(IEnumerable<PackageAndVersionIdPair> toAddOrUpdate, IEnumerable<PackageAndVersionIdPair> toRemove);
         bool ToggleSelection(string packageUniqueId);
         void TriggerOnSelectionChanged();
-
-        void SetExpanded(string packageUniqueId, bool value);
-        void SetExpanded(IPackage package, bool value);
         void SetSeeAllVersions(string packageUniqueId, bool value);
         void SetSeeAllVersions(IPackage package, bool value);
         bool IsGroupExpanded(string groupName);
diff --git a/Modules/PackageManagerUI/Editor/UI/MultiSelect/CheckUpdateFoldout.cs b/Modules/PackageManagerUI/Editor/UI/MultiSelect/CheckUpdateFoldout.cs
index 5264611cc0..8a86a3893c 100644
--- a/Modules/PackageManagerUI/Editor/UI/MultiSelect/CheckUpdateFoldout.cs
+++ b/Modules/PackageManagerUI/Editor/UI/MultiSelect/CheckUpdateFoldout.cs
@@ -10,7 +10,7 @@ internal class CheckUpdateFoldout : MultiSelectFoldout
         private AssetStoreCallQueue m_AssetStoreCallQueue;
 
         public CheckUpdateFoldout(PageManager pageManager, AssetStoreCache assetStoreCache, AssetStoreCallQueue assetStoreCallQueue)
-            : base(new PackageDeselectButton(pageManager))
+            : base(new PackageDeselectButton(pageManager, "deselectCheckUpdate"))
         {
             m_AssetStoreCache = assetStoreCache;
             m_AssetStoreCallQueue = assetStoreCallQueue;
diff --git a/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs b/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs
index 8cb6ea8811..5f2b107ed7 100644
--- a/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs
+++ b/Modules/PackageManagerUI/Editor/UI/MultiSelect/MultiSelectDetails.cs
@@ -200,6 +200,7 @@ private void Refresh()
         private void OnDeselectLockedSelectionsClicked()
         {
             m_PageManager.RemoveSelection(m_UnlockFoldout.versions.Select(s => new PackageAndVersionIdPair(s.packageUniqueId, s.uniqueId)));
+            PackageManagerWindowAnalytics.SendEvent("deselectLocked", packageIds: m_UnlockFoldout.versions.Select(v => v.packageUniqueId));
         }
 
         private VisualElementCache cache { get; set; }
diff --git a/Modules/PackageManagerUI/Editor/UI/MultiSelect/NoActionsFoldout.cs b/Modules/PackageManagerUI/Editor/UI/MultiSelect/NoActionsFoldout.cs
index 87dcf7e434..bc2f0fedd9 100644
--- a/Modules/PackageManagerUI/Editor/UI/MultiSelect/NoActionsFoldout.cs
+++ b/Modules/PackageManagerUI/Editor/UI/MultiSelect/NoActionsFoldout.cs
@@ -7,7 +7,7 @@ namespace UnityEditor.PackageManager.UI.Internal
     internal class NoActionsFoldout : MultiSelectFoldout
     {
         public NoActionsFoldout(PageManager pageManager)
-            : base(new PackageDeselectButton(pageManager))
+            : base(new PackageDeselectButton(pageManager, "deselectNoAction"))
         {
             headerTextTemplate = L10n.Tr("No common action available for {0}");
         }
diff --git a/Modules/PackageManagerUI/Editor/UI/MultiSelect/UpdateFoldout.cs b/Modules/PackageManagerUI/Editor/UI/MultiSelect/UpdateFoldout.cs
index 727a0b2b52..9f30556839 100644
--- a/Modules/PackageManagerUI/Editor/UI/MultiSelect/UpdateFoldout.cs
+++ b/Modules/PackageManagerUI/Editor/UI/MultiSelect/UpdateFoldout.cs
@@ -17,7 +17,7 @@ public UpdateFoldout(ApplicationProxy applicationProxy,
 
         protected override MultiSelectItem CreateMultiSelectItem(IPackageVersion version)
         {
-            var rightInfoText = string.Format(k_UpdateInfoTextFormat, PackageUpdateButton.GetTargetVersion(version).versionString);
+            var rightInfoText = string.Format(k_UpdateInfoTextFormat, version?.package?.versions.GetUpdateTarget(version).versionString);
             return new MultiSelectItem(version, rightInfoText);
         }
     }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDependencySampleItemLowWidth.cs b/Modules/PackageManagerUI/Editor/UI/PackageDependencySampleItemLowWidth.cs
index a4ab09cdab..0ab3d8acac 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDependencySampleItemLowWidth.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDependencySampleItemLowWidth.cs
@@ -10,18 +10,9 @@ internal class PackageDependencySampleItemLowWidth : VisualElement
     {
         private VisualElementCache cache { get; set; }
 
-        private ResourceLoader m_ResourceLoader;
-
-        public void ResolveDependencies()
-        {
-            var container = ServicesContainer.instance;
-            m_ResourceLoader = container.Resolve<ResourceLoader>();
-        }
-
-        public PackageDependencySampleItemLowWidth(string name, string version, Label installStatus)
+        public PackageDependencySampleItemLowWidth(ResourceLoader resourceLoader, string name, string version, Label installStatus)
         {
-            ResolveDependencies();
-            var root = m_ResourceLoader.GetTemplate("PackageDependencySampleItemLowWidth.uxml");
+            var root = resourceLoader.GetTemplate("PackageDependencySampleItemLowWidth.uxml");
             Add(root);
 
             cache = new VisualElementCache(root);
@@ -38,15 +29,14 @@ public PackageDependencySampleItemLowWidth(string name, string version, Label in
                 item.Add(installStatus);
         }
 
-        public PackageDependencySampleItemLowWidth(IPackageVersion version, Sample sample)
+        public PackageDependencySampleItemLowWidth(ResourceLoader resourceLoader, IPackageVersion version, Sample sample, SelectionProxy selection, AssetDatabaseProxy assetDatabase, ApplicationProxy application, IOProxy iOProxy)
         {
-            ResolveDependencies();
-            var root = m_ResourceLoader.GetTemplate("PackageDependencySampleItemLowWidth.uxml");
+            var root = resourceLoader.GetTemplate("PackageDependencySampleItemLowWidth.uxml");
             Add(root);
 
             cache = new VisualElementCache(root);
 
-            var sampleItem  = new PackageSampleItem(version, sample);
+            var sampleItem  = new PackageDetailsSampleItem(version, sample, selection, assetDatabase, application, iOProxy);
             sampleItem.importButton.SetEnabled(version.isInstalled);
 
             var name = sampleItem.nameLabel.text;
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs
index f7bd7e7cb2..6d259dd2cc 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetails.cs
@@ -2,7 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -93,7 +92,9 @@ private void RecalculateFillerHeight(GeometryChangedEvent evt)
         {
             if (evt.oldRect.height == evt.newRect.height)
                 return;
-            featureDependencies.RecalculateFillerHeight(detail.layout.height, scrollView.layout.height);
+
+            var featureDependencies = tabView.GetTab<FeatureDependenciesTab>(FeatureDependenciesTab.k_Id);
+            featureDependencies?.RecalculateFillerHeight(detail.layout.height, scrollView.layout.height);
         }
 
         private void OnDetailScroll(float offset)
@@ -106,7 +107,8 @@ private void OnTermOfServiceAgreementStatusChange(TermOfServiceAgreementStatus s
             if (status == TermOfServiceAgreementStatus.Accepted)
                 return;
 
-            var result = m_Application.DisplayDialog(L10n.Tr("Package Manager"),
+            var result = m_Application.DisplayDialog("acceptToS",
+                L10n.Tr("Accepting Terms of Service and EULA"),
                 L10n.Tr("You need to accept Asset Store Terms of Service and EULA before you can download/update any package."),
                 L10n.Tr("Read and accept"), L10n.Tr("Close"));
 
@@ -233,6 +235,6 @@ private void RefreshDetailError(IPackage package, IPackageVersion version)
         private VisualElement customContainer => cache.Get<VisualElement>("detailCustomContainer");
         internal VisualElement extensionContainer => cache.Get<VisualElement>("detailExtensionContainer");
 
-        private FeatureDependencies featureDependencies => cache.Get<FeatureDependencies>("featureDependencies");
+        private PackageDetailsTabView tabView => cache.Get<PackageDetailsTabView>("packageDetailsTabView");
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs
index 1b0288e581..a9a7da70d0 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsBody.cs
@@ -3,7 +3,6 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using UnityEngine.UIElements;
 
@@ -13,83 +12,99 @@ internal class PackageDetailsBody : VisualElement
     {
         internal new class UxmlFactory : UxmlFactory<PackageDetailsBody> {}
 
-        private const string k_EmptyDescriptionClass = "empty";
-        private const int k_maxDescriptionCharacters = 10000;
-
         private ResourceLoader m_ResourceLoader;
         private PackageDatabase m_PackageDatabase;
         private PackageManagerProjectSettingsProxy m_SettingsProxy;
+        private PackageManagerPrefs m_PackageManagerPrefs;
+        private SelectionProxy m_Selection;
+        private AssetDatabaseProxy m_AssetDatabase;
+        private ApplicationProxy m_Application;
+        private IOProxy m_IOProxy;
+        private AssetStoreCache m_AssetStoreCache;
+        private PageManager m_PageManager;
+        private UpmCache m_UpmCache;
+
+        private PackageDetailsTabView m_TabView;
+
         private void ResolveDependencies()
         {
             var container = ServicesContainer.instance;
             m_ResourceLoader = container.Resolve<ResourceLoader>();
             m_SettingsProxy = container.Resolve<PackageManagerProjectSettingsProxy>();
             m_PackageDatabase = container.Resolve<PackageDatabase>();
+            m_PackageManagerPrefs = container.Resolve<PackageManagerPrefs>();
+            m_Selection = container.Resolve<SelectionProxy>();
+            m_AssetDatabase = container.Resolve<AssetDatabaseProxy>();
+            m_Application = container.Resolve<ApplicationProxy>();
+            m_IOProxy = container.Resolve<IOProxy>();
+            m_AssetStoreCache = container.Resolve<AssetStoreCache>();
+            m_PageManager = container.Resolve<PageManager>();
+            m_UpmCache = container.Resolve<UpmCache>();
         }
 
-        internal bool descriptionExpanded => m_DescriptionExpanded;
-        private bool m_DescriptionExpanded;
-
-        private IPackage m_Package;
         private IPackageVersion m_Version;
 
         public PackageDetailsBody()
         {
             ResolveDependencies();
 
-            var root = m_ResourceLoader.GetTemplate("PackageDetailsBody.uxml");
-            Add(root);
-            cache = new VisualElementCache(root);
+            m_TabView = new PackageDetailsTabView()
+            {
+                name = "packageDetailsTabView"
+            };
+            Add(m_TabView);
+
+            m_TabView.onTabSwitched += OnTabSwitched;
 
-            detailDescMore.clickable.clicked += DescMoreClick;
-            detailDescLess.clickable.clicked += DescLessClick;
-            detailDesc.RegisterCallback<GeometryChangedEvent>(DescriptionGeometryChangeEvent);
+            AddTabs();
+        }
+
+        public void AddTabs()
+        {
+            // the ordering for each tab matters; since right now, the order of tabs between
+            //  package types does not matter, we can afford to keep everything ordered statically
+            // AssetStore: Overview - Releases - Images
+            m_TabView.AddTab(new PackageDetailsOverviewTab(m_ResourceLoader));
+            m_TabView.AddTab(new PackageDetailsReleasesTab());
+            m_TabView.AddTab(new PackageDetailsImagesTab(m_AssetStoreCache));
+
+            // Other packages: Description - Versions - Samples - Dependencies or Packages Included
+            m_TabView.AddTab(new PackageDetailsDescriptionTab(m_ResourceLoader));
+            m_TabView.AddTab(new PackageDetailsVersionsTab(m_ResourceLoader, m_Application, m_PackageManagerPrefs, m_PackageDatabase, m_PageManager, m_SettingsProxy, m_UpmCache, m_IOProxy));
+            m_TabView.AddTab(new PackageDetailsSamplesTab(m_ResourceLoader, m_PackageDatabase, m_Selection, m_AssetDatabase, m_Application, m_IOProxy));
+            m_TabView.AddTab(new PackageDetailsDependenciesTab(m_ResourceLoader, m_PackageDatabase));
+            m_TabView.AddTab(new FeatureDependenciesTab(m_ResourceLoader, m_PackageDatabase, m_PackageManagerPrefs, m_SettingsProxy, m_Application));
         }
 
         public void OnEnable()
         {
             m_PackageDatabase.onPackagesChanged += RefreshDependencies;
-            m_SettingsProxy.onEnablePackageDependenciesChanged += RefreshDependencies;
+            m_PageManager.onVisualStateChange += RefreshVersionsHistory;
+
+            // restore after domain reload
+            m_TabView.SelectTab(m_PackageManagerPrefs.selectedPackageDetailsTabIdentifier);
         }
 
         public void OnDisable()
         {
-            detailsImages.OnDisable();
-
             m_PackageDatabase.onPackagesChanged -= RefreshDependencies;
-            m_SettingsProxy.onEnablePackageDependenciesChanged -= RefreshDependencies;
+            m_PageManager.onVisualStateChange -= RefreshVersionsHistory;
         }
 
         public void Refresh(IPackage package, IPackageVersion version)
         {
-            m_Package = package;
             m_Version = version;
-
-            detailsImages.Refresh(m_Package);
-            sampleList.SetPackageVersion(m_Version);
-            UIUtils.SetElementDisplay(disabledInfoBox, m_Version.HasTag(PackageTag.Disabled));
-
-            SetEnabled(m_Package?.hasEntitlementsError != true);
-
-            RefreshDependencies();
-            RefreshLabels();
-            RefreshDescription();
-            RefreshReleaseDetails();
-            RefreshSizeAndSupportedUnityVersions();
-            RefreshPurchasedDate();
-            RefreshSourcePath();
-            RefreshPlatformList();
+            RefreshTabs();
         }
 
-        private void RefreshPlatformList()
+        private void RefreshTabs()
         {
-            packagePlatformList.SetPackageVersion(m_Version);
+            m_TabView.RefreshAllTabs(m_Version);
         }
 
         private void RefreshDependencies()
         {
-            featureDependencies.SetPackageVersion(m_Version);
-            dependencies.SetPackageVersion(m_Version);
+            m_TabView.RefreshTabs(new[] { FeatureDependenciesTab.k_Id, PackageDetailsDependenciesTab.k_Id }, m_Version);
         }
 
         private void RefreshDependencies(bool _)
@@ -102,219 +117,16 @@ private void RefreshDependencies(PackagesChangeArgs _)
             RefreshDependencies();
         }
 
-        private void RefreshLabels()
+        public void OnTabSwitched(PackageDetailsTabElement oldSelection, PackageDetailsTabElement newSelection)
         {
-            detailLabels.Clear();
-
-            if (enabledSelf && m_Package?.labels != null)
-            {
-                var labels = string.Join(", ", m_Package.labels.ToArray());
-
-                if (!string.IsNullOrEmpty(labels))
-                {
-                    var label = new SelectableLabel();
-                    label.SetValueWithoutNotify(labels);
-                    detailLabels.Add(label);
-                }
-            }
-
-            var hasLabels = detailLabels.Children().Any();
-            var isAssetStorePackage = m_Package is AssetStorePackage;
-
-            if (!hasLabels && isAssetStorePackage)
-                detailLabels.Add(new Label(L10n.Tr("(None)")));
-
-            UIUtils.SetElementDisplay(detailLabelsContainer, hasLabels || isAssetStorePackage);
-        }
-
-        private void DescMoreClick()
-        {
-            detailDesc.style.maxHeight = float.MaxValue;
-            UIUtils.SetElementDisplay(detailDescMore, false);
-            UIUtils.SetElementDisplay(detailDescLess, true);
-            m_DescriptionExpanded = true;
-        }
-
-        private void DescLessClick()
-        {
-            detailDesc.style.maxHeight = (int)detailDesc.MeasureTextSize("|", 0, MeasureMode.Undefined, 0, MeasureMode.Undefined).y * 3 + 5;
-            UIUtils.SetElementDisplay(detailDescMore, true);
-            UIUtils.SetElementDisplay(detailDescLess, false);
-            m_DescriptionExpanded = false;
-        }
-
-        private void DescriptionGeometryChangeEvent(GeometryChangedEvent evt)
-        {
-            if (m_Package == null || !m_Package.Is(PackageType.AssetStore))
-            {
-                UIUtils.SetElementDisplay(detailDescMore, false);
-                UIUtils.SetElementDisplay(detailDescLess, false);
-                return;
-            }
-
-            var minTextHeight = (int)detailDesc.MeasureTextSize("|", 0, MeasureMode.Undefined, 0, MeasureMode.Undefined).y * 3 + 1;
-            var textHeight = (int)detailDesc.MeasureTextSize(detailDesc.text, evt.newRect.width, MeasureMode.AtMost, float.MaxValue, MeasureMode.Undefined).y + 1;
-            if (!m_DescriptionExpanded && textHeight > minTextHeight)
-            {
-                UIUtils.SetElementDisplay(detailDescMore, true);
-                UIUtils.SetElementDisplay(detailDescLess, false);
-                detailDesc.style.maxHeight = minTextHeight + 4;
-                return;
-            }
-
-            if (evt.newRect.width > evt.oldRect.width && textHeight <= minTextHeight)
-            {
-                UIUtils.SetElementDisplay(detailDescMore, false);
-                UIUtils.SetElementDisplay(detailDescLess, false);
-            }
-            else if (m_DescriptionExpanded && evt.newRect.width < evt.oldRect.width && textHeight > minTextHeight)
-            {
-                UIUtils.SetElementDisplay(detailDescMore, false);
-                UIUtils.SetElementDisplay(detailDescLess, true);
-            }
+            m_PackageManagerPrefs.selectedPackageDetailsTabIdentifier = newSelection.id;
         }
 
-        private void RefreshDescription()
+        private void RefreshVersionsHistory(IEnumerable<VisualState> states)
         {
-            var hasDescription = !string.IsNullOrEmpty(m_Version.description);
-            var desc = hasDescription ? m_Version.description : L10n.Tr("There is no description for this package.");
-            if (desc.Length > k_maxDescriptionCharacters)
-                desc = desc.Substring(0, k_maxDescriptionCharacters);
-            detailDesc.EnableInClassList(k_EmptyDescriptionClass, !hasDescription);
-            detailDesc.style.maxHeight = int.MaxValue;
-            detailDesc.SetValueWithoutNotify(desc);
-            UIUtils.SetElementDisplay(detailDescMore, false);
-            UIUtils.SetElementDisplay(detailDescLess, false);
-            m_DescriptionExpanded = !m_Package.Is(PackageType.AssetStore);
-        }
-
-        private void RefreshPurchasedDate()
-        {
-            if (enabledSelf)
-            {
-                detailPurchasedDate.SetValueWithoutNotify(m_Package?.purchasedTime?.ToString("MMMM dd, yyyy", CultureInfo.CreateSpecificCulture("en-US")) ?? string.Empty);
-            }
-            UIUtils.SetElementDisplay(detailPurchasedDateContainer, !string.IsNullOrEmpty(detailPurchasedDate.text));
+            var newVisualState = states.FirstOrDefault(state => state.packageUniqueId == m_Version?.packageUniqueId);
+            if (newVisualState?.userUnlocked == true && m_PageManager.GetSelection()?.Count == 1)
+                m_TabView.RefreshTab(PackageDetailsVersionsTab.k_Id, m_Version);
         }
-
-        private void RefreshReleaseDetails()
-        {
-            detailReleaseDetails.Clear();
-
-            // If the package details is not enabled, don't update the date yet as we are fetching new information
-            if (enabledSelf && m_Package.firstPublishedDate != null)
-            {
-                detailReleaseDetails.Add(new PackageReleaseDetailsItem($"{m_Version.versionString}{(m_Version is AssetStorePackageVersion ? " (Current)" : string.Empty)}",
-                    m_Version.publishedDate, m_Version.releaseNotes));
-
-                if (m_Package.firstPublishedDate != null)
-                    detailReleaseDetails.Add(new PackageReleaseDetailsItem("Original", m_Package.firstPublishedDate, string.Empty));
-            }
-
-            UIUtils.SetElementDisplay(detailReleaseDetailsContainer, detailReleaseDetails.Children().Any());
-        }
-
-        private void RefreshSizeAndSupportedUnityVersions()
-        {
-            var showSupportedUnityVersions = RefreshSupportedUnityVersions();
-            var showSize = RefreshSizeInfo();
-            UIUtils.SetElementDisplay(detailSizesAndSupportedVersionsContainer, showSize || showSupportedUnityVersions);
-        }
-
-        private bool RefreshSupportedUnityVersions()
-        {
-            var hasSupportedVersions = (m_Version.supportedVersions?.Any() == true);
-            var supportedVersion = m_Version.supportedVersions?.FirstOrDefault();
-
-            if (!hasSupportedVersions)
-            {
-                supportedVersion = m_Version.supportedVersion;
-                hasSupportedVersions = supportedVersion != null;
-            }
-
-            UIUtils.SetElementDisplay(detailUnityVersionsContainer, hasSupportedVersions);
-            if (hasSupportedVersions)
-            {
-                detailUnityVersions.SetValueWithoutNotify(string.Format(L10n.Tr("{0} or higher"), supportedVersion));
-                var tooltip = supportedVersion.ToString();
-                if (m_Version.supportedVersions != null && m_Version.supportedVersions.Any())
-                {
-                    var versions = m_Version.supportedVersions.Select(version => version.ToString()).ToArray();
-                    tooltip = versions.Length == 1 ? versions[0] :
-                        string.Format(L10n.Tr("{0} and {1} to improve compatibility with the range of these versions of Unity"), string.Join(", ", versions, 0, versions.Length - 1), versions[versions.Length - 1]);
-                }
-                detailUnityVersions.tooltip = string.Format(L10n.Tr("Package has been submitted using Unity {0}"), tooltip);
-            }
-            else
-            {
-                detailUnityVersions.SetValueWithoutNotify(string.Empty);
-                detailUnityVersions.tooltip = string.Empty;
-            }
-
-            return hasSupportedVersions;
-        }
-
-        private bool RefreshSizeInfo()
-        {
-            var showSizes = m_Version.sizes.Any();
-            UIUtils.SetElementDisplay(detailSizesContainer, showSizes);
-            detailSizes.Clear();
-
-            var sizeInfo = m_Version.sizes.FirstOrDefault(info => info.supportedUnityVersion == m_Version.supportedVersion);
-            if (sizeInfo == null)
-                sizeInfo = m_Version.sizes.LastOrDefault();
-
-            if (sizeInfo != null)
-            {
-                var label = new SelectableLabel();
-                label.style.whiteSpace = WhiteSpace.Normal;
-                label.SetValueWithoutNotify(string.Format(L10n.Tr("Size: {0} (Number of files: {1})"), UIUtils.ConvertToHumanReadableSize(sizeInfo.downloadSize), sizeInfo.assetCount));
-                detailSizes.Add(label);
-            }
-
-            return showSizes;
-        }
-
-        private void RefreshSourcePath()
-        {
-            var sourcePath = (m_Version as UpmPackageVersion)?.sourcePath;
-            UIUtils.SetElementDisplay(detailSourcePathContainer, !string.IsNullOrEmpty(sourcePath));
-
-            if (!string.IsNullOrEmpty(sourcePath))
-                detailSourcePath.SetValueWithoutNotify(sourcePath);
-        }
-
-        private VisualElementCache cache { get; set; }
-
-        private SelectableLabel detailDesc => cache.Get<SelectableLabel>("detailDesc");
-        private Button detailDescMore => cache.Get<Button>("detailDescMore");
-        private Button detailDescLess => cache.Get<Button>("detailDescLess");
-
-        private HelpBox disabledInfoBox => cache.Get<HelpBox>("disabledInfoBox");
-
-        private VisualElement detailSourcePathContainer => cache.Get<VisualElement>("detailSourcePathContainer");
-        private SelectableLabel detailSourcePath => cache.Get<SelectableLabel>("detailSourcePath");
-
-        private VisualElement detailSizesAndSupportedVersionsContainer => cache.Get<VisualElement>("detailSizesAndSupportedVersionsContainer");
-        private VisualElement detailUnityVersionsContainer => cache.Get<VisualElement>("detailUnityVersionsContainer");
-        private SelectableLabel detailUnityVersions => cache.Get<SelectableLabel>("detailUnityVersions");
-        private VisualElement detailSizesContainer => cache.Get<VisualElement>("detailSizesContainer");
-        private VisualElement detailSizes => cache.Get<VisualElement>("detailSizes");
-
-        private VisualElement detailPurchasedDateContainer => cache.Get<VisualElement>("detailPurchasedDateContainer");
-        private SelectableLabel detailPurchasedDate => cache.Get<SelectableLabel>("detailPurchasedDate");
-
-        private VisualElement detailReleaseDetailsContainer => cache.Get<VisualElement>("detailReleaseDetailsContainer");
-        private VisualElement detailReleaseDetails => cache.Get<VisualElement>("detailReleaseDetails");
-
-        private VisualElement detailLabelsContainer => cache.Get<VisualElement>("detailLabelsContainer");
-        private VisualElement detailLabels => cache.Get<VisualElement>("detailLabels");
-
-        private PackageSampleList sampleList => cache.Get<PackageSampleList>("detailSampleList");
-        private PackageDependencies dependencies => cache.Get<PackageDependencies>("detailDependencies");
-        private PackageDetailsImages detailsImages => cache.Get<PackageDetailsImages>("detailImagesContainer");
-
-        private FeatureDependencies featureDependencies => cache.Get<FeatureDependencies>("featureDependencies");
-        private PackagePlatformList packagePlatformList => cache.Get<PackagePlatformList>("detailPlatformList");
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs
index 8d90d558cf..79232e3cf1 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsHeader.cs
@@ -38,8 +38,8 @@ internal enum InfoBoxState
 
         private static readonly string[] k_InfoBoxReadMoreUrl =
         {
-            "/Documentation/Manual/pack-prerelease.html",
-            "/Documentation/Manual/pack-experimental.html",
+            "/Documentation/Manual/pack-preview.html",
+            "/Documentation/Manual/pack-exp.html",
             "/Documentation/Manual/pack-releasecandidate.html",
             "/Documentation/Manual/upm-scoped.html"
         };
@@ -56,6 +56,8 @@ internal enum InfoBoxState
         private ApplicationProxy m_Application;
         private PageManager m_PageManager;
         private PackageDatabase m_PackageDatabase;
+        private UpmCache m_UpmCache;
+
         private void ResolveDependencies()
         {
             var container = ServicesContainer.instance;
@@ -63,6 +65,7 @@ private void ResolveDependencies()
             m_Application = container.Resolve<ApplicationProxy>();
             m_PageManager = container.Resolve<PageManager>();
             m_PackageDatabase = container.Resolve<PackageDatabase>();
+            m_UpmCache = container.Resolve<UpmCache>();
         }
 
         private IPackage m_Package;
@@ -76,8 +79,10 @@ public PackageDetailsHeader()
             Add(root);
             cache = new VisualElementCache(root);
 
+            m_PageManager.onVisualStateChange += OnVisualStateChange;
             detailAuthorLink.clickable.clicked += AuthorClick;
             scopedRegistryInfoBox.Q<Button>().clickable.clicked += OnInfoBoxClickMore;
+            quickStart.clickable.clicked += ViewQuickStartClick;
         }
 
         public void Refresh(IPackage package, IPackageVersion version)
@@ -88,7 +93,10 @@ public void Refresh(IPackage package, IPackageVersion version)
             detailTitle.SetValueWithoutNotify(m_Version.displayName);
             detailsLinks.Refresh(m_Package, m_Version);
 
+            UIUtils.SetElementDisplay(disabledWarningBox, version.HasTag(PackageTag.Disabled));
+
             RefreshName();
+            RefreshDependency();
             RefreshFeatureSetElements();
             RefreshAuthor();
             RefreshTags();
@@ -119,19 +127,43 @@ private void RefreshHiddenAssetInfo()
             UIUtils.SetElementDisplay(hiddenAssetInfoBoxContainer, showHiddenInfoBox);
         }
 
-        private void RefreshFeatureSetElements()
+        private void RefreshFeatureSetElements(VisualState visualState = null)
         {
-            var featureSets = m_PackageDatabase.GetFeatureDependents(m_Package.versions.installed);
+            var featureSets = m_PackageDatabase.GetFeaturesThatUseThisPackage(m_Package.versions.installed);
             RefreshUsedInFeatureSetMessage(featureSets);
             RefreshFeatureSetDependentVersionDifferentInfoBox(featureSets);
-            RefreshLockIcons(featureSets);
+            RefreshLockIcons(featureSets, visualState);
+            RefreshQuickStart();
         }
 
-        private void RefreshLockIcons(IEnumerable<IPackageVersion> featureSets)
+        private void RefreshQuickStart()
         {
-            if (featureSets?.Any() == true)
+            var showQuickStartButton = m_Package.Is(PackageType.Feature) && !string.IsNullOrEmpty(UpmPackageDocs.GetQuickStartUrl(m_Version, m_UpmCache));
+            if (showQuickStartButton)
             {
-                var visualState = m_PageManager.GetVisualState(m_Package);
+                quickStart.Clear();
+                quickStart.Add(new VisualElement { classList = { "quickStartIcon" } });
+                quickStart.Add(new TextElement { text = L10n.Tr("QuickStart"), classList = { "quickStartText" } });
+            }
+            UIUtils.SetElementDisplay(quickStart, showQuickStartButton);
+        }
+
+        private void ViewQuickStartClick()
+        {
+            UpmPackageDocs.ViewUrl(UpmPackageDocs.GetQuickStartUrl(m_Version, m_UpmCache), string.Empty, L10n.Tr("quick start documentation"), "viewQuickstart", m_Version, m_Package, m_Application);
+        }
+
+        private void RefreshDependency()
+        {
+            UIUtils.SetElementDisplay(dependencyContainer, m_Version.isInstalled && !m_Version.isDirectDependency && !m_Version.HasTag(PackageTag.Feature));
+        }
+
+        private void RefreshLockIcons(IEnumerable<IPackageVersion> featureSets, VisualState visualState = null)
+        {
+            var showLockedIcon = featureSets?.Any() == true;
+            if (showLockedIcon)
+            {
+                visualState = visualState ?? m_PageManager.GetVisualState(m_Package);
                 if (visualState?.isLocked == true)
                 {
                     lockedIcon.RemoveFromClassList("unlocked");
@@ -144,10 +176,15 @@ private void RefreshLockIcons(IEnumerable<IPackageVersion> featureSets)
                     lockedIcon.RemoveFromClassList("locked");
                     lockedIcon.tooltip = L10n.Tr("This package is unlocked. You can now change its version.");
                 }
-                UIUtils.SetElementDisplay(lockedIcon, true);
             }
-            else
-                UIUtils.SetElementDisplay(lockedIcon, false);
+            UIUtils.SetElementDisplay(lockedIcon, showLockedIcon);
+        }
+
+        private void OnVisualStateChange(IEnumerable<VisualState> visualStates)
+        {
+            var visualState = visualStates.FirstOrDefault(vs => vs.packageUniqueId == m_Package.uniqueId);
+            if (visualState != null)
+                RefreshFeatureSetElements(visualState);
         }
 
         private static Button CreateLink(IPackageVersion version)
@@ -165,16 +202,18 @@ internal void RefreshUsedInFeatureSetMessage(IEnumerable<IPackageVersion> featur
 
             if (featureSetsCount > 0)
             {
-                var element = new VisualElement {name = "usedInFeatureSetIconAndMessageContainer"};
-                var icon = new VisualElement {name = "featureSetIcon"};
+                // we don't want to see the dependency container when a package is installed as a feature dependency
+                UIUtils.SetElementDisplay(dependencyContainer, false);
+
+                var element = new VisualElement { name = "usedInFeatureSetIconAndMessageContainer" };
+                var icon = new VisualElement { name = "featureSetIcon" };
                 element.Add(icon);
 
                 var message = new Label {name = "usedInFeatureSetMessageLabel"};
-                message.text = string.Format(L10n.Tr("This {0} is installed as part of "), m_Package.GetDescriptor());
+                message.text = string.Format(L10n.Tr("is installed as part of the "), m_Package.GetDescriptor());
 
                 element.Add(message);
                 usedInFeatureSetMessageContainer.Add(element);
-
                 usedInFeatureSetMessageContainer.Add(CreateLink(featureSets.FirstOrDefault()));
 
                 if (featureSetsCount > 2)
@@ -199,11 +238,11 @@ internal void RefreshUsedInFeatureSetMessage(IEnumerable<IPackageVersion> featur
 
                     usedInFeatureSetMessageContainer.Add(and);
                     usedInFeatureSetMessageContainer.Add(CreateLink(featureSets.LastOrDefault()));
-                    usedInFeatureSetMessageContainer.Add(new Label(L10n.Tr(" Features.")));
+                    usedInFeatureSetMessageContainer.Add(new Label(L10n.Tr("features.")));
                 }
                 else
                 {
-                    usedInFeatureSetMessageContainer.Add(new Label(L10n.Tr(" Feature.")));
+                    usedInFeatureSetMessageContainer.Add(new Label(L10n.Tr("feature.")));
                 }
             }
         }
@@ -212,13 +251,13 @@ private void RefreshFeatureSetDependentVersionDifferentInfoBox(IEnumerable<IPack
         {
             var featureSetsCount = featureSets?.Count() ?? 0;
 
-            // if the installed version is the Feature Set version and the user is viewing a different version
+            // if the installed version is the feature set version and the user is viewing a different version
             if (featureSetsCount > 0 && m_Package?.versions.installed != null && m_Package.versions.installed.version == m_Package.versions.lifecycleVersion?.version
                 && m_Version != m_Package.versions.installed)
             {
                 featureSetDependentVersionDifferentInfoBox.text = featureSetsCount > 1 ?
-                    string.Format(L10n.Tr("This Package is part of the {0} Features, therefore we recommend keeping the version {1} installed. Changing to a different version may affect the Features' performance."), string.Join(", ", featureSets.Select(f => f.displayName)), m_Package.versions.installed.versionString)
-                    : string.Format(L10n.Tr("This Package is part of the {0} Feature, therefore we recommend keeping the version {1} installed. Changing to a different version may affect the Feature's performance."), featureSets.FirstOrDefault().displayName, m_Package.versions.installed.versionString);
+                    string.Format(L10n.Tr("This package is part of the {0} features, therefore we recommend keeping the version {1} installed. Changing to a different version may affect the features' performance."), string.Join(", ", featureSets.Select(f => f.displayName)), m_Package.versions.installed.versionString)
+                    : string.Format(L10n.Tr("This package is part of the {0} feature, therefore we recommend keeping the version {1} installed. Changing to a different version may affect the feature's performance."), featureSets.FirstOrDefault().displayName, m_Package.versions.installed.versionString);
                 UIUtils.SetElementDisplay(featureSetDependentVersionDifferentInfoBox, true);
             }
             else
@@ -229,23 +268,11 @@ private void RefreshFeatureSetDependentVersionDifferentInfoBox(IEnumerable<IPack
 
         private void RefreshAuthor()
         {
-            var showAuthorContainer = !string.IsNullOrEmpty(m_Version?.author);
-            UIUtils.SetElementDisplay(detailAuthorContainer, showAuthorContainer);
-            if (showAuthorContainer)
-            {
-                if (!string.IsNullOrEmpty(m_Version.authorLink))
-                {
-                    UIUtils.SetElementDisplay(detailAuthorText, false);
-                    UIUtils.SetElementDisplay(detailAuthorLink, true);
-                    detailAuthorLink.text = m_Version.author;
-                }
-                else
-                {
-                    UIUtils.SetElementDisplay(detailAuthorText, true);
-                    UIUtils.SetElementDisplay(detailAuthorLink, false);
-                    detailAuthorText.SetValueWithoutNotify(m_Version.author);
-                }
-            }
+            var showDetailAuthorLink = !string.IsNullOrEmpty(m_Version?.author) && !string.IsNullOrEmpty(m_Version.authorLink);
+            if (showDetailAuthorLink)
+                detailAuthorLink.text = m_Version.author;
+
+            UIUtils.SetElementDisplay(detailAuthorLink, showDetailAuthorLink);
         }
 
         private void RefreshTags()
@@ -253,7 +280,7 @@ private void RefreshTags()
             foreach (var tag in k_VisibleTags)
             {
                 if (tag == PackageTag.Release && m_Version.HasTag(PackageTag.Feature) &&
-                    m_Version.dependencies.Any(dependency => !m_PackageDatabase.GetPackageInFeatureVersion(dependency.name).HasTag(PackageTag.Release)))
+                    (m_Version.dependencies == null || m_Version.dependencies.Any(dependency => m_PackageDatabase.GetPackageInFeatureVersion(dependency.name)?.HasTag(PackageTag.Release) != true)))
                     UIUtils.SetElementDisplay(GetTagLabel(PackageTag.Release.ToString()), false);
                 else
                     UIUtils.SetElementDisplay(GetTagLabel(tag.ToString()), m_Version.HasTag(tag));
@@ -277,7 +304,10 @@ private void AuthorClick()
         {
             var authorLink = m_Version?.authorLink ?? string.Empty;
             if (!string.IsNullOrEmpty(authorLink))
+            {
                 m_Application.OpenURL(authorLink);
+                PackageManagerWindowAnalytics.SendEvent("viewAuthorLink", m_Version?.uniqueId);
+            }
         }
 
         private void RefreshEntitlement()
@@ -298,8 +328,8 @@ private void RefreshVersionLabel()
 
             var releaseDateString = m_Version.publishedDate?.ToString("MMMM dd, yyyy", CultureInfo.CreateSpecificCulture("en-US"));
             detailVersion.SetValueWithoutNotify(string.IsNullOrEmpty(releaseDateString)
-                ? string.Format(L10n.Tr("Version {0}"), versionString)
-                : string.Format(L10n.Tr("Version {0} - {1}"), versionString, releaseDateString));
+                ? versionString
+                : string.Format(L10n.Tr("{0} · {1}"), versionString, releaseDateString));
         }
 
         private void RefreshVersionInfoIcon()
@@ -329,7 +359,7 @@ private void RefreshVersionInfoIcon()
             // In Lifecycle V2, if a Unity package doesn't have a lifecycle version (listed in the editor manifest),
             // then that package is not considered part of the Unity Editor "product" and we need to let users know.
             var unityVersionString = m_Application.unityVersion;
-            if (!m_Package.versions.hasLifecycleVersion && m_Package.Is(PackageType.Unity))
+            if (!m_Package.versions.hasLifecycleVersion && m_Package.Is(PackageType.Unity) && !m_Package.Is(PackageType.BuiltIn))
             {
                 UIUtils.SetElementDisplay(versionInfoIcon, true);
                 versionInfoIcon.tooltip = string.Format(L10n.Tr("This package is not officially supported for Unity {0}."), unityVersionString);
@@ -360,20 +390,32 @@ private void RefreshRegistry()
         {
             var registry = m_Version.registry;
             var showRegistry = registry != null;
-            UIUtils.SetElementDisplay(detailRegistryContainer, showRegistry);
+            UIUtils.SetElementDisplay(detailRegistry, showRegistry);
+            UIUtils.SetElementDisplay(scopedRegistryInfoBox, showRegistry);
             if (showRegistry)
             {
                 scopedRegistryInfoBox.text = k_InfoBoxReadMoreText[(int)InfoBoxState.ScopedRegistry];
                 UIUtils.SetElementDisplay(scopedRegistryInfoBox, !registry.isDefault);
-                if (!m_Version.packageInfo.versions.all.Any())
+
+                var detailRegistryName = L10n.Tr("Unknown");
+                detailRegistry.tooltip = string.Empty;
+                if (m_Version.packageInfo.versions.all.Any())
+                {
+                    detailRegistryName = registry.isDefault ? "Unity Technologies Inc." : registry.name;
+                    detailRegistry.tooltip = registry.url;
+                }
+
+                detailRegistry.enableRichText = true;
+                if (registry.isDefault)
                 {
-                    detailRegistryName.text = L10n.Tr("Unknown");
-                    detailRegistryName.tooltip = string.Empty;
+                    detailRegistry.text = string.Format(L10n.Tr("From <b>Unity Registry</b> by {0}"), detailRegistryName);
                 }
                 else
                 {
-                    detailRegistryName.text = registry.isDefault ? "Unity" : registry.name;
-                    detailRegistryName.tooltip = registry.url;
+                    if (!string.IsNullOrEmpty(m_Version?.author))
+                        detailRegistry.text = L10n.Tr($"From <b>{detailRegistryName}</b> by {m_Version?.author}");
+                    else
+                        detailRegistry.text = L10n.Tr($"From <b>{detailRegistryName}</b>");
                 }
             }
             if (m_Version.HasTag(PackageTag.Experimental))
@@ -419,22 +461,22 @@ private void OnInfoBoxClickMore()
 
         private SelectableLabel detailName => cache.Get<SelectableLabel>("detailName");
 
-        private VisualElement detailAuthorContainer => cache.Get<VisualElement>("detailAuthorContainer");
-        private SelectableLabel detailAuthorText => cache.Get<SelectableLabel>("detailAuthorText");
         private Button detailAuthorLink => cache.Get<Button>("detailAuthorLink");
 
         private PackageDetailsLinks detailsLinks => cache.Get<PackageDetailsLinks>("detailLinksContainer");
 
         internal PackageTagLabel GetTagLabel(string tag) => cache.Get<PackageTagLabel>("tag" + tag);
 
-        private VisualElement detailRegistryContainer => cache.Get<VisualElement>("detailRegistryContainer");
+        private Label detailRegistry => cache.Get<Label>("detailRegistry");
         private HelpBox scopedRegistryInfoBox => cache.Get<HelpBox>("scopedRegistryInfoBox");
-        private Label detailRegistryName => cache.Get<Label>("detailRegistryName");
+        private Button quickStart => cache.Get<Button>("quickStart");
 
         private VisualElement usedInFeatureSetMessageContainer => cache.Get<VisualElement>("usedInFeatureSetMessageContainer");
+        private VisualElement dependencyContainer => cache.Get<VisualElement>("dependencyContainer");
         private HelpBox featureSetDependentVersionDifferentInfoBox => cache.Get<HelpBox>("featureSetDependentVersionDifferentInfoBox");
         private VisualElement lockedIcon => cache.Get<VisualElement>("lockedIcon");
         private HelpBox embeddedFeatureSetWarningBox => cache.Get<HelpBox>("embeddedFeatureSetWarningBox");
         private VisualElement hiddenAssetInfoBoxContainer => cache.Get<VisualElement>("hiddenAssetInfoBoxContainer");
+        private HelpBox disabledWarningBox => cache.Get<HelpBox>("disabledWarningBox");
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsImages.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsImages.cs
deleted file mode 100644
index e799fec4dc..0000000000
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsImages.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using UnityEngine;
-using UnityEngine.UIElements;
-using System.Linq;
-using System.Collections.Generic;
-
-namespace UnityEditor.PackageManager.UI.Internal
-{
-    internal class PackageDetailsImages : VisualElement
-    {
-        internal new class UxmlFactory : UxmlFactory<PackageDetailsImages> {}
-
-        private static Texture2D s_LoadingTexture;
-
-        // Keep track of the width breakpoints at which images were hidden so we know
-        //  when to add them back in
-        private Stack<float> m_WidthsWhenImagesRemoved;
-
-        private IPackage m_Package;
-
-        private VisualElement m_ImagesContainer;
-        private Button m_MoreLink;
-
-        private ApplicationProxy m_Application;
-        private AssetStoreCache m_AssetStoreCache;
-        private void ResolveDependencies()
-        {
-            var container = ServicesContainer.instance;
-            m_Application = container.Resolve<ApplicationProxy>();
-            m_AssetStoreCache = container.Resolve<AssetStoreCache>();
-        }
-
-        public PackageDetailsImages()
-        {
-            ResolveDependencies();
-
-            m_WidthsWhenImagesRemoved = new Stack<float>();
-
-            var titleLabel = new Label(L10n.Tr("Images & Videos")) { classList = { "containerTitle" } };
-            Add(titleLabel);
-
-            m_ImagesContainer = new VisualElement() { name = "detailImages" };
-            Add(m_ImagesContainer);
-            m_ImagesContainer.RegisterCallback<GeometryChangedEvent>(ImagesGeometryChangeEvent);
-
-            m_MoreLink = new Button() { name = "detailImagesMoreLink", classList = { "link", "font-big", "moreless" } };
-            m_MoreLink.text = L10n.Tr("View images & videos on Asset Store");
-            Add(m_MoreLink);
-        }
-
-        public void OnDisable()
-        {
-            ClearSupportingImages();
-        }
-
-        public void Refresh(IPackage package)
-        {
-            m_Package = package;
-
-            var visible = m_Package?.images.Any() ?? false;
-
-            UIUtils.SetElementDisplay(this, visible);
-            ClearSupportingImages();
-
-            if (!visible)
-                return;
-
-            if (s_LoadingTexture == null)
-                s_LoadingTexture = (Texture2D)EditorGUIUtility.LoadRequired("Icons/UnityLogo.png");
-
-            if (long.TryParse(m_Package.uniqueId, out long id))
-            {
-                foreach (var packageImage in m_Package.images)
-                {
-                    var image = new Label { classList = { "image" } };
-                    image.OnLeftClick(() => { m_Application.OpenURL(packageImage.url); });
-                    image.style.backgroundImage = s_LoadingTexture;
-                    m_ImagesContainer.Add(image);
-
-                    m_AssetStoreCache.DownloadImageAsync(id, packageImage.thumbnailUrl, (retId, texture) =>
-                    {
-                        if (retId.ToString() == m_Package?.uniqueId)
-                        {
-                            texture.hideFlags = HideFlags.HideAndDontSave;
-                            image.style.backgroundImage = texture;
-                        }
-                    });
-                }
-            }
-
-            m_MoreLink.clicked += OnMoreImagesClicked;
-        }
-
-        private void ClearSupportingImages()
-        {
-            foreach (var elt in m_ImagesContainer.Children())
-            {
-                if (elt is Label &&
-                    elt.style.backgroundImage.value.texture != null &&
-                    elt.style.backgroundImage.value.texture != s_LoadingTexture)
-                {
-                    Object.DestroyImmediate(elt.style.backgroundImage.value.texture);
-                }
-            }
-            m_ImagesContainer.Clear();
-            m_MoreLink.clicked -= OnMoreImagesClicked;
-        }
-
-        private void OnMoreImagesClicked()
-        {
-            m_Application.OpenURL((m_Package as AssetStorePackage).assetStoreLink);
-        }
-
-        private void ImagesGeometryChangeEvent(GeometryChangedEvent evt)
-        {
-            // hide or show the last image depending on whether it fits on the screen
-            var images = m_ImagesContainer.Children();
-            var visibleImages = images.Where(elem => UIUtils.IsElementVisible(elem));
-
-            var firstInvisibleImage = images.FirstOrDefault(elem => !UIUtils.IsElementVisible(elem));
-            var visibleImagesWidth = visibleImages.Sum(elem => elem.rect.width);
-            var lastVisibleImage = visibleImages.LastOrDefault();
-
-            var widthWhenLastImageRemoved = m_WidthsWhenImagesRemoved.Any() ? m_WidthsWhenImagesRemoved.Peek() : float.MaxValue;
-
-            // if the container approximately doubles in height, that indicates the last image was wrapped around to another row
-            if (lastVisibleImage != null && (evt.newRect.height >= 2 * lastVisibleImage.rect.height || visibleImagesWidth >= evt.newRect.width))
-            {
-                UIUtils.SetElementDisplay(lastVisibleImage, false);
-                m_WidthsWhenImagesRemoved.Push(evt.newRect.width);
-            }
-            else if (firstInvisibleImage != null && evt.newRect.width > widthWhenLastImageRemoved)
-            {
-                UIUtils.SetElementDisplay(firstInvisibleImage, true);
-                m_WidthsWhenImagesRemoved.Pop();
-            }
-        }
-    }
-}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs
index 77c379281c..94e48223e5 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsLinks.cs
@@ -2,10 +2,8 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
+using System.Collections.Generic;
 using System.Linq;
-using UnityEngine;
-using UnityEngine.Networking;
 using UnityEngine.UIElements;
 using Button = UnityEngine.UIElements.Button;
 
@@ -18,7 +16,6 @@ internal class PackageDetailsLinks : VisualElement
         public static readonly string k_ViewLicensesText = L10n.Tr("View licenses");
         public static readonly string k_ViewUseCasesText = L10n.Tr("Use Cases");
         public static readonly string k_ViewDashboardText = L10n.Tr("Go to Dashboard");
-        public static readonly string k_ViewQuickStartText = L10n.Tr("QuickStart");
 
         public const string k_LinkClass = "link";
 
@@ -28,13 +25,11 @@ internal class PackageDetailsLinks : VisualElement
         private IPackageVersion m_Version;
 
         private ApplicationProxy m_Application;
-        private UpmCache m_UpmCache;
         private IOProxy m_IOProxy;
         private void ResolveDependencies()
         {
             var container = ServicesContainer.instance;
             m_Application = container.Resolve<ApplicationProxy>();
-            m_UpmCache = container.Resolve<UpmCache>();
             m_IOProxy = container.Resolve<IOProxy>();
         }
 
@@ -60,7 +55,12 @@ public void Refresh(IPackage package, IPackageVersion version)
             {
                 if (string.IsNullOrEmpty(link.name) || string.IsNullOrEmpty(link.url))
                     continue;
-                AddToLinks(leftItems, new Button(() => { m_Application.OpenURL(link.url); })
+                AddToLinks(leftItems, new Button(() =>
+                {
+                    m_Application.OpenURL(link.url);
+                    if (!string.IsNullOrEmpty(link.analyticsEventName))
+                        PackageManagerWindowAnalytics.SendEvent(link.analyticsEventName, version?.uniqueId);
+                })
                 {
                     text = link.name,
                     tooltip = link.url,
@@ -84,19 +84,6 @@ public void Refresh(IPackage package, IPackageVersion version)
             if (UpmPackageDocs.HasDashboard(version))
                 AddToLinks(leftItems, new Button(ViewDashboardClick) { text = k_ViewDashboardText, classList = { k_LinkClass } });
 
-            var topOffset = false;
-            if (package.Is(PackageType.Feature) && !string.IsNullOrEmpty(GetQuickStartUrl(m_Version)))
-            {
-                var quickStartButton = new Button(ViewQuickStartClick) {  name = "quickStart", classList = { "quickStartButton", "right" } };
-                quickStartButton.Add(new VisualElement { classList = { "quickStartIcon" } });
-                quickStartButton.Add(new TextElement { text = k_ViewQuickStartText, classList = { "quickStartText" } });
-
-                Add(quickStartButton);
-
-                topOffset = leftItems.childCount == 0;
-            }
-            // Offset the links container to the top when there are no links and only quick start button visible
-            EnableInClassList("topOffset", topOffset);
             UIUtils.SetElementDisplay(this, childCount != 0);
         }
 
@@ -108,63 +95,26 @@ private void AddToLinks(VisualElement parent, VisualElement item, bool showInter
             parent.Add(item);
         }
 
-        private void ViewUrl(string onlineUrl, string offlineDocPath, string docType, string analyticsEvent)
+        private void ViewUrl(string[] onlineUrls, string offlineDocPath, string docType, string analyticsEvent)
         {
-            if (!string.IsNullOrEmpty(onlineUrl) && m_Application.isInternetReachable)
+            if (m_Application.isInternetReachable)
             {
-                var request = UnityWebRequest.Head(onlineUrl);
-                try
-                {
-                    var operation = request.SendWebRequest();
-                    operation.completed += (op) =>
-                    {
-                        if (request.responseCode >= 200 && request.responseCode < 300)
-                        {
-                            m_Application.OpenURL(onlineUrl);
-
-                            PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}ValidUrl", m_Version?.uniqueId);
-                        }
-                        else
-                            HandleInvalidOrUnreachableOnlineUrl(onlineUrl, offlineDocPath, docType, analyticsEvent);
-                    };
-                }
-                catch (InvalidOperationException e)
+                if (onlineUrls.Length == 0)
                 {
-                    if (e.Message != "Insecure connection not allowed")
-                        throw e;
+                    UpmPackageDocs.HandleInvalidOrUnreachableOnlineUrl(string.Empty, offlineDocPath, docType, analyticsEvent, m_Version, m_Package, m_Application);
+                    return;
                 }
-                return;
-            }
-            HandleInvalidOrUnreachableOnlineUrl(onlineUrl, offlineDocPath, docType, analyticsEvent);
-        }
 
-        private void HandleInvalidOrUnreachableOnlineUrl(string onlineUrl, string offlineDocPath, string docType, string analyticsEvent)
-        {
-            if (!string.IsNullOrEmpty(offlineDocPath))
-            {
-                m_Application.RevealInFinder(offlineDocPath);
-
-                PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}OnDisk", m_Version?.uniqueId);
-                return;
+                UpmPackageDocs.OpenWebUrl(onlineUrls[0], m_Version, m_Application, analyticsEvent, () =>
+                {
+                    var urls = new List<string>(onlineUrls).Skip(1).ToArray();
+                    ViewUrl(urls, offlineDocPath, docType, analyticsEvent);
+                });
             }
-
-            if (!string.IsNullOrEmpty(onlineUrl))
+            else
             {
-                // With the current `UpmPackageDocs.GetDocumentationUrl` implementation,
-                // We'll get invalid url links for non-unity packages on unity3d.com
-                // We want to avoiding opening these kinds of links to avoid confusion.
-                if (!UpmClient.IsUnityUrl(onlineUrl) || m_Package.Is(PackageType.Unity) || m_Version.packageUniqueId.StartsWith("com.unity."))
-                {
-                    m_Application.OpenURL(onlineUrl);
-
-                    PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}UnreachableOrInvalidUrl", m_Version?.uniqueId);
-                    return;
-                }
+                UpmPackageDocs.HandleInvalidOrUnreachableOnlineUrl(string.Empty, offlineDocPath, docType, analyticsEvent, m_Version, m_Package, m_Application);
             }
-
-            PackageManagerWindowAnalytics.SendEvent($"{analyticsEvent}NotFound", m_Version?.uniqueId);
-
-            Debug.LogError(string.Format(L10n.Tr("[Package Manager Window] Unable to find valid {0} for this {1}."), docType, m_Package.GetDescriptor()));
         }
 
         private void ViewDocClick()
@@ -174,33 +124,22 @@ private void ViewDocClick()
 
         private void ViewChangelogClick()
         {
-            ViewUrl(UpmPackageDocs.GetChangelogUrl(m_Version), UpmPackageDocs.GetOfflineChangelog(m_IOProxy, m_Version), L10n.Tr("changelog"), "viewChangelog");
+            UpmPackageDocs.ViewUrl(UpmPackageDocs.GetChangelogUrl(m_Version), UpmPackageDocs.GetOfflineChangelog(m_IOProxy, m_Version), L10n.Tr("changelog"), "viewChangelog", m_Version, m_Package, m_Application);
         }
 
         private void ViewLicensesClick()
         {
-            ViewUrl(UpmPackageDocs.GetLicensesUrl(m_Version), UpmPackageDocs.GetOfflineLicenses(m_IOProxy, m_Version), L10n.Tr("license documentation"), "viewLicense");
+            UpmPackageDocs.ViewUrl(UpmPackageDocs.GetLicensesUrl(m_Version), UpmPackageDocs.GetOfflineLicenses(m_IOProxy, m_Version), L10n.Tr("license documentation"), "viewLicense", m_Version, m_Package, m_Application);
         }
 
         private void ViewUseCasesClick()
         {
-            ViewUrl(UpmPackageDocs.GetUseCasesUrl(m_Version), UpmPackageDocs.GetOfflineUseCasesUrl(m_IOProxy, m_Version), L10n.Tr("use cases"), "viewUseCases");
+            UpmPackageDocs.ViewUrl(UpmPackageDocs.GetUseCasesUrl(m_Version), UpmPackageDocs.GetOfflineUseCasesUrl(m_IOProxy, m_Version), L10n.Tr("use cases"), "viewUseCases", m_Version, m_Package, m_Application);
         }
 
         private void ViewDashboardClick()
         {
-            ViewUrl(UpmPackageDocs.GetDashboardUrl(m_Version), UpmPackageDocs.GetOfflineDashboardUrl(m_IOProxy, m_Version), L10n.Tr("dashboard"), "viewDashboard");
-        }
-
-        private void ViewQuickStartClick()
-        {
-            ViewUrl(GetQuickStartUrl(m_Version), string.Empty, L10n.Tr("quick start documentation"), "viewQuickstart");
-        }
-
-        public string GetQuickStartUrl(IPackageVersion version)
-        {
-            var upmReserved = m_UpmCache.ParseUpmReserved(version?.packageInfo);
-            return upmReserved?.GetString("quickstart") ?? string.Empty;
+            UpmPackageDocs.ViewUrl(UpmPackageDocs.GetDashboardUrl(m_Version), UpmPackageDocs.GetOfflineDashboardUrl(m_IOProxy, m_Version), L10n.Tr("dashboard"), "viewDashboard", m_Version, m_Package, m_Application);
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDependencies.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsDependenciesTab.cs
similarity index 56%
rename from Modules/PackageManagerUI/Editor/UI/PackageDependencies.cs
rename to Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsDependenciesTab.cs
index 2a47f46157..6c9eb0a9bf 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageDependencies.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsDependenciesTab.cs
@@ -2,60 +2,56 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
-    internal class PackageDependencies : VisualElement
+    internal class PackageDetailsDependenciesTab : PackageDetailsTabElement
     {
-        internal new class UxmlFactory : UxmlFactory<PackageDependencies> {}
+        public const string k_Id = "dependencies";
 
-        private ResourceLoader m_ResourceLoader;
-        private PackageManagerPrefs m_PackageManagerPrefs;
-        private PackageManagerProjectSettingsProxy m_SettingsProxy;
-        private PackageDatabase m_PackageDatabase;
-        private void ResolveDependencies()
+        private const int k_DependencyViewSwitchWidthBreakpoint = 420;
+        private readonly ResourceLoader m_ResourceLoader;
+        private readonly PackageDatabase m_PackageDatabase;
+
+        public override bool IsValid(IPackageVersion version)
         {
-            var container = ServicesContainer.instance;
-            m_ResourceLoader = container.Resolve<ResourceLoader>();
-            m_PackageManagerPrefs = container.Resolve<PackageManagerPrefs>();
-            m_SettingsProxy = container.Resolve<PackageManagerProjectSettingsProxy>();
-            m_PackageDatabase = container.Resolve<PackageDatabase>();
+            return version?.package?.Is(PackageType.Feature) != true
+                && version?.package?.Is(PackageType.MainNotUnity | PackageType.ScopedRegistry | PackageType.Unity | PackageType.BuiltIn) == true;
         }
 
-        public PackageDependencies()
+        public PackageDetailsDependenciesTab(ResourceLoader resourceLoader, PackageDatabase packageDatabase)
         {
-            ResolveDependencies();
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Dependencies");
+            m_ResourceLoader = resourceLoader;
+            m_PackageDatabase = packageDatabase;
 
-            var root = m_ResourceLoader.GetTemplate("PackageDependencies.uxml");
+            var root = m_ResourceLoader.GetTemplate("PackageDetailsDependenciesTab.uxml");
             Add(root);
-            cache = new VisualElementCache(root);
+            m_Cache = new VisualElementCache(root);
 
-            SetExpanded(m_PackageManagerPrefs.dependenciesExpanded);
-            dependenciesExpander.RegisterValueChangedCallback(evt => SetExpanded(evt.newValue));
             RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
         }
 
-        private void SetExpanded(bool expanded)
+        public override void Refresh(IPackageVersion version)
         {
-            if (dependenciesExpander.value != expanded)
-                dependenciesExpander.value = expanded;
-            if (m_PackageManagerPrefs.dependenciesExpanded != expanded)
-                m_PackageManagerPrefs.dependenciesExpanded = expanded;
-            UIUtils.SetElementDisplay(dependenciesOuterContainer, expanded);
+            UpdateDependencies(version?.dependencies);
+            UpdateReverseDependencies(m_PackageDatabase.GetReverseDependencies(version));
         }
 
         private void OnGeometryChanged(GeometryChangedEvent evt)
         {
-            float newWidth = evt.newRect.width;
-            ToggleLowWidthDependencyView(newWidth);
+            if (Math.Abs(evt.newRect.width - evt.oldRect.width) > 1.0f)
+                ToggleLowWidthDependencyView(evt.newRect.width);
         }
 
         private void ToggleLowWidthDependencyView(float width)
         {
-            if (width <= 420)
+            if (width <= k_DependencyViewSwitchWidthBreakpoint)
             {
                 UIUtils.SetElementDisplay(dependenciesListLowWidth, true);
                 UIUtils.SetElementDisplay(reverseDependenciesListLowWidth, true);
@@ -88,12 +84,12 @@ private static SelectableLabel BuildSelectableLabel(string text, string clazz)
             return label;
         }
 
-        private string GetNameText(DependencyInfo dependency, IPackage package, IPackageVersion version)
+        public static string GetNameText(DependencyInfo dependency, IPackage package, IPackageVersion version)
         {
             return version?.displayName ?? package?.displayName ?? dependency.name;
         }
 
-        private string GetVersionText(DependencyInfo dependency, IPackage package)
+        public static string GetVersionText(DependencyInfo dependency, IPackage package)
         {
             if (package == null || package.Is(PackageType.Feature))
                 return string.Empty;
@@ -102,7 +98,7 @@ private string GetVersionText(DependencyInfo dependency, IPackage package)
             return dependency.version;
         }
 
-        private string GetVersionText(IPackageVersion packageVersion)
+        private static string GetVersionText(IPackageVersion packageVersion)
         {
             if (packageVersion == null || packageVersion.HasTag(PackageTag.Feature))
                 return string.Empty;
@@ -111,7 +107,7 @@ private string GetVersionText(IPackageVersion packageVersion)
             return packageVersion.version.ToString();
         }
 
-        private string GetStatusText(DependencyInfo dependency, IPackageVersion installedVersion)
+        public static string GetStatusText(DependencyInfo dependency, IPackageVersion installedVersion)
         {
             if (installedVersion == null)
                 return string.Empty;
@@ -128,25 +124,6 @@ private string GetStatusText(DependencyInfo dependency, IPackageVersion installe
                 ? string.Format("({0})", statusText) : string.Format("({0} {1})", installedVersion.version, statusText);
         }
 
-        public void SetPackageVersion(IPackageVersion version)
-        {
-            if (!m_SettingsProxy.enablePackageDependencies || version?.HasTag(PackageTag.Feature) == true)
-            {
-                UIUtils.SetElementDisplay(this, false);
-                return;
-            }
-
-            var dependencies = version?.dependencies;
-            var reverseDependencies = m_PackageDatabase.GetReverseDependencies(version);
-            var showDependency = dependencies != null || reverseDependencies != null;
-            UIUtils.SetElementDisplay(this, showDependency);
-            if (!showDependency)
-                return;
-
-            UpdateDependencies(dependencies);
-            UpdateReverseDependencies(reverseDependencies);
-        }
-
         private void UpdateDependencies(DependencyInfo[] dependencies)
         {
             dependenciesNames.Clear();
@@ -174,7 +151,7 @@ private void UpdateDependencies(DependencyInfo[] dependencies)
                 dependenciesVersions.Add(BuildSelectableLabel(versionText, "text"));
                 dependenciesStatuses.Add(BuildLabel(statusText, "text"));
 
-                var dependencyLowWidthItem = new PackageDependencySampleItemLowWidth(nameText, versionText, BuildLabel(statusText, "text"));
+                var dependencyLowWidthItem = new PackageDependencySampleItemLowWidth(m_ResourceLoader, nameText, versionText, BuildLabel(statusText, "text"));
                 dependenciesListLowWidth.Add(dependencyLowWidthItem);
             }
         }
@@ -201,25 +178,23 @@ private void UpdateReverseDependencies(IEnumerable<IPackageVersion> reverseDepen
                 reverseDependenciesNames.Add(BuildSelectableLabel(nameText, "text"));
                 reverseDependenciesVersions.Add(BuildSelectableLabel(versionText, "text"));
 
-                var reverseDependencyLowWidthItem = new PackageDependencySampleItemLowWidth(nameText, versionText, null);
+                var reverseDependencyLowWidthItem = new PackageDependencySampleItemLowWidth(m_ResourceLoader, nameText, versionText, null);
                 reverseDependenciesListLowWidth.Add(reverseDependencyLowWidthItem);
             }
         }
 
-        private VisualElementCache cache { get; set; }
-        private Toggle dependenciesExpander { get { return cache.Get<Toggle>("dependenciesExpander"); } }
-        private VisualElement dependenciesOuterContainer { get { return cache.Get<VisualElement>("dependenciesOuterContainer"); } }
-        private VisualElement dependenciesNormalView { get { return cache.Get<VisualElement>("dependenciesNormalView"); } }
-        private Label noDependencies { get { return cache.Get<Label>("noDependencies"); } }
-        private VisualElement dependenciesNames { get { return cache.Get<VisualElement>("dependenciesNames"); } }
-        private VisualElement dependenciesVersions { get { return cache.Get<VisualElement>("dependenciesVersions"); } }
-        private VisualElement dependenciesStatuses { get { return cache.Get<VisualElement>("dependenciesStatuses"); } }
-        private VisualElement dependenciesListLowWidth { get { return cache.Get<VisualElement>("dependenciesListLowWidth"); } }
-
-        private VisualElement reverseDependenciesNormalView { get { return cache.Get<VisualElement>("reverseDependenciesNormalView"); } }
-        private Label noReverseDependencies { get { return cache.Get<Label>("noReverseDependencies"); } }
-        private VisualElement reverseDependenciesNames { get { return cache.Get<VisualElement>("reverseDependenciesNames"); } }
-        private VisualElement reverseDependenciesVersions { get { return cache.Get<VisualElement>("reverseDependenciesVersions"); } }
-        private VisualElement reverseDependenciesListLowWidth { get { return cache.Get<VisualElement>("reverseDependenciesListLowWidth"); } }
+        private readonly  VisualElementCache m_Cache;
+        private VisualElement dependenciesNormalView => m_Cache.Get<VisualElement>("dependenciesNormalView");
+        private Label noDependencies => m_Cache.Get<Label>("noDependencies");
+        private VisualElement dependenciesNames => m_Cache.Get<VisualElement>("dependenciesNames");
+        private VisualElement dependenciesVersions => m_Cache.Get<VisualElement>("dependenciesVersions");
+        private VisualElement dependenciesStatuses => m_Cache.Get<VisualElement>("dependenciesStatuses");
+        private VisualElement dependenciesListLowWidth => m_Cache.Get<VisualElement>("dependenciesListLowWidth");
+
+        private VisualElement reverseDependenciesNormalView => m_Cache.Get<VisualElement>("reverseDependenciesNormalView");
+        private Label noReverseDependencies => m_Cache.Get<Label>("noReverseDependencies");
+        private VisualElement reverseDependenciesNames => m_Cache.Get<VisualElement>("reverseDependenciesNames");
+        private VisualElement reverseDependenciesVersions => m_Cache.Get<VisualElement>("reverseDependenciesVersions");
+        private VisualElement reverseDependenciesListLowWidth => m_Cache.Get<VisualElement>("reverseDependenciesListLowWidth");
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsDescriptionTab.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsDescriptionTab.cs
new file mode 100644
index 0000000000..3755fa02cf
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsDescriptionTab.cs
@@ -0,0 +1,63 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsDescriptionTab : PackageDetailsTabElement
+    {
+        public const string k_Id = "description";
+
+        private const string k_EmptyDescriptionClass = "empty";
+        private const int k_maxDescriptionCharacters = 10000;
+
+        public override bool IsValid(IPackageVersion version)
+        {
+            return version?.package?.Is(PackageType.AssetStore) == false;
+        }
+
+        public PackageDetailsDescriptionTab(ResourceLoader resourceLoader)
+        {
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Description");
+            var root = resourceLoader.GetTemplate("DetailsTabs/PackageDetailsDescriptionTab.uxml");
+            Add(root);
+            m_Cache = new VisualElementCache(root);
+        }
+
+        public override void Refresh(IPackageVersion version)
+        {
+            packagePlatformList.Refresh(version);
+            RefreshDescription(version);
+            RefreshSourcePath(version);
+        }
+
+        private void RefreshDescription(IPackageVersion version)
+        {
+            var hasDescription = !string.IsNullOrEmpty(version.description);
+            var desc = hasDescription ? version.description : L10n.Tr("There is no description for this package.");
+            if (desc.Length > k_maxDescriptionCharacters)
+                desc = desc.Substring(0, k_maxDescriptionCharacters);
+            detailDescription.EnableInClassList(k_EmptyDescriptionClass, !hasDescription);
+            detailDescription.style.maxHeight = int.MaxValue;
+            detailDescription.SetValueWithoutNotify(desc);
+        }
+
+        private void RefreshSourcePath(IPackageVersion version)
+        {
+            var sourcePath = (version as UpmPackageVersion)?.sourcePath;
+            UIUtils.SetElementDisplay(detailSourcePathContainer, !string.IsNullOrEmpty(sourcePath));
+
+            if (!string.IsNullOrEmpty(sourcePath))
+                detailSourcePath.SetValueWithoutNotify(sourcePath.EscapeBackslashes());
+        }
+
+        private readonly VisualElementCache m_Cache;
+        private PackagePlatformList packagePlatformList => m_Cache.Get<PackagePlatformList>("detailPlatformList");
+        private SelectableLabel detailDescription => m_Cache.Get<SelectableLabel>("detailDescription");
+        private VisualElement detailSourcePathContainer => m_Cache.Get<VisualElement>("detailSourcePathContainer");
+        private SelectableLabel detailSourcePath => m_Cache.Get<SelectableLabel>("detailSourcePath");
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/Features/FeatureDependencies.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsFeatureDependenciesTab.cs
similarity index 76%
rename from Modules/PackageManagerUI/Editor/UI/Features/FeatureDependencies.cs
rename to Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsFeatureDependenciesTab.cs
index 6eb6309314..4b392af33c 100644
--- a/Modules/PackageManagerUI/Editor/UI/Features/FeatureDependencies.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsFeatureDependenciesTab.cs
@@ -8,11 +8,54 @@
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
-    internal class FeatureDependencies : VisualElement
+    internal enum FeatureState
     {
-        public const string k_SelectedClassName = "selected";
+        None,
+        Info,
+        Customized
+    }
+
+    internal class FeatureDependencyItem : VisualElement
+    {
+        public IPackageVersion packageVersion { get; private set; }
+        public string packageName { get; private set; }
+
+        public FeatureDependencyItem(IPackageVersion featureVersion, IPackageVersion featureDependencyVersion, FeatureState state = FeatureState.None)
+        {
+            packageVersion = featureDependencyVersion;
+            packageName = featureDependencyVersion.packageUniqueId;
+
+            m_Name = new Label { name = "name" };
+            m_Name.text = featureDependencyVersion?.displayName ?? string.Empty;
+            Add(m_Name);
 
-        internal new class UxmlFactory : UxmlFactory<FeatureDependencies> {}
+            m_State = new VisualElement { name = "versionState" };
+            if (state == FeatureState.Customized && featureVersion.isInstalled)
+            {
+                m_State.AddToClassList(state.ToString().ToLower());
+                m_State.tooltip = L10n.Tr("This package has been manually customized");
+            }
+
+            Add(m_State);
+        }
+
+        public FeatureDependencyItem(string dependencyName)
+        {
+            packageName = dependencyName;
+
+            m_Name = new Label { name = "name" };
+            m_Name.text = dependencyName;
+            Add(m_Name);
+        }
+
+        private Label m_Name;
+        private VisualElement m_State;
+    }
+
+    internal class FeatureDependenciesTab : PackageDetailsTabElement
+    {
+        public const string k_SelectedClassName = "selected";
+        public const string k_Id = "packagesincluded";
 
         private ResourceLoader m_ResourceLoader;
         private PackageDatabase m_PackageDatabase;
@@ -24,28 +67,27 @@ internal class FeatureDependencies : VisualElement
 
         private string infoBoxUrl => $"https://docs.unity3d.com/{m_Application?.shortUnityVersion}/Documentation/Manual";
 
-        private void ResolveDependencies()
-        {
-            var container = ServicesContainer.instance;
-            m_ResourceLoader = container.Resolve<ResourceLoader>();
-            m_PackageDatabase = container.Resolve<PackageDatabase>();
-            m_PackageManagerPrefs = container.Resolve<PackageManagerPrefs>();
-            m_SettingsProxy = container.Resolve<PackageManagerProjectSettingsProxy>();
-            m_Application = container.Resolve<ApplicationProxy>();
-        }
-
         private IPackageVersion m_FeatureVersion;
 
-        public FeatureDependencies()
+        public FeatureDependenciesTab(ResourceLoader resourceLoader,
+                                      PackageDatabase packageDatabase,
+                                      PackageManagerPrefs packageManagerPrefs,
+                                      PackageManagerProjectSettingsProxy settingsProxy,
+                                      ApplicationProxy applicationProxy)
         {
-            ResolveDependencies();
+            m_ResourceLoader = resourceLoader;
+            m_PackageDatabase = packageDatabase;
+            m_PackageManagerPrefs = packageManagerPrefs;
+            m_SettingsProxy = settingsProxy;
+            m_Application = applicationProxy;
+
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Packages Included");
 
             var root = m_ResourceLoader.GetTemplate("FeatureDependencies.uxml");
             Add(root);
 
             cache = new VisualElementCache(root);
-            SetExpanded(m_PackageManagerPrefs.featureDependenciesExpanded);
-            dependenciesExpander?.RegisterValueChangedCallback(evt => SetExpanded(evt.newValue));
             dependencyInfoBox.Q<Button>().clickable.clicked += () => m_Application.OpenURL($"{infoBoxUrl}/{m_Link}");
         }
 
@@ -72,7 +114,7 @@ public FeatureState GetFeatureState(IPackageVersion version)
 
         public void RecalculateFillerHeight(float detailsHeight, float scrollViewHeight)
         {
-            if (!dependenciesExpander.value || !UIUtils.IsElementVisible(this))
+            if (!UIUtils.IsElementVisible(this))
                 return;
             var detailsContentHeight = detailsHeight - fillerLeftContainer.layout.height;
             var newFillerHeight = Mathf.Max(0, scrollViewHeight - detailsContentHeight);
@@ -80,16 +122,12 @@ public void RecalculateFillerHeight(float detailsHeight, float scrollViewHeight)
                 fillerLeftContainer.style.height = newFillerHeight;
         }
 
-        private void SetExpanded(bool expanded)
+        public override bool IsValid(IPackageVersion version)
         {
-            if (dependenciesExpander.value != expanded)
-                dependenciesExpander.value = expanded;
-            if (m_PackageManagerPrefs.featureDependenciesExpanded != expanded)
-                m_PackageManagerPrefs.featureDependenciesExpanded = expanded;
-            UIUtils.SetElementDisplay(dependenciesOuterContainer, expanded);
+            return version?.HasTag(PackageTag.Feature) == true;
         }
 
-        public void SetPackageVersion(IPackageVersion version)
+        public override void Refresh(IPackageVersion version)
         {
             m_FeatureVersion = version;
 
@@ -116,12 +154,6 @@ public void SetPackageVersion(IPackageVersion version)
             }
 
             RefreshSelection();
-            RefreshHeaderText(dependencyList.childCount);
-        }
-
-        private void RefreshHeaderText(int numPackages)
-        {
-            dependenciesExpander.text = numPackages == 1 ? L10n.Tr("One Package Included") : string.Format(L10n.Tr("{0} Packages Included"), numPackages);
         }
 
         private void OnDependencyItemClicked(IPackageVersion version, string dependencyName)
@@ -176,7 +208,7 @@ private void RefreshSelection(IPackageVersion version = null)
             }
 
             var tab = PackageFilterTab.UnityRegistry;
-            if (version.isDirectDependency || m_SettingsProxy.enablePackageDependencies)
+            if (version.isDirectDependency)
                 tab = PackageFilterTab.InProject;
             dependencyLink.clickable.clicked += () => PackageManagerWindow.SelectPackageAndFilterStatic(version.name, tab);
 
@@ -194,7 +226,6 @@ private void RefreshSelection(IPackageVersion version = null)
         }
 
         private VisualElementCache cache { get; set; }
-        private Toggle dependenciesExpander => cache.Get<Toggle>("dependenciesExpander");
         private VisualElement dependenciesOuterContainer => cache.Get<VisualElement>("featureDependenciesOuterContainer");
         private VisualElement dependencyList => cache.Get<VisualElement>("featureDependenciesList");
         private SelectableLabel dependencyTitle => cache.Get<SelectableLabel>("featureDependencyTitle");
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsImagesTab.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsImagesTab.cs
new file mode 100644
index 0000000000..d18c480af8
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsImagesTab.cs
@@ -0,0 +1,139 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine;
+using UnityEngine.UIElements;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsImagesTab : PackageDetailsTabElement
+    {
+        public const string k_Id = "images";
+
+        private static Texture2D s_LoadingTexture;
+
+        private IPackageVersion m_Version;
+
+        private VisualElement m_MainImageInnerContainer;
+        private Image m_MainImage;
+
+        private VisualElement m_ThumbnailsContainer;
+
+        private AssetStoreCache m_AssetStoreCache;
+
+        private List<Texture2D> m_ImageTextures;
+
+        public PackageDetailsImagesTab(AssetStoreCache assetStoreCache)
+        {
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Images");
+            m_AssetStoreCache = assetStoreCache;
+
+            m_ImageTextures = new List<Texture2D>();
+
+            m_MainImage = new Image() { name = "mainImage", classList = { "image" } };
+            m_MainImage.scaleMode = ScaleMode.ScaleToFit;
+
+            // Wrap main image in two layers of containers to lock the aspect ratio
+            var mainImageOuterContainer = new VisualElement() { name = "mainImageOuterContainer" };
+            m_MainImageInnerContainer = new VisualElement() { name = "mainImageInnerContainer" };
+            m_MainImageInnerContainer.Add(m_MainImage);
+            mainImageOuterContainer.Add(m_MainImageInnerContainer);
+            Add(mainImageOuterContainer);
+
+            m_ThumbnailsContainer = new VisualElement() { name = "thumbnailsContainer" };
+            Add(m_ThumbnailsContainer);
+
+            m_Version = null;
+        }
+
+        public override bool IsValid(IPackageVersion version)
+        {
+            return version?.package?.images?.Any() ?? false;
+        }
+
+        public override void Refresh(IPackageVersion version)
+        {
+            m_Version = version;
+            var package = version.package;
+
+            ClearImages();
+
+            if (s_LoadingTexture == null)
+                s_LoadingTexture = (Texture2D)EditorGUIUtility.LoadRequired("Icons/UnityLogo.png");
+
+            if (long.TryParse(package.uniqueId, out long id))
+            {
+                m_MainImage.image = s_LoadingTexture;
+                foreach (var packageImage in package.images)
+                {
+                    var thumbnail = new Image() { classList = { "thumbnail", "image" } };
+                    thumbnail.image = s_LoadingTexture;
+                    thumbnail.scaleMode = ScaleMode.ScaleAndCrop;
+                    m_ThumbnailsContainer.Add(thumbnail);
+                    m_AssetStoreCache.DownloadImageAsync(id, packageImage.thumbnailUrl, (retId, texture) =>
+                    {
+                        if (texture != null)
+                        {
+                            m_ImageTextures.Add(texture);
+                            texture.hideFlags = HideFlags.HideAndDontSave;
+                        }
+
+                        if (retId.ToString() == m_Version.package?.uniqueId)
+                        {
+                            thumbnail.image = texture ?? s_LoadingTexture;
+                            thumbnail.OnLeftClick(() => OnImageClicked(thumbnail, packageImage));
+                        }
+                    });
+
+                    // We run `OnImageClicked` at the beginning to make sure the selection is set properly
+                    if (packageImage.type == PackageImage.ImageType.Main)
+                        OnImageClicked(thumbnail, packageImage);
+                }
+            }
+        }
+
+        private void ClearImages()
+        {
+            m_MainImage.image = null;
+            foreach (var thumbnail in m_ThumbnailsContainer.Children().OfType<Image>())
+                thumbnail.image = null;
+            m_ThumbnailsContainer.Clear();
+            foreach (var texture in m_ImageTextures)
+                Object.DestroyImmediate(texture);
+            m_ImageTextures.Clear();
+        }
+
+        private void OnImageClicked(Image image, PackageImage changeToImage)
+        {
+            if (long.TryParse(m_Version.package.uniqueId, out long id))
+            {
+                var url = changeToImage.type == PackageImage.ImageType.Main ? changeToImage.thumbnailUrl : changeToImage.url;
+                m_AssetStoreCache.DownloadImageAsync(id, url, (retId, texture2d) =>
+                {
+                    if (texture2d != null)
+                    {
+                        m_ImageTextures.Add(texture2d);
+                        texture2d.hideFlags = HideFlags.HideAndDontSave;
+                    }
+
+                    // If for whatever reason the main image is not available, we fall back to use thumbnail so that the user don't just see
+                    // the loading texture indefinitely.
+                    var texture = texture2d ?? image.image;
+                    if (retId.ToString() == m_Version.package?.uniqueId)
+                    {
+                        m_MainImage.image = texture;
+                        if (changeToImage.type == PackageImage.ImageType.Main && texture.width > 0)
+                            m_MainImageInnerContainer.style.paddingTop = new Length(100.0f * texture.height / texture.width, LengthUnit.Percent);
+                    }
+                });
+                foreach (var thumbnail in m_ThumbnailsContainer.Children().OfType<Image>())
+                    thumbnail.RemoveFromClassList("selected");
+                image.AddToClassList("selected");
+            }
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsOverviewTab.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsOverviewTab.cs
new file mode 100644
index 0000000000..fe05d1afa6
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsOverviewTab.cs
@@ -0,0 +1,114 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Globalization;
+using System.Linq;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsOverviewTab : PackageDetailsTabElement
+    {
+        public const string k_Id = "overview";
+
+        private const string k_EmptyDescriptionClass = "empty";
+        private const int k_maxDescriptionCharacters = 10000;
+
+        public override bool IsValid(IPackageVersion version)
+        {
+            return version?.package?.Is(PackageType.AssetStore) == true;
+        }
+
+        public PackageDetailsOverviewTab(ResourceLoader resourceLoader)
+        {
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Overview");
+
+            var root = resourceLoader.GetTemplate("DetailsTabs/PackageDetailsOverviewTab.uxml");
+            Add(root);
+            m_Cache = new VisualElementCache(root);
+        }
+
+        public override void Refresh(IPackageVersion version)
+        {
+            RefreshLabels(version);
+            RefreshSupportedUnityVersions(version);
+            RefreshSizeInfo(version);
+            RefreshPurchasedDate(version);
+            RefreshDescription(version);
+        }
+
+        private void RefreshLabels(IPackageVersion version)
+        {
+            var package = version?.package;
+            var hasLabels = package?.labels?.Any() == true;
+            if (hasLabels)
+                assignedLabelList.Refresh(package.labels.Count() > 1 ? L10n.Tr("Assigned Labels") : L10n.Tr("Assigned Label"), package.labels);
+            UIUtils.SetElementDisplay(assignedLabelList, hasLabels);
+        }
+
+        private void RefreshSupportedUnityVersions(IPackageVersion version)
+        {
+            var supportedVersion = version.supportedVersions?.Any() == true ? version.supportedVersions.First() : version.supportedVersion;
+            var hasSupportedVersions = supportedVersion != null;
+            if (hasSupportedVersions)
+            {
+                detailUnityVersions.SetValueWithoutNotify(string.Format(L10n.Tr("{0} or higher"), supportedVersion));
+
+                var tooltip = supportedVersion.ToString();
+                if (version.supportedVersions?.Any() == true)
+                {
+                    var versions = version.supportedVersions.Select(version => version.ToString()).ToArray();
+                    tooltip = versions.Length == 1 ? versions[0] :
+                        string.Format(L10n.Tr("{0} and {1} to improve compatibility with the range of these versions of Unity"), string.Join(", ", versions, 0, versions.Length - 1), versions[versions.Length - 1]);
+                }
+                detailUnityVersions.tooltip = string.Format(L10n.Tr("Package has been submitted using Unity {0}"), tooltip);
+            }
+            UIUtils.SetElementDisplay(detailUnityVersionsContainer, hasSupportedVersions);
+        }
+
+        private void RefreshSizeInfo(IPackageVersion version)
+        {
+            var showSizes = version.sizes.Any();
+            if (showSizes)
+            {
+                var sizeInfo = version.sizes.FirstOrDefault(info => info.supportedUnityVersion == version.supportedVersion) ?? version.sizes.Last();
+                detailSizes.SetValueWithoutNotify(string.Format(L10n.Tr("Size: {0} (Number of files: {1})"), UIUtils.ConvertToHumanReadableSize(sizeInfo.downloadSize), sizeInfo.assetCount));
+            }
+            UIUtils.SetElementDisplay(detailSizesContainer, showSizes);
+        }
+
+        private void RefreshPurchasedDate(IPackageVersion version)
+        {
+            detailPurchasedDate.SetValueWithoutNotify(version.package?.purchasedTime?.ToString("MMMM dd, yyyy", CultureInfo.CreateSpecificCulture("en-US")) ?? string.Empty);
+            UIUtils.SetElementDisplay(detailPurchasedDateContainer, !string.IsNullOrEmpty(detailPurchasedDate.text));
+        }
+
+        private void RefreshDescription(IPackageVersion version)
+        {
+            var hasDescription = !string.IsNullOrEmpty(version.description);
+            var desc = hasDescription ? version.description : L10n.Tr("There is no description for this package.");
+            if (desc.Length > k_maxDescriptionCharacters)
+                desc = desc.Substring(0, k_maxDescriptionCharacters);
+            detailDescription.EnableInClassList(k_EmptyDescriptionClass, !hasDescription);
+            detailDescription.style.maxHeight = int.MaxValue;
+            detailDescription.SetValueWithoutNotify(desc);
+        }
+
+        private readonly VisualElementCache m_Cache;
+
+        private TagLabelList assignedLabelList => m_Cache.Get<TagLabelList>("assignedLabelList");
+
+        private VisualElement detailUnityVersionsContainer => m_Cache.Get<VisualElement>("detailUnityVersionsContainer");
+        private SelectableLabel detailUnityVersions => m_Cache.Get<SelectableLabel>("detailUnityVersions");
+
+        private VisualElement detailSizesContainer => m_Cache.Get<VisualElement>("detailSizesContainer");
+        private SelectableLabel detailSizes => m_Cache.Get<SelectableLabel>("detailSizes");
+
+        private VisualElement detailPurchasedDateContainer => m_Cache.Get<VisualElement>("detailPurchasedDateContainer");
+        private SelectableLabel detailPurchasedDate => m_Cache.Get<SelectableLabel>("detailPurchasedDate");
+
+        private SelectableLabel detailDescription => m_Cache.Get<SelectableLabel>("detailDescription");
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsReleasesTab.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsReleasesTab.cs
new file mode 100644
index 0000000000..3e45b536fc
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsReleasesTab.cs
@@ -0,0 +1,44 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsReleasesTab : PackageDetailsTabElement
+    {
+        public const string k_Id = "releases";
+
+        private readonly VisualElement m_ReleasesContainer;
+
+        public override bool IsValid(IPackageVersion version)
+        {
+            return version?.package?.Is(PackageType.AssetStore) == true;
+        }
+
+        public PackageDetailsReleasesTab()
+        {
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Releases");
+
+            m_ReleasesContainer = new VisualElement { name = "releasesContainer" };
+            Add(m_ReleasesContainer);
+        }
+
+        public override void Refresh(IPackageVersion version)
+        {
+            m_ReleasesContainer.Clear();
+
+            if (version?.package?.firstPublishedDate != null)
+            {
+                var latest = version.package.versions.latest;
+                if (latest != version)
+                    m_ReleasesContainer.Add(new PackageReleaseDetailsItem(latest.versionString, latest.publishedDate, false, latest.releaseNotes));
+
+                m_ReleasesContainer.Add(new PackageReleaseDetailsItem(version.versionString, version.publishedDate, version is AssetStorePackageVersion, version.releaseNotes));
+                m_ReleasesContainer.Add(new PackageReleaseDetailsItem(L10n.Tr("Original"), version.package.firstPublishedDate));
+            }
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageSampleItem.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsSampleItem.cs
similarity index 76%
rename from Modules/PackageManagerUI/Editor/UI/PackageSampleItem.cs
rename to Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsSampleItem.cs
index cb71d30a75..59d9a45ee9 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageSampleItem.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsSampleItem.cs
@@ -9,25 +9,22 @@
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
-    internal class PackageSampleItem
+    internal class PackageDetailsSampleItem
     {
-        private IPackageVersion m_Version;
+        private readonly IPackageVersion m_Version;
         private Sample m_Sample;
 
-        private SelectionProxy m_Selection;
-        private AssetDatabaseProxy m_AssetDatabase;
-        private IOProxy m_IOProxy;
-        private void ResolveDependencies()
-        {
-            var container = ServicesContainer.instance;
-            m_Selection = container.Resolve<SelectionProxy>();
-            m_AssetDatabase = container.Resolve<AssetDatabaseProxy>();
-            m_IOProxy = container.Resolve<IOProxy>();
-        }
+        private readonly SelectionProxy m_Selection;
+        private readonly AssetDatabaseProxy m_AssetDatabase;
+        private readonly ApplicationProxy m_ApplicationProxy;
+        private readonly IOProxy m_IOProxy;
 
-        public PackageSampleItem(IPackageVersion version, Sample sample)
+        public PackageDetailsSampleItem(IPackageVersion version, Sample sample, SelectionProxy selection, AssetDatabaseProxy assetDatabase, ApplicationProxy application, IOProxy iOProxy)
         {
-            ResolveDependencies();
+            m_Selection = selection;
+            m_AssetDatabase = assetDatabase;
+            m_ApplicationProxy = application;
+            m_IOProxy = iOProxy;
 
             m_Version = version;
             m_Sample = sample;
@@ -43,7 +40,7 @@ public PackageSampleItem(IPackageVersion version, Sample sample)
         private void OnImportButtonClicked()
         {
             var previousImports = m_Sample.previousImports;
-            var previousImportPaths = previousImports.Aggregate<string, string>(string.Empty,
+            var previousImportPaths = previousImports.Aggregate(string.Empty,
                 (current, next) => current + next.Replace(@"\", "/").Replace(Application.dataPath, "Assets") + "\n");
 
             var warningMessage = string.Empty;
@@ -67,7 +64,8 @@ private void OnImportButtonClicked()
             }
 
             if (!string.IsNullOrEmpty(warningMessage) &&
-                !EditorUtility.DisplayDialog(L10n.Tr("Unity Package Manager"),
+                !m_ApplicationProxy.DisplayDialog("importPackageSample",
+                    L10n.Tr("Importing package sample"),
                     warningMessage + L10n.Tr(" Are you sure you want to continue?"),
                     L10n.Tr("Yes"), L10n.Tr("No")))
             {
@@ -114,14 +112,14 @@ private void RefreshImportStatus()
         }
 
         private Label m_ImportStatus;
-        internal Label importStatus { get { return m_ImportStatus ?? (m_ImportStatus = new Label() { classList = { "importStatus" } }); } }
+        internal Label importStatus { get { return m_ImportStatus ??= new Label { classList = { "importStatus" } }; } }
         private Label m_NameLabel;
-        internal Label nameLabel { get { return m_NameLabel ?? (m_NameLabel = new Label() { classList = { "nameLabel" } }); } }
+        internal Label nameLabel { get { return m_NameLabel ??= new Label { classList = { "nameLabel" } }; } }
         private Label m_SizeLabel;
-        internal Label sizeLabel { get { return m_SizeLabel ?? (m_SizeLabel = new Label() { classList = { "sizeLabel" } }); } }
-        internal SelectableLabel descriptionLabel { get { return m_DescriptionLabel ?? (m_DescriptionLabel = new SelectableLabel() { classList = { "descriptionLabel" } }); } }
+        internal Label sizeLabel { get { return m_SizeLabel ??= new Label { classList = { "sizeLabel" } }; } }
         private SelectableLabel m_DescriptionLabel;
+        internal SelectableLabel descriptionLabel { get { return m_DescriptionLabel ??= new SelectableLabel { classList = { "descriptionLabel" } }; } }
         private Button m_ImportButton;
-        internal Button importButton { get { return m_ImportButton ?? (m_ImportButton = new Button() { classList = { "importButton" } }); } }
+        internal Button importButton { get { return m_ImportButton ??= new Button { classList = { "importButton" } }; } }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageSampleList.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsSamplesTab.cs
similarity index 59%
rename from Modules/PackageManagerUI/Editor/UI/PackageSampleList.cs
rename to Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsSamplesTab.cs
index f7bd51fd84..7ea7635cfa 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageSampleList.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsSamplesTab.cs
@@ -2,89 +2,80 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Linq;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.PackageManager.UI.Internal
 {
-    internal class PackageSampleList : VisualElement
+    internal class PackageDetailsSamplesTab : PackageDetailsTabElement
     {
-        internal new class UxmlFactory : UxmlFactory<PackageSampleList> {}
+        public const string k_Id = "samples";
 
         private const int k_SampleListSwitchWidthBreakpoint = 420;
-        private ResourceLoader m_ResourceLoader;
-        private PackageManagerPrefs m_PackageManagerPrefs;
-        private PackageDatabase m_PackageDatabase;
+        private readonly ResourceLoader m_ResourceLoader;
+        private readonly PackageDatabase m_PackageDatabase;
+        private readonly SelectionProxy m_Selection;
+        private readonly AssetDatabaseProxy m_AssetDatabase;
+        private readonly ApplicationProxy m_Application;
+        private readonly IOProxy m_IOProxy;
+
         private IEnumerable<Sample> m_Samples;
         private IPackageVersion m_Version;
-        private void ResolveDependencies()
-        {
-            var container = ServicesContainer.instance;
-            m_ResourceLoader = container.Resolve<ResourceLoader>();
-            m_PackageManagerPrefs = container.Resolve<PackageManagerPrefs>();
-            m_PackageDatabase = container.Resolve<PackageDatabase>();
-        }
 
-        private void OnGeometryChanged(GeometryChangedEvent evt)
+        public PackageDetailsSamplesTab(ResourceLoader resourceLoader, PackageDatabase packageDatabase, SelectionProxy selection, AssetDatabaseProxy assetDatabase, ApplicationProxy application, IOProxy iOProxy)
         {
-            if (m_Version != null && m_Samples?.Count() > 0 == true)
-            {
-                float newWidth = evt.newRect.width;
-                ToggleLowWidthSampleView(newWidth, false);
-            }
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Samples");
+            m_ResourceLoader = resourceLoader;
+            m_PackageDatabase = packageDatabase;
+            m_Selection = selection;
+            m_AssetDatabase = assetDatabase;
+            m_Application = application;
+            m_IOProxy = iOProxy;
+
+            var root = m_ResourceLoader.GetTemplate("PackageDetailsSamplesTab.uxml");
+            Add(root);
+            m_Cache = new VisualElementCache(root);
+
+            RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
         }
 
-        private void ToggleLowWidthSampleView(float width, bool packageChanged)
+        public override bool IsValid(IPackageVersion version)
         {
-            var showLowWidth = width <= k_SampleListSwitchWidthBreakpoint;
+            if (version == null || version.package?.Is(PackageType.AssetStore | PackageType.BuiltIn) == true)
+                return false;
 
-            if (showLowWidth && (!samplesListLowWidth.visible || samplesContainer.visible || packageChanged))
-                SwitchToSampleListLowWidth();
-            else if (!showLowWidth && (!samplesContainer.visible || samplesListLowWidth.visible || packageChanged))
-                SwitchToRegularSampleList();
+            var samples = version.isInstalled || version.HasTag(PackageTag.Feature) ? m_PackageDatabase.GetSamples(version) : Enumerable.Empty<Sample>();
+            return samples?.Any() == true;
         }
 
-        public PackageSampleList()
+        public override void Refresh(IPackageVersion version)
         {
-            ResolveDependencies();
+            var packageChanged = version.packageUniqueId != m_Version?.packageUniqueId;
 
-            var root = m_ResourceLoader.GetTemplate("PackageSampleList.uxml");
-            Add(root);
-            cache = new VisualElementCache(root);
+            m_Version = version;
+            m_Samples = m_Version.isInstalled || m_Version.HasTag(PackageTag.Feature) ? m_PackageDatabase.GetSamples(m_Version) : Enumerable.Empty<Sample>();
 
-            SetExpanded(m_PackageManagerPrefs.samplesExpanded);
-            samplesExpander.RegisterValueChangedCallback(evt => SetExpanded(evt.newValue));
-            RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
+            UIUtils.SetElementDisplay(samplesErrorInfoBox, m_Version.HasTag(PackageTag.InDevelopment) && m_Samples.Any(sample => string.IsNullOrEmpty(sample.displayName)));
+            ToggleLowWidthSampleView(layout.width, packageChanged);
         }
 
-        private void SetExpanded(bool expanded)
+        private void OnGeometryChanged(GeometryChangedEvent evt)
         {
-            if (samplesExpander.value != expanded)
-                samplesExpander.value = expanded;
-            if (m_PackageManagerPrefs.samplesExpanded != expanded)
-                m_PackageManagerPrefs.samplesExpanded = expanded;
-            UIUtils.SetElementDisplay(samplesOuterContainer, expanded);
+            if (m_Version != null && m_Samples?.Count() > 0 && Math.Abs(evt.newRect.width - evt.oldRect.width) > 1.0f)
+                ToggleLowWidthSampleView(evt.newRect.width, false);
         }
 
-        public void SetPackageVersion(IPackageVersion version)
+        private void ToggleLowWidthSampleView(float width, bool packageChanged)
         {
-            var samples = version.isInstalled || version.HasTag(PackageTag.Feature) ? m_PackageDatabase.GetSamples(version) : Enumerable.Empty<Sample>();
-            if (samples?.Any() != true)
-            {
-                UIUtils.SetElementDisplay(this, false);
-                return;
-            }
-            UIUtils.SetElementDisplay(this, true);
-
-            var packageChanged = version.packageUniqueId != m_Version?.packageUniqueId;
-            var width = rect.width;
-
-            m_Version = version;
-            m_Samples = samples;
+            var showLowWidth = width <= k_SampleListSwitchWidthBreakpoint;
 
-            UIUtils.SetElementDisplay(samplesErrorInfoBox, m_Version.HasTag(PackageTag.InDevelopment) && m_Samples.Any(sample => string.IsNullOrEmpty(sample.displayName)));
-            ToggleLowWidthSampleView(width, packageChanged);
+            if (showLowWidth && (!samplesListLowWidth.visible || samplesContainer.visible || packageChanged))
+                SwitchToSampleListLowWidth();
+            else if (!showLowWidth && (!samplesContainer.visible || samplesListLowWidth.visible || packageChanged))
+                SwitchToRegularSampleList();
         }
 
         private void SwitchToSampleListLowWidth()
@@ -96,7 +87,7 @@ private void SwitchToSampleListLowWidth()
 
             foreach (var sample in m_Samples)
             {
-                var sampleVisualItemLowWidth = new PackageDependencySampleItemLowWidth(m_Version, sample);
+                var sampleVisualItemLowWidth = new PackageDependencySampleItemLowWidth(m_ResourceLoader, m_Version, sample, m_Selection, m_AssetDatabase, m_Application, m_IOProxy);
                 samplesListLowWidth.Add(sampleVisualItemLowWidth);
             }
         }
@@ -110,7 +101,7 @@ private void SwitchToRegularSampleList()
 
             foreach (var sample in m_Samples.Where(s => !string.IsNullOrEmpty(s.displayName)))
             {
-                var sampleItem = new PackageSampleItem(m_Version, sample);
+                var sampleItem = new PackageDetailsSampleItem(m_Version, sample, m_Selection, m_AssetDatabase, m_Application, m_IOProxy);
                 var sampleContainer = new VisualElement();
                 sampleContainer.AddClasses("sampleContainer");
 
@@ -138,18 +129,14 @@ private void SwitchToRegularSampleList()
                     sampleContainer.Add(description);
                 }
 
-
                 samplesContainer.Add(sampleContainer);
-
                 sampleItem.importButton.SetEnabled(m_Version.isInstalled);
             }
         }
 
-        private VisualElementCache cache { get; set; }
-        private Toggle samplesExpander { get { return cache.Get<Toggle>("samplesExpander"); } }
-        internal VisualElement samplesListLowWidth { get { return cache.Get<VisualElement>("samplesListLowWidth"); } }
-        private VisualElement samplesOuterContainer { get { return cache.Get<VisualElement>("samplesOuterContainer"); } }
-        internal VisualElement samplesContainer { get { return cache.Get<VisualElement>("samplesContainer"); } }
-        internal HelpBox samplesErrorInfoBox => cache.Get<HelpBox>("samplesErrorInfoBox");
+        private readonly VisualElementCache m_Cache;
+        internal VisualElement samplesListLowWidth => m_Cache.Get<VisualElement>("samplesListLowWidth");
+        internal VisualElement samplesContainer => m_Cache.Get<VisualElement>("samplesContainer");
+        internal HelpBox samplesErrorInfoBox => m_Cache.Get<HelpBox>("samplesErrorInfoBox");
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsTabElement.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsTabElement.cs
new file mode 100644
index 0000000000..6c7ec5caec
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsTabElement.cs
@@ -0,0 +1,23 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal abstract class PackageDetailsTabElement : BaseTabElement
+    {
+        // used to determine if the tab should be shown at all
+        public virtual bool IsValid(IPackageVersion version) => true;
+
+        public PackageDetailsTabElement()
+        {
+            style.display = DisplayStyle.Flex;
+            style.flexGrow = 1;
+            style.flexShrink = 1;
+        }
+
+        public abstract void Refresh(IPackageVersion version);
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsTabView.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsTabView.cs
new file mode 100644
index 0000000000..acfbed85a0
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsTabView.cs
@@ -0,0 +1,107 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsTabView : BaseTabView<PackageDetailsTabElement>
+    {
+        internal new class UxmlFactory : UxmlFactory<PackageDetailsTabView> { }
+
+        private Label m_EntitlementsErrorLabel;
+
+        public IEnumerable<PackageDetailsTabElement> orderedTabs => m_BodyContainer.Children().OfType<PackageDetailsTabElement>();
+
+        private IPackageVersion m_Version = null;
+        private HashSet<PackageDetailsTabElement> m_DeferredRefreshTracker = new HashSet<PackageDetailsTabElement>();
+
+        public PackageDetailsTabView()
+        {
+            m_HeaderContainer.name = "packageDetailsTabViewHeaderContainer";
+            m_BodyContainer.name = "packageDetailsTabViewBodyContainer";
+
+            m_EntitlementsErrorLabel = new Label(L10n.Tr("Information is unavailable because the package license isn't registered to your user account."));
+            m_EntitlementsErrorLabel.AddClasses("packageTabsEntitlementsError");
+            Add(m_EntitlementsErrorLabel);
+        }
+
+        public void RefreshAllTabs(IPackageVersion version)
+        {
+            RefreshTabs(tabs, version);
+            UIUtils.SetElementDisplay(m_BodyContainer, !version.hasEntitlementsError);
+            UIUtils.SetElementDisplay(m_EntitlementsErrorLabel, version.hasEntitlementsError);
+        }
+
+        public void RefreshTabs(IEnumerable<string> tabIds, IPackageVersion version)
+        {
+            var tabs = tabIds.Select(id => GetTab(id)).Where(tab => tab != null);
+            RefreshTabs(tabs, version);
+        }
+
+        public void RefreshTab(string tabId, IPackageVersion version)
+        {
+            var tabs = new[] { GetTab<PackageDetailsTabElement>(tabId) }.Where(tab => tab != null);
+            RefreshTabs(tabs, version);
+        }
+
+        private void RefreshTabs(IEnumerable<PackageDetailsTabElement> tabs, IPackageVersion version)
+        {
+            m_Version = version;
+            foreach (var tab in tabs)
+            {
+                m_DeferredRefreshTracker.Add(tab);
+                if (!RefreshTabAndHeaderVisibility(tab, version))
+                    m_DeferredRefreshTracker.Remove(tab);
+            }
+
+            UpdateSelectionIfCurrentSelectionIsInvalid();
+            DeferredRefresh();
+        }
+
+        private void UpdateSelectionIfCurrentSelectionIsInvalid()
+        {
+            if (UIUtils.IsElementVisible(GetTab(selectedTabId)))
+                return;
+
+            var firstValidTab = orderedTabs.FirstOrDefault(tab => tab.IsValid(m_Version));
+            SelectTab(firstValidTab);
+        }
+
+        private bool RefreshTabAndHeaderVisibility(PackageDetailsTabElement tab, IPackageVersion version)
+        {
+            var tabHeader = m_HeaderButtons[tab.id];
+            var isValid = tab.IsValid(version);
+            UIUtils.SetElementDisplay(tabHeader, isValid);
+            UIUtils.SetElementDisplay(tab, isValid && tab.id == selectedTabId);
+            return isValid;
+        }
+
+        private void DeferredRefresh()
+        {
+            var selectedTab = GetTab(selectedTabId);
+            if (m_DeferredRefreshTracker.Contains(selectedTab))
+            {
+                selectedTab.Refresh(m_Version);
+                m_DeferredRefreshTracker.Remove(selectedTab);
+            }
+        }
+
+        protected override void OnTabHeaderClicked(PackageDetailsTabElement tab)
+        {
+            base.OnTabHeaderClicked(tab);
+            PackageManagerWindowAnalytics.SendEvent("changeDetailsTab", m_Version?.uniqueId);
+        }
+
+        public override bool SelectTab(PackageDetailsTabElement tabToSelect)
+        {
+            var tabSwitched = base.SelectTab(tabToSelect);
+            if (tabSwitched)
+                DeferredRefresh();
+            return tabSwitched;
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionHistoryItem.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionHistoryItem.cs
new file mode 100644
index 0000000000..aa2a3b6059
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionHistoryItem.cs
@@ -0,0 +1,316 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsVersionHistoryItem : VisualElement
+    {
+        public IPackageVersion version => m_Version;
+        public bool expanded => versionHistoryItemToggle.value;
+        public PackageToolBarButton button => m_Button;
+
+        private IPackageVersion m_Version;
+        private readonly PackageToolBarRegularButton m_Button;
+        private readonly PackageDatabase m_PackageDatabase;
+        private readonly UpmCache m_UpmCache;
+        private readonly ApplicationProxy m_ApplicationProxy;
+        private readonly IOProxy m_IOProxy;
+
+        public event Action<bool> onToggleChanged = delegate {};
+
+        public PackageDetailsVersionHistoryItem(ResourceLoader resourceLoader,
+            PackageDatabase packageDatabase,
+            UpmCache upmCache,
+            ApplicationProxy applicationProxy,
+            IOProxy ioProxy,
+            IPackageVersion version,
+            bool multipleVersionsVisible,
+            bool isLatestVersion,
+            bool expanded,
+            PackageToolBarRegularButton button)
+        {
+            m_Version = version;
+            m_PackageDatabase = packageDatabase;
+            m_UpmCache = upmCache;
+            m_ApplicationProxy = applicationProxy;
+            m_IOProxy = ioProxy;
+
+            var root = resourceLoader.GetTemplate("PackageDetailsVersionHistoryItem.uxml");
+            Add(root);
+            m_Cache = new VisualElementCache(root);
+
+            SetExpanded(expanded);
+            versionHistoryItemToggle.RegisterValueChangedCallback(evt =>
+            {
+                SetExpanded(evt.newValue);
+                onToggleChanged?.Invoke(evt.newValue);
+            });
+
+            m_Button = button;
+            if (m_Button != null)
+                versionHistoryItemToggleRightContainer.Add(m_Button.element);
+
+            versionHistoryItemChangeLogLink.clickable.clicked += () => UpmPackageDocs.ViewUrl(UpmPackageDocs.GetChangelogUrl(m_Version), UpmPackageDocs.GetOfflineChangelog(m_IOProxy, m_Version), L10n.Tr("changelog"), "viewChangelog", m_Version, m_Version.package, m_ApplicationProxy);
+
+            Refresh(multipleVersionsVisible, isLatestVersion);
+        }
+
+        public void StopSpinner()
+        {
+            if (m_Version?.isFullyFetched == false)
+                versionHistoryItemToggleSpinner?.Stop();
+        }
+
+
+        private void Refresh(bool multipleVersionsVisible, bool isLatestVersion)
+        {
+            var isVisible = m_Version != null;
+            UIUtils.SetElementDisplay(this, isVisible);
+            if (!isVisible)
+                return;
+
+            RefreshHeader(multipleVersionsVisible, isLatestVersion);
+            RefreshContent();
+            m_Button?.Refresh(m_Version);
+        }
+
+        private void RefreshHeader(bool multipleVersionsVisible, bool isLatestVersion)
+        {
+            versionHistoryItemToggle.text = m_Version?.version?.ToString() ?? m_Version?.versionString;
+            versionHistoryItemTag.Refresh(m_Version, true);
+            UIUtils.SetElementDisplay(versionHistoryItemTag, versionHistoryItemTag.tag != PackageTag.None);
+
+            RefreshState(multipleVersionsVisible, isLatestVersion);
+        }
+
+        private void RefreshState(bool multipleVersionsVisible, bool isLatestVersion)
+        {
+            if (m_Version == null)
+            {
+                versionHistoryItemState.text = string.Empty;
+                return;
+            }
+
+            var primary = m_Version.package.versions.primary;
+            var recommended = m_Version.package.versions.recommended;
+            var versionInManifest = primary?.packageInfo?.projectDependenciesEntry;
+            var stateText = string.Empty;
+
+            if (m_Version == primary)
+            {
+                if (m_Version.isInstalled)
+                    stateText = L10n.Tr(m_Version.isDirectDependency ? "Installed" : "Installed as dependency");
+                else if (m_Version == recommended && multipleVersionsVisible && m_Version.isUnityPackage)
+                    stateText = L10n.Tr("Recommended");
+                else if (!m_Version.isUnityPackage && multipleVersionsVisible && isLatestVersion)
+                    stateText = L10n.Tr("Latest");
+            }
+            else if (versionInManifest == m_Version.versionString)
+                stateText = L10n.Tr("Requested");
+            else if (m_Version == recommended && m_Version.isUnityPackage)
+                stateText = L10n.Tr("Recommended");
+            else if ((primary.isInstalled || !m_Version.isUnityPackage) && isLatestVersion)
+                stateText = L10n.Tr("Latest");
+
+            versionHistoryItemState.text = stateText;
+        }
+
+        private void RefreshContent()
+        {
+            if (!versionHistoryItemToggle.value)
+                return;
+
+            var fullyFetched = m_Version.isFullyFetched;
+            UIUtils.SetElementDisplay(versionHistoryItemContainer, fullyFetched);
+            if (!fullyFetched)
+            {
+                // If version is not fully fetched, we need to fetch extra information, meanwhile we need to start a spinner and disable the UI
+                // We don't need to stop spinner since FetchExtraInfo raises a PackageVersionUpdated event,
+                // and PackageDetailsVersionTabs will be refresh because PackageDetails is refreshed.
+                SetEnabled(false);
+                versionHistoryItemToggleSpinner.Start();
+                m_PackageDatabase.FetchExtraInfo(m_Version);
+                return;
+            }
+
+            RefreshReleaseDate();
+            RefreshChangeLog();
+            RefreshDependencies();
+            RefreshMetaDataChanges();
+        }
+
+        private void RefreshReleaseDate()
+        {
+            var releasedDate = m_Version.publishedDate?.ToString("MMMM dd, yyyy", CultureInfo.CreateSpecificCulture("en-US")) ?? string.Empty;
+            UIUtils.SetElementDisplay(versionHistoryItemReleaseContainer, !string.IsNullOrEmpty(releasedDate));
+            versionHistoryItemReleaseDate.text = releasedDate;
+        }
+
+        private void RefreshChangeLog()
+        {
+            UIUtils.SetElementDisplay(versionHistoryItemChangeLogContainer, false);
+            UIUtils.SetElementDisplay(versionHistoryItemChangeLogTitle, false);
+            UIUtils.SetElementDisplay(versionHistoryItemChangeLogLabel, false);
+            UIUtils.SetElementDisplay(versionHistoryItemChangeLogLink, false);
+
+            var upmReserved = m_UpmCache.ParseUpmReserved(m_Version?.packageInfo);
+            var changeLog = upmReserved?.GetString("changelog");
+            var hasChangeLogInInfo = !string.IsNullOrEmpty(changeLog);
+            if (hasChangeLogInInfo)
+            {
+                versionHistoryItemChangeLogLabel.text = changeLog;
+                UIUtils.SetElementDisplay(versionHistoryItemChangeLogTitle, true);
+                UIUtils.SetElementDisplay(versionHistoryItemChangeLogLabel, true);
+                UIUtils.SetElementDisplay(versionHistoryItemChangeLogContainer, true);
+            }
+
+            if (UpmPackageDocs.HasChangelog(m_Version))
+            {
+                versionHistoryItemChangeLogLink.text = hasChangeLogInInfo ? L10n.Tr("See full changelog") : L10n.Tr("See changelog");
+                UIUtils.SetElementDisplay(versionHistoryItemChangeLogLink, true);
+                UIUtils.SetElementDisplay(versionHistoryItemChangeLogContainer, true);
+            }
+        }
+
+        private void RefreshDependencies()
+        {
+            var primary = m_Version?.package?.versions?.primary;
+            if (!HasDependenciesDifference(primary, m_Version))
+            {
+                UIUtils.SetElementDisplay(versionHistoryItemDependenciesContainer, false);
+                return;
+            }
+
+            UIUtils.SetElementDisplay(versionHistoryItemDependenciesContainer, true);
+            var hasDependencies = m_Version?.dependencies?.Any() ?? false;
+            if (!hasDependencies)
+            {
+                versionHistoryItemDependenciesLabel.text = L10n.Tr("No dependencies");
+                UIUtils.SetElementDisplay(versionHistoryItemDependenciesList, false);
+            }
+            else
+            {
+                versionHistoryItemDependenciesLabel.text = $"<b>{L10n.Tr("Is using")}</b>";
+                versionHistoryItemDependenciesNames.Clear();
+                versionHistoryItemDependenciesVersions.Clear();
+                versionHistoryItemDependenciesStatuses.Clear();
+
+                foreach (var dependency in m_Version.dependencies)
+                {
+                    m_PackageDatabase.GetPackageAndVersion(dependency, out var package, out var packageVersion);
+
+                    var nameText = PackageDetailsDependenciesTab.GetNameText(dependency, package, packageVersion);
+                    var versionText = PackageDetailsDependenciesTab.GetVersionText(dependency, package);
+                    if (string.IsNullOrEmpty(versionText))
+                        versionText = dependency.version;
+                    var statusText = PackageDetailsDependenciesTab.GetStatusText(dependency, package?.versions.installed);
+
+                    versionHistoryItemDependenciesNames.Add(new SelectableLabel { text = nameText });
+                    versionHistoryItemDependenciesVersions.Add(new SelectableLabel { text = versionText });
+                    versionHistoryItemDependenciesStatuses.Add(new SelectableLabel { text = statusText });
+                }
+
+                UIUtils.SetElementDisplay(versionHistoryItemDependenciesList, true);
+            }
+        }
+
+        private static bool HasDependenciesDifference(IPackageVersion left, IPackageVersion right)
+        {
+            if (left == null || right == null)
+                return false;
+
+            var leftDependencies = new List<DependencyInfo>(left.dependencies);
+            var rightDependencies = new List<DependencyInfo>(right.dependencies);
+            var leftDifferences = leftDependencies.Except(rightDependencies, new DependencyInfoComparer());
+            var rightDifferences = rightDependencies.Except(leftDependencies, new DependencyInfoComparer());
+            return leftDifferences.Any() || rightDifferences.Any();
+        }
+
+        private void RefreshMetaDataChanges()
+        {
+            var primary = m_Version?.package?.versions?.primary;
+            if (primary == null || m_Version == primary)
+            {
+                UIUtils.SetElementDisplay(versionHistoryItemMetaDataContainer, false);
+                return;
+            }
+
+            var hasDisplayNameChange = string.Compare(m_Version.displayName, primary.displayName, StringComparison.InvariantCultureIgnoreCase) != 0;
+            var hasAuthorChange = string.Compare(m_Version.author, primary.author, StringComparison.InvariantCultureIgnoreCase) != 0;
+            var hasDescriptionChange = string.Compare(m_Version.description, primary.description, StringComparison.InvariantCultureIgnoreCase) != 0;
+
+            UIUtils.SetElementDisplay(versionHistoryItemMetaDataContainer, hasDisplayNameChange || hasDescriptionChange || hasAuthorChange);
+            if (hasDisplayNameChange || hasDescriptionChange || hasAuthorChange)
+            {
+                UIUtils.SetElementDisplay(versionHistoryItemMetaDataTitle, hasDisplayNameChange);
+                versionHistoryItemMetaDataTitle.text = $"<b>{L10n.Tr("Title")}:</b> {m_Version.displayName}";
+
+                UIUtils.SetElementDisplay(versionHistoryItemMetaDataAuthor, hasAuthorChange);
+                versionHistoryItemMetaDataAuthor.text = $"<b>{L10n.Tr("Author")}:</b> {m_Version.author}";
+
+                UIUtils.SetElementDisplay(versionHistoryItemMetaDataDescription, hasDescriptionChange);
+                versionHistoryItemMetaDataDescription.text = $"<b>{L10n.Tr("Description")}:</b>\n{m_Version.description}";
+            }
+        }
+
+        private void SetExpanded(bool expanded)
+        {
+            UIUtils.SetElementDisplay(versionHistoryItemContainer, expanded);
+            if (expanded)
+                RefreshContent();
+
+            if (versionHistoryItemToggle.value != expanded)
+                versionHistoryItemToggle.SetValueWithoutNotify(expanded);
+        }
+
+        private class DependencyInfoComparer : IEqualityComparer<DependencyInfo>
+        {
+            public bool Equals(DependencyInfo leftDependencyInfo, DependencyInfo rightDependencyInfo)
+            {
+                return string.Equals(leftDependencyInfo.name, rightDependencyInfo.name, StringComparison.InvariantCultureIgnoreCase) &&
+                       string.Equals(leftDependencyInfo.version, rightDependencyInfo.version, StringComparison.InvariantCultureIgnoreCase);
+            }
+
+            public int GetHashCode(DependencyInfo dependencyInfo)
+            {
+                var hashCode = new HashCode();
+                hashCode.Add(dependencyInfo.name, StringComparer.InvariantCultureIgnoreCase);
+                hashCode.Add(dependencyInfo.version, StringComparer.InvariantCultureIgnoreCase);
+                return hashCode.ToHashCode();
+            }
+        }
+
+        private readonly VisualElementCache m_Cache;
+
+        private Toggle versionHistoryItemToggle => m_Cache.Get<Toggle>("versionHistoryItemToggle");
+        private PackageTagLabel versionHistoryItemTag => m_Cache.Get<PackageTagLabel>("versionHistoryItemTag");
+        private SelectableLabel versionHistoryItemState => m_Cache.Get<SelectableLabel>("versionHistoryItemState");
+        private VisualElement versionHistoryItemToggleRightContainer => m_Cache.Get<VisualElement>("versionHistoryItemToggleRightContainer");
+        private VisualElement versionHistoryItemContainer => m_Cache.Get<VisualElement>("versionHistoryItemContainer");
+        private VisualElement versionHistoryItemReleaseContainer => m_Cache.Get<VisualElement>("versionHistoryItemReleaseContainer");
+        private SelectableLabel versionHistoryItemReleaseDate => m_Cache.Get<SelectableLabel>("versionHistoryItemReleaseDate");
+        private VisualElement versionHistoryItemChangeLogContainer => m_Cache.Get<VisualElement>("versionHistoryItemChangeLogContainer");
+        private Label versionHistoryItemChangeLogTitle => m_Cache.Get<Label>("versionHistoryItemChangeLogTitle");
+        private SelectableLabel versionHistoryItemChangeLogLabel => m_Cache.Get<SelectableLabel>("versionHistoryItemChangeLogLabel");
+        private Button versionHistoryItemChangeLogLink => m_Cache.Get<Button>("versionHistoryItemChangeLogLink");
+        private VisualElement versionHistoryItemDependenciesContainer => m_Cache.Get<VisualElement>("versionHistoryItemDependenciesContainer");
+        private Label versionHistoryItemDependenciesLabel => m_Cache.Get<Label>("versionHistoryItemDependenciesLabel");
+        private VisualElement versionHistoryItemDependenciesList => m_Cache.Get<VisualElement>("versionHistoryItemDependenciesList");
+        private VisualElement versionHistoryItemDependenciesNames => m_Cache.Get<VisualElement>("versionHistoryItemDependenciesNames");
+        private VisualElement versionHistoryItemDependenciesVersions => m_Cache.Get<VisualElement>("versionHistoryItemDependenciesVersions");
+        private VisualElement versionHistoryItemDependenciesStatuses => m_Cache.Get<VisualElement>("versionHistoryItemDependenciesStatuses");
+        private VisualElement versionHistoryItemMetaDataContainer => m_Cache.Get<VisualElement>("versionHistoryItemMetaDataContainer");
+        private SelectableLabel versionHistoryItemMetaDataTitle => m_Cache.Get<SelectableLabel>("versionHistoryItemMetaDataTitle");
+        private SelectableLabel versionHistoryItemMetaDataAuthor => m_Cache.Get<SelectableLabel>("versionHistoryItemMetaDataAuthor");
+        private SelectableLabel versionHistoryItemMetaDataDescription => m_Cache.Get<SelectableLabel>("versionHistoryItemMetaDataDescription");
+        private LoadingSpinner versionHistoryItemToggleSpinner => m_Cache.Get<LoadingSpinner>("versionHistoryItemToggleSpinner");
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionsTab.cs b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionsTab.cs
new file mode 100644
index 0000000000..52be3d8e8b
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/PackageDetailsTabs/PackageDetailsVersionsTab.cs
@@ -0,0 +1,164 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Linq;
+using UnityEngine.UIElements;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDetailsVersionsTab : PackageDetailsTabElement
+    {
+        public const string k_Id = "versions";
+
+        private readonly ResourceLoader m_ResourceLoader;
+        private readonly ApplicationProxy m_ApplicationProxy;
+        private readonly PackageManagerPrefs m_PackageManagerPrefs;
+        private readonly PackageDatabase m_PackageDatabase;
+        private readonly PageManager m_PageManager;
+        private readonly PackageManagerProjectSettingsProxy m_SettingsProxy;
+        private readonly UpmCache m_UpmCache;
+        private readonly IOProxy m_IOProxy;
+
+        private readonly VisualElement m_Container;
+        private readonly VisualElement m_VersionHistoryList;
+        private readonly VisualElement m_VersionsToolbar;
+        private readonly Button m_VersionsShowOthersButton;
+
+        private IPackageVersion m_Version;
+
+        private readonly ButtonDisableCondition m_DisableIfCompiling;
+        private readonly ButtonDisableCondition m_DisableIfInstallOrUninstallInProgress;
+
+        public PackageDetailsVersionsTab(ResourceLoader resourceLoader,
+            ApplicationProxy applicationProxyProxy,
+            PackageManagerPrefs packageManagerPrefs,
+            PackageDatabase packageDatabase,
+            PageManager pageManager,
+            PackageManagerProjectSettingsProxy settingsProxy,
+            UpmCache upmCache,
+            IOProxy ioProxy)
+        {
+            m_Id = k_Id;
+            m_DisplayName = L10n.Tr("Version History");
+            m_ResourceLoader = resourceLoader;
+            m_ApplicationProxy = applicationProxyProxy;
+            m_PackageManagerPrefs = packageManagerPrefs;
+            m_PackageDatabase = packageDatabase;
+            m_PageManager = pageManager;
+            m_SettingsProxy = settingsProxy;
+            m_UpmCache = upmCache;
+            m_IOProxy = ioProxy;
+
+            m_DisableIfCompiling = new ButtonDisableCondition(() => m_ApplicationProxy.isCompiling,
+                L10n.Tr("You need to wait until the compilation is finished to perform this action."));
+            m_DisableIfInstallOrUninstallInProgress = new ButtonDisableCondition(() => m_PackageDatabase.isInstallOrUninstallInProgress,
+                L10n.Tr("You need to wait until other install or uninstall operations are finished to perform this action."));
+
+            m_Container = new VisualElement { name = "versionsTab" };
+            Add(m_Container);
+
+            m_VersionHistoryList = new VisualElement { name = "versionsList" };
+            m_Container.Add(m_VersionHistoryList);
+
+            m_VersionsToolbar = new VisualElement { name = "versionsToolbar" };
+            m_Container.Add(m_VersionsToolbar);
+
+            m_VersionsShowOthersButton = new Button { name = "versionsShowAllButton", text = L10n.Tr("See other versions") };
+            m_VersionsToolbar.Add(m_VersionsShowOthersButton);
+
+            m_VersionsShowOthersButton.clickable.clicked += ShowOthersVersion;
+        }
+
+        private void ShowOthersVersion()
+        {
+            if (m_Version?.package == null)
+                return;
+
+            m_PageManager.SetSeeAllVersions(m_Version.package, true);
+            PackageManagerWindowAnalytics.SendEvent("seeAllVersions", m_Version.package.uniqueId);
+
+            Refresh(m_Version);
+        }
+
+        public override bool IsValid(IPackageVersion version)
+        {
+            return version?.package?.Is(PackageType.AssetStore | PackageType.Feature | PackageType.BuiltIn) == false;
+        }
+
+        public override void Refresh(IPackageVersion version)
+        {
+            m_Version = version;
+            if (m_Version?.uniqueId != m_PackageManagerPrefs.packageDisplayedInVersionHistoryTab)
+            {
+                m_PackageManagerPrefs.ClearExpandedVersionHistoryItems();
+                m_PackageManagerPrefs.packageDisplayedInVersionHistoryTab = m_Version?.uniqueId;
+            }
+
+            foreach (var historyItem in m_VersionHistoryList.Children().OfType<PackageDetailsVersionHistoryItem>())
+                historyItem.StopSpinner();
+            m_VersionHistoryList.Clear();
+
+            if (m_Version?.package?.versions == null)
+            {
+                UIUtils.SetElementDisplay(m_Container, false);
+                return;
+            }
+
+            var seeAllVersions = m_PageManager.GetVisualState(m_Version.package)?.seeAllVersions ?? false;
+            var keyVersions = m_Version.package.versions.key.ToList();
+            var allVersions = m_Version.package.versions.ToList();
+
+            var versions = seeAllVersions ? allVersions : keyVersions;
+            versions.Reverse();
+
+            var seeVersionsToolbar = !seeAllVersions && allVersions.Count > keyVersions.Count && (m_Version.package.Is(PackageType.ScopedRegistry) || m_SettingsProxy.seeAllPackageVersions || m_Version.package.versions.installed?.HasTag(PackageTag.Experimental) == true);
+            UIUtils.SetElementDisplay(m_VersionsToolbar, seeVersionsToolbar);
+
+            var latestVersion = m_Version.package?.versions.latest;
+            var primaryVersion = m_Version.package?.versions.primary;
+            var multipleVersionsVisible = versions.Count > 1;
+
+            foreach (var v in versions)
+            {
+                PackageToolBarRegularButton button;
+                if (primaryVersion?.isInstalled ?? false)
+                {
+                    if (v == primaryVersion)
+                    {
+                        button = new PackageRemoveButton(m_ApplicationProxy, m_PackageManagerPrefs, m_PackageDatabase, m_PageManager);
+                        button.SetGlobalDisableConditions(m_DisableIfCompiling, m_DisableIfInstallOrUninstallInProgress);
+                    }
+                    else
+                    {
+                        button = new PackageUpdateButton(m_ApplicationProxy, m_PackageDatabase, m_PageManager, false);
+                        button.SetGlobalDisableConditions(m_DisableIfCompiling, m_DisableIfInstallOrUninstallInProgress);
+                    }
+                }
+                else
+                {
+                    button = new PackageAddButton(m_ApplicationProxy, m_PackageDatabase);
+                    button.SetGlobalDisableConditions(m_DisableIfCompiling, m_DisableIfInstallOrUninstallInProgress);
+                }
+
+                var isExpanded = m_PackageManagerPrefs.IsVersionHistoryItemExpanded(v.uniqueId);
+                var isLatest = v == latestVersion;
+                var versionHistoryItem = new PackageDetailsVersionHistoryItem(m_ResourceLoader,
+                    m_PackageDatabase,
+                    m_UpmCache,
+                    m_ApplicationProxy,
+                    m_IOProxy,
+                    v,
+                    multipleVersionsVisible,
+                    isLatest,
+                    isExpanded,
+                    button);
+                versionHistoryItem.onToggleChanged += expanded => m_PackageManagerPrefs.SetVersionHistoryItemExpanded(versionHistoryItem.version?.uniqueId, expanded);
+
+                m_VersionHistoryList.Add(versionHistoryItem);
+            }
+
+            UIUtils.SetElementDisplay(m_Container, true);
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageGroup.cs b/Modules/PackageManagerUI/Editor/UI/PackageGroup.cs
index e40004664c..116603a01b 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageGroup.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageGroup.cs
@@ -19,21 +19,17 @@ internal class PackageGroup : VisualElement
 
         public IEnumerable<PackageItem> packageItems => groupContainer.Children().Cast<PackageItem>();
 
-        private ResourceLoader m_ResourceLoader;
-        private PageManager m_PageManager;
-        private PackageManagerProjectSettingsProxy m_SettingsProxy;
-        private PackageDatabase m_PackageDatabase;
-        private void ResolveDependencies(ResourceLoader resourceLoader, PageManager pageManager, PackageManagerProjectSettingsProxy settingsProxy, PackageDatabase packageDatabase)
+        private readonly ResourceLoader m_ResourceLoader;
+        private readonly PageManager m_PageManager;
+        private readonly PackageManagerProjectSettingsProxy m_SettingsProxy;
+        private readonly PackageDatabase m_PackageDatabase;
+
+        public PackageGroup(ResourceLoader resourceLoader, PageManager pageManager, PackageManagerProjectSettingsProxy settingsProxy, PackageDatabase packageDatabase, string groupName, string displayName, bool expanded = true, bool hidden = false)
         {
             m_ResourceLoader = resourceLoader;
             m_PageManager = pageManager;
             m_SettingsProxy = settingsProxy;
             m_PackageDatabase = packageDatabase;
-        }
-
-        public PackageGroup(ResourceLoader resourceLoader, PageManager pageManager, PackageManagerProjectSettingsProxy settingsProxy, PackageDatabase packageDatabase, string groupName, string displayName, bool expanded = true, bool hidden = false)
-        {
-            ResolveDependencies(resourceLoader, pageManager, settingsProxy, packageDatabase);
 
             name = groupName;
             var root = m_ResourceLoader.GetTemplate("PackageGroup.uxml");
@@ -69,7 +65,7 @@ public void RefreshHeaderVisibility()
 
         internal PackageItem AddPackageItem(IPackage package, VisualState state)
         {
-            var packageItem = new PackageItem(m_PageManager, m_SettingsProxy, m_PackageDatabase) {packageGroup = this};
+            var packageItem = new PackageItem(m_ResourceLoader, m_PageManager, m_SettingsProxy, m_PackageDatabase) {packageGroup = this};
             packageItem.SetPackageAndVisualState(package, state);
             groupContainer.Add(packageItem);
             return packageItem;
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageItem.cs b/Modules/PackageManagerUI/Editor/UI/PackageItem.cs
index 80341426fd..7beaf77b3b 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageItem.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageItem.cs
@@ -2,7 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.UIElements;
 
@@ -13,7 +12,6 @@ internal class PackageItem : VisualElement, ISelectableItem
         // Note that the height here is only the height of the main item (i.e, version list is not expanded)
         internal const int k_MainItemHeight = 25;
         private const string k_SelectedClassName = "selected";
-        private const string k_ExpandedClassName = "expanded";
 
         private string m_CurrentStateClass;
 
@@ -43,27 +41,22 @@ private IPackageVersion selectedVersion
             }
         }
 
-        internal IEnumerable<PackageVersionItem> versionItems => m_VersionList?.Children().Cast<PackageVersionItem>() ?? Enumerable.Empty<PackageVersionItem>();
-
         internal bool isLocked => m_LockedIcon?.visible ?? false;
-        internal bool isExpanded => m_ArrowExpander?.value ?? false;
         internal bool isDependency => !package?.versions.installed?.isDirectDependency ?? false;
 
-        private PageManager m_PageManager;
-        private PackageManagerProjectSettingsProxy m_SettingsProxy;
-        private PackageDatabase m_PackageDatabase;
-        private void ResolveDependencies(PageManager pageManager, PackageManagerProjectSettingsProxy settingsProxy, PackageDatabase packageDatabase)
+        private readonly ResourceLoader m_ResourceLoader;
+        private readonly PageManager m_PageManager;
+        private readonly PackageManagerProjectSettingsProxy m_SettingsProxy;
+        private readonly PackageDatabase m_PackageDatabase;
+
+        public PackageItem(ResourceLoader resourceLoader, PageManager pageManager, PackageManagerProjectSettingsProxy settingsProxy, PackageDatabase packageDatabase)
         {
+            m_ResourceLoader = resourceLoader;
             m_PageManager = pageManager;
             m_SettingsProxy = settingsProxy;
             m_PackageDatabase = packageDatabase;
         }
 
-        public PackageItem(PageManager pageManager, PackageManagerProjectSettingsProxy settingsProxy, PackageDatabase packageDatabase)
-        {
-            ResolveDependencies(pageManager, settingsProxy, packageDatabase);
-        }
-
         public void SetPackageAndVisualState(IPackage package, VisualState state)
         {
             var isFeature = package?.Is(PackageType.Feature) == true;
@@ -73,7 +66,6 @@ public void SetPackageAndVisualState(IPackage package, VisualState state)
                 BuildMainItem(isFeature);
             }
 
-            UpdateExpanderUI(false);
             SetPackage(package);
             UpdateVisualState(state);
         }
@@ -88,10 +80,11 @@ private void BuildMainItem(bool isFeature)
             m_LeftContainer = new VisualElement {name = "leftContainer", classList = {"left"}};
             m_MainItem.Add(m_LeftContainer);
 
-            m_ArrowExpander = new Toggle {name = "arrowExpander", classList = {"expander"}};
-            m_ArrowExpander.RegisterValueChangedCallback(ToggleExpansion);
+            m_DependencyIcon = new Label { name = "dependencyIcon" };
+            m_DependencyIcon.tooltip = "Installed as dependency";
+            m_LeftContainer.Add(m_DependencyIcon);
+
             m_LockedIcon = new Label { name = "lockedIcon" };
-            m_LeftContainer.Add(m_ArrowExpander);
             m_LeftContainer.Add(m_LockedIcon);
 
             m_ExpanderHidden = new Label {name = "expanderHidden", classList = {"expanderHidden"}};
@@ -139,21 +132,6 @@ private void BuildMainItem(bool isFeature)
                 m_InfoStateIcon = new VisualElement { name = "versionState" };
                 m_StateContainer.Add(m_InfoStateIcon);
             }
-
-            m_VersionsContainer = null;
-        }
-
-        private void BuildVersions()
-        {
-            m_VersionsContainer = new VisualElement {name = "versionsContainer"};
-            Add(m_VersionsContainer);
-
-            m_VersionList = new ScrollView {name = "versionList"};
-            m_VersionsContainer.Add(m_VersionList);
-
-            m_SeeAllVersionsLabel = new Label(L10n.Tr("See other versions")) {name = "seeAllVersions"};
-            m_SeeAllVersionsLabel.OnLeftClick(SeeAllVersionsClick);
-            m_VersionsContainer.Add(m_SeeAllVersionsLabel);
         }
 
         public void UpdateVisualState(VisualState newVisualState)
@@ -176,34 +154,22 @@ public void Refresh(VisualState newVisualState = null)
             if (m_NumPackagesInFeature != null)
                 m_NumPackagesInFeature.text = string.Format(L10n.Tr("{0} packages"), package.versions.primary?.dependencies?.Length ?? 0);
 
-            var expandable = !package.Is(PackageType.BuiltIn | PackageType.Feature | PackageType.AssetStore) && (newVisualState?.expandable ?? true);
-            UIUtils.SetElementDisplay(m_ArrowExpander, expandable);
-            UIUtils.SetElementDisplay(m_ExpanderHidden, !expandable && !visualState.isLocked);
+            UIUtils.SetElementDisplay(m_ExpanderHidden, !visualState.isLocked);
 
             var showVersionLabel = !package.Is(PackageType.BuiltIn | PackageType.Feature);
             UIUtils.SetElementDisplay(m_VersionLabel, showVersionLabel);
 
             UIUtils.SetElementDisplay(m_LockedIcon, false);
+            UIUtils.SetElementDisplay(m_DependencyIcon, false);
 
-            if (!expandable && UIUtils.IsElementVisible(m_VersionsContainer))
-                UpdateExpanderUI(false);
-            else
-                UpdateExpanderUI(visualState.expanded);
-
-            UpdateLockedUI(visualState.isLocked, expandable);
-
-            var showVersionList = !targetVersion.HasTag(PackageTag.BuiltIn) && !string.IsNullOrEmpty(package.displayName);
-            UIUtils.SetElementDisplay(m_VersionList, showVersionList);
+            UpdateLockedUI(visualState.isLocked);
+            UpdateDependencyUI(visualState.isLocked);
 
             var version = selectedVersion;
             if (version != null && version != targetVersion)
                 visualState.seeAllVersions = visualState.seeAllVersions || !package.versions.key.Contains(version);
 
             RefreshState();
-
-            if (showVersionList)
-                RefreshVersions();
-
             RefreshSelection();
             RefreshTags();
             RefreshEntitlement();
@@ -271,44 +237,11 @@ private void GetState()
             }
         }
 
-        private void RefreshVersions()
-        {
-            if (!m_ArrowExpander.value)
-                return;
-
-            m_VersionList.Clear();
-
-            var seeAllVersions = visualState?.seeAllVersions ?? false;
-            var keyVersions = package.versions.key.ToList();
-            var allVersions = package.versions.ToList();
-
-            var versions = seeAllVersions ? allVersions : keyVersions;
-
-            for (var i = versions.Count - 1; i >= 0; i--)
-            {
-                var multipleVersionsVisible = versions.Count > 1;
-                var isLatestVersion = i == versions.Count - 1;
-                m_VersionList.Add(new PackageVersionItem(package, versions[i], multipleVersionsVisible, isLatestVersion));
-            }
-
-            var seeAllVersionsLabelVisible = !seeAllVersions && allVersions.Count > keyVersions.Count
-                && (package.Is(PackageType.ScopedRegistry) || m_SettingsProxy.seeAllPackageVersions || package.versions.installed?.HasTag(PackageTag.Experimental) == true);
-            UIUtils.SetElementDisplay(m_SeeAllVersionsLabel, seeAllVersionsLabelVisible);
-
-            // Hack until ScrollList has a better way to do the same -- Vertical scroll bar is not yet visible
-            var maxNumberOfItemBeforeScrollbar = 6;
-            m_VersionList.EnableInClassList("hasScrollBar", versions.Count > maxNumberOfItemBeforeScrollbar);
-        }
-
         public void RefreshSelection()
         {
             var enable = selectedVersion != null;
             EnableInClassList(k_SelectedClassName, enable);
             m_MainItem.EnableInClassList(k_SelectedClassName, enable);
-
-            if (UIUtils.IsElementVisible(m_VersionList))
-                foreach (var versionItem in versionItems)
-                    versionItem.EnableInClassList(k_SelectedClassName, selectedVersion == versionItem.targetVersion);
         }
 
         private void RefreshTags()
@@ -341,36 +274,24 @@ public void ToggleSelectMainItem()
             m_PageManager.ToggleSelected(package?.uniqueId, true);
         }
 
-        private void ToggleExpansion(ChangeEvent<bool> evt)
+        internal void UpdateLockedUI(bool showLock)
         {
-            SetExpanded(evt.newValue);
+            UIUtils.SetElementDisplay(m_LockedIcon, showLock);
         }
 
-        internal void SetExpanded(bool value)
+        internal void UpdateDependencyUI(bool showLock)
         {
-            if (!UIUtils.IsElementVisible(m_ArrowExpander))
+            if (targetVersion == null)
                 return;
 
-            m_PageManager.SetExpanded(package, value);
-        }
-
-        internal void UpdateLockedUI(bool showLock, bool expandable)
-        {
-            UIUtils.SetElementDisplay(m_ArrowExpander, !showLock && expandable);
-            UIUtils.SetElementDisplay(m_LockedIcon, showLock);
-
-            if (showLock && UIUtils.IsElementVisible(m_VersionsContainer))
-                UIUtils.SetElementDisplay(m_VersionsContainer, false);
-        }
-
-        internal void UpdateExpanderUI(bool expanded)
-        {
-            m_MainItem.EnableInClassList(k_ExpandedClassName, expanded);
-            m_ArrowExpander.SetValueWithoutNotify(expanded);
+            var showDependencyIcon = targetVersion.isInstalled &&
+                                     !targetVersion.isDirectDependency &&
+                                     !targetVersion.HasTag(PackageTag.Feature) &&
+                                     !showLock;
 
-            if (expanded && m_VersionsContainer == null)
-                BuildVersions();
-            UIUtils.SetElementDisplay(m_VersionsContainer, expanded);
+            UIUtils.SetElementDisplay(m_DependencyIcon, showDependencyIcon);
+            if (showDependencyIcon)
+                UIUtils.SetElementDisplay(m_ExpanderHidden, false);
         }
 
         private void SeeAllVersionsClick()
@@ -399,7 +320,6 @@ private void StopSpinner()
         }
 
         private Label m_NameLabel;
-        private Label m_SeeAllVersionsLabel;
         private VisualElement m_TagContainer;
         private VisualElement m_MainItem;
         private VisualElement m_StateIcon;
@@ -408,11 +328,9 @@ private void StopSpinner()
         private Label m_EntitlementLabel;
         private Label m_VersionLabel;
         private LoadingSpinner m_Spinner;
-        private Toggle m_ArrowExpander;
         private Label m_LockedIcon;
+        private Label m_DependencyIcon;
         private Label m_ExpanderHidden;
-        private VisualElement m_VersionsContainer;
-        private ScrollView m_VersionList;
         private VisualElement m_LeftContainer;
         private VisualElement m_RightContainer;
         private Label m_NumPackagesInFeature;
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageList.cs b/Modules/PackageManagerUI/Editor/UI/PackageList.cs
index ae5867ef28..b8ec99b9fa 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageList.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageList.cs
@@ -68,8 +68,6 @@ public void OnEnable()
 
             m_UnityConnect.onUserLoginStateChange += OnUserLoginStateChange;
 
-            m_SettingsProxy.onSeeAllVersionsChanged += OnSeeAllPackageVersionsChanged;
-
             m_PackageFiltering.onFilterTabChanged += OnFilterTabChanged;
 
             listView.OnEnable();
@@ -100,7 +98,6 @@ public void OnDisable()
 
             m_UnityConnect.onUserLoginStateChange -= OnUserLoginStateChange;
 
-            m_SettingsProxy.onSeeAllVersionsChanged -= OnSeeAllPackageVersionsChanged;
             m_PackageFiltering.onFilterTabChanged -= OnFilterTabChanged;
 
             listView.OnDisable();
@@ -310,11 +307,6 @@ private void OnFilterTabChanged(PackageFilterTab filterTab)
                 currentView.OnFilterTabChanged(filterTab);
         }
 
-        private void OnSeeAllPackageVersionsChanged(bool value)
-        {
-            currentView.OnSeeAllPackageVersionsChanged(value);
-        }
-
         internal IPackageListView currentView => m_PackageFiltering.currentFilterTab == PackageFilterTab.AssetStore ? (IPackageListView)listView : scrollView;
 
         private VisualElementCache cache { get; set; }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs b/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs
index dafb1326fb..cfe0930c4b 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageListScrollView.cs
@@ -81,14 +81,7 @@ private ISelectableItem GetFirstSelectedItem()
         {
             m_PackageDatabase.GetPackageAndVersion(m_PageManager.GetSelection().firstSelection, out var package, out var version);
             var selectedVersion = version ?? package?.versions.primary;
-            var packageItem = GetPackageItem(selectedVersion?.packageUniqueId);
-            if (packageItem == null)
-                return null;
-
-            if (!packageItem.visualState.expanded)
-                return packageItem;
-
-            return packageItem.versionItems.FirstOrDefault(v => v.targetVersion == selectedVersion);
+            return GetPackageItem(selectedVersion?.packageUniqueId);
         }
 
         public void ScrollToSelection()
@@ -121,19 +114,9 @@ private void ScrollIfNeeded(VisualElement target)
             ScrollIfNeeded();
         }
 
-        public void SetSelectedItemExpanded(bool value)
-        {
-            // Disable item expansion when there are multiple items selected
-            var selection = m_PageManager.GetSelection();
-            if (selection.Count > 1)
-                return;
-
-            GetPackageItem(selection.firstSelection?.packageUniqueId)?.SetExpanded(value);
-        }
-
         private void AddOrUpdatePackageItem(VisualState state, IPackage package = null)
         {
-            package = package ?? m_PackageDatabase.GetPackage(state?.packageUniqueId);
+            package ??= m_PackageDatabase.GetPackage(state?.packageUniqueId);
             if (package == null)
                 return;
 
@@ -305,15 +288,11 @@ public void OnListUpdate(ListUpdateArgs args)
             }
         }
 
-        private PackageItem GetPackageItemFromMouseEvent(MouseDownEvent evt, out PackageVersionItem versionItem)
+        private PackageItem GetPackageItemFromMouseEvent(MouseDownEvent evt)
         {
-            versionItem = null;
             var target = evt.leafTarget as VisualElement;
             while (target != null && target != this)
             {
-                var packageVersionItem = target as PackageVersionItem;
-                if (packageVersionItem != null)
-                    versionItem = packageVersionItem;
                 var packageItem = target as PackageItem;
                 if (packageItem != null)
                     return packageItem;
@@ -373,7 +352,7 @@ private void OnMouseDown(MouseDownEvent evt)
             if (evt.button != 0)
                 return;
 
-            var packageItem = GetPackageItemFromMouseEvent(evt, out var packageVersionItem);
+            var packageItem = GetPackageItemFromMouseEvent(evt);
             if (packageItem == null)
                 return;
 
@@ -386,8 +365,6 @@ private void OnMouseDown(MouseDownEvent evt)
 
             if (evt.actionKey)
                 packageItem.ToggleSelectMainItem();
-            else if (packageVersionItem != null)
-                packageVersionItem.SelectVersionItem();
             else
                 packageItem.SelectMainItem();
         }
@@ -426,16 +403,6 @@ public void OnKeyDownShortcut(KeyDownEvent evt)
                 SelectAllVisible();
                 evt.StopPropagation();
             }
-            else if (evt.keyCode == KeyCode.RightArrow)
-            {
-                SetSelectedItemExpanded(true);
-                evt.StopPropagation();
-            }
-            else if (evt.keyCode == KeyCode.LeftArrow)
-            {
-                SetSelectedItemExpanded(false);
-                evt.StopPropagation();
-            }
             else if (evt.keyCode == KeyCode.UpArrow)
             {
                 if (SelectNext(true))
@@ -468,29 +435,7 @@ private ISelectableItem FindNextVisibleSelectableItem(bool reverseOrder)
             if (packageItem == null)
                 return null;
 
-            // First we try to look for the next visible options within all the versions of the current package when the list is expanded
-            if (packageItem.visualState.expanded)
-            {
-                m_PackageDatabase.GetPackageAndVersion(lastSelection, out var package, out var version);
-                var selectedVersion = version ?? package?.versions.primary;
-
-                var versionItem = packageItem.versionItems.FirstOrDefault(v => v.targetVersion == selectedVersion);
-                var nextVersionItem = UIUtils.FindNextSibling(versionItem, reverseOrder, UIUtils.IsElementVisible) as PackageVersionItem;
-                if (nextVersionItem != null)
-                    return nextVersionItem;
-            }
-
-            var nextPackageItem = FindNextVisiblePackageItem(packageItem, reverseOrder);
-            if (nextPackageItem == null)
-                return null;
-
-            if (nextPackageItem.visualState.expanded)
-            {
-                var nextVersionItem = reverseOrder ? nextPackageItem.versionItems.LastOrDefault() : nextPackageItem.versionItems.FirstOrDefault();
-                if (nextVersionItem != null)
-                    return nextVersionItem;
-            }
-            return nextPackageItem;
+            return FindNextVisiblePackageItem(packageItem, reverseOrder);
         }
 
         public void OnFilterTabChanged(PackageFilterTab filterTab)
@@ -546,16 +491,5 @@ private static PackageItem FindNextVisiblePackageItem(PackageItem packageItem, b
             }
             return nextVisibleItem;
         }
-
-        public void OnSeeAllPackageVersionsChanged(bool value)
-        {
-            if (m_PackageFiltering.currentFilterTab == PackageFilterTab.BuiltIn || m_PackageFiltering.currentFilterTab == PackageFilterTab.AssetStore)
-                return;
-
-            var page = m_PageManager.GetPage(m_PackageFiltering.currentFilterTab);
-            foreach (var visualState in page.visualStates)
-                visualState.expanded = false;
-            page.Rebuild();
-        }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageListView.cs b/Modules/PackageManagerUI/Editor/UI/PackageListView.cs
index 006c2941f6..bd57b685cb 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageListView.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageListView.cs
@@ -13,6 +13,7 @@ internal class PackageListView : ListView, IPackageListView
     {
         internal new class UxmlFactory : UxmlFactory<PackageListView> {}
 
+        private ResourceLoader m_ResourceLoader;
         private PackageDatabase m_PackageDatabase;
         private PageManager m_PageManager;
         private AssetStoreCache m_AssetStoreCache;
@@ -21,6 +22,7 @@ internal class PackageListView : ListView, IPackageListView
         private void ResolveDependencies()
         {
             var container = ServicesContainer.instance;
+            m_ResourceLoader = container.Resolve<ResourceLoader>();
             m_PackageDatabase = container.Resolve<PackageDatabase>();
             m_PageManager = container.Resolve<PageManager>();
             m_AssetStoreCache = container.Resolve<AssetStoreCache>();
@@ -52,13 +54,13 @@ public PackageListView()
 
         public void OnEnable()
         {
-            onSelectionChange += SyncListViewSelectionToPageManager;
+            selectionChanged += SyncListViewSelectionToPageManager;
             m_PageManager.onSelectionChanged += SyncPageManagerSelectionToListView;
         }
 
         public void OnDisable()
         {
-            onSelectionChange -= SyncListViewSelectionToPageManager;
+            selectionChanged -= SyncListViewSelectionToPageManager;
             m_PageManager.onSelectionChanged -= SyncPageManagerSelectionToListView;
         }
 
@@ -114,7 +116,7 @@ private void BindItem(VisualElement item, int index)
 
         private VisualElement MakeItem()
         {
-            return new PackageItem(m_PageManager, m_SettingsProxy, m_PackageDatabase);
+            return new PackageItem(m_ResourceLoader, m_PageManager, m_SettingsProxy, m_PackageDatabase);
         }
 
         public PackageItem GetPackageItem(string packageUniqueId)
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerFiltersWindow.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerFiltersWindow.cs
index edb022af58..8a546844d2 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerFiltersWindow.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerFiltersWindow.cs
@@ -41,7 +41,7 @@ internal abstract class PackageManagerFiltersWindow : EditorWindow
         private bool m_DelayedUpdate;
 
         private ResourceLoader m_ResourceLoader;
-        private void ResolveDependencies()
+        protected virtual void ResolveDependencies()
         {
             var container = ServicesContainer.instance;
             m_ResourceLoader = container.Resolve<ResourceLoader>();
@@ -102,22 +102,22 @@ private void DelayedUpdatePageFilters()
             }
         }
 
-        protected virtual void Init(Rect rect, PageFilters filters)
+        protected virtual void Init(Rect rect, IPage page)
         {
-            m_Filters = filters?.Clone() ?? new PageFilters();
+            m_Filters = page.filters?.Clone() ?? new PageFilters();
             m_Container.Clear();
-            DoDisplay();
+            DoDisplay(page);
             ApplyFilters();
-            ShowAsDropDown(rect, GetSize(), new[] { PopupLocation.Below });
+            ShowAsDropDown(rect, GetSize(page), new[] { PopupLocation.Below });
         }
 
-        protected abstract Vector2 GetSize();
+        protected abstract Vector2 GetSize(IPage page);
         protected abstract void ApplyFilters();
-        protected abstract void DoDisplay();
+        protected abstract void DoDisplay(IPage page);
 
-        public static bool ShowAtPosition(Rect rect, PackageFilterTab tab, PageFilters filters)
+        public static bool ShowAtPosition(Rect rect, IPage page)
         {
-            if (s_Window != null)
+            if (s_Window != null || page == null)
                 return false;
 
             var nowMilliSeconds = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
@@ -127,11 +127,11 @@ public static bool ShowAtPosition(Rect rect, PackageFilterTab tab, PageFilters f
             {
                 Event.current?.Use();
 
-                if (tab != PackageFilterTab.AssetStore)
+                if (page.tab != PackageFilterTab.AssetStore)
                     s_Window = CreateInstance<UpmFiltersWindow>();
                 else
                     s_Window = CreateInstance<AssetStoreFiltersWindow>();
-                s_Window.Init(rect, filters);
+                s_Window.Init(rect, page);
             }
 
             return !justClosed;
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs
index 34ddddad8d..56b75fa090 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerPrefs.cs
@@ -94,14 +94,6 @@ public virtual bool dependenciesExpanded
             set => m_DependenciesExpanded = value;
         }
 
-        [SerializeField]
-        private bool m_FeatureDependenciesExpanded = false;
-        public virtual bool featureDependenciesExpanded
-        {
-            get => m_FeatureDependenciesExpanded;
-            set => m_FeatureDependenciesExpanded = value;
-        }
-
         [SerializeField]
         private string m_SelectedFeatureDependency;
         public virtual string selectedFeatureDependency
@@ -126,6 +118,13 @@ public float packageDetailVerticalScrollOffset
             set => m_PackageDetailVerticalScrollOffset = value;
         }
 
+        [SerializeField]
+        private string m_SelectedPackageDetailsTabIdentifier;
+        public string selectedPackageDetailsTabIdentifier {
+            get =>  m_SelectedPackageDetailsTabIdentifier;
+            set => m_SelectedPackageDetailsTabIdentifier = value;
+        }
+
         [SerializeField]
         private List<string> m_ExpandedDetailsExtensions = new List<string>();
         public virtual bool IsDetailsExtensionExpanded(string extensionTitle)
@@ -144,5 +143,40 @@ public virtual void SetDetailsExtensionExpanded(string extensionTitle, bool valu
             else if (!value && index >= 0)
                 m_ExpandedDetailsExtensions.RemoveAt(index);
         }
+
+        [SerializeField]
+        private string m_PackageDisplayedInVersionHistoryTab;
+        public virtual string packageDisplayedInVersionHistoryTab
+        {
+            get => m_PackageDisplayedInVersionHistoryTab;
+            set => m_PackageDisplayedInVersionHistoryTab = value;
+        }
+
+        [SerializeField]
+        private List<string> m_ExpandedVersionHistoryItems = new List<string>();
+        public virtual void SetVersionHistoryItemExpanded(string uniqueId, bool expanded)
+        {
+            if (string.IsNullOrEmpty(uniqueId))
+                return;
+
+            var index = m_ExpandedVersionHistoryItems.IndexOf(uniqueId);
+            if (expanded && index < 0)
+                m_ExpandedVersionHistoryItems.Add(uniqueId);
+            else if (!expanded && index >= 0)
+                m_ExpandedVersionHistoryItems.RemoveAt(index);
+        }
+
+        public virtual bool IsVersionHistoryItemExpanded(string uniqueId)
+        {
+            if (string.IsNullOrEmpty(uniqueId))
+                return false;
+
+            return m_ExpandedVersionHistoryItems.Contains(uniqueId);
+        }
+
+        public virtual void ClearExpandedVersionHistoryItems()
+        {
+            m_ExpandedVersionHistoryItems.Clear();
+        }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs
index a7004617b1..c73905af05 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerToolbar.cs
@@ -334,7 +334,7 @@ private void SetupAddMenu()
                 {
                     if (m_IOProxy.GetFileName(path) != "package.json")
                     {
-                        Debug.Log(L10n.Tr("[Package Manager] Please select a valid package.json file in a package folder."));
+                        Debug.Log(L10n.Tr("[Package Manager Window] Please select a valid package.json file in a package folder."));
                         return;
                     }
 
@@ -354,7 +354,7 @@ private void SetupAddMenu()
                 }
                 catch (System.IO.IOException e)
                 {
-                    Debug.Log($"[Package Manager] Cannot add package from disk {path}: {e.Message}");
+                    Debug.Log($"[Package Manager Window] Cannot add package from disk {path}: {e.Message}");
                 }
             };
 
@@ -403,7 +403,8 @@ private void SetupAddMenu()
                                 m_PageManager.SetSelected(package);
                             }
                         }
-                    }
+                    },
+                    windowSize = new Vector2(resolvedStyle.width, 50)
                 };
                 addMenu.ShowInputDropdown(args);
             };
@@ -484,7 +485,9 @@ private void UpdateOrdering(IPage page)
                     orderingMenu.text = $"Sort: {L10n.Tr(firstOrdering.displayName)}";
                     filters.orderBy = firstOrdering.orderBy;
                     filters.isReverseOrder = firstOrdering.order == PageCapability.Order.Descending;
-                    page.UpdateFilters(filters);
+
+                    if(page.UpdateFilters(filters))
+                        PackageManagerFiltersAnalytics.SendEvent(filters);
                 }
             }
         }
@@ -499,7 +502,9 @@ private bool AddOrdering(IPage page, PageCapability.Ordering ordering)
                 var filters = page.filters.Clone();
                 filters.orderBy = ordering.orderBy;
                 filters.isReverseOrder = ordering.order == PageCapability.Order.Descending;
-                page.UpdateFilters(filters);
+                if (page.UpdateFilters(filters))
+                    PackageManagerFiltersAnalytics.SendEvent(filters);
+
             }, a =>
                 {
                     return page.filters.orderBy == ordering.orderBy &&
@@ -529,12 +534,13 @@ private void SetupFilters()
                     PackageManagerFiltersWindow.instance.Close();
 
                 var page = m_PageManager.GetCurrentPage();
-                if (page != null && PackageManagerFiltersWindow.ShowAtPosition(GUIUtility.GUIToScreenRect(filtersMenu.worldBound), page.tab, page.filters))
+                if (page != null && PackageManagerFiltersWindow.ShowAtPosition(GUIUtility.GUIToScreenRect(filtersMenu.worldBound), page))
                 {
                     filtersMenu.pseudoStates |= PseudoStates.Active;
                     PackageManagerFiltersWindow.instance.OnFiltersChanged += filters =>
                     {
-                        page.UpdateFilters(filters);
+                        if (page.UpdateFilters(filters))
+                            PackageManagerFiltersAnalytics.SendEvent(filters);
                     };
                     PackageManagerFiltersWindow.instance.OnClose += () =>
                     {
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerWindow.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerWindow.cs
index 5e0cdbc8f0..1b2e55a44e 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerWindow.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerWindow.cs
@@ -134,13 +134,13 @@ void CreateGUI()
                 }
                 catch (ResourceLoaderException)
                 {
-                    Debug.LogError(L10n.Tr("[Package Manager] Unable to load resource, window can't be displayed.)"));
+                    Debug.LogError(L10n.Tr("[Package Manager Window] Unable to load resource, window can't be displayed.)"));
                     return;
                 }
                 catch (TargetInvocationException e)
                 {
                     CheckInnerException<ResourceLoaderException>(e);
-                    Debug.LogError(L10n.Tr("[Package Manager] Unable to load resource, window can't be displayed.)"));
+                    Debug.LogError(L10n.Tr("[Package Manager Window] Unable to load resource, window can't be displayed.)"));
                     return;
                 }
             }
@@ -254,7 +254,7 @@ internal static void OpenPackageManagerOnFilter(string filterAndSubPageToSelect)
                 PackageManagerWindowAnalytics.SendEvent("openWindowOnFilter", filterAndSubPageToSelect);
         }
 
-        [UsedByNativeCode]
+        [UsedByNativeCode("PackageManagerUI_OnPackageManagerResolve")]
         internal static void OnPackageManagerResolve()
         {
             var packageDatabase = ServicesContainer.instance.Resolve<Internal.PackageDatabase>();
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs b/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs
index c3169b108e..8c64d3623e 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageManagerWindowRoot.cs
@@ -102,8 +102,6 @@ public void OnEnable()
 
             m_AssetStoreCachePathProxy.onConfigChanged += OnAssetStoreCacheConfigChange;
 
-            PackageManagerWindowAnalytics.Setup();
-
             EditorApplication.focusChanged += OnFocusChanged;
             m_Selection.onSelectionChanged += RefreshSelectedInInspectorClass;
 
diff --git a/Modules/PackageManagerUI/Editor/UI/PackagePlatformList.cs b/Modules/PackageManagerUI/Editor/UI/PackagePlatformList.cs
index 7753a80869..6ccb093a4a 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackagePlatformList.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackagePlatformList.cs
@@ -2,7 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine.UIElements;
 
@@ -12,117 +11,39 @@ internal class PackagePlatformList : VisualElement
     {
         internal new class UxmlFactory : UxmlFactory<PackagePlatformList> {}
 
-        private IPackageVersion m_Version;
-        private ResourceLoader m_ResourceLoader;
         private UpmCache m_UpmCache;
-        private bool m_MorePlatformView;
-        public PackagePlatformList()
-        {
-            ResolveDependencies();
-
-            var root = m_ResourceLoader.GetTemplate("PackagePlatformList.uxml");
-            Add(root);
-
-            cache = new VisualElementCache(root);
-
-            buttonPlatformMore.clickable.clicked += PlatformMoreClick;
-            buttonPlatformLess.clickable.clicked += PlatformLessClick;
-        }
-
         private void ResolveDependencies()
         {
             var container = ServicesContainer.instance;
-            m_ResourceLoader = container.Resolve<ResourceLoader>();
             m_UpmCache = container.Resolve<UpmCache>();
         }
 
-        public void SetPackageVersion(IPackageVersion version)
+        public PackagePlatformList()
         {
-            m_Version = version;
-            CheckForSupportedPlatforms();
+            ResolveDependencies();
+            m_TagLabelList = new TagLabelList();
+            Add(m_TagLabelList);
         }
 
-        private void CheckForSupportedPlatforms()
+        public void Refresh(IPackageVersion version)
         {
             UIUtils.SetElementDisplay(this, false);
 
-            if (m_Version?.packageInfo == null)
+            if (version?.packageInfo == null)
                 return;
 
-            var platformNames = GetPlatforms(m_Version);
-            if (!platformNames.Any())
-                return;
-
-            UIUtils.SetElementDisplay(this, true);
-            UIUtils.SetElementDisplay(buttonPlatformMore, false);
-            UIUtils.SetElementDisplay(buttonPlatformLess, false);
-
-            platformList.Clear();
-            platformList.Add(supportedPlatformsLabel);
-
-            AdaptSupportedPlatformLabel(platformNames.Count() > 1);
-            DisplaySupportedPlatforms(platformNames);
-        }
-
-        private IEnumerable<string> GetPlatforms(IPackageVersion version)
-        {
             var upmReserved = m_UpmCache.ParseUpmReserved(version?.packageInfo);
-            return upmReserved?.GetList<string>("supportedPlatforms") ?? Enumerable.Empty<string>();
-        }
-
-        private void AdaptSupportedPlatformLabel(bool moreThanOnePlatform)
-        {
-            supportedPlatformsLabel.text = moreThanOnePlatform ? L10n.Tr("Supported Platforms:") : L10n.Tr("Supported Platform:");
-        }
+            var platformNames = upmReserved?.GetList<string>("supportedPlatforms") ?? Enumerable.Empty<string>();
 
-        private void DisplaySupportedPlatforms(IEnumerable<string> platformNames)
-        {
-            foreach (var platformName in platformNames)
-            {
-                var packageTagPlatform = new PackageTagLabel {classList = {"platform"}};
-                packageTagPlatform.text = platformName;
-                platformList.Add(packageTagPlatform);
-            }
-
-            if (platformNames.Count() < 5)
+            if (!platformNames.Any())
                 return;
 
-            platformList.Add(buttonPlatformMore);
-            platformList.Add(buttonPlatformLess);
-            PlatformLessClick();
-        }
-
-        internal void PlatformMoreClick()
-        {
-            UIUtils.SetElementDisplay(buttonPlatformMore, false);
-            UIUtils.SetElementDisplay(buttonPlatformLess, true);
-            m_MorePlatformView = true;
-            HideShowPlatforms();
-        }
-
-        private void PlatformLessClick()
-        {
-            UIUtils.SetElementDisplay(buttonPlatformMore, true);
-            UIUtils.SetElementDisplay(buttonPlatformLess, false);
-            m_MorePlatformView = false;
-            HideShowPlatforms();
-        }
+            UIUtils.SetElementDisplay(this, true);
 
-        private void HideShowPlatforms()
-        {
-            var platformElements = platformList.Children().OfType<PackageTagLabel>();
-            // We start at 3 to keep the first three platforms visible
-            for (var i = 3; i < platformElements.Count(); i++)
-            {
-                var platform = platformElements.ElementAt(i);
-                UIUtils.SetElementDisplay(platform, m_MorePlatformView);
-            }
+            var listLabel = platformNames.Count() > 1 ? L10n.Tr("Supported Platforms:") : L10n.Tr("Supported Platform:");
+            m_TagLabelList.Refresh(listLabel, platformNames);
         }
 
-        private VisualElementCache cache { get; set; }
-        private VisualElement platformList => cache.Get<VisualElement>("platformsList");
-        private Label supportedPlatformsLabel => cache.Get<Label>("supportedPlatformsLabel");
-        private Button buttonPlatformMore => cache.Get<Button>("buttonPlatformMore");
-        private Button buttonPlatformLess => cache.Get<Button>("buttonPlatformLess");
+        private TagLabelList m_TagLabelList;
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageReleaseDetailsItem.cs b/Modules/PackageManagerUI/Editor/UI/PackageReleaseDetailsItem.cs
index 4987b5651c..60f077b2fb 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageReleaseDetailsItem.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageReleaseDetailsItem.cs
@@ -10,56 +10,44 @@ namespace UnityEditor.PackageManager.UI.Internal
 {
     internal class PackageReleaseDetailsItem : VisualElement
     {
-        internal new class UxmlFactory : UxmlFactory<PackageReleaseDetailsItem> {}
-
-        private ResourceLoader m_ResourceLoader;
-        private void ResolveDependencies()
+        public PackageReleaseDetailsItem(string versionString, DateTime? publishedDate, bool isCurrent = false, string releaseNotes = "")
         {
-            var container = ServicesContainer.instance;
-            m_ResourceLoader = container.Resolve<ResourceLoader>();
-        }
-
-        public PackageReleaseDetailsItem()
-        {
-            ResolveDependencies();
-
-            var root = m_ResourceLoader.GetTemplate("PackageReleaseDetailsItem.uxml");
-            Add(root);
-            cache = new VisualElementCache(root);
+            AddToClassList("release");
+
+            var versionAndReleaseContainer = new VisualElement { name = "versionAndReleaseContainer" };
+            Add(versionAndReleaseContainer);
+
+            versionAndReleaseContainer.Add(new SelectableLabel
+            {
+                name = "version",
+                focusable = true,
+                text = versionString
+            });
+
+            versionAndReleaseContainer.Add(new Label
+            {
+                name = "current",
+                text = isCurrent ? L10n.Tr("Current") : string.Empty
+            });
+
+            versionAndReleaseContainer.Add(new SelectableLabel
+            {
+                name = "releaseDate",
+                focusable = true,
+                text = publishedDate?.ToString(L10n.Tr("MMMM dd, yyyy"), CultureInfo.CreateSpecificCulture("en-US")) != null ?
+                    string.Format(L10n.Tr("released on {0}"), publishedDate?.ToString(L10n.Tr("MMMM dd, yyyy"), CultureInfo.CreateSpecificCulture("en-US"))) :
+                    string.Empty
+            });
+
+            if (string.IsNullOrEmpty(releaseNotes))
+                return;
+
+            Add(new SelectableLabel
+            {
+                name = "releaseNotes",
+                focusable = true,
+                text = releaseNotes
+            });
         }
-
-        public PackageReleaseDetailsItem(string versionString, DateTime? publishedDate, string releaseNotes) : this()
-        {
-            var releaseDateString = publishedDate?.ToString("MMMM dd, yyyy", CultureInfo.CreateSpecificCulture("en-US"));
-
-            versionAndReleaseDateLabel.SetValueWithoutNotify(versionString + (releaseDateString != null ? $" - released on {releaseDateString}" : string.Empty));
-
-            releaseNotesLabel.SetValueWithoutNotify(releaseNotes);
-
-            lessButton.clicked += OnLessButtonClicked;
-            moreButton.clicked += OnMoreButtonClicked;
-
-            UIUtils.SetElementDisplay(releaseNotesContainer, false);
-            UIUtils.SetElementDisplay(moreButton, !string.IsNullOrEmpty(releaseNotes));
-        }
-
-        public void OnLessButtonClicked()
-        {
-            UIUtils.SetElementDisplay(releaseNotesContainer, false);
-            UIUtils.SetElementDisplay(moreButton, true);
-        }
-
-        public void OnMoreButtonClicked()
-        {
-            UIUtils.SetElementDisplay(releaseNotesContainer, true);
-            UIUtils.SetElementDisplay(moreButton, false);
-        }
-
-        private VisualElementCache cache { get; set; }
-        private SelectableLabel versionAndReleaseDateLabel { get { return cache.Get<SelectableLabel>("versionAndReleaseDate"); } }
-        private VisualElement releaseNotesContainer { get { return cache.Get<VisualElement>("releaseNotesContainer"); } }
-        private SelectableLabel releaseNotesLabel { get { return cache.Get<SelectableLabel>("releaseNotes"); } }
-        private Button moreButton { get { return cache.Get<Button>("releaseDetailMore"); } }
-        private Button lessButton { get { return cache.Get<Button>("releaseDetailLess"); } }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs b/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs
index b1e1d63b2c..5a8c2016ab 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageSelectionEditor.cs
@@ -181,14 +181,14 @@ internal override void OnHeaderControlsGUI()
                 return;
 
             var previousEnabled = GUI.enabled;
-            GUI.enabled =  m_Package?.state == PackageState.InDevelopment && (m_Version?.isInstalled ?? false);
+
+            PackageManifest manifest = null;
+            if (m_Package?.state == PackageState.InDevelopment && (m_Version?.isInstalled ?? false))
+                manifest = m_AssetDatabase.LoadAssetAtPath<PackageManifest>($"{m_Version.packageInfo.assetPath}/package.json");
+            GUI.enabled =  manifest != null;
             if (GUILayout.Button(Styles.editPackage, EditorStyles.miniButton))
-            {
-                var path = m_Version.packageInfo.assetPath;
-                var manifest = m_AssetDatabase.LoadAssetAtPath<PackageManifest>($"{path}/package.json");
-                if (manifest != null)
-                    m_Selection.activeObject = manifest;
-            }
+                m_Selection.activeObject = manifest;
+
             GUI.enabled = m_Package != null && m_Version != null;
             if (GUILayout.Button(Styles.viewInPackageManager, EditorStyles.miniButton))
             {
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel.cs b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel.cs
index 23ff602213..0902ced099 100644
--- a/Modules/PackageManagerUI/Editor/UI/PackageTagLabel.cs
+++ b/Modules/PackageManagerUI/Editor/UI/PackageTagLabel.cs
@@ -11,33 +11,60 @@ internal class PackageTagLabel : Label
         internal new class UxmlFactory : UxmlFactory<PackageTagLabel, UxmlTraits> {}
         internal new class UxmlTraits : TextElement.UxmlTraits {}
 
-        private PackageTagLabel(string text, string tooltipText, PackageTag tag = PackageTag.None)
-            : base(text)
-        {
-            AddToClassList(tag.ToString());
-            tooltip = tooltipText;
-        }
+        private PackageTag m_Tag;
+        public PackageTag tag => m_Tag;
 
-        public PackageTagLabel()
+        public void Refresh(IPackageVersion version, bool isVersionItem = false)
         {
-        }
+            if (m_Tag != PackageTag.None)
+                RemoveFromClassList(m_Tag.ToString());
+
+            text = string.Empty;
+            tooltip = string.Empty;
+            m_Tag = PackageTag.None;
 
-        public static PackageTagLabel CreateTagLabel(IPackageVersion version, bool isVersionItem = false)
-        {
             if (version != null)
             {
                 if (version.HasTag(PackageTag.Custom))
-                    return new PackageTagLabel(L10n.Tr("Custom"), string.Empty, PackageTag.Custom);
-                if (version.HasTag(PackageTag.PreRelease))
-                    return new PackageTagLabel(L10n.Tr("Pre"), L10n.Tr("Pre-release"), PackageTag.PreRelease);
-                if (isVersionItem && version.HasTag(PackageTag.Release))
-                    return new PackageTagLabel(L10n.Tr("R"), L10n.Tr("Release"), PackageTag.Release);
-                if (version.HasTag(PackageTag.Experimental))
-                    return new PackageTagLabel(L10n.Tr("Exp"), L10n.Tr("Experimental"), PackageTag.Experimental);
-                if (version.HasTag(PackageTag.ReleaseCandidate))
-                    return new PackageTagLabel(L10n.Tr("RC"), L10n.Tr("Release Candidate"), PackageTag.ReleaseCandidate);
+                {
+                    text = L10n.Tr("Custom");
+                    m_Tag = PackageTag.Custom;
+                }
+                else if (version.HasTag(PackageTag.PreRelease))
+                {
+                    text = L10n.Tr("Pre");
+                    tooltip = L10n.Tr("Pre-release");
+                    m_Tag = PackageTag.PreRelease;
+                }
+                else if (isVersionItem && version.HasTag(PackageTag.Release))
+                {
+                    text = L10n.Tr("R");
+                    tooltip = L10n.Tr("Release");
+                    m_Tag = PackageTag.Release;
+                }
+                else if (version.HasTag(PackageTag.Experimental))
+                {
+                    text = L10n.Tr("Exp");
+                    tooltip = L10n.Tr("Experimental");
+                    m_Tag = PackageTag.Experimental;
+                }
+                else if (version.HasTag(PackageTag.ReleaseCandidate))
+                {
+                    text = L10n.Tr("RC");
+                    tooltip = L10n.Tr("Release Candidate");
+                    m_Tag = PackageTag.ReleaseCandidate;
+                }
             }
-            return null;
+
+            if (m_Tag != PackageTag.None)
+                AddToClassList(m_Tag.ToString());
+        }
+
+        public static PackageTagLabel CreateTagLabel(IPackageVersion version, bool isVersionItem = false)
+        {
+            var tagLabel = new PackageTagLabel();
+            tagLabel.Refresh(version, isVersionItem);
+            return tagLabel.m_Tag != PackageTag.None ? tagLabel : null;
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/PackageVersionItem.cs b/Modules/PackageManagerUI/Editor/UI/PackageVersionItem.cs
deleted file mode 100644
index 00f5fb4ddb..0000000000
--- a/Modules/PackageManagerUI/Editor/UI/PackageVersionItem.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using UnityEngine.UIElements;
-
-namespace UnityEditor.PackageManager.UI.Internal
-{
-    internal class PackageVersionItem : VisualElement, ISelectableItem
-    {
-        public IPackage package { get; private set; }
-        public IPackageVersion version { get; private set; }
-
-        private ResourceLoader m_ResourceLoader;
-        private PageManager m_PageManager;
-        private void ResolveDependencies()
-        {
-            var container = ServicesContainer.instance;
-            m_ResourceLoader = container.Resolve<ResourceLoader>();
-            m_PageManager = container.Resolve<PageManager>();
-        }
-
-        public PackageVersionItem(IPackage package, IPackageVersion version, bool multipleVersionsVisible, bool isLatestVersion)
-        {
-            ResolveDependencies();
-
-            var root = m_ResourceLoader.GetTemplate("PackageVersionItem.uxml");
-            Add(root);
-            cache = new VisualElementCache(root);
-
-            this.package = package;
-            this.version = version;
-
-            RefreshLabel(multipleVersionsVisible, isLatestVersion, version.isUnityPackage == true);
-        }
-
-        public IPackageVersion targetVersion { get { return version; } }
-        public VisualElement element { get { return this; } }
-
-        private void RefreshLabel(bool multipleVersionsVisible, bool isLatestVersion, bool isUnityPackage)
-        {
-            versionLabel.text = version.version?.ToString() ?? version.versionString;
-            versionLabel.ShowTextTooltipOnSizeChange();
-
-            var primary = package.versions.primary;
-            var recommended = package.versions.recommended;
-            var versionInManifest = primary?.packageInfo?.projectDependenciesEntry;
-            var stateText = string.Empty;
-
-            if (version == primary)
-            {
-                if (version.isInstalled)
-                    stateText = L10n.Tr(version.isDirectDependency ? "Currently installed" : "Installed as dependency");
-                else if (version.HasTag(PackageTag.Downloadable) && version.isAvailableOnDisk)
-                    stateText = L10n.Tr("Currently downloaded");
-                // with keyVersions being potentially larger now, we want to
-                //  show 'Recommended' text whether package is installed or not
-                //  if more than one version is in keyVersions
-                else if (version == recommended && multipleVersionsVisible && isUnityPackage)
-                    stateText = L10n.Tr("Recommended");
-                else if (!isUnityPackage && multipleVersionsVisible && isLatestVersion)
-                    stateText = L10n.Tr("Latest update");
-            }
-            else if (versionInManifest == version.versionString)
-                stateText = L10n.Tr("Requested but overridden");
-            else if (version == recommended && isUnityPackage)
-                stateText = L10n.Tr("Recommended");
-            else if ((primary.isInstalled || !isUnityPackage) && isLatestVersion)
-                stateText = L10n.Tr("Latest update");
-
-            stateLabel.text = stateText;
-
-            var tagLabel = PackageTagLabel.CreateTagLabel(version, true);
-            if (tagLabel != null)
-                stateContainer.Add(tagLabel);
-        }
-
-        public void SelectVersionItem()
-        {
-            m_PageManager.SetSelected(package, version, true);
-        }
-
-        private VisualElementCache cache { get; set; }
-        private Label stateLabel { get { return cache.Get<Label>("stateLabel"); } }
-        private Label versionLabel { get { return cache.Get<Label>("versionLabel"); } }
-        private VisualElement stateContainer { get { return cache.Get<VisualElement>("stateContainer"); } }
-    }
-}
diff --git a/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs b/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs
index bbb9f2c3af..801cea7468 100644
--- a/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ScopedRegistriesSettings.cs
@@ -76,8 +76,8 @@ public ScopedRegistriesSettings()
 
             m_UpmRegistryClient.onRegistriesModified += OnRegistriesModified;
             m_UpmRegistryClient.onRegistryOperationError += OnRegistryOperationError;
-            Undo.undoRedoPerformed -= OnUndoRedoPerformed;
-            Undo.undoRedoPerformed += OnUndoRedoPerformed;
+            Undo.undoRedoEvent -= OnUndoRedoPerformed;
+            Undo.undoRedoEvent += OnUndoRedoPerformed;
 
             // on domain reload, it's not guaranteed that the settings have
             //  reloaded the draft object yet- need to wait and do this when
@@ -93,7 +93,7 @@ public ScopedRegistriesSettings()
             }
         }
 
-        private void OnUndoRedoPerformed()
+        private void OnUndoRedoPerformed(in UndoRedoInfo info)
         {
             if (EditorWindow.HasOpenInstances<ProjectSettingsWindow>())
             {
@@ -153,12 +153,12 @@ private void RemoveRegistryClicked()
                 if (AnyPackageInstalledFromRegistry(draft.original.name))
                 {
                     message = L10n.Tr("There are packages in your project that are from this scoped registry, please remove them before removing the scoped registry.");
-                    EditorUtility.DisplayDialog(L10n.Tr("Cannot delete scoped registry"), message, L10n.Tr("Ok"));
+                    m_ApplicationProxy.DisplayDialog("cannotDeleteScopedRegistry", L10n.Tr("Cannot delete scoped registry"), message, L10n.Tr("Ok"));
                     return;
                 }
 
                 message = L10n.Tr("You are about to delete a scoped registry, are you sure you want to continue?");
-                var deleteRegistry = m_ApplicationProxy.isBatchMode || EditorUtility.DisplayDialog(L10n.Tr("Deleting a scoped registry"), message, L10n.Tr("Ok"), L10n.Tr("Cancel"));
+                var deleteRegistry = m_ApplicationProxy.isBatchMode || m_ApplicationProxy.DisplayDialog("deleteScopedRegistry", L10n.Tr("Deleting a scoped registry"), message, L10n.Tr("Ok"), L10n.Tr("Cancel"));
 
                 if (deleteRegistry)
                 {
@@ -203,7 +203,8 @@ private void RemoveScopeClicked()
         private void ApplyChanges()
         {
             if (draft.isUrlOrScopesUpdated && AnyPackageInstalledFromRegistry(draft.original.name) &&
-                !EditorUtility.DisplayDialog(L10n.Tr("Updating a scoped registry"),
+                !m_ApplicationProxy.DisplayDialog("updateScopedRegistry",
+                    L10n.Tr("Updating a scoped registry"),
                     L10n.Tr("There are packages in your project that are from this scoped registry, updating the URL or the scopes could result in errors in your project. Are you sure you want to continue?"),
                     L10n.Tr("Ok"), L10n.Tr("Cancel")))
                 return;
@@ -311,7 +312,7 @@ private bool ShowUnsavedChangesDialog()
             if (!draft.hasUnsavedChanges)
                 return true;
 
-            var discardChanges = m_ApplicationProxy.isBatchMode || EditorUtility.DisplayDialog(L10n.Tr("Discard unsaved changes"),
+            var discardChanges = m_ApplicationProxy.isBatchMode || m_ApplicationProxy.DisplayDialog("discardUnsavedRegistryChanges", L10n.Tr("Discard unsaved changes"),
                 L10n.Tr("You have unsaved changes which would be lost if you continue this operation. Do you want to continue and discard unsaved changes?"),
                 L10n.Tr("Continue"), L10n.Tr("Cancel"));
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ScopedRegistryAddedPopup.cs b/Modules/PackageManagerUI/Editor/UI/ScopedRegistryAddedPopup.cs
index 513c143964..3b9b62c559 100644
--- a/Modules/PackageManagerUI/Editor/UI/ScopedRegistryAddedPopup.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ScopedRegistryAddedPopup.cs
@@ -36,6 +36,7 @@ void WaitForPackageManagerProjectSettings()
 
                 var servicesContainer = ServicesContainer.instance;
                 var packageManagerSettingsProxy = servicesContainer.Resolve<PackageManagerProjectSettingsProxy>();
+                var applicationProxy = servicesContainer.Resolve<ApplicationProxy>();
                 packageManagerSettingsProxy.scopedRegistriesSettingsExpanded = true;
 
                 var message = registriesAddedCount.Pluralize(
@@ -47,9 +48,8 @@ void WaitForPackageManagerProjectSettings()
                     string.Empty, string.Empty,
                     "a scoped registry", $"{registriesAddedCount} scoped registries");
 
-                if (EditorUtility.DisplayDialog(L10n.Tr(title), L10n.Tr(message), L10n.Tr("Read more"), L10n.Tr("Close")))
+                if (applicationProxy.DisplayDialog("onRegistriesAddedPopup", L10n.Tr(title), L10n.Tr(message), L10n.Tr("Read more"), L10n.Tr("Close")))
                 {
-                    var applicationProxy = servicesContainer.Resolve<ApplicationProxy>();
                     applicationProxy.OpenURL($"https://docs.unity3d.com/{applicationProxy.shortUnityVersion}/Documentation/Manual/upm-scoped.html");
                 }
             }
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs
index 11ece20468..980805cf17 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageAddButton.cs
@@ -27,6 +27,9 @@ public PackageAddButton(ApplicationProxy applicationProxy,
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             m_PackageDatabase.Install(versions);
+            // The current multi-select UI does not allow users to install non-recommended versions
+            // Should this change in the future, we'll need to update the analytics event accordingly.
+            PackageManagerWindowAnalytics.SendEvent("installNewRecommended", packageIds: versions.Select(v => v.uniqueId));
             return true;
         }
 
@@ -41,6 +44,7 @@ protected override bool TriggerAction(IPackageVersion version)
                     var packageNameAndVersions = string.Join("\n\u2022 ",
                         customizedDependencies.Select(package => $"{package.displayName} - {package.versions.lifecycleVersion.version}").ToArray());
 
+                    var title = string.Format(L10n.Tr("Installing {0}"), version.package.GetDescriptor());
                     var message = customizedDependencies.Length == 1 ?
                         string.Format(
                         L10n.Tr("This {0} includes a package version that is different from what's already installed. Would you like to reset the following package to the required version?\n\u2022 {1}"),
@@ -49,7 +53,7 @@ protected override bool TriggerAction(IPackageVersion version)
                         L10n.Tr("This {0} includes package versions that are different from what are already installed. Would you like to reset the following packages to the required versions?\n\u2022 {1}"),
                         version.package.GetDescriptor(), packageNameAndVersions);
 
-                    var result = m_Application.DisplayDialogComplex(L10n.Tr("Unity Package Manager"), message, L10n.Tr("Install and Reset"), L10n.Tr("Cancel"), L10n.Tr("Install Only"));
+                    var result = m_Application.DisplayDialogComplex("installPackageWithCustomizedDependencies", title, message, L10n.Tr("Install and Reset"), L10n.Tr("Cancel"), L10n.Tr("Install Only"));
                     if (result == 1) // Cancel
                         return false;
                     if (result == 0) // Install and reset
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs
index 8534d7d216..44eb77bf8f 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageCancelDownloadButton.cs
@@ -11,15 +11,23 @@ internal class PackageCancelDownloadButton : PackageToolBarRegularButton
     {
         private AssetStoreDownloadManager m_AssetStoreDownloadManager;
         private PackageDatabase m_PackageDatabase;
-        public PackageCancelDownloadButton(AssetStoreDownloadManager assetStoreDownloadManager, PackageDatabase packageDatabase)
+        private bool m_IsIconButton;
+        public PackageCancelDownloadButton(AssetStoreDownloadManager assetStoreDownloadManager, PackageDatabase packageDatabase, bool isIconButton = false)
         {
             m_AssetStoreDownloadManager = assetStoreDownloadManager;
             m_PackageDatabase = packageDatabase;
+            m_IsIconButton = isIconButton;
+            if (isIconButton)
+            {
+                element.AddToClassList("cancelIcon");
+                element.AddToClassList("icon");
+            }
         }
 
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             m_PackageDatabase.AbortDownload(versions.Select(v => v.package));
+            PackageManagerWindowAnalytics.SendEvent("abortDownload", packageIds: versions.Select(v => v.packageUniqueId));
             return true;
         }
 
@@ -42,8 +50,8 @@ protected override bool IsVisible(IPackageVersion version)
         protected override IEnumerable<ButtonDisableCondition> GetDisableConditions(IPackageVersion version)
         {
             var operation = m_AssetStoreDownloadManager.GetDownloadOperation(version.packageUniqueId);
-            var resumeRequsted = operation?.state == DownloadState.ResumeRequested;
-            yield return new ButtonDisableCondition(resumeRequsted,
+            var resumeRequested = operation?.state == DownloadState.ResumeRequested;
+            yield return new ButtonDisableCondition(resumeRequested,
                 L10n.Tr("A resume request has been sent. You cannot cancel this download until it is resumed."));
         }
 
@@ -52,10 +60,7 @@ protected override string GetTooltip(IPackageVersion version, bool isInProgress)
             return string.Format(L10n.Tr("Click to cancel the download of this {0}."), version.package.GetDescriptor());
         }
 
-        protected override string GetText(IPackageVersion version, bool isInProgress)
-        {
-            return L10n.Tr("Cancel");
-        }
+        protected override string GetText(IPackageVersion version, bool isInProgress) => m_IsIconButton ? string.Empty : L10n.Tr("Cancel");
 
         protected override bool IsInProgress(IPackageVersion version) => false;
     }
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs
index 47853ed4cf..0dd26ac435 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDeselectButton.cs
@@ -9,15 +9,20 @@ namespace UnityEditor.PackageManager.UI.Internal
 {
     internal class PackageDeselectButton : PackageToolBarRegularButton
     {
+        private string m_AnalyticsEventName;
+
         private PageManager m_PageManager;
-        public PackageDeselectButton(PageManager pageManager)
+        public PackageDeselectButton(PageManager pageManager, string analyticsEventName = null)
         {
             m_PageManager = pageManager;
+            m_AnalyticsEventName = analyticsEventName;
         }
 
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             m_PageManager.RemoveSelection(versions.Select(v => new PackageAndVersionIdPair(v.packageUniqueId, v.uniqueId)));
+            if (!string.IsNullOrEmpty(m_AnalyticsEventName))
+                PackageManagerWindowAnalytics.SendEvent(m_AnalyticsEventName, packageIds: versions.Select(v => v.packageUniqueId));
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDowngradeButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDowngradeButton.cs
new file mode 100644
index 0000000000..f532322f5c
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDowngradeButton.cs
@@ -0,0 +1,74 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageDowngradeButton : PackageToolBarDropdownButton
+    {
+        private AssetStoreDownloadManager m_AssetStoreDownloadManager;
+        private AssetStoreCache m_AssetStoreCache;
+        private PackageDatabase m_PackageDatabase;
+        public PackageDowngradeButton(AssetStoreDownloadManager assetStoreDownloadManager, AssetStoreCache assetStoreCache, PackageDatabase packageDatabase)
+        {
+            m_AssetStoreDownloadManager = assetStoreDownloadManager;
+            m_AssetStoreCache = assetStoreCache;
+            m_PackageDatabase = packageDatabase;
+
+            m_Element.SetIcon("warning");
+        }
+
+        protected override bool TriggerAction(IPackageVersion version)
+        {
+            var canDownload = m_PackageDatabase.Download(version.package);
+            if (canDownload)
+                PackageManagerWindowAnalytics.SendEvent("startDownloadDowngrade", version.packageUniqueId);
+            return canDownload;
+        }
+
+        protected override bool IsVisible(IPackageVersion version)
+        {
+            if (version?.HasTag(PackageTag.Downloadable) != true)
+                return false;
+
+            var localInfo = m_AssetStoreCache.GetLocalInfo(version.packageUniqueId);
+            if (localInfo?.canDowngrade != true)
+                return false;
+
+            var operation = m_AssetStoreDownloadManager.GetDownloadOperation(version.packageUniqueId);
+            return operation == null || operation.state == DownloadState.DownloadRequested || !operation.isProgressVisible;
+        }
+
+        protected override string GetTooltip(IPackageVersion version, bool isInProgress)
+        {
+            if (isInProgress)
+                return L10n.Tr("The download request has been sent. Please wait for the download to start.");
+
+            var localInfo = m_AssetStoreCache.GetLocalInfo(version.packageUniqueId);
+            return string.Format(AssetStorePackage.k_IncompatibleWarningMessage, localInfo.supportedVersion);
+        }
+
+        protected override string GetText(IPackageVersion version, bool isInProgress)
+        {
+            return L10n.Tr("Update");
+        }
+
+        protected override bool IsInProgress(IPackageVersion version)
+        {
+            var operation = m_AssetStoreDownloadManager.GetDownloadOperation(version?.packageUniqueId);
+            var localInfo = m_AssetStoreCache.GetLocalInfo(version?.packageUniqueId);
+            return localInfo?.canDowngrade == true && operation?.isInProgress == true;
+        }
+
+        protected override IEnumerable<ButtonDisableCondition> GetDisableConditions(IPackageVersion version)
+        {
+            yield return new ButtonDisableCondition(() => version?.HasTag(PackageTag.Disabled) ?? false,
+                L10n.Tr("This package is no longer available and cannot be downloaded anymore."));
+        }
+
+        protected override bool IsHiddenWhenInProgress(IPackageVersion version) => true;
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs
index 35e9207981..172cbfc8de 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadButton.cs
@@ -21,8 +21,10 @@ public PackageDownloadButton(AssetStoreDownloadManager assetStoreDownloadManager
 
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
-            m_PackageDatabase.Download(versions.Select(v => v.package));
-            return true;
+            var canDownload = m_PackageDatabase.Download(versions.Select(v => v.package));
+            if (canDownload)
+                PackageManagerWindowAnalytics.SendEvent("startDownloadNew", packageIds: versions.Select(v => v.packageUniqueId));
+            return canDownload;
         }
 
         protected override bool TriggerAction(IPackageVersion version)
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs
index da01e0f469..7049ec7f06 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageDownloadUpdateButton.cs
@@ -21,7 +21,9 @@ public PackageDownloadUpdateButton(AssetStoreDownloadManager assetStoreDownloadM
 
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
-            m_PackageDatabase.Download(versions.Select(v => v.package));
+            var canDownload = m_PackageDatabase.Download(versions.Select(v => v.package));
+            if (canDownload)
+                PackageManagerWindowAnalytics.SendEvent("startDownloadUpdate", packageIds: versions.Select(v => v.packageUniqueId));
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs
index be95a965b5..37817211e8 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackagePauseDownloadButton.cs
@@ -8,10 +8,17 @@ internal class PackagePauseDownloadButton : PackageToolBarRegularButton
     {
         private AssetStoreDownloadManager m_AssetStoreDownloadManager;
         private PackageDatabase m_PackageDatabase;
-        public PackagePauseDownloadButton(AssetStoreDownloadManager assetStoreDownloadManager, PackageDatabase packageDatabase)
+        private bool m_IsIconButton;
+        public PackagePauseDownloadButton(AssetStoreDownloadManager assetStoreDownloadManager, PackageDatabase packageDatabase, bool isIconButton = false)
         {
             m_AssetStoreDownloadManager = assetStoreDownloadManager;
             m_PackageDatabase = packageDatabase;
+            m_IsIconButton = isIconButton;
+            if (isIconButton)
+            {
+                element.AddToClassList("pauseIcon");
+                element.AddToClassList("icon");
+            }
         }
 
         protected override bool TriggerAction(IPackageVersion version)
@@ -27,7 +34,10 @@ protected override bool IsVisible(IPackageVersion version)
                 return false;
 
             var operation = m_AssetStoreDownloadManager.GetDownloadOperation(version.packageUniqueId);
-            return operation?.isInProgress == true || operation?.state == DownloadState.Pausing;
+
+            // We only want to see two icons at the same time (cancel + resume OR cancel + pause)
+            // So we hide the pause button when the resume button is shown, that's why we check the ResumeRequested state
+            return operation?.state != DownloadState.ResumeRequested && (operation?.isInProgress == true || operation?.state == DownloadState.Pausing);
         }
 
         protected override string GetTooltip(IPackageVersion version, bool isInProgress)
@@ -37,10 +47,7 @@ protected override string GetTooltip(IPackageVersion version, bool isInProgress)
             return string.Format(L10n.Tr("Click to pause the download of this {0}."), version.package.GetDescriptor());
         }
 
-        protected override string GetText(IPackageVersion version, bool isInProgress)
-        {
-            return L10n.Tr("Pause");
-        }
+        protected override string GetText(IPackageVersion version, bool isInProgress) => m_IsIconButton ? string.Empty : L10n.Tr("Pause");
 
         protected override bool IsInProgress(IPackageVersion version) => m_AssetStoreDownloadManager.GetDownloadOperation(version.packageUniqueId).state == DownloadState.Pausing;
     }
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs
index 456daf901f..11c7956d5a 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRedownloadButton.cs
@@ -22,11 +22,8 @@ protected override bool TriggerAction(IPackageVersion version)
         {
             var canDownload = m_PackageDatabase.Download(version.package);
             if (canDownload)
-            {
                 PackageManagerWindowAnalytics.SendEvent("startReDownload", version.packageUniqueId);
-                return true;
-            }
-            return false;
+            return canDownload;
         }
 
         protected override bool IsVisible(IPackageVersion version)
@@ -36,7 +33,7 @@ protected override bool IsVisible(IPackageVersion version)
 
             var localInfo = m_AssetStoreCache.GetLocalInfo(version.packageUniqueId);
             var operation = m_AssetStoreDownloadManager.GetDownloadOperation(version.packageUniqueId);
-            return localInfo?.canUpdate == false
+            return localInfo?.canUpdateOrDowngrade == false
                 && (operation == null || operation.state == DownloadState.DownloadRequested || !operation.isProgressVisible);
         }
 
@@ -57,7 +54,7 @@ protected override bool IsInProgress(IPackageVersion version)
         {
             var operation = m_AssetStoreDownloadManager.GetDownloadOperation(version?.packageUniqueId);
             var localInfo = m_AssetStoreCache.GetLocalInfo(version?.packageUniqueId);
-            return localInfo?.canUpdate == false && operation?.isInProgress == true;
+            return localInfo?.canUpdateOrDowngrade == false && operation?.isInProgress == true;
         }
 
         protected override IEnumerable<ButtonDisableCondition> GetDisableConditions(IPackageVersion version)
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs
index 8b4865eeeb..aeb8c24346 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveButton.cs
@@ -29,24 +29,11 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             var title = string.Format(L10n.Tr("Removing {0} items"), versions.Count);
 
-            if (versions.Any(v => v.HasTag(PackageTag.Custom)))
-            {
-                var message = L10n.Tr("At least one item is a package in development. You will lose all your changes(if any) if you delete a package in development. Are you sure you want to remove these items?");
-
-                if (!m_Application.DisplayDialog(title, message, L10n.Tr("Yes"), L10n.Tr("No")))
-                    return false;
-
-                m_PackageDatabase.Uninstall(versions.Select(v => v.package));
-                // After a bulk removal, we want to deselect them to avoid installing them back by accident.
-                DeselectVersions(versions);
-                return true;
-            }
-
             var result = 0;
             if (!m_PackageManagerPrefs.skipMultiSelectRemoveConfirmation)
             {
                 var message = L10n.Tr("Are you sure you want to remove these items?");
-                result = m_Application.DisplayDialogComplex(title, message, L10n.Tr("Remove"), L10n.Tr("Cancel"), L10n.Tr("Never ask"));
+                result = m_Application.DisplayDialogComplex("removeMultiplePackages", title, message, L10n.Tr("Remove"), L10n.Tr("Cancel"), L10n.Tr("Never ask"));
             }
 
             // Cancel
@@ -58,6 +45,7 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
                 m_PackageManagerPrefs.skipMultiSelectRemoveConfirmation = true;
 
             m_PackageDatabase.Uninstall(versions.Select(v => v.package));
+            PackageManagerWindowAnalytics.SendEvent("uninstall", packageIds: versions.Select(v => v.uniqueId));
             // After a bulk removal, we want to deselect them to avoid installing them back by accident.
             DeselectVersions(versions);
             return true;
@@ -65,43 +53,34 @@ protected override bool TriggerAction(IList<IPackageVersion> versions)
 
         protected override bool TriggerAction(IPackageVersion version)
         {
-            if (version.HasTag(PackageTag.Custom))
-            {
-                if (!m_Application.DisplayDialog(L10n.Tr("Unity Package Manager"), L10n.Tr("You will lose all your changes (if any) if you delete a package in development. Are you sure?"), L10n.Tr("Yes"), L10n.Tr("No")))
-                    return false;
-
-                m_PackageDatabase.RemoveEmbedded(version.package);
-                PackageManagerWindowAnalytics.SendEvent("removeEmbedded", version.uniqueId);
-                return true;
-            }
-
             var result = 0;
             if (version.HasTag(PackageTag.BuiltIn))
             {
                 if (!m_PackageManagerPrefs.skipDisableConfirmation)
                 {
-                    result = m_Application.DisplayDialogComplex(L10n.Tr("Disable Built-In Package"),
+                    result = m_Application.DisplayDialogComplex("disableBuiltInPackage",
+                        L10n.Tr("Disable Built-In Package"),
                         L10n.Tr("Are you sure you want to disable this built-in package?"),
                         L10n.Tr("Disable"), L10n.Tr("Cancel"), L10n.Tr("Never ask"));
                 }
             }
             else
             {
-                var isPartOfFeature = m_PackageDatabase.GetFeatureDependents(version).Any(featureSet => featureSet.isInstalled);
+                var isPartOfFeature = m_PackageDatabase.GetFeaturesThatUseThisPackage(version).Any(featureSet => featureSet.isInstalled);
                 if (isPartOfFeature || !m_PackageManagerPrefs.skipRemoveConfirmation)
                 {
                     var descriptor = version.package.GetDescriptor();
-                    var title = string.Format(L10n.Tr("Removing {0}"), CultureInfo.InvariantCulture.TextInfo.ToTitleCase(descriptor));
+                    var title = string.Format(L10n.Tr("Removing {0}"), descriptor);
                     if (isPartOfFeature)
                     {
                         var message = string.Format(L10n.Tr("Are you sure you want to remove this {0} that is used by at least one installed feature?"), descriptor);
-                        var removeIt = m_Application.DisplayDialog(title, message, L10n.Tr("Remove"), L10n.Tr("Cancel"));
+                        var removeIt = m_Application.DisplayDialog("removePackagePartOfFeature", title, message, L10n.Tr("Remove"), L10n.Tr("Cancel"));
                         result = removeIt ? 0 : 1;
                     }
                     else
                     {
                         var message = string.Format(L10n.Tr("Are you sure you want to remove this {0}?"), descriptor);
-                        result = m_Application.DisplayDialogComplex(title, message, L10n.Tr("Remove"), L10n.Tr("Cancel"), L10n.Tr("Never ask"));
+                        result = m_Application.DisplayDialogComplex("removePackage", title, message, L10n.Tr("Remove"), L10n.Tr("Cancel"), L10n.Tr("Never ask"));
                     }
                 }
             }
@@ -121,7 +100,7 @@ protected override bool TriggerAction(IPackageVersion version)
 
             // If the user is removing a package that is part of a feature set, lock it after removing from manifest
             // Having this check condition should be more optimal once we implement caching of Feature Set Dependents for each package
-            if (m_PackageDatabase.GetFeatureDependents(version.package.versions.installed)?.Any() == true)
+            if (m_PackageDatabase.GetFeaturesThatUseThisPackage(version.package.versions.installed)?.Any() == true)
                 m_PageManager.SetPackagesUserUnlockedState(new List<string> { version.packageUniqueId }, false);
 
             // Remove
@@ -133,8 +112,9 @@ protected override bool TriggerAction(IPackageVersion version)
         protected override bool IsVisible(IPackageVersion version)
         {
             var installed = version?.package.versions.installed;
-            return version?.HasTag(PackageTag.Removable) == true
-                && installed != null
+            return installed != null
+                && version.HasTag(PackageTag.Removable)
+                && !version.HasTag(PackageTag.Custom)
                 && (installed == version || version.IsRequestedButOverriddenVersion);
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveCustomButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveCustomButton.cs
new file mode 100644
index 0000000000..30aca127ea
--- /dev/null
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageRemoveCustomButton.cs
@@ -0,0 +1,67 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Linq;
+using System.Collections.Generic;
+
+namespace UnityEditor.PackageManager.UI.Internal
+{
+    internal class PackageRemoveCustomButton : PackageToolBarRegularButton
+    {
+        private ApplicationProxy m_Application;
+        private PackageDatabase m_PackageDatabase;
+        private PageManager m_PageManager;
+        public PackageRemoveCustomButton(ApplicationProxy applicationProxy,
+                                   PackageDatabase packageDatabase,
+                                   PageManager pageManager)
+        {
+            m_Application = applicationProxy;
+            m_PackageDatabase = packageDatabase;
+            m_PageManager = pageManager;
+        }
+
+        protected override bool TriggerAction(IPackageVersion version)
+        {
+            if (version.HasTag(PackageTag.Custom))
+            {
+                if (!m_Application.DisplayDialog("removeEmbeddedPackage", L10n.Tr("Removing package in development"), L10n.Tr("You will lose all your changes (if any) if you delete a package in development. Are you sure?"), L10n.Tr("Yes"), L10n.Tr("No")))
+                    return false;
+
+                m_PackageDatabase.RemoveEmbedded(version.package);
+                PackageManagerWindowAnalytics.SendEvent("removeEmbedded", version.uniqueId);
+                return true;
+            }
+
+            return false;
+        }
+
+        protected override bool IsVisible(IPackageVersion version)
+        {
+            var installed = version?.package.versions.installed;
+            return installed != null
+                && version.HasTag(PackageTag.Removable)
+                && version.HasTag(PackageTag.Custom)
+                && (installed == version || version.IsRequestedButOverriddenVersion);
+        }
+
+        protected override string GetTooltip(IPackageVersion version, bool isInProgress)
+        {
+            if (isInProgress)
+                return k_InProgressGenericTooltip;
+            return string.Format(L10n.Tr("Click to remove this {0} from your project."), version.package.GetDescriptor());
+        }
+
+        protected override string GetText(IPackageVersion version, bool isInProgress)
+        {
+            return isInProgress ? L10n.Tr("Removing") : L10n.Tr("Remove");
+        }
+
+        protected override bool IsInProgress(IPackageVersion version) => m_PackageDatabase.IsUninstallInProgress(version.package);
+
+        private void DeselectVersions(IList<IPackageVersion> versions)
+        {
+            m_PageManager.RemoveSelection(versions.Select(v => new PackageAndVersionIdPair(v.packageUniqueId, v.uniqueId)));
+        }
+    }
+}
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResetButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResetButton.cs
index c2034a8b49..4688937d6c 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResetButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResetButton.cs
@@ -29,6 +29,8 @@ protected override bool TriggerAction(IPackageVersion version)
 
             var packageNameAndVersions = string.Join("\n\u2022 ",
                 packagesToUninstall.Select(package => $"{package.displayName} - {package.versions.lifecycleVersion.version}").ToArray());
+
+            var title = string.Format(L10n.Tr("Resetting {0}"), version.package.GetDescriptor());
             var message = packagesToUninstall.Length == 1 ?
                 string.Format(
                 L10n.Tr("Are you sure you want to reset this {0}?\nThe following included package will reset to the required version:\n\u2022 {1}"),
@@ -37,7 +39,7 @@ protected override bool TriggerAction(IPackageVersion version)
                 L10n.Tr("Are you sure you want to reset this {0}?\nThe following included packages will reset to their required versions:\n\u2022 {1}"),
                 version.package.GetDescriptor(), packageNameAndVersions);
 
-            if (!m_Application.DisplayDialog(L10n.Tr("Unity Package Manager"), message, L10n.Tr("Continue"), L10n.Tr("Cancel")))
+            if (!m_Application.DisplayDialog("resetPackage", title, message, L10n.Tr("Continue"), L10n.Tr("Cancel")))
                 return false;
 
             m_PageManager.SetPackagesUserUnlockedState(packagesToUninstall.Select(p => p.uniqueId), false);
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs
index 5703a904d0..1f7c0502e2 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageResumeDownloadButton.cs
@@ -8,11 +8,17 @@ internal class PackageResumeDownloadButton : PackageToolBarRegularButton
     {
         private AssetStoreDownloadManager m_AssetStoreDownloadManager;
         private PackageDatabase m_PackageDatabase;
-        public PackageResumeDownloadButton(AssetStoreDownloadManager assetStoreDownloadManager,
-                                           PackageDatabase packageDatabase)
+        private bool m_IsIconButton;
+        public PackageResumeDownloadButton(AssetStoreDownloadManager assetStoreDownloadManager, PackageDatabase packageDatabase, bool isIconButton = false)
         {
             m_AssetStoreDownloadManager = assetStoreDownloadManager;
             m_PackageDatabase = packageDatabase;
+            m_IsIconButton = isIconButton;
+            if (isIconButton)
+            {
+                element.AddToClassList("resumeIcon");
+                element.AddToClassList("icon");
+            }
         }
 
         protected override bool TriggerAction(IPackageVersion version)
@@ -38,10 +44,7 @@ protected override string GetTooltip(IPackageVersion version, bool isInProgress)
             return string.Format(L10n.Tr("Click to resume the download of this {0}."), version.package.GetDescriptor());
         }
 
-        protected override string GetText(IPackageVersion version, bool isInProgress)
-        {
-            return L10n.Tr("Resume");
-        }
+        protected override string GetText(IPackageVersion version, bool isInProgress) => m_IsIconButton ? string.Empty : L10n.Tr("Resume");
 
         protected override bool IsInProgress(IPackageVersion version) => m_AssetStoreDownloadManager.GetDownloadOperation(version.packageUniqueId)?.state == DownloadState.ResumeRequested;
     }
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs
index d345313883..ea4a9ac046 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBar.cs
@@ -41,6 +41,7 @@ private void ResolveDependencies()
         private PackageUpdateButton m_UpdateButton;
         private PackageGitUpdateButton m_GitUpdateButton;
         private PackageRemoveButton m_RemoveButton;
+        private PackageRemoveCustomButton m_RemoveCustomButton;
         private PackageResetButton m_ResetButton;
 
         private PackagePauseDownloadButton m_PauseButton;
@@ -51,13 +52,14 @@ private void ResolveDependencies()
         private PackageRedownloadButton m_RedownloadButton;
         private PackageDownloadButton m_DownloadButton;
         private PackageDownloadUpdateButton m_DownloadUpdateButton;
+        private PackageDowngradeButton m_DowngradeButton;
 
         private PackageUnlockButton m_UnlockButton;
         private PackageSignInButton m_SignInButton;
 
         private VisualElement m_MainContainer;
         private VisualElement m_ProgressContainer;
-        private PackageToolBarError m_ErrorContainer;
+        private PackageToolBarError m_ErrorState;
 
         private ProgressBar m_DownloadProgress;
 
@@ -71,6 +73,9 @@ public PackageToolbar()
             m_MainContainer = new VisualElement { name = "toolbarMainContainer" };
             Add(m_MainContainer);
 
+            m_ErrorState = new PackageToolBarError() { name = "toolbarErrorState" };
+            m_MainContainer.Add(m_ErrorState);
+
             var leftItems = new VisualElement();
             leftItems.AddToClassList("leftItems");
             m_MainContainer.Add(leftItems);
@@ -88,9 +93,6 @@ public PackageToolbar()
             m_DownloadProgress = new ProgressBar { name = "downloadProgress" };
             m_ProgressContainer.Add(m_DownloadProgress);
 
-            m_ErrorContainer = new PackageToolBarError(m_PackageDatabase) { name = "toolbarErrorContainer" };
-            Add(m_ErrorContainer);
-
             InitializeButtons();
         }
 
@@ -127,6 +129,11 @@ private void InitializeButtons()
             m_RemoveButton.onAction += RefreshBuiltInButtons;
             m_BuiltInActions.Add(m_RemoveButton.element);
 
+            m_RemoveCustomButton = new PackageRemoveCustomButton(m_Application, m_PackageDatabase, m_PageManager);
+            m_RemoveCustomButton.SetGlobalDisableConditions(m_DisableIfInstallOrUninstallInProgress, m_DisableIfCompiling);
+            m_RemoveCustomButton.onAction += RefreshBuiltInButtons;
+            m_BuiltInActions.Add(m_RemoveCustomButton.element);
+
             m_ResetButton = new PackageResetButton(m_Application, m_PackageDatabase, m_PageManager);
             m_ResetButton.SetGlobalDisableConditions(m_DisableIfInstallOrUninstallInProgress, m_DisableIfCompiling);
             m_ResetButton.onAction += RefreshBuiltInButtons;
@@ -153,26 +160,31 @@ private void InitializeButtons()
             m_DownloadUpdateButton.onAction += Refresh;
             m_BuiltInActions.Add(m_DownloadUpdateButton.element);
 
+            m_DowngradeButton = new PackageDowngradeButton(m_AssetStoreDownloadManager, m_AssetStoreCache, m_PackageDatabase);
+            m_DowngradeButton.SetGlobalDisableConditions(m_DisableIfNoNetwork, m_DisableIfCompiling);
+            m_DowngradeButton.onAction += Refresh;
+            m_BuiltInActions.Add(m_DowngradeButton.element);
+
             m_SignInButton = new PackageSignInButton(m_UnityConnectProxy);
             m_SignInButton.SetGlobalDisableConditions(m_DisableIfNoNetwork);
             m_SignInButton.onAction += RefreshBuiltInButtons;
             m_BuiltInActions.Add(m_SignInButton.element);
 
             // Since pause, resume, cancel buttons are only used to control the download progress, we want to put them in the progress container instead
-            m_CancelButton = new PackageCancelDownloadButton(m_AssetStoreDownloadManager, m_PackageDatabase);
-            m_CancelButton.SetGlobalDisableConditions(m_DisableIfCompiling);
-            m_CancelButton.onAction += Refresh;
-            m_ProgressContainer.Add(m_CancelButton.element);
+            m_ResumeButton = new PackageResumeDownloadButton(m_AssetStoreDownloadManager, m_PackageDatabase, true);
+            m_ResumeButton.SetGlobalDisableConditions(m_DisableIfNoNetwork, m_DisableIfCompiling);
+            m_ResumeButton.onAction += RefreshProgressControlButtons;
+            m_ProgressContainer.Add(m_ResumeButton.element);
 
-            m_PauseButton = new PackagePauseDownloadButton(m_AssetStoreDownloadManager, m_PackageDatabase);
+            m_PauseButton = new PackagePauseDownloadButton(m_AssetStoreDownloadManager, m_PackageDatabase, true);
             m_PauseButton.SetGlobalDisableConditions(m_DisableIfCompiling);
             m_PauseButton.onAction += RefreshProgressControlButtons;
             m_ProgressContainer.Add(m_PauseButton.element);
 
-            m_ResumeButton = new PackageResumeDownloadButton(m_AssetStoreDownloadManager, m_PackageDatabase);
-            m_ResumeButton.SetGlobalDisableConditions(m_DisableIfNoNetwork, m_DisableIfCompiling);
-            m_ResumeButton.onAction += RefreshProgressControlButtons;
-            m_ProgressContainer.Add(m_ResumeButton.element);
+            m_CancelButton = new PackageCancelDownloadButton(m_AssetStoreDownloadManager, m_PackageDatabase, true);
+            m_CancelButton.SetGlobalDisableConditions(m_DisableIfCompiling);
+            m_CancelButton.onAction += Refresh;
+            m_ProgressContainer.Add(m_CancelButton.element);
         }
 
         public void OnEnable()
@@ -203,29 +215,14 @@ public void Refresh(IPackage package, IPackageVersion version)
 
         private void Refresh()
         {
-            // Since only one of `errorContainer`, `progressContainer` or `mainContainer` can be visible at the same time
-            // we can use `chain` refresh mechanism in the order of priority (error > progress > main)
-            if (RefreshErrorContainer())
-                return;
-
+            // Since only one of `progressContainer` or `mainContainer` can be visible at the same time
+            // we can use `chain` refresh mechanism in the order of priority (progress > main)
             if (RefreshProgressContainer())
                 return;
 
             RefreshMainContainer();
         }
 
-        // Returns true if error is visible and there's no need to further check other containers
-        private bool RefreshErrorContainer()
-        {
-            var errorVisible = m_ErrorContainer.Refresh(m_Package, m_Version);
-            if (errorVisible)
-            {
-                UIUtils.SetElementDisplay(m_MainContainer, false);
-                UIUtils.SetElementDisplay(m_ProgressContainer, false);
-            }
-            return errorVisible;
-        }
-
         // Returns true if the progress bar is visible and there's no need to further check other containers
         private bool RefreshProgressContainer(IOperation operation = null)
         {
@@ -234,7 +231,6 @@ private bool RefreshProgressContainer(IOperation operation = null)
             UIUtils.SetElementDisplay(m_ProgressContainer, progressVisible);
             if (progressVisible)
             {
-                UIUtils.SetElementDisplay(m_ErrorContainer, false);
                 UIUtils.SetElementDisplay(m_MainContainer, false);
                 RefreshProgressControlButtons();
             }
@@ -243,7 +239,7 @@ private bool RefreshProgressContainer(IOperation operation = null)
 
         private void RefreshMainContainer()
         {
-            UIUtils.SetElementDisplay(m_ErrorContainer, false);
+            UIUtils.SetElementDisplay(m_ErrorState, m_ErrorState.Refresh(m_Package, m_Version));
             UIUtils.SetElementDisplay(m_ProgressContainer, false);
             UIUtils.SetElementDisplay(m_MainContainer, true);
 
@@ -260,12 +256,14 @@ private void RefreshBuiltInButtons()
             m_AddButton.Refresh(m_Version);
             m_UpdateButton.Refresh(m_Version);
             m_RemoveButton.Refresh(m_Version);
+            m_RemoveCustomButton.Refresh(m_Version);
             m_ResetButton.Refresh(m_Version);
 
             m_ImportButton.Refresh(m_Version);
             m_RedownloadButton.Refresh(m_Version);
             m_DownloadButton.Refresh(m_Version);
             m_DownloadUpdateButton.Refresh(m_Version);
+            m_DowngradeButton.Refresh(m_Version);
         }
 
         private void RefreshProgressControlButtons()
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBarError.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBarError.cs
index 0c32d86dc6..772fd7a5c0 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBarError.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageToolBarError.cs
@@ -9,43 +9,14 @@ namespace UnityEditor.PackageManager.UI.Internal
 {
     internal class PackageToolBarError : VisualElement
     {
-        private PackageDatabase m_PackageDatabase;
-        private void ResolveDependencies(PackageDatabase packageDatabase)
+        public PackageToolBarError()
         {
-            m_PackageDatabase = packageDatabase;
-        }
-
-        private Label m_ErrorMessage;
-        private Label m_ErrorStatus;
-        private Button m_OkButton;
-
-        private IPackage m_Package;
-        private IPackageVersion m_Version;
-        public PackageToolBarError(PackageDatabase packageDatabase)
-        {
-            ResolveDependencies(packageDatabase);
-
-            m_ErrorStatus = new Label { name = "state" };
-            m_ErrorStatus.AddToClassList("status");
-            Add(m_ErrorStatus);
-
-            m_ErrorMessage = new Label { name = "message" };
-            m_ErrorMessage.AddToClassList("errorMessage");
-            m_ErrorMessage.ShowTextTooltipOnSizeChange();
-            Add(m_ErrorMessage);
-
-            m_OkButton = new Button { name = "okButton", text = L10n.Tr("Ok")};
-            m_OkButton.clickable.clicked += OnOkClicked;
-            Add(m_OkButton);
         }
 
         public bool Refresh(IPackage package, IPackageVersion version)
         {
-            m_Package = package;
-            m_Version = version;
-
-            var operationError = m_Version?.errors?.FirstOrDefault(e => e.HasAttribute(UIError.Attribute.IsClearable))
-                ?? m_Package?.errors?.FirstOrDefault(e => e.HasAttribute(UIError.Attribute.IsClearable));
+            var operationError = version?.errors?.FirstOrDefault(e => e.HasAttribute(UIError.Attribute.IsClearable))
+                ?? package?.errors?.FirstOrDefault(e => e.HasAttribute(UIError.Attribute.IsClearable));
             if (operationError == null)
             {
                 ClearError();
@@ -60,29 +31,23 @@ private void SetError(string message, PackageState state)
             switch (state)
             {
                 case PackageState.Error:
-                    m_ErrorStatus.AddClasses("error");
+                    AddToClassList("error");
                     break;
                 case PackageState.Warning:
-                    m_ErrorStatus.AddClasses("warning");
+                    AddToClassList("warning");
                     break;
                 default: break;
             }
 
-            m_ErrorMessage.text = message;
+            tooltip = message;
             UIUtils.SetElementDisplay(this, true);
         }
 
         private void ClearError()
         {
             UIUtils.SetElementDisplay(this, false);
-            m_ErrorMessage.text = string.Empty;
-            m_ErrorStatus.ClearClassList();
-        }
-
-        private void OnOkClicked()
-        {
-            // We use `PackageDatabase.ClearPackageErrors` instead of `IPackage.ClearErrors` to trigger `onPackagesChanged` events.
-            m_PackageDatabase.ClearPackageErrors(m_Package, e => e.HasAttribute(UIError.Attribute.IsClearable));
+            tooltip = string.Empty;
+            ClearClassList();
         }
     }
 }
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUnlockButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUnlockButton.cs
index fd70a6685c..692c4733bb 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUnlockButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUnlockButton.cs
@@ -18,6 +18,7 @@ public PackageUnlockButton(PageManager pageManager)
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
             m_PageManager.SetPackagesUserUnlockedState(versions.Select(v => v.packageUniqueId), true);
+            PackageManagerWindowAnalytics.SendEvent("unlock", packageIds: versions.Select(v => v.packageUniqueId));
             return true;
         }
 
diff --git a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs
index 2767ad9bf5..0b3c4a0e5a 100644
--- a/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs
+++ b/Modules/PackageManagerUI/Editor/UI/ToolBar/PackageUpdateButton.cs
@@ -9,57 +9,57 @@ namespace UnityEditor.PackageManager.UI.Internal
 {
     internal class PackageUpdateButton : PackageToolBarRegularButton
     {
-        private static readonly string k_MultiSelectUpdateButtonText = L10n.Tr("Update");
-        private static readonly string k_MultiSelectUpdatingButtonText = L10n.Tr("Updating");
         private static readonly string k_UpdateToButtonTextFormat = L10n.Tr("Update to {0}");
         private static readonly string k_UpdatingToButtonTextFormat = L10n.Tr("Updating to {0}");
+        private static readonly string k_UpdateToWithoutVersionButtonText = L10n.Tr("Update");
+        private static readonly string k_UpdatingToWithoutVersionButtonText = L10n.Tr("Updating");
 
-        internal static IPackageVersion GetTargetVersion(IPackageVersion version)
-        {
-            if (version?.isInstalled == true && version != version.package.versions.recommended)
-                return version.package.versions.latest ?? version;
-            return version;
-        }
+        private bool m_ShowVersion;
 
         private ApplicationProxy m_Application;
         private PackageDatabase m_PackageDatabase;
         private PageManager m_PageManager;
         public PackageUpdateButton(ApplicationProxy applicationProxy,
                                 PackageDatabase packageDatabase,
-                                PageManager pageManager)
+                                PageManager pageManager,
+                                bool showVersion = true)
         {
             m_Application = applicationProxy;
             m_PackageDatabase = packageDatabase;
             m_PageManager = pageManager;
+            m_ShowVersion = showVersion;
         }
 
-
-
         protected override bool TriggerAction(IList<IPackageVersion> versions)
         {
-            m_PackageDatabase.Install(versions.Select(v => GetTargetVersion(v)));
+            m_PackageDatabase.Install(versions.Select(v => v?.package?.versions.GetUpdateTarget(v)));
+            // The current multi-select UI does not allow users to install non-recommended versions
+            // Should this change in the future, we'll need to update the analytics event accordingly.
+            PackageManagerWindowAnalytics.SendEvent("installUpdateRecommended", packageIds: versions.Select(v => v.uniqueId));
             return true;
         }
 
         protected override bool TriggerAction(IPackageVersion version)
         {
-            var installedVersion = version.package.versions.installed;
-            var targetVersion = GetTargetVersion(version);
+            var versionsList = version?.package?.versions;
+            var installedVersion = versionsList?.installed;
+            var targetVersion = versionsList?.GetUpdateTarget(version);
             if (installedVersion != null && !installedVersion.isDirectDependency && installedVersion != targetVersion)
             {
-                var featureSetDependents = m_PackageDatabase.GetFeatureDependents(installedVersion);
+                var featureSetDependents = m_PackageDatabase.GetFeaturesThatUseThisPackage(installedVersion);
                 // if the installed version is being used by a Feature Set show the more specific
                 //  Feature Set dialog instead of the generic one
+                var title = string.Format(L10n.Tr("Updating {0}"), version.package.GetDescriptor());
                 if (featureSetDependents.Any())
                 {
                     var message = string.Format(L10n.Tr("Changing a {0} that is part of a feature can lead to errors. Are you sure you want to proceed?"), version.package.GetDescriptor());
-                    if (!m_Application.DisplayDialog(L10n.Tr("Warning"), message, L10n.Tr("Yes"), L10n.Tr("No")))
+                    if (!m_Application.DisplayDialog("updatePackagePartOfFeature", title, message, L10n.Tr("Yes"), L10n.Tr("No")))
                         return false;
                 }
                 else
                 {
                     var message = L10n.Tr("This version of the package is being used by other packages. Upgrading a different version might break your project. Are you sure you want to continue?");
-                    if (!m_Application.DisplayDialog(L10n.Tr("Unity Package Manager"), message, L10n.Tr("Yes"), L10n.Tr("No")))
+                    if (!m_Application.DisplayDialog("updatePackageUsedByOthers", title, message, L10n.Tr("Yes"), L10n.Tr("No")))
                         return false;
                 }
             }
@@ -73,6 +73,7 @@ protected override bool TriggerAction(IPackageVersion version)
                     var packageNameAndVersions = string.Join("\n\u2022 ",
                         customizedDependencies.Select(package => $"{package.displayName} - {package.versions.lifecycleVersion.version}").ToArray());
 
+                    var title = string.Format(L10n.Tr("Updating {0}"), version.package.GetDescriptor());
                     var message = customizedDependencies.Length == 1 ?
                         string.Format(
                         L10n.Tr("This {0} includes a package version that is different from what's already installed. Would you like to reset the following package to the required version?\n\u2022 {1}"),
@@ -81,7 +82,7 @@ protected override bool TriggerAction(IPackageVersion version)
                         L10n.Tr("This {0} includes package versions that are different from what are already installed. Would you like to reset the following packages to the required versions?\n\u2022 {1}"),
                         version.package.GetDescriptor(), packageNameAndVersions);
 
-                    var result = m_Application.DisplayDialogComplex(L10n.Tr("Unity Package Manager"), message, L10n.Tr("Install and Reset"), L10n.Tr("Cancel"), L10n.Tr("Install Only"));
+                    var result = m_Application.DisplayDialogComplex("installAndReset", title, message, L10n.Tr("Install and Reset"), L10n.Tr("Cancel"), L10n.Tr("Install Only"));
                     if (result == 1) // Cancel
                         return false;
                     if (result == 0) // Install and reset
@@ -107,12 +108,14 @@ protected override bool TriggerAction(IPackageVersion version)
 
         protected override bool IsVisible(IPackageVersion version)
         {
-            var installed = version?.package.versions.installed;
-            var targetVersion = GetTargetVersion(version);
+            var versionsList = version?.package?.versions;
+            var installed = versionsList?.installed;
+            var targetVersion = versionsList?.GetUpdateTarget(version);
             return installed?.HasTag(PackageTag.VersionLocked) == false
                 && targetVersion?.HasTag(PackageTag.Installable) == true
                 && installed != targetVersion
                 && !version.IsRequestedButOverriddenVersion
+                && (version.isDirectDependency || version != installed)
                 && !version.HasTag(PackageTag.Local)
                 && m_PageManager.GetVisualState(version.package)?.isLocked != true;
         }
@@ -127,13 +130,14 @@ protected override string GetTooltip(IPackageVersion version, bool isInProgress)
 
         protected override string GetText(IPackageVersion version, bool isInProgress)
         {
-            if (m_PageManager.GetSelection().Count > 1)
-                return isInProgress ? k_MultiSelectUpdatingButtonText : k_MultiSelectUpdateButtonText;
+            if (!m_ShowVersion || m_PageManager.GetSelection().Count > 1)
+                return isInProgress ? k_UpdatingToWithoutVersionButtonText : k_UpdateToWithoutVersionButtonText;
 
-            return string.Format(isInProgress ? k_UpdatingToButtonTextFormat : k_UpdateToButtonTextFormat, GetTargetVersion(version).version);
+            return string.Format(isInProgress ? k_UpdatingToButtonTextFormat : k_UpdateToButtonTextFormat,
+                version?.package?.versions.GetUpdateTarget(version).version);
         }
 
-        protected override bool IsInProgress(IPackageVersion version) => m_PackageDatabase.IsInstallInProgress(GetTargetVersion(version));
+        protected override bool IsInProgress(IPackageVersion v) => m_PackageDatabase.IsInstallInProgress(v.package.versions.GetUpdateTarget(v));
 
         protected override IEnumerable<ButtonDisableCondition> GetDisableConditions(IPackageVersion version)
         {
diff --git a/Modules/ParticleSystem/Managed/IJobParticleSystem.cs b/Modules/ParticleSystem/Managed/IJobParticleSystem.cs
index 202f1a0cfe..adc9a1ca8e 100644
--- a/Modules/ParticleSystem/Managed/IJobParticleSystem.cs
+++ b/Modules/ParticleSystem/Managed/IJobParticleSystem.cs
@@ -7,6 +7,7 @@
 using Unity.Collections.LowLevel.Unsafe;
 using Unity.Jobs;
 using Unity.Jobs.LowLevel.Unsafe;
+using System.Diagnostics;
 
 namespace UnityEngine.ParticleSystemJobs
 {
@@ -28,11 +29,81 @@ public interface IJobParticleSystemParallelForBatch
         void Execute(ParticleSystemJobData jobData, int startIndex, int count);
     }
 
+    public static class IJobParticleSystemExtensions
+    {
+        public static void EarlyJobInit<T>()
+            where T : struct, IJobParticleSystem
+        {
+            ParticleSystemJobStruct<T>.Initialize();
+        }
+
+        internal static IntPtr GetReflectionData<T>()
+            where T : struct, IJobParticleSystem
+        {
+            ParticleSystemJobStruct<T>.Initialize();
+            var reflectionData = ParticleSystemJobStruct<T>.jobReflectionData.Data;
+            ParticleSystemJobUtility.CheckReflectionDataCorrect(reflectionData);
+            return reflectionData;
+        }
+    }
+
+    public static class IJobParticleSystemParallelForExtensions
+    {
+        public static void EarlyJobInit<T>()
+            where T : struct, IJobParticleSystemParallelFor
+        {
+            ParticleSystemParallelForJobStruct<T>.Initialize();
+        }
+
+        internal static IntPtr GetReflectionData<T>()
+            where T : struct, IJobParticleSystemParallelFor
+        {
+            ParticleSystemParallelForJobStruct<T>.Initialize();
+            var reflectionData = ParticleSystemParallelForJobStruct<T>.jobReflectionData.Data;
+            ParticleSystemJobUtility.CheckReflectionDataCorrect(reflectionData);
+            return reflectionData;
+        }
+    }
+
+    public static class IJobParticleSystemParallelForBatchExtensions
+    {
+        public static void EarlyJobInit<T>()
+            where T : struct, IJobParticleSystemParallelForBatch
+        {
+            ParticleSystemParallelForBatchJobStruct<T>.Initialize();
+        }
+
+        internal static IntPtr GetReflectionData<T>()
+            where T : struct, IJobParticleSystemParallelForBatch
+        {
+            ParticleSystemParallelForBatchJobStruct<T>.Initialize();
+            var reflectionData = ParticleSystemParallelForBatchJobStruct<T>.jobReflectionData.Data;
+            ParticleSystemJobUtility.CheckReflectionDataCorrect(reflectionData);
+            return reflectionData;
+        }
+    }
+
+    static class ParticleSystemJobUtility
+    {
+        [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        internal static void CheckReflectionDataCorrect(IntPtr reflectionData)
+        {
+            if (reflectionData == IntPtr.Zero)
+                throw new InvalidOperationException("Support for burst compiled calls to Schedule depends on the Jobs package.\n\nFor generic job types, please include [assembly: RegisterGenericJobType(typeof(MyJob<MyJobSpecialization>))] in your source file.");
+        }
+
+        unsafe internal static JobsUtility.JobScheduleParameters CreateScheduleParams<T>(ref T jobData, ParticleSystem ps, JobHandle dependsOn, IntPtr jobReflectionData) where T : struct
+        {
+            dependsOn = JobHandle.CombineDependencies(ps.GetManagedJobHandle(), dependsOn);
+            return new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), jobReflectionData, dependsOn, ScheduleMode.Parallel);
+        }
+    }
+
     public static class IParticleSystemJobExtensions
     {
         unsafe public static JobHandle Schedule<T>(this T jobData, ParticleSystem ps, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParticleSystem
         {
-            var scheduleParams = CreateScheduleParams(ref jobData, ps, dependsOn, ParticleSystemJobStruct<T>.Initialize());
+            var scheduleParams = ParticleSystemJobUtility.CreateScheduleParams(ref jobData, ps, dependsOn, IJobParticleSystemExtensions.GetReflectionData<T>());
             var handle = ParticleSystem.ScheduleManagedJob(ref scheduleParams, ps.GetManagedJobData());
             ps.SetManagedJobHandle(handle);
             return handle;
@@ -40,7 +111,7 @@ public static class IParticleSystemJobExtensions
 
         unsafe public static JobHandle Schedule<T>(this T jobData, ParticleSystem ps, int minIndicesPerJobCount, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParticleSystemParallelFor
         {
-            var scheduleParams = CreateScheduleParams(ref jobData, ps, dependsOn, ParticleSystemParallelForJobStruct<T>.Initialize());
+            var scheduleParams = ParticleSystemJobUtility.CreateScheduleParams(ref jobData, ps, dependsOn, IJobParticleSystemParallelForExtensions.GetReflectionData<T>());
             var handle = JobsUtility.ScheduleParallelForDeferArraySize(ref scheduleParams, minIndicesPerJobCount, ps.GetManagedJobData(), null);
             ps.SetManagedJobHandle(handle);
             return handle;
@@ -48,17 +119,11 @@ public static class IParticleSystemJobExtensions
 
         unsafe public static JobHandle ScheduleBatch<T>(this T jobData, ParticleSystem ps, int innerLoopBatchCount, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParticleSystemParallelForBatch
         {
-            var scheduleParams = CreateScheduleParams(ref jobData, ps, dependsOn, ParticleSystemParallelForBatchJobStruct<T>.Initialize());
+            var scheduleParams = ParticleSystemJobUtility.CreateScheduleParams(ref jobData, ps, dependsOn, IJobParticleSystemParallelForBatchExtensions.GetReflectionData<T>());
             var handle = JobsUtility.ScheduleParallelForDeferArraySize(ref scheduleParams, innerLoopBatchCount, ps.GetManagedJobData(), null);
             ps.SetManagedJobHandle(handle);
             return handle;
         }
-
-        unsafe private static JobsUtility.JobScheduleParameters CreateScheduleParams<T>(ref T jobData, ParticleSystem ps, JobHandle dependsOn, IntPtr jobReflectionData) where T : struct
-        {
-            dependsOn = JobHandle.CombineDependencies(ps.GetManagedJobHandle(), dependsOn);
-            return new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), jobReflectionData, dependsOn, ScheduleMode.Parallel);
-        }
     }
 }
 
diff --git a/Modules/ParticleSystem/Managed/ParticleSystemJobStructs.cs b/Modules/ParticleSystem/Managed/ParticleSystemJobStructs.cs
index 911633ce61..052252625f 100644
--- a/Modules/ParticleSystem/Managed/ParticleSystemJobStructs.cs
+++ b/Modules/ParticleSystem/Managed/ParticleSystemJobStructs.cs
@@ -7,6 +7,8 @@
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using Unity.Jobs.LowLevel.Unsafe;
+using Unity.Burst;
+using static Unity.Collections.LowLevel.Unsafe.BurstLike;
 
 namespace UnityEngine.ParticleSystemJobs
 {
@@ -169,13 +171,13 @@ unsafe struct NativeListData
 
     internal struct ParticleSystemJobStruct<T> where T : struct, IJobParticleSystem
     {
-        public static IntPtr jobReflectionData;
+        public static readonly SharedStatic<IntPtr> jobReflectionData = SharedStatic<IntPtr>.GetOrCreate<ParticleSystemJobStruct<T>>();
 
-        public static IntPtr Initialize()
+        [BurstDiscard]
+        public static void Initialize()
         {
-            if (jobReflectionData == IntPtr.Zero)
-                jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
-            return jobReflectionData;
+            if (jobReflectionData.Data == IntPtr.Zero)
+                jobReflectionData.Data = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
         }
 
         public delegate void ExecuteJobFunction(ref T data, IntPtr listDataPtr, IntPtr unusedPtr, ref JobRanges ranges, int jobIndex);
@@ -195,13 +197,13 @@ public static unsafe void Execute(ref T data, IntPtr listDataPtr, IntPtr unusedP
 
     internal struct ParticleSystemParallelForJobStruct<T> where T : struct, IJobParticleSystemParallelFor
     {
-        public static IntPtr jobReflectionData;
+        public static readonly SharedStatic<IntPtr> jobReflectionData = SharedStatic<IntPtr>.GetOrCreate<ParticleSystemParallelForJobStruct<T>>();
 
-        public static IntPtr Initialize()
+        [BurstDiscard]
+        public static void Initialize()
         {
-            if (jobReflectionData == IntPtr.Zero)
-                jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
-            return jobReflectionData;
+            if (jobReflectionData.Data == IntPtr.Zero)
+                jobReflectionData.Data = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
         }
 
         public delegate void ExecuteJobFunction(ref T data, IntPtr listDataPtr, IntPtr bufferRangePatchData, ref JobRanges ranges, int jobIndex);
@@ -233,13 +235,13 @@ public static unsafe void Execute(ref T data, IntPtr listDataPtr, IntPtr bufferR
 
     internal struct ParticleSystemParallelForBatchJobStruct<T> where T : struct, IJobParticleSystemParallelForBatch
     {
-        public static IntPtr jobReflectionData;
+        public static readonly SharedStatic<IntPtr> jobReflectionData = SharedStatic<IntPtr>.GetOrCreate<ParticleSystemParallelForBatchJobStruct<T>>();
 
-        public static IntPtr Initialize()
+        [BurstDiscard]
+        public static void Initialize()
         {
-            if (jobReflectionData == IntPtr.Zero)
-                jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
-            return jobReflectionData;
+            if (jobReflectionData.Data == IntPtr.Zero)
+                jobReflectionData.Data = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
         }
 
         public delegate void ExecuteJobFunction(ref T data, IntPtr listDataPtr, IntPtr bufferRangePatchData, ref JobRanges ranges, int jobIndex);
diff --git a/Modules/ParticleSystem/Managed/ParticleSystemStructs.cs b/Modules/ParticleSystem/Managed/ParticleSystemStructs.cs
index 38943bc24c..a103425ec5 100644
--- a/Modules/ParticleSystem/Managed/ParticleSystemStructs.cs
+++ b/Modules/ParticleSystem/Managed/ParticleSystemStructs.cs
@@ -402,6 +402,39 @@ public struct Trails
             internal List<float> textureOffsets;
             internal int maxTrailCount;
             internal int maxPositionsPerTrailCount;
+
+            internal void Allocate()
+            {
+                if (positions == null)
+                    positions = new List<Vector4>();
+                if (frontPositions == null)
+                    frontPositions = new List<int>();
+                if (backPositions == null)
+                    backPositions = new List<int>();
+                if (positionCounts == null)
+                    positionCounts = new List<int>();
+                if (textureOffsets == null)
+                    textureOffsets = new List<float>();
+            }
+
+            public int capacity
+            {
+                set
+                {
+                    Allocate();
+                    positions.Capacity = value;
+                    frontPositions.Capacity = value;
+                    backPositions.Capacity = value;
+                    positionCounts.Capacity = value;
+                    textureOffsets.Capacity = value;
+                }
+                get
+                {
+                    if (positions == null)
+                        return 0;
+                    return positions.Capacity;
+                }
+            }
         }
 
         public struct ColliderData
diff --git a/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs b/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs
index 869ce51995..dd65b8b1e1 100644
--- a/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs
+++ b/Modules/ParticleSystem/ScriptBindings/ParticleSystem.bindings.cs
@@ -105,7 +105,7 @@ extern public bool proceduralSimulationSupported
 
         [FreeFunction(Name = "ParticleSystemScriptBindings::SetParticlesWithNativeArray", HasExplicitThis = true, ThrowsException = true)]
         extern private void SetParticlesWithNativeArray(IntPtr particles, int particlesLength, int size, int offset);
-        public void SetParticles([Out] NativeArray<Particle> particles, int size, int offset) { unsafe { SetParticlesWithNativeArray((IntPtr)particles.GetUnsafeReadOnlyPtr(), particles.Length, size, 0); } }
+        public void SetParticles([Out] NativeArray<Particle> particles, int size, int offset) { unsafe { SetParticlesWithNativeArray((IntPtr)particles.GetUnsafeReadOnlyPtr(), particles.Length, size, offset); } }
         public void SetParticles([Out] NativeArray<Particle> particles, int size) { SetParticles(particles, size, 0); }
         public void SetParticles([Out] NativeArray<Particle> particles) { SetParticles(particles, -1); }
 
@@ -116,7 +116,7 @@ extern public bool proceduralSimulationSupported
 
         [FreeFunction(Name = "ParticleSystemScriptBindings::GetParticlesWithNativeArray", HasExplicitThis = true, ThrowsException = true)]
         extern private int GetParticlesWithNativeArray(IntPtr particles, int particlesLength, int size, int offset);
-        public int GetParticles([Out] NativeArray<Particle> particles, int size, int offset) { unsafe { return GetParticlesWithNativeArray((IntPtr)particles.GetUnsafePtr(), particles.Length, size, 0); } }
+        public int GetParticles([Out] NativeArray<Particle> particles, int size, int offset) { unsafe { return GetParticlesWithNativeArray((IntPtr)particles.GetUnsafePtr(), particles.Length, size, offset); } }
         public int GetParticles([Out] NativeArray<Particle> particles, int size) { return GetParticles(particles, size, 0); }
         public int GetParticles([Out] NativeArray<Particle> particles) { return GetParticles(particles, -1); }
 
@@ -135,11 +135,19 @@ extern public bool proceduralSimulationSupported
         extern private void GetTrailDataInternal(ref Trails trailData);
         public Trails GetTrails()
         {
-            var result = new Trails() { positions = new List<Vector4>(), frontPositions = new List<int>(), backPositions = new List<int>(), positionCounts = new List<int>(), textureOffsets = new List<float>() };
+            var result = new Trails();
+            result.Allocate();
             GetTrailDataInternal(ref result);
             return result;
         }
 
+        public int GetTrails(ref Trails trailData)
+        {
+            trailData.Allocate();
+            GetTrailDataInternal(ref trailData);
+            return trailData.positions.Count;
+        }
+
         [FreeFunction(Name = "ParticleSystemScriptBindings::SetTrailData", HasExplicitThis = true)]
         extern public void SetTrails(Trails trailData);
 
diff --git a/Modules/ParticleSystemEditor/ParticleEffectUI.cs b/Modules/ParticleSystemEditor/ParticleEffectUI.cs
index 40af427b8e..4badcfcead 100644
--- a/Modules/ParticleSystemEditor/ParticleEffectUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleEffectUI.cs
@@ -9,7 +9,6 @@
 using UnityEditor.ShortcutManagement;
 using UnityEngine;
 using UnityEngine.Rendering;
-using UnityEngine.SceneManagement;
 
 // The ParticleEffectUI displays one or more ParticleSystemUIs.
 
@@ -371,7 +370,7 @@ public bool InitializeIfNeeded(IEnumerable<ParticleSystem> systems)
             return initializeRequired;
         }
 
-        internal void UndoRedoPerformed()
+        internal void UndoRedoPerformed(in UndoRedoInfo info)
         {
             Refresh();
             foreach (ParticleSystemUI e in m_Emitters)
@@ -383,7 +382,7 @@ internal void UndoRedoPerformed()
                         moduleUI.CheckVisibilityState();
 
                         if (moduleUI.foldout)
-                            moduleUI.UndoRedoPerformed();
+                            moduleUI.UndoRedoPerformed(info);
                     }
                 }
             }
@@ -645,7 +644,7 @@ internal void PlayBackInfoGUI(bool isPlayMode)
             else
                 EditorGUILayout.LabelField(s_Texts.particleSpeeds, GUIContent.Temp("0.0 - 0.0"));
 
-            if (!EditorApplication.isPlaying)
+            if (!isPlayMode)
             {
                 ParticleSystemEditorUtils.previewLayers = EditorGUILayout.LayerMaskField(ParticleSystemEditorUtils.previewLayers, s_Texts.previewLayers);
                 ParticleSystemEditorUtils.resimulation = GUILayout.Toggle(ParticleSystemEditorUtils.resimulation, s_Texts.resimulation, EditorStyles.toggle);
diff --git a/Modules/ParticleSystemEditor/ParticleSystemCurveEditor.cs b/Modules/ParticleSystemEditor/ParticleSystemCurveEditor.cs
index ccf665df2b..0e47830237 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemCurveEditor.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemCurveEditor.cs
@@ -80,7 +80,7 @@ public bool IsRegion()
     public void OnDisable()
     {
         m_CurveEditor.OnDisable();
-        Undo.undoRedoPerformed -= UndoRedoPerformed;
+        Undo.undoRedoEvent -= UndoRedoPerformed;
     }
 
     public void OnDestroy()
@@ -150,10 +150,10 @@ public void Init()
         m_CurveEditor.SetShownVRangeInsideMargins(m_CurveEditorSettings.vRangeMin, m_CurveEditorSettings.hRangeMax);
         m_CurveEditor.ignoreScrollWheelUntilClicked = false;
 
-        Undo.undoRedoPerformed += UndoRedoPerformed;
+        Undo.undoRedoEvent += UndoRedoPerformed;
     }
 
-    void UndoRedoPerformed()
+    void UndoRedoPerformed(in UndoRedoInfo info)
     {
         ContentChanged();
     }
diff --git a/Modules/ParticleSystemEditor/ParticleSystemEditor.cs b/Modules/ParticleSystemEditor/ParticleSystemEditor.cs
index 56cff4beaa..192509f54f 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemEditor.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemEditor.cs
@@ -29,7 +29,6 @@ public class ShortcutContext : IShortcutToolContext
 
         ShortcutContext m_ShortcutContext = new ShortcutContext { active = true };
 
-
         public static GUIContent playBackTitle
         {
             get
@@ -64,7 +63,7 @@ public void OnEnable()
             EditorApplication.hierarchyChanged += HierarchyOrProjectWindowWasChanged;
             EditorApplication.projectChanged += HierarchyOrProjectWindowWasChanged;
             SceneView.duringSceneGui += OnSceneViewGUI;
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
 
             ShortcutIntegration.instance.contextManager.RegisterToolContext(m_ShortcutContext);
         }
@@ -74,7 +73,7 @@ public void OnDisable()
             SceneView.duringSceneGui -= OnSceneViewGUI;
             EditorApplication.projectChanged -= HierarchyOrProjectWindowWasChanged;
             EditorApplication.hierarchyChanged -= HierarchyOrProjectWindowWasChanged;
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
 
             if (m_ParticleEffectUI != null)
             {
@@ -99,11 +98,11 @@ internal bool HandleShortcutEvent(Event evt)
             return false;
         }
 
-        void UndoRedoPerformed()
+        void UndoRedoPerformed(in UndoRedoInfo info)
         {
             Init(true);
             if (m_ParticleEffectUI != null)
-                m_ParticleEffectUI.UndoRedoPerformed();
+                m_ParticleEffectUI.UndoRedoPerformed(info);
         }
 
         private void Init(bool forceInit)
diff --git a/Modules/ParticleSystemEditor/ParticleSystemModules/CollisionModuleUI.cs b/Modules/ParticleSystemEditor/ParticleSystemModules/CollisionModuleUI.cs
index 61dacd0525..f31e033aec 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemModules/CollisionModuleUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemModules/CollisionModuleUI.cs
@@ -5,6 +5,7 @@
 using UnityEngine;
 using System.Collections.Generic;
 using UnityEditorInternal;
+using UnityEditor.EditorTools;
 
 namespace UnityEditor
 {
@@ -36,19 +37,11 @@ enum PlaneVizType { Grid, Solid }
 
         ReorderableList m_PlanesList;
 
-        List<Transform> m_ScenePlanes = new List<Transform>();
         static PlaneVizType m_PlaneVisualizationType = PlaneVizType.Solid;
         static float m_ScaleGrid = 1.0f;
         static bool s_VisualizeBounds = false;
-        static Transform s_SelectedTransform; // static so to ensure only one selected Transform across multiple particle systems
         internal static PrefColor s_CollisionBoundsColor = new PrefColor("Particle System/Collision Bounds", 0.0f, 1.0f, 0.0f, 1.0f);
 
-        static EditMode.SceneViewEditMode[] s_SceneViewEditModes = new[]
-        {
-            EditMode.SceneViewEditMode.ParticleSystemCollisionModulePlanesMove,
-            EditMode.SceneViewEditMode.ParticleSystemCollisionModulePlanesRotate
-        };
-
         static readonly string s_UndoCollisionPlaneString = L10n.Tr("Modified Collision Plane Transform");
 
         class Texts
@@ -76,6 +69,7 @@ class Texts
             public GUIContent multiplyColliderForceByCollisionAngle = EditorGUIUtility.TrTextContent("Multiply by Collision Angle", "Should the force be proportional to the angle of the particle collision?  A particle collision directly along the collision normal produces all the specified force whilst collisions away from the collision normal produce less force.");
             public GUIContent multiplyColliderForceByParticleSpeed = EditorGUIUtility.TrTextContent("Multiply by Particle Speed", "Should the force be proportional to the particle speed?");
             public GUIContent multiplyColliderForceByParticleSize = EditorGUIUtility.TrTextContent("Multiply by Particle Size", "Should the force be proportional to the particle size?");
+            public GUIContent sceneTools = EditorGUIUtility.TrTextContent("Scene Tools");
 
             public GUIContent[] collisionTypes = new GUIContent[]
             {
@@ -101,14 +95,158 @@ class Texts
                 EditorGUIUtility.TrTextContent("Grid"),
                 EditorGUIUtility.TrTextContent("Solid")
             };
+        }
+        private static Texts s_Texts;
 
-            public GUIContent[] toolContents =
+        [EditorTool("Transform Collider", typeof(ParticleSystem))]
+        class CollisionModuleTransformTool : EditorTool
+        {
+            private HashSet<Transform> m_ScenePlanes = new HashSet<Transform>();
+            private static Transform s_SelectedTransform;    // static to ensure there is only one selected Transform across multiple particle systems
+
+            public override GUIContent toolbarIcon
             {
-                EditorGUIUtility.TrIconContent("MoveTool", "Move plane editing mode."),
-                EditorGUIUtility.TrIconContent("RotateTool", "Rotate plane editing mode.")
-            };
+                get { return EditorGUIUtility.TrIconContent("TransformTool", "Collision module plane editing mode."); }
+            }
+
+            public override bool IsAvailable()
+            {
+                foreach (var t in targets)
+                {
+                    var ps = t as ParticleSystem;
+                    if (ps == null)
+                        continue;
+
+                    var collision = ps.collision;
+                    if (collision.enabled && collision.type == ParticleSystemCollisionType.Planes)
+                        return true;
+                }
+
+                return false;
+            }
+
+            public override void OnToolGUI(EditorWindow window)
+            {
+                var firstTransform = SyncScenePlanes();
+
+                if (m_ScenePlanes.Count == 0)
+                    return;
+
+                // Clear invalid selection (ie when selecting other system)
+                if (s_SelectedTransform != null)
+                {
+                    if (!m_ScenePlanes.Contains(s_SelectedTransform))
+                        s_SelectedTransform = null;
+                }
+
+                // Always try to select first collider if no selection exists
+                if (s_SelectedTransform == null)
+                    s_SelectedTransform = firstTransform;
+
+                Event evt = Event.current;
+
+                Color origCol = Handles.color;
+                Color col = new Color(1, 1, 1, 0.5F);
+                bool isPlaying = EditorApplication.isPlaying;
+
+                foreach (var transform in m_ScenePlanes)
+                {
+                    Vector3 position = transform.position;
+                    Quaternion rotation = transform.rotation;
+                    Vector3 right = rotation * Vector3.right;
+                    Vector3 up = rotation * Vector3.up;
+                    Vector3 forward = rotation * Vector3.forward;
+                    bool isPlayingAndStatic = isPlaying && transform.gameObject.isStatic;
+
+                    if (ReferenceEquals(s_SelectedTransform, transform))
+                    {
+                        EditorGUI.BeginChangeCheck();
+                        var newPosition = transform.position;
+                        var newRotation = transform.rotation;
+
+                        using (new EditorGUI.DisabledScope(isPlayingAndStatic))
+                        {
+                            if (isPlayingAndStatic)
+                                Handles.ShowSceneViewLabel(position, Handles.s_StaticLabel);
+                            Handles.TransformHandle(ref newPosition, ref newRotation);
+                        }
+                        if (EditorGUI.EndChangeCheck())
+                        {
+                            Undo.RecordObject(transform, s_UndoCollisionPlaneString);
+                            transform.position = newPosition;
+                            transform.rotation = newRotation;
+                            ParticleSystemEditorUtils.PerformCompleteResimulation();
+                        }
+                    }
+                    else
+                    {
+                        float handleSize = HandleUtility.GetHandleSize(position) * 0.6f;
+
+                        EventType oldEventType = evt.type;
+
+                        // we want ignored mouse up events to check for dragging off of scene view
+                        if (evt.type == EventType.Ignore && evt.rawType == EventType.MouseUp)
+                            oldEventType = evt.rawType;
+
+                        Handles.FreeMoveHandle(position, handleSize, Vector3.zero, Handles.RectangleHandleCap);
+
+                        // Detect selected plane (similar to TreeEditor)
+                        if (oldEventType == EventType.MouseDown && evt.type == EventType.Used)
+                        {
+                            s_SelectedTransform = transform;
+                            oldEventType = EventType.Used;
+                            GUIUtility.hotControl = 0; // Reset hot control or the FreeMoveHandle will prevent input to the new Handles. (case 873514)
+                        }
+                    }
+
+                    Handles.color = col;
+                    Color color = Handles.s_ColliderHandleColor * 0.9f;
+                    if (isPlayingAndStatic)
+                        color.a *= 0.2f;
+
+                    if (m_PlaneVisualizationType == PlaneVizType.Grid)
+                    {
+                        DrawGrid(position, right, forward, up, color);
+                    }
+                    else
+                    {
+                        DrawSolidPlane(position, rotation, color, Color.yellow);
+                    }
+                }
+
+                Handles.color = origCol;
+            }
+
+            private Transform SyncScenePlanes()
+            {
+                m_ScenePlanes.Clear();
+
+                Transform firstTransform = null;
+
+                foreach (var t in targets)
+                {
+                    var ps = t as ParticleSystem;
+                    if (ps == null)
+                        continue;
+
+                    if (ps.collision.type != ParticleSystemCollisionType.Planes)
+                        continue;
+
+                    for (int planeIndex = 0; planeIndex < ps.collision.planeCount; planeIndex++)
+                    {
+                        var transform = ps.collision.GetPlane(planeIndex);
+                        if (transform != null)
+                        {
+                            m_ScenePlanes.Add(transform);
+                            if (firstTransform == null)
+                                firstTransform = transform;
+                        }
+                    }
+                }
+
+                return firstTransform;
+            }
         }
-        private static Texts s_Texts;
 
         public CollisionModuleUI(ParticleSystemUI owner, SerializedObject o, string displayName)
             : base(owner, o, "CollisionModule", displayName)
@@ -120,15 +258,7 @@ private bool editingPlanes
         {
             get
             {
-                return ((EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemCollisionModulePlanesMove ||
-                    EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemCollisionModulePlanesRotate) &&
-                    EditMode.IsOwner(m_ParticleSystemUI.m_ParticleEffectUI.m_Owner.customEditor));
-            }
-            set
-            {
-                if (!value && editingPlanes)
-                    EditMode.QuitEditMode();
-                SceneView.RepaintAll();
+                return EditorToolManager.activeTool is CollisionModuleTransformTool;
             }
         }
 
@@ -182,30 +312,6 @@ protected override void Init()
             m_PlanesList.drawElementCallback = DrawPlaneElementCallback;
             m_PlanesList.elementHeight = kReorderableListElementHeight;
             m_PlanesList.onAddCallback = OnAddPlaneElementCallback;
-
-            SyncVisualization();
-        }
-
-        public override void UndoRedoPerformed()
-        {
-            base.UndoRedoPerformed();
-            SyncVisualization();
-        }
-
-        protected override void SetVisibilityState(VisibilityState newState)
-        {
-            base.SetVisibilityState(newState);
-
-            // Show tools again when module is not visible
-            if (newState != VisibilityState.VisibleAndFoldedOut)
-            {
-                s_SelectedTransform = null;
-                editingPlanes = false;
-            }
-            else
-            {
-                SyncVisualization();
-            }
         }
 
         override public void OnInspectorGUI(InitialModuleUI initial)
@@ -213,34 +319,12 @@ override public void OnInspectorGUI(InitialModuleUI initial)
             EditorGUI.BeginChangeCheck();
             CollisionTypes type = (CollisionTypes)GUIPopup(s_Texts.collisionType, m_Type, s_Texts.collisionTypes);
             if (EditorGUI.EndChangeCheck())
-                SyncVisualization();
+                ToolManager.RefreshAvailableTools();
 
             if (type == CollisionTypes.Plane)
-            {
                 DoListOfPlanesGUI();
-
-                EditorGUI.BeginChangeCheck();
-                m_PlaneVisualizationType = (PlaneVizType)GUIPopup(s_Texts.visualization, (int)m_PlaneVisualizationType, s_Texts.planeVizTypes);
-                if (EditorGUI.EndChangeCheck())
-                {
-                    EditorPrefs.SetInt("PlaneColisionVizType", (int)m_PlaneVisualizationType);
-                }
-
-                EditorGUI.BeginChangeCheck();
-                m_ScaleGrid = GUIFloat(s_Texts.scalePlane, m_ScaleGrid, "f2");
-                if (EditorGUI.EndChangeCheck())
-                {
-                    m_ScaleGrid = Mathf.Max(0f, m_ScaleGrid);
-                    EditorPrefs.SetFloat("ScalePlaneColision", m_ScaleGrid);
-                }
-
-                if (EditorGUIUtility.comparisonViewMode == EditorGUIUtility.ComparisonViewMode.None)
-                    GUIButtonGroup(s_SceneViewEditModes, s_Texts.toolContents, m_ParticleSystemUI.GetBounds, m_ParticleSystemUI.m_ParticleEffectUI.m_Owner.customEditor);
-            }
             else
-            {
                 GUIPopup(s_Texts.collisionMode, m_CollisionMode, s_Texts.collisionModes);
-            }
 
             GUIMinMaxCurve(s_Texts.dampen, m_Dampen);
             GUIMinMaxCurve(s_Texts.bounce, m_Bounce);
@@ -275,46 +359,46 @@ override public void OnInspectorGUI(InitialModuleUI initial)
 
             if (EditorGUIUtility.comparisonViewMode == EditorGUIUtility.ComparisonViewMode.None)
             {
-                EditorGUI.BeginChangeCheck();
-                s_VisualizeBounds = GUIToggle(s_Texts.visualizeBounds, s_VisualizeBounds);
-                if (EditorGUI.EndChangeCheck())
-                    EditorPrefs.SetBool("VisualizeBounds", s_VisualizeBounds);
-            }
-        }
+                EditorGUILayout.BeginVertical("GroupBox");
 
-        protected override void OnModuleEnable()
-        {
-            base.OnModuleEnable();
-            SyncVisualization();
-        }
+                if (type == CollisionTypes.Plane)
+                {
+                    var editorTools = new List<EditorTool>(2);
+                    EditorToolManager.GetComponentTools(x => x.GetEditor<EditorTool>() is CollisionModuleTransformTool, editorTools, true);
 
-        protected override void OnModuleDisable()
-        {
-            base.OnModuleDisable();
-            editingPlanes = false;
-        }
+                    GUILayout.BeginHorizontal();
+                    EditorGUILayout.PrefixLabel(s_Texts.sceneTools, ParticleSystemStyles.Get().label, ParticleSystemStyles.Get().label);
+                    EditorGUILayout.EditorToolbar(editorTools);
+                    GUILayout.EndHorizontal();
 
-        private void SyncVisualization()
-        {
-            m_ScenePlanes.Clear();
+                    EditorGUILayout.Space();
 
-            if (m_Type.hasMultipleDifferentValues || (CollisionTypes)m_Type.intValue != CollisionTypes.Plane)
-            {
-                editingPlanes = false;
-                return;
-            }
-
-            foreach (ParticleSystem ps in m_ParticleSystemUI.m_ParticleSystems)
-            {
-                if (ps.collision.type != ParticleSystemCollisionType.Planes)
-                    continue;
+                    EditorGUI.BeginChangeCheck();
+                    m_PlaneVisualizationType = (PlaneVizType)GUIPopup(s_Texts.visualization, (int)m_PlaneVisualizationType, s_Texts.planeVizTypes);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        EditorPrefs.SetInt("PlaneColisionVizType", (int)m_PlaneVisualizationType);
+                    }
 
-                for (int planeIndex = 0; planeIndex < ps.collision.planeCount; planeIndex++)
+                    EditorGUI.BeginChangeCheck();
+                    m_ScaleGrid = GUIFloat(s_Texts.scalePlane, m_ScaleGrid, "f2");
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        m_ScaleGrid = Mathf.Max(0f, m_ScaleGrid);
+                        EditorPrefs.SetFloat("ScalePlaneColision", m_ScaleGrid);
+                    }
+                }
+                else
                 {
-                    var transform = ps.collision.GetPlane(planeIndex);
-                    if (transform != null && !m_ScenePlanes.Contains(transform))
-                        m_ScenePlanes.Add(transform);
+                    GUILayout.Label(s_Texts.sceneTools, ParticleSystemStyles.Get().label);
                 }
+
+                EditorGUI.BeginChangeCheck();
+                s_VisualizeBounds = GUIToggle(s_Texts.visualizeBounds, s_VisualizeBounds);
+                if (EditorGUI.EndChangeCheck())
+                    EditorPrefs.SetBool("VisualizeBounds", s_VisualizeBounds);
+
+                EditorGUILayout.EndVertical();
             }
         }
 
@@ -340,12 +424,7 @@ private void DoListOfPlanesGUI()
                 return;
             }
 
-            EditorGUI.BeginChangeCheck();
-
             m_PlanesList.DoLayoutList();
-
-            if (EditorGUI.EndChangeCheck())
-                SyncVisualization();
         }
 
         void OnAddPlaneElementCallback(ReorderableList list)
@@ -380,94 +459,6 @@ void DrawPlaneElementCallback(Rect rect, int index, bool isActive, bool isFocuse
         override public void OnSceneViewGUI()
         {
             RenderCollisionBounds();
-            CollisionPlanesSceneGUI();
-        }
-
-        private void CollisionPlanesSceneGUI()
-        {
-            if (m_ScenePlanes.Count == 0)
-                return;
-
-            Event evt = Event.current;
-
-            Color origCol = Handles.color;
-            Color col = new Color(1, 1, 1, 0.5F);
-
-            for (int i = 0; i < m_ScenePlanes.Count; ++i)
-            {
-                if (m_ScenePlanes[i] == null)
-                    continue;
-
-                Transform transform = m_ScenePlanes[i];
-                Vector3 position = transform.position;
-                Quaternion rotation = transform.rotation;
-                Vector3 right = rotation * Vector3.right;
-                Vector3 up = rotation * Vector3.up;
-                Vector3 forward = rotation * Vector3.forward;
-                bool isPlayingAndStatic = EditorApplication.isPlaying && transform.gameObject.isStatic;
-                if (editingPlanes)
-                {
-                    if (Object.ReferenceEquals(s_SelectedTransform, transform))
-                    {
-                        EditorGUI.BeginChangeCheck();
-                        var newPosition = transform.position;
-                        var newRotation = transform.rotation;
-
-                        using (new EditorGUI.DisabledScope(isPlayingAndStatic))
-                        {
-                            if (isPlayingAndStatic)
-                                Handles.ShowSceneViewLabel(position, Handles.s_StaticLabel);
-                            if (EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemCollisionModulePlanesMove)
-                                newPosition = Handles.PositionHandle(position, rotation);
-                            else if (EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemCollisionModulePlanesRotate)
-                                newRotation = Handles.RotationHandle(rotation, position);
-                        }
-                        if (EditorGUI.EndChangeCheck())
-                        {
-                            Undo.RecordObject(transform, s_UndoCollisionPlaneString);
-                            transform.position = newPosition;
-                            transform.rotation = newRotation;
-                            ParticleSystemEditorUtils.PerformCompleteResimulation();
-                        }
-                    }
-                    else
-                    {
-                        float handleSize = HandleUtility.GetHandleSize(position) * 0.6f;
-
-                        EventType oldEventType = evt.type;
-
-                        // we want ignored mouse up events to check for dragging off of scene view
-                        if (evt.type == EventType.Ignore && evt.rawType == EventType.MouseUp)
-                            oldEventType = evt.rawType;
-
-                        Handles.FreeMoveHandle(position, handleSize, Vector3.zero, Handles.RectangleHandleCap);
-
-                        // Detect selected plane (similar to TreeEditor)
-                        if (oldEventType == EventType.MouseDown && evt.type == EventType.Used)
-                        {
-                            s_SelectedTransform = transform;
-                            oldEventType = EventType.Used;
-                            GUIUtility.hotControl = 0; // Reset hot control or the FreeMoveHandle will prevent input to the new Handles. (case 873514)
-                        }
-                    }
-                }
-
-                Handles.color = col;
-                Color color = Handles.s_ColliderHandleColor * 0.9f;
-                if (isPlayingAndStatic)
-                    color.a *= 0.2f;
-
-                if (m_PlaneVisualizationType == PlaneVizType.Grid)
-                {
-                    DrawGrid(position, right, forward, up, color);
-                }
-                else
-                {
-                    DrawSolidPlane(position, rotation, color, Color.yellow);
-                }
-            }
-
-            Handles.color = origCol;
         }
 
         void RenderCollisionBounds()
diff --git a/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUI.cs b/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUI.cs
index a07c6505fc..f0ff859809 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUI.cs
@@ -4,7 +4,7 @@
 
 using UnityEngine;
 using System.Collections.Generic;
-
+using UnityEditor.EditorTools;
 
 namespace UnityEditor
 {
@@ -119,11 +119,11 @@ public virtual void UpdateCullingSupportedString(ref string text) {}
 
         protected virtual void OnModuleEnable()
         {
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
             Init(); // ensure initialized
         }
 
-        public virtual void UndoRedoPerformed()
+        public virtual void UndoRedoPerformed(in UndoRedoInfo info)
         {
             // If the undo operation has changed the module to now be disabled then we should remove any of its curves from the curve editor. (case 861424)
             if (!enabled)
@@ -132,7 +132,7 @@ public virtual void UndoRedoPerformed()
 
         protected virtual void OnModuleDisable()
         {
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
             ParticleSystemCurveEditor psce = m_ParticleSystemUI.m_ParticleEffectUI.GetParticleSystemCurveEditor();
             foreach (SerializedProperty curveProp in m_ModuleCurves)
             {
@@ -211,10 +211,15 @@ public virtual bool DrawHeader(Rect rect, GUIContent label)
             bool wasEnabled = GUI.enabled;
             GUI.enabled = true;
 
+            EditorGUI.BeginChangeCheck();
+
             label = EditorGUI.BeginProperty(rect, label, m_Enabled);
             var toggleState = GUI.Toggle(rect, foldout, label, ParticleSystemStyles.Get().moduleHeaderStyle);
             EditorGUI.EndProperty();
 
+            if (EditorGUI.EndChangeCheck())
+                ToolManager.RefreshAvailableTools();
+
             GUI.enabled = wasEnabled;
             return toggleState;
         }
diff --git a/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUIHelpers.cs b/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUIHelpers.cs
index 1ee2d639a6..e61c6d6e08 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUIHelpers.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemModules/ModuleUIHelpers.cs
@@ -497,7 +497,7 @@ public static void GUIIntDraggableX2(GUIContent mainLabel, GUIContent label1, Se
 
         public static int IntDraggable(Rect rect, GUIContent label, SerializedProperty intProp, float dragWidth)
         {
-            EditorGUI.BeginProperty(rect, GUIContent.none, intProp);
+            label = EditorGUI.BeginProperty(rect, label, intProp);
 
             EditorGUI.BeginChangeCheck();
             int newValue = IntDraggable(rect, label, intProp.intValue, dragWidth);
@@ -513,7 +513,7 @@ public static int GUIInt(GUIContent guiContent, SerializedProperty intProp, para
         {
             Rect rect = GUILayoutUtility.GetRect(0, kSingleLineHeight, layoutOptions);
 
-            EditorGUI.BeginProperty(rect, GUIContent.none, intProp);
+            guiContent = EditorGUI.BeginProperty(rect, guiContent, intProp);
             PrefixLabel(rect, guiContent);
 
             EditorGUI.BeginChangeCheck();
diff --git a/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs b/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs
index b669c429f5..c42de2ffaa 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemModules/RendererModuleUI.cs
@@ -108,7 +108,8 @@ class Texts
 
             public GUIContent sortingLayer = EditorGUIUtility.TrTextContent("Sorting Layer", "Name of the Renderer's sorting layer.");
             public GUIContent sortingOrder = EditorGUIUtility.TrTextContent("Order in Layer", "Renderer's order within a sorting layer");
-            public GUIContent space = EditorGUIUtility.TrTextContent("Render Alignment", "Specifies if the particles will face the camera, align to world axes, or stay local to the system's transform.");
+            public GUIContent space = EditorGUIUtility.TrTextContent("Render Alignment", "Specifies if the particles face the camera, align to world axes, or stay local to the system's transform.");
+            public GUIContent alignedToDirectionSpace = EditorGUIUtility.TrTextContent("Render Alignment", "Specifies if the particles face the camera, align to world axes, or stay local to the system's transform. When using Align to Direction in the Shape module, Particle Systems only support Local and World Render Alignments.");
             public GUIContent pivot = EditorGUIUtility.TrTextContent("Pivot", "Applies an offset to the pivot of particles, as a multiplier of its size.");
             public GUIContent flip = EditorGUIUtility.TrTextContent("Flip", "Cause some particles to be flipped horizontally and/or vertically. (Set between 0 and 1, where a higher value causes more to flip)");
             public GUIContent flipMeshes = EditorGUIUtility.TrTextContent("Flip", "Cause some mesh particles to be flipped along each of their axes. Use a shader with CullMode=None, to avoid inside-out geometry. (Set between 0 and 1, where a higher value causes more to flip)");
@@ -148,6 +149,12 @@ class Texts
                 EditorGUIUtility.TrTextContent("Velocity")
             };
 
+            public GUIContent[] alignedToDirectionSpaces = new GUIContent[]
+            {
+                EditorGUIUtility.TrTextContent("World"),
+                EditorGUIUtility.TrTextContent("Local")
+            };
+
             public GUIContent[] localSpace = new GUIContent[]
             {
                 EditorGUIUtility.TrTextContent("Local")
@@ -358,13 +365,11 @@ override public void OnInspectorGUI(InitialModuleUI initial)
                         bool anyAlignToDirection = m_ParticleSystemUI.m_ParticleSystems.FirstOrDefault(o => o.shape.enabled && o.shape.alignToDirection) != null;
                         if (anyAlignToDirection)
                         {
-                            using (new EditorGUI.DisabledScope(true))
-                            {
-                                GUIPopup(s_Texts.space, 0, s_Texts.localSpace); // force to "Local"
-                            }
-
-                            GUIContent info = EditorGUIUtility.TrTextContent("Using Align to Direction in the Shape Module forces the system to be rendered using Local Render Alignment.");
-                            EditorGUILayout.HelpBox(info.text, MessageType.Info, true);
+                            EditorGUI.BeginChangeCheck();
+                            int selectedIndex = (m_RenderAlignment.hasMultipleDifferentValues || m_RenderAlignment.intValue == (int)ParticleSystemRenderSpace.World) ? 0 : 1;
+                            selectedIndex = GUIPopup(s_Texts.alignedToDirectionSpace, selectedIndex, s_Texts.alignedToDirectionSpaces);
+                            if (EditorGUI.EndChangeCheck())
+                                m_RenderAlignment.intValue = (selectedIndex == 0) ? (int)ParticleSystemRenderSpace.World : (int)ParticleSystemRenderSpace.Local;
                         }
                         else
                         {
@@ -586,11 +591,11 @@ private void DoVertexStreamsGUI(RenderMode renderMode)
                     int numMeshes = renderer.GetMeshes(meshes);
                     for (int i = 0; i < numMeshes; i++)
                     {
-                        if (meshes[i].HasVertexAttribute(VertexAttribute.TexCoord2))
+                        if (meshes[i].HasVertexAttribute(VertexAttribute.TexCoord4))
                         {
                             if (errors != "")
                                 errors += "\n\n";
-                            errors += "Meshes may only use a maximum of 2 input UV streams.";
+                            errors += "Meshes may only use a maximum of 4 input UV streams.";
                         }
                     }
                 }
diff --git a/Modules/ParticleSystemEditor/ParticleSystemModules/ShapeModuleUI.cs b/Modules/ParticleSystemEditor/ParticleSystemModules/ShapeModuleUI.cs
index fb7f0c490d..3ae14498a4 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemModules/ShapeModuleUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemModules/ShapeModuleUI.cs
@@ -3,6 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
+using UnityEditor.EditorTools;
 using UnityEditor.IMGUI.Controls;
 using UnityEditorInternal;
 using UnityEngine;
@@ -108,13 +110,13 @@ public void OnInspectorGUI(MultiModeTexts text, GUIContent[] modesText, bool sho
         private static Mesh s_SphereMesh;
         private static Mesh s_HemisphereMesh;
         private static readonly Matrix4x4 s_ArcHandleOffsetMatrix = Matrix4x4.TRS(Vector3.zero, Quaternion.AngleAxis(90f, Vector3.right) * Quaternion.AngleAxis(90f, Vector3.up), Vector3.one);
-        private ArcHandle m_ArcHandle = new ArcHandle();
-        private BoxBoundsHandle m_BoxBoundsHandle = new BoxBoundsHandle();
-        private SphereBoundsHandle m_SphereBoundsHandle = new SphereBoundsHandle();
+        private static ArcHandle s_ArcHandle = new ArcHandle();
+        private static BoxBoundsHandle s_BoxBoundsHandle = new BoxBoundsHandle();
+        private static SphereBoundsHandle s_SphereBoundsHandle = new SphereBoundsHandle();
         private static PrefColor s_GizmoColor = new PrefColor("Particle System/Shape Module Gizmos", 148f / 255f, 229f / 255f, 1f, 0.9f);
         private static Color s_ShapeGizmoThicknessTint = new Color(0.7f, 0.7f, 0.7f, 1.0f);
 
-        private Mesh m_SpriteMesh;
+        private static Mesh s_SpriteMesh;
 
         private readonly ParticleSystemShapeType[] m_GuiTypes = new[] { ParticleSystemShapeType.Sphere, ParticleSystemShapeType.Hemisphere, ParticleSystemShapeType.Cone, ParticleSystemShapeType.Donut, ParticleSystemShapeType.Box, ParticleSystemShapeType.Mesh, ParticleSystemShapeType.MeshRenderer, ParticleSystemShapeType.SkinnedMeshRenderer, ParticleSystemShapeType.Sprite, ParticleSystemShapeType.SpriteRenderer, ParticleSystemShapeType.Circle, ParticleSystemShapeType.SingleSidedEdge, ParticleSystemShapeType.Rectangle };
         private readonly int[] m_TypeToGuiTypeIndex = new[] { 0, 0, 1, 1, 2, 4, 5, 2, 2, 2, 10, 10, 11, 6, 7, 4, 4, 3, 12, 8, 9 };
@@ -122,13 +124,83 @@ public void OnInspectorGUI(MultiModeTexts text, GUIContent[] modesText, bool sho
         private readonly ParticleSystemShapeType[] boxShapes = new ParticleSystemShapeType[] { ParticleSystemShapeType.Box, ParticleSystemShapeType.BoxShell, ParticleSystemShapeType.BoxEdge };
         private readonly ParticleSystemShapeType[] coneShapes = new ParticleSystemShapeType[] { ParticleSystemShapeType.Cone, ParticleSystemShapeType.ConeVolume };
 
-        static EditMode.SceneViewEditMode[] s_SceneViewEditModes = new[]
+        abstract class ShapeTool : EditorTool
         {
-            EditMode.SceneViewEditMode.ParticleSystemShapeModuleGizmo,
-            EditMode.SceneViewEditMode.ParticleSystemShapeModulePosition,
-            EditMode.SceneViewEditMode.ParticleSystemShapeModuleRotation,
-            EditMode.SceneViewEditMode.ParticleSystemShapeModuleScale
-        };
+            public override bool IsAvailable()
+            {
+                foreach (var t in targets)
+                {
+                    var ps = t as ParticleSystem;
+                    if (ps == null)
+                        continue;
+
+                    if (ps.shape.enabled)
+                        return true;
+                }
+                return false;
+
+            }
+        }
+
+        [EditorTool("Shape", typeof(ParticleSystem))]
+        class ShapeGizmoTool : ShapeTool, IDrawSelectedHandles
+        {
+            public override GUIContent toolbarIcon
+            {
+                get { return EditorGUIUtility.TrIconContent("ParticleShapeTool", "Shape module gizmo editing mode."); }
+            }
+
+            public override void OnToolGUI(EditorWindow window)
+            {
+                OnShapeToolGUI(true, targets);
+            }
+
+            public void OnDrawHandles()
+            {
+                OnShapeToolGUI(false, targets);
+            }
+        }
+
+        [EditorTool("Transform Shape", typeof(ParticleSystem))]
+        class ShapePositionTool : ShapeTool
+        {
+            public override GUIContent toolbarIcon
+            {
+                get { return EditorGUIUtility.TrIconContent("TransformTool", "Shape module transform editing mode."); }
+            }
+
+            public override void OnToolGUI(EditorWindow window)
+            {
+                foreach (var t in targets)
+                {
+                    var ps = t as ParticleSystem;
+                    if (ps == null)
+                        continue;
+
+                    var shapeModule = ps.shape;
+                    Matrix4x4 transformMatrix = GetSceneViewTransformMatrix(ps);
+
+                    Vector3 position = transformMatrix.MultiplyPoint(shapeModule.position);
+                    Quaternion rotation = transformMatrix.rotation * Quaternion.Euler(shapeModule.rotation);
+                    Vector3 scale = transformMatrix.MultiplyVector(shapeModule.scale);
+
+                    EditorGUI.BeginChangeCheck();
+
+                    Handles.TransformHandle(ref position, ref rotation, ref scale);
+
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        Undo.RecordObject(ps, s_Texts.undoTransform);
+
+                        Matrix4x4 inverseTransformMatrix = transformMatrix.inverse;
+
+                        shapeModule.position = inverseTransformMatrix.MultiplyPoint(position);
+                        shapeModule.rotation = (inverseTransformMatrix.rotation * rotation).eulerAngles;
+                        shapeModule.scale = inverseTransformMatrix.MultiplyVector(scale);
+                    }
+                }
+            }
+        }
 
         class Texts
         {
@@ -163,6 +235,7 @@ class Texts
             public GUIContent position = EditorGUIUtility.TrTextContent("Position", "Translate the emission shape.");
             public GUIContent rotation = EditorGUIUtility.TrTextContent("Rotation", "Rotate the emission shape.");
             public GUIContent scale = EditorGUIUtility.TrTextContent("Scale", "Scale the emission shape.");
+            public GUIContent sceneTools = EditorGUIUtility.TrTextContent("Scene Tools");
 
             public readonly string undoSphereThickness = L10n.Tr("Sphere Thickness Handle Change");
             public readonly string undoSphere = L10n.Tr("Sphere Handle Change");
@@ -241,14 +314,6 @@ class Texts
                 EditorGUIUtility.TrTextContent("Blue"),
                 EditorGUIUtility.TrTextContent("Alpha")
             };
-
-            public GUIContent[] toolContents =
-            {
-                EditorGUIUtility.TrIconContent("ParticleShapeTool", "Shape gizmo editing mode."),
-                EditorGUIUtility.TrIconContent("MoveTool", "Shape transform position editing mode."),
-                EditorGUIUtility.TrIconContent("RotateTool", "Shape transform rotation editing mode."),
-                EditorGUIUtility.TrIconContent("ScaleTool", "Shape transform scale editing mode.")
-            };
         }
 
         static Texts s_Texts;
@@ -297,39 +362,10 @@ private bool editToolActive
         {
             get
             {
-                if (EditMode.IsOwner(m_ParticleSystemUI.m_ParticleEffectUI.m_Owner.customEditor))
-                {
-                    if (EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleGizmo ||
-                        EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModulePosition ||
-                        EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleRotation ||
-                        EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleScale)
-                        return true;
-                }
-                return false;
-            }
-            set
-            {
-                if (!value && editToolActive)
-                    EditMode.QuitEditMode();
-                SceneView.RepaintAll();
+                return EditorToolManager.activeTool is ShapeTool;
             }
         }
 
-        protected override void SetVisibilityState(VisibilityState newState)
-        {
-            base.SetVisibilityState(newState);
-
-            // Show tools again when module is not visible
-            if (newState != VisibilityState.VisibleAndFoldedOut)
-                editToolActive = false;
-        }
-
-        protected override void OnModuleDisable()
-        {
-            base.OnModuleDisable();
-            editToolActive = false;
-        }
-
         protected override void Init()
         {
             if (m_Type != null)
@@ -596,7 +632,19 @@ override public void OnInspectorGUI(InitialModuleUI initial)
             OnMiscInspectorGUI();
 
             if (EditorGUIUtility.comparisonViewMode == EditorGUIUtility.ComparisonViewMode.None)
-                GUIButtonGroup(s_SceneViewEditModes, s_Texts.toolContents, m_ParticleSystemUI.GetBounds, m_ParticleSystemUI.m_ParticleEffectUI.m_Owner.customEditor);
+            {
+                EditorGUILayout.BeginVertical("GroupBox");
+
+                var editorTools = new List<EditorTool>(2);
+                EditorToolManager.GetComponentTools(x => x.GetEditor<EditorTool>() is ShapeTool, editorTools, true);
+
+                GUILayout.BeginHorizontal();
+                EditorGUILayout.PrefixLabel(s_Texts.sceneTools, ParticleSystemStyles.Get().label, ParticleSystemStyles.Get().label);
+                EditorGUILayout.EditorToolbar(editorTools);
+                GUILayout.EndHorizontal();
+
+                EditorGUILayout.EndVertical();
+            }
         }
 
         private void OnTextureInspectorGUI()
@@ -640,29 +688,39 @@ private void OnMiscInspectorGUI()
             GUIFloat(s_Texts.randomPositionAmount, m_RandomPositionAmount);
         }
 
-        override public void OnSceneViewGUI()
+        private static Matrix4x4 GetSceneViewTransformMatrix(ParticleSystem ps)
         {
+            Matrix4x4 transformMatrix = new Matrix4x4();
+            var transform = ps.transform;
+            if (ps.main.scalingMode == ParticleSystemScalingMode.Local)
+                transformMatrix.SetTRS(transform.position, transform.rotation, transform.localScale);
+            else
+                transformMatrix = transform.localToWorldMatrix;
+            return transformMatrix;
+        }
+
+        internal static void OnShapeToolGUI(bool allowGizmoEditing, IEnumerable<UnityEngine.Object> targets)
+        {
+            if (s_Texts == null)
+                s_Texts = new Texts();
+
             Color origCol = Handles.color;
             Handles.color = s_GizmoColor;
 
             Matrix4x4 orgMatrix = Handles.matrix;
 
-            EditorGUI.BeginChangeCheck();
-
-            bool allowGizmoEditing = editToolActive && EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleGizmo;
-
-            foreach (ParticleSystem ps in m_ParticleSystemUI.m_ParticleSystems)
+            foreach (var target in targets)
             {
+                var ps = target as ParticleSystem;
+                if (ps == null)
+                    continue;
+
                 var shapeModule = ps.shape;
                 var mainModule = ps.main;
 
                 ParticleSystemShapeType type = shapeModule.shapeType;
 
-                Matrix4x4 transformMatrix = new Matrix4x4();
-                if (mainModule.scalingMode == ParticleSystemScalingMode.Local)
-                    transformMatrix.SetTRS(ps.transform.position, ps.transform.rotation, ps.transform.localScale);
-                else
-                    transformMatrix = ps.transform.localToWorldMatrix;
+                Matrix4x4 transformMatrix = GetSceneViewTransformMatrix(ps);
 
                 bool isBox = (type == ParticleSystemShapeType.Box || type == ParticleSystemShapeType.BoxShell || type == ParticleSystemShapeType.BoxEdge || type == ParticleSystemShapeType.Rectangle);
 
@@ -704,37 +762,37 @@ override public void OnSceneViewGUI()
                     // Thickness
                     EditorGUI.BeginChangeCheck();
 
-                    m_ArcHandle.angle = shapeModule.arc;
-                    m_ArcHandle.radius = shapeModule.radius * (1.0f - shapeModule.radiusThickness);
-                    m_ArcHandle.SetColorWithRadiusHandle(s_ShapeGizmoThicknessTint, 0f);
-                    m_ArcHandle.radiusHandleColor *= gizmoEditingColor;
-                    m_ArcHandle.angleHandleColor = Color.clear;
+                    s_ArcHandle.angle = shapeModule.arc;
+                    s_ArcHandle.radius = shapeModule.radius * (1.0f - shapeModule.radiusThickness);
+                    s_ArcHandle.SetColorWithRadiusHandle(s_ShapeGizmoThicknessTint, 0f);
+                    s_ArcHandle.radiusHandleColor *= gizmoEditingColor;
+                    s_ArcHandle.angleHandleColor = Color.clear;
 
                     using (new Handles.DrawingScope(Handles.matrix * s_ArcHandleOffsetMatrix))
-                        m_ArcHandle.DrawHandle();
+                        s_ArcHandle.DrawHandle();
 
                     if (EditorGUI.EndChangeCheck())
                     {
                         Undo.RecordObject(ps, s_Texts.undoCircleThickness);
-                        shapeModule.radiusThickness = 1.0f - (m_ArcHandle.radius / shapeModule.radius);
+                        shapeModule.radiusThickness = 1.0f - (s_ArcHandle.radius / shapeModule.radius);
                     }
 
                     // Circle
                     EditorGUI.BeginChangeCheck();
 
-                    m_ArcHandle.radius = shapeModule.radius;
-                    m_ArcHandle.SetColorWithRadiusHandle(Color.white, 0f);
-                    m_ArcHandle.radiusHandleColor *= gizmoEditingColor;
-                    m_ArcHandle.angleHandleColor *= gizmoEditingColor;
+                    s_ArcHandle.radius = shapeModule.radius;
+                    s_ArcHandle.SetColorWithRadiusHandle(Color.white, 0f);
+                    s_ArcHandle.radiusHandleColor *= gizmoEditingColor;
+                    s_ArcHandle.angleHandleColor *= gizmoEditingColor;
 
                     using (new Handles.DrawingScope(Handles.matrix * s_ArcHandleOffsetMatrix))
-                        m_ArcHandle.DrawHandle();
+                        s_ArcHandle.DrawHandle();
 
                     if (EditorGUI.EndChangeCheck())
                     {
                         Undo.RecordObject(ps, s_Texts.undoCircle);
-                        shapeModule.radius = m_ArcHandle.radius;
-                        shapeModule.arc = m_ArcHandle.angle;
+                        shapeModule.radius = s_ArcHandle.radius;
+                        shapeModule.arc = s_ArcHandle.angle;
                     }
 
                     // Texture
@@ -837,18 +895,18 @@ override public void OnSceneViewGUI()
                 {
                     EditorGUI.BeginChangeCheck();
 
-                    m_BoxBoundsHandle.center = Vector3.zero;
-                    m_BoxBoundsHandle.size = shapeModule.scale;
-                    m_BoxBoundsHandle.handleColor = gizmoEditingColor;
-                    m_BoxBoundsHandle.DrawHandle();
+                    s_BoxBoundsHandle.center = Vector3.zero;
+                    s_BoxBoundsHandle.size = shapeModule.scale;
+                    s_BoxBoundsHandle.handleColor = gizmoEditingColor;
+                    s_BoxBoundsHandle.DrawHandle();
 
                     if (EditorGUI.EndChangeCheck())
                     {
                         Undo.RecordObject(ps, s_Texts.undoBox);
-                        shapeModule.scale = m_BoxBoundsHandle.size;
+                        shapeModule.scale = s_BoxBoundsHandle.size;
                     }
 
-                    Matrix4x4 textureTransform = combinedMatrix * Matrix4x4.TRS(new Vector3(0.0f, 0.0f, -m_BoxBoundsHandle.size.z * 0.5f), Quaternion.identity, m_BoxBoundsHandle.size);
+                    Matrix4x4 textureTransform = combinedMatrix * Matrix4x4.TRS(new Vector3(0.0f, 0.0f, -s_BoxBoundsHandle.size.z * 0.5f), Quaternion.identity, s_BoxBoundsHandle.size);
                     OnSceneViewTextureGUI(shapeModule, s_QuadMesh, true, s_TextureMaterial, textureTransform);
                 }
                 else if (type == ParticleSystemShapeType.Donut)
@@ -856,19 +914,19 @@ override public void OnSceneViewGUI()
                     // Radius
                     EditorGUI.BeginChangeCheck();
 
-                    m_ArcHandle.radius = shapeModule.radius;
-                    m_ArcHandle.angle = shapeModule.arc;
-                    m_ArcHandle.SetColorWithRadiusHandle(Color.white * gizmoEditingColor, 0f);
-                    m_ArcHandle.wireframeColor = Color.clear;
+                    s_ArcHandle.radius = shapeModule.radius;
+                    s_ArcHandle.angle = shapeModule.arc;
+                    s_ArcHandle.SetColorWithRadiusHandle(Color.white * gizmoEditingColor, 0f);
+                    s_ArcHandle.wireframeColor = Color.clear;
 
                     using (new Handles.DrawingScope(Handles.matrix * s_ArcHandleOffsetMatrix))
-                        m_ArcHandle.DrawHandle();
+                        s_ArcHandle.DrawHandle();
 
                     if (EditorGUI.EndChangeCheck())
                     {
                         Undo.RecordObject(ps, s_Texts.undoDonut);
-                        shapeModule.radius = m_ArcHandle.radius;
-                        shapeModule.arc = m_ArcHandle.angle;
+                        shapeModule.radius = s_ArcHandle.radius;
+                        shapeModule.arc = s_ArcHandle.angle;
                     }
 
                     // Donut extents
@@ -891,11 +949,11 @@ override public void OnSceneViewGUI()
                     }
 
                     // Donut thickness
-                    m_SphereBoundsHandle.axes = PrimitiveBoundsHandle.Axes.X | PrimitiveBoundsHandle.Axes.Y;
-                    m_SphereBoundsHandle.radius = shapeModule.donutRadius * (1.0f - shapeModule.radiusThickness);
-                    m_SphereBoundsHandle.center = Vector3.zero;
-                    m_SphereBoundsHandle.SetColor(s_ShapeGizmoThicknessTint);
-                    m_SphereBoundsHandle.handleColor *= gizmoEditingColor;
+                    s_SphereBoundsHandle.axes = PrimitiveBoundsHandle.Axes.X | PrimitiveBoundsHandle.Axes.Y;
+                    s_SphereBoundsHandle.radius = shapeModule.donutRadius * (1.0f - shapeModule.radiusThickness);
+                    s_SphereBoundsHandle.center = Vector3.zero;
+                    s_SphereBoundsHandle.SetColor(s_ShapeGizmoThicknessTint);
+                    s_SphereBoundsHandle.handleColor *= gizmoEditingColor;
 
                     const float handleInterval = 90.0f;
                     int numOuterRadii = Mathf.Max(1, (int)Mathf.Ceil(shapeModule.arc / handleInterval));
@@ -905,28 +963,28 @@ override public void OnSceneViewGUI()
                     {
                         EditorGUI.BeginChangeCheck();
                         using (new Handles.DrawingScope(Handles.matrix * (Matrix4x4.Rotate(Quaternion.Euler(0.0f, 0.0f, handleInterval * i)) * donutRadiusStartMatrix)))
-                            m_SphereBoundsHandle.DrawHandle();
+                            s_SphereBoundsHandle.DrawHandle();
                         if (EditorGUI.EndChangeCheck())
                         {
                             Undo.RecordObject(ps, s_Texts.undoDonutRadiusThickness);
-                            shapeModule.radiusThickness = 1.0f - (m_SphereBoundsHandle.radius / shapeModule.donutRadius);
+                            shapeModule.radiusThickness = 1.0f - (s_SphereBoundsHandle.radius / shapeModule.donutRadius);
                         }
                     }
 
                     // Donut radius
-                    m_SphereBoundsHandle.radius = shapeModule.donutRadius;
-                    m_SphereBoundsHandle.SetColor(Color.white);
-                    m_SphereBoundsHandle.handleColor *= gizmoEditingColor;
+                    s_SphereBoundsHandle.radius = shapeModule.donutRadius;
+                    s_SphereBoundsHandle.SetColor(Color.white);
+                    s_SphereBoundsHandle.handleColor *= gizmoEditingColor;
 
                     for (int i = 0; i < numOuterRadii; i++)
                     {
                         EditorGUI.BeginChangeCheck();
                         using (new Handles.DrawingScope(Handles.matrix * (Matrix4x4.Rotate(Quaternion.Euler(0.0f, 0.0f, handleInterval * i)) * donutRadiusStartMatrix)))
-                            m_SphereBoundsHandle.DrawHandle();
+                            s_SphereBoundsHandle.DrawHandle();
                         if (EditorGUI.EndChangeCheck())
                         {
                             Undo.RecordObject(ps, s_Texts.undoDonutRadius);
-                            shapeModule.donutRadius = m_SphereBoundsHandle.radius;
+                            shapeModule.donutRadius = s_SphereBoundsHandle.radius;
                         }
                     }
 
@@ -962,85 +1020,51 @@ override public void OnSceneViewGUI()
                 {
                     EditorGUI.BeginChangeCheck();
 
-                    m_BoxBoundsHandle.center = Vector3.zero;
-                    m_BoxBoundsHandle.size = new Vector3(shapeModule.scale.x, shapeModule.scale.y, 0.0f);
-                    m_BoxBoundsHandle.handleColor = gizmoEditingColor;
-                    m_BoxBoundsHandle.DrawHandle();
+                    s_BoxBoundsHandle.center = Vector3.zero;
+                    s_BoxBoundsHandle.size = new Vector3(shapeModule.scale.x, shapeModule.scale.y, 0.0f);
+                    s_BoxBoundsHandle.handleColor = gizmoEditingColor;
+                    s_BoxBoundsHandle.DrawHandle();
 
                     if (EditorGUI.EndChangeCheck())
                     {
                         Undo.RecordObject(ps, s_Texts.undoRectangle);
-                        shapeModule.scale = new Vector3(m_BoxBoundsHandle.size.x, m_BoxBoundsHandle.size.y, 0.0f);
+                        shapeModule.scale = new Vector3(s_BoxBoundsHandle.size.x, s_BoxBoundsHandle.size.y, 0.0f);
                     }
 
-                    OnSceneViewTextureGUI(shapeModule, s_QuadMesh, true, s_TextureMaterial, combinedMatrix * Matrix4x4.Scale(m_BoxBoundsHandle.size));
+                    OnSceneViewTextureGUI(shapeModule, s_QuadMesh, true, s_TextureMaterial, combinedMatrix * Matrix4x4.Scale(s_BoxBoundsHandle.size));
                 }
                 else if (type == ParticleSystemShapeType.Sprite)
                 {
                     Sprite sprite = shapeModule.sprite;
                     if (sprite)
                     {
-                        if (!m_SpriteMesh)
+                        if (!s_SpriteMesh)
                         {
-                            m_SpriteMesh = new Mesh();
-                            m_SpriteMesh.name = "ParticleSpritePreview";
-                            m_SpriteMesh.hideFlags |= HideFlags.HideAndDontSave;
+                            s_SpriteMesh = new Mesh();
+                            s_SpriteMesh.name = "ParticleSpritePreview";
+                            s_SpriteMesh.hideFlags |= HideFlags.HideAndDontSave;
                         }
 
-                        m_SpriteMesh.vertices = Array.ConvertAll(sprite.vertices, i => (Vector3)i);
-                        m_SpriteMesh.uv = sprite.uv;
-                        m_SpriteMesh.triangles = Array.ConvertAll(sprite.triangles, i => (int)i);
+                        s_SpriteMesh.vertices = Array.ConvertAll(sprite.vertices, i => (Vector3)i);
+                        s_SpriteMesh.uv = sprite.uv;
+                        s_SpriteMesh.triangles = Array.ConvertAll(sprite.triangles, i => (int)i);
 
                         bool orgWireframeMode = GL.wireframe;
                         GL.wireframe = true;
                         s_Material.SetPass(0);
-                        Graphics.DrawMeshNow(m_SpriteMesh, combinedMatrix);
+                        Graphics.DrawMeshNow(s_SpriteMesh, combinedMatrix);
                         GL.wireframe = orgWireframeMode;
 
-                        OnSceneViewTextureGUI(shapeModule, m_SpriteMesh, false, s_TextureMaterial, combinedMatrix);
-                    }
-                }
-
-                if (EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModulePosition || EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleRotation || EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleScale)
-                {
-                    Handles.matrix = Matrix4x4.identity;
-
-                    Vector3 position = transformMatrix.MultiplyPoint(shapeModule.position);
-                    Quaternion rotation = transformMatrix.rotation * Quaternion.Euler(shapeModule.rotation);
-                    Vector3 scale = transformMatrix.MultiplyVector(shapeModule.scale);
-
-                    float handleSize = HandleUtility.GetHandleSize(position);
-
-                    EditorGUI.BeginChangeCheck();
-
-                    if (EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModulePosition)
-                        position = Handles.PositionHandle(position, rotation);
-                    else if (EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleRotation)
-                        rotation = Handles.RotationHandle(rotation, position);
-                    else if (EditMode.editMode == EditMode.SceneViewEditMode.ParticleSystemShapeModuleScale)
-                        scale = Handles.ScaleHandle(scale, position, rotation, handleSize);
-
-                    if (EditorGUI.EndChangeCheck())
-                    {
-                        Undo.RecordObject(ps, s_Texts.undoTransform);
-
-                        Matrix4x4 inverseTransformMatrix = transformMatrix.inverse;
-
-                        shapeModule.position = inverseTransformMatrix.MultiplyPoint(position);
-                        shapeModule.rotation = (inverseTransformMatrix.rotation * rotation).eulerAngles;
-                        shapeModule.scale = inverseTransformMatrix.MultiplyVector(scale);
+                        OnSceneViewTextureGUI(shapeModule, s_SpriteMesh, false, s_TextureMaterial, combinedMatrix);
                     }
                 }
             }
 
-            if (EditorGUI.EndChangeCheck())
-                m_ParticleSystemUI.m_ParticleEffectUI.m_Owner.Repaint();
-
             Handles.color = origCol;
             Handles.matrix = orgMatrix;
         }
 
-        private void OnSceneViewTextureGUI(ParticleSystem.ShapeModule shapeModule, Mesh mesh, bool twoSided, Material mat, Matrix4x4 transform)
+        private static void OnSceneViewTextureGUI(ParticleSystem.ShapeModule shapeModule, Mesh mesh, bool twoSided, Material mat, Matrix4x4 transform)
         {
             Texture texture = shapeModule.texture;
             if (texture)
@@ -1048,10 +1072,10 @@ private void OnSceneViewTextureGUI(ParticleSystem.ShapeModule shapeModule, Mesh
                 mat.SetPass(0);
                 mat.SetTexture("_MainTex", texture);
                 mat.SetColor("_Color", new Color(1.0f, 1.0f, 1.0f, 0.4f));
-                mat.SetFloat("_ClipChannel", (float)(int)shapeModule.textureClipChannel);
+                mat.SetFloat("_ClipChannel", (int)shapeModule.textureClipChannel);
                 mat.SetFloat("_ClipThreshold", shapeModule.textureClipThreshold);
-                mat.SetFloat("_Cull", twoSided ? (float)UnityEngine.Rendering.CullMode.Off : (float)UnityEngine.Rendering.CullMode.Back);
-                mat.SetFloat("_UVChannel", (float)shapeModule.textureUVChannel);
+                mat.SetFloat("_Cull", twoSided ? (float)CullMode.Off : (float)CullMode.Back);
+                mat.SetFloat("_UVChannel", shapeModule.textureUVChannel);
                 Graphics.DrawMeshNow(mesh, transform);
             }
         }
diff --git a/Modules/ParticleSystemEditor/ParticleSystemUI.cs b/Modules/ParticleSystemEditor/ParticleSystemUI.cs
index b958674f81..b63be74488 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemUI.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemUI.cs
@@ -425,7 +425,7 @@ private void ShowBounds(ParticleSystem ps)
                 Handles.color = oldCol;
             }
 
-            // In multi-edit, children are not stored, so render thir bounds manually
+            // In multi-edit, children are not stored, so render their bounds manually
             if (multiEdit)
             {
                 ParticleSystem[] children = ps.transform.GetComponentsInChildren<ParticleSystem>();
diff --git a/Modules/ParticleSystemEditor/ParticleSystemWindow.cs b/Modules/ParticleSystemEditor/ParticleSystemWindow.cs
index e7e6360574..068de2c25b 100644
--- a/Modules/ParticleSystemEditor/ParticleSystemWindow.cs
+++ b/Modules/ParticleSystemEditor/ParticleSystemWindow.cs
@@ -62,7 +62,7 @@ void OnEnable()
             SceneView.duringSceneGui += OnSceneViewGUI;
             EditorApplication.pauseStateChanged += OnPauseStateChanged;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
-            Undo.undoRedoPerformed += UndoRedoPerformed;
+            Undo.undoRedoEvent += UndoRedoPerformed;
 
             autoRepaintOnSceneChange = false;
         }
@@ -74,7 +74,7 @@ void OnDisable()
             EditorApplication.hierarchyChanged -= OnHierarchyOrProjectWindowWasChanged;
             EditorApplication.pauseStateChanged -= OnPauseStateChanged;
             EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
-            Undo.undoRedoPerformed -= UndoRedoPerformed;
+            Undo.undoRedoEvent -= UndoRedoPerformed;
 
 
             Clear();
@@ -105,7 +105,7 @@ void OnPlayModeStateChanged(PlayModeStateChange state)
             Repaint();
         }
 
-        void UndoRedoPerformed()
+        void UndoRedoPerformed(in UndoRedoInfo info)
         {
             InitEffectUI();
             Repaint();
diff --git a/Modules/Physics/ScriptBindings/Articulations.bindings.cs b/Modules/Physics/ScriptBindings/Articulations.bindings.cs
index b479f18acb..6bcd1bf1fa 100644
--- a/Modules/Physics/ScriptBindings/Articulations.bindings.cs
+++ b/Modules/Physics/ScriptBindings/Articulations.bindings.cs
@@ -161,7 +161,7 @@ public List<float> elements
 
     [NativeHeader("Modules/Physics/ArticulationBody.h")]
     [NativeClass("Unity::ArticulationBody")]
-    public class ArticulationBody : Behaviour
+    public partial class ArticulationBody : Behaviour
     {
         extern public ArticulationJointType jointType { get; set; }
         extern public Vector3 anchorPosition { get; set; }
@@ -170,18 +170,6 @@ public class ArticulationBody : Behaviour
         extern public Quaternion parentAnchorRotation { get; set; }
         extern public bool isRoot { get; }
 
-        [Obsolete("computeParentAnchor has been renamed to matchAnchors (UnityUpgradable) -> matchAnchors")]
-        public bool computeParentAnchor
-        {
-            get
-            {
-                return matchAnchors;
-            }
-            set
-            {
-                matchAnchors = value;
-            }
-        }
         extern public bool matchAnchors { get; set; }
 
         extern public ArticulationDofLock linearLockX { get; set; }
@@ -247,8 +235,10 @@ public void AddForceAtPosition(Vector3 force, Vector3 position)
         extern public Vector3 angularVelocity { get; set; }
 
         extern public float mass { get; set; }
+        extern public bool automaticCenterOfMass { get; set; }
         extern public Vector3 centerOfMass { get; set; }
         extern public Vector3 worldCenterOfMass { get; }
+        extern public bool automaticInertiaTensor { get; set; }
         extern public Vector3 inertiaTensor { get; set; }
         extern public Quaternion inertiaTensorRotation { get; set; }
         extern public void ResetCenterOfMass();
@@ -269,7 +259,9 @@ public void AddForceAtPosition(Vector3 force, Vector3 position)
 
         extern public ArticulationReducedSpace jointPosition { get; set; }
         extern public ArticulationReducedSpace jointVelocity { get; set; }
-        extern public ArticulationReducedSpace jointAcceleration { get; set; }
+        extern public ArticulationReducedSpace jointAcceleration { get;
+        [Obsolete("Setting joint accelerations is not supported in forward kinematics. To have inverse dynamics take acceleration into account, use GetJointForcesForAcceleration instead", true)]
+        set; }
         extern public ArticulationReducedSpace jointForce { get; set; }
         extern public ArticulationReducedSpace driveForce { get; }
 
@@ -289,7 +281,6 @@ public void AddForceAtPosition(Vector3 force, Vector3 position)
         extern public int GetJointVelocities(List<float> velocities);
         extern public void SetJointVelocities(List<float> velocities);
         extern public int GetJointAccelerations(List<float> accelerations);
-        extern public void SetJointAccelerations(List<float> accelerations);
         extern public int GetJointForces(List<float> forces);
         extern public void SetJointForces(List<float> forces);
         extern public ArticulationReducedSpace GetJointForcesForAcceleration(ArticulationReducedSpace acceleration);
diff --git a/Modules/Physics/ScriptBindings/Articulations.deprecated.cs b/Modules/Physics/ScriptBindings/Articulations.deprecated.cs
new file mode 100644
index 0000000000..cc82a3c5b3
--- /dev/null
+++ b/Modules/Physics/ScriptBindings/Articulations.deprecated.cs
@@ -0,0 +1,30 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+using UnityEngine.Bindings;
+using UnityEngine.Scripting;
+using System.Runtime.InteropServices;
+using UnityEngine.Internal;
+using System.Collections.Generic;
+
+
+
+namespace UnityEngine
+{
+    public partial class ArticulationBody : Behaviour
+    {
+        [Obsolete("computeParentAnchor has been renamed to matchAnchors (UnityUpgradable) -> matchAnchors")]
+        public bool computeParentAnchor
+        {
+            get => matchAnchors;
+            set => matchAnchors = value;
+        }
+
+        [Obsolete("Setting joint accelerations is not supported in forward kinematics. To have inverse dynamics take acceleration into account, use GetJointForcesForAcceleration instead",true)]
+        extern public void SetJointAccelerations(List<float> accelerations);
+    }
+}
+
diff --git a/Modules/Physics/ScriptBindings/ContactModification.bindings.cs b/Modules/Physics/ScriptBindings/ContactModification.bindings.cs
index 9aa2dbefb7..d45f294544 100644
--- a/Modules/Physics/ScriptBindings/ContactModification.bindings.cs
+++ b/Modules/Physics/ScriptBindings/ContactModification.bindings.cs
@@ -18,17 +18,20 @@ namespace UnityEngine
     public partial class Physics
     {
         public static event Action<PhysicsScene, NativeArray<ModifiableContactPair>> ContactModifyEvent;
+        public static event Action<PhysicsScene, NativeArray<ModifiableContactPair>> ContactModifyEventCCD;
 
         [RequiredByNativeCode]
-        private static unsafe void OnSceneContactModify(PhysicsScene scene, IntPtr buffer, int count)
+        private static unsafe void OnSceneContactModify(PhysicsScene scene, IntPtr buffer, int count, bool isCCD)
         {
             var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<ModifiableContactPair>(buffer.ToPointer(), count, Allocator.None);
 
             var safety = AtomicSafetyHandle.Create();
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, safety);
 
-            if (ContactModifyEvent != null)
-                ContactModifyEvent(scene, array);
+            if (!isCCD)
+                ContactModifyEvent?.Invoke(scene, array);
+            else
+                ContactModifyEventCCD?.Invoke(scene, array);
 
             AtomicSafetyHandle.Release(safety);
         }
diff --git a/Modules/Physics/ScriptBindings/Dynamics.bindings.cs b/Modules/Physics/ScriptBindings/Dynamics.bindings.cs
index 1d4ff995d5..6d082fa3c9 100644
--- a/Modules/Physics/ScriptBindings/Dynamics.bindings.cs
+++ b/Modules/Physics/ScriptBindings/Dynamics.bindings.cs
@@ -106,8 +106,10 @@ public partial class Rigidbody : UnityEngine.Component
         extern public bool freezeRotation { get; set; }
         extern public RigidbodyConstraints constraints { get; set; }
         extern public CollisionDetectionMode collisionDetectionMode { get; set; }
+        extern public bool automaticCenterOfMass { get; set; }
         extern public Vector3 centerOfMass { get; set; }
         extern public Vector3 worldCenterOfMass { get; }
+        extern public bool automaticInertiaTensor { get; set; }
         extern public Quaternion inertiaTensorRotation { get; set; }
         extern public Vector3 inertiaTensor { get; set; }
         extern public bool detectCollisions { get; set; }
@@ -457,6 +459,7 @@ public class HingeJoint : Joint
         extern public JointSpring spring { get; set; }
         extern public bool useMotor { get; set; }
         extern public bool useLimits { get; set; }
+        extern public bool extendedLimits { get; set; }
         extern public bool useSpring { get; set; }
         extern public float velocity { get; }
         extern public float angle { get; }
diff --git a/Modules/Physics/ScriptBindings/QueryCommand.bindings.cs b/Modules/Physics/ScriptBindings/QueryCommand.bindings.cs
index e2f00324a9..42e46effb0 100644
--- a/Modules/Physics/ScriptBindings/QueryCommand.bindings.cs
+++ b/Modules/Physics/ScriptBindings/QueryCommand.bindings.cs
@@ -8,124 +8,170 @@
 using Unity.Jobs.LowLevel.Unsafe;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
+using UnityEngine.Internal;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
 
 namespace UnityEngine
 {
+    [StructLayout(LayoutKind.Sequential)]
+    public struct QueryParameters
+    {
+        public int layerMask;
+        public bool hitMultipleFaces;
+        public QueryTriggerInteraction hitTriggers;
+        public bool hitBackfaces;
+
+        public QueryParameters(int layerMask = Physics.DefaultRaycastLayers, bool hitMultipleFaces = false, QueryTriggerInteraction hitTriggers = QueryTriggerInteraction.UseGlobal, bool hitBackfaces = false)
+        {
+            this.layerMask = layerMask;
+            this.hitMultipleFaces = hitMultipleFaces;
+            this.hitTriggers = hitTriggers;
+            this.hitBackfaces = hitBackfaces;
+        }
+
+        public static QueryParameters Default => new QueryParameters(Physics.DefaultRaycastLayers, false, QueryTriggerInteraction.UseGlobal, false);
+    }
     [NativeHeader("Modules/Physics/BatchCommands/RaycastCommand.h")]
     [NativeHeader("Runtime/Jobs/ScriptBindings/JobsBindingsTypes.h")]
-    public struct RaycastCommand
+    public partial struct RaycastCommand
     {
-        public RaycastCommand(Vector3 from, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers, int maxHits = 1)
+        public RaycastCommand(Vector3 from, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.from = from;
             this.direction = direction;
-            this.distance = distance;
-            this.layerMask = layerMask;
-            this.maxHits = maxHits;
             this.physicsScene = Physics.defaultPhysicsScene;
-        }
+            this.distance = distance;
+            this.queryParameters = queryParameters;
 
-        public RaycastCommand(PhysicsScene physicsScene, Vector3 from, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers, int maxHits = 1)
+        }
+        public RaycastCommand(PhysicsScene physicsScene, Vector3 from, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.from = from;
             this.direction = direction;
-            this.distance = distance;
-            this.layerMask = layerMask;
-            this.maxHits = maxHits;
             this.physicsScene = physicsScene;
+            this.distance = distance;
+            this.queryParameters = queryParameters;
         }
 
         public Vector3 from { get; set; }
         public Vector3 direction {get; set; }
-        public float distance { get; set; }
-        public int layerMask { get; set; }
-        public int maxHits { get; set; }
         public PhysicsScene physicsScene { get; set; }
+        public float distance { get; set; }
+        public QueryParameters queryParameters;
 
-        public unsafe static JobHandle ScheduleBatch(NativeArray<RaycastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        public unsafe static JobHandle ScheduleBatch(NativeArray<RaycastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, int maxHits, JobHandle dependsOn = new JobHandle())
         {
+            if (maxHits < 1)
+            {
+                Debug.LogWarning("maxHits should be greater than 0.");
+                return new JobHandle();
+            }
+            else if (results.Length < maxHits * commands.Length)
+            {
+                Debug.LogWarning("The supplied results buffer is too small, there should be at least maxHits space per each command in the batch.");
+                return new JobHandle();
+            }
+
             var jobData = new BatchQueryJob<RaycastCommand, RaycastHit>(commands, results);
             var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), BatchQueryJobStruct<BatchQueryJob<RaycastCommand, RaycastHit>>.Initialize(), dependsOn, ScheduleMode.Parallel);
 
-            return ScheduleRaycastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob);
+            return ScheduleRaycastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob, maxHits);
+        }
+
+        public unsafe static JobHandle ScheduleBatch(NativeArray<RaycastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        {
+            return ScheduleBatch(commands, results, minCommandsPerJob, 1, dependsOn);
         }
 
         [FreeFunction("ScheduleRaycastCommandBatch", ThrowsException = true)]
-        unsafe extern private static JobHandle ScheduleRaycastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob);
+        unsafe extern private static JobHandle ScheduleRaycastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob, int maxHits);
+
     }
 
     [NativeHeader("Modules/Physics/BatchCommands/SpherecastCommand.h")]
     [NativeHeader("Runtime/Jobs/ScriptBindings/JobsBindingsTypes.h")]
-    public struct SpherecastCommand
+    public partial struct SpherecastCommand
     {
-        public SpherecastCommand(Vector3 origin, float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        public SpherecastCommand(Vector3 origin, float radius, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.origin = origin;
             this.direction = direction;
             this.radius = radius;
             this.distance = distance;
-            this.layerMask = layerMask;
-            maxHits = 1;
             this.physicsScene = Physics.defaultPhysicsScene;
+            this.queryParameters = queryParameters;
         }
 
-        public SpherecastCommand(PhysicsScene physicsScene, Vector3 origin,  float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        public SpherecastCommand(PhysicsScene physicsScene, Vector3 origin,  float radius, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.origin = origin;
             this.direction = direction;
             this.radius = radius;
             this.distance = distance;
-            this.layerMask = layerMask;
-            maxHits = 1;
             this.physicsScene = physicsScene;
+            this.queryParameters = queryParameters;
         }
 
         public Vector3 origin { get; set; }
         public float radius { get; set; }
         public Vector3 direction { get; set; }
         public float distance { get; set; }
-        public int layerMask { get; set; }
-        internal int maxHits { get; set; }
         public PhysicsScene physicsScene { get; set; }
+        public QueryParameters queryParameters;
 
-        public unsafe static JobHandle ScheduleBatch(NativeArray<SpherecastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        public unsafe static JobHandle ScheduleBatch(NativeArray<SpherecastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, int maxHits, JobHandle dependsOn = new JobHandle())
         {
+            if (maxHits < 1)
+            {
+                Debug.LogWarning("maxHits should be greater than 0.");
+                return new JobHandle();
+            }
+            else if (results.Length < maxHits * commands.Length)
+            {
+                Debug.LogWarning("The supplied results buffer is too small, there should be at least maxHits space per each command in the batch.");
+                return new JobHandle();
+            }
+
             var jobData = new BatchQueryJob<SpherecastCommand, RaycastHit>(commands, results);
             var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), BatchQueryJobStruct<BatchQueryJob<SpherecastCommand, RaycastHit>>.Initialize(), dependsOn, ScheduleMode.Parallel);
 
-            return ScheduleSpherecastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob);
+            return ScheduleSpherecastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob, maxHits);
+        }
+
+        public unsafe static JobHandle ScheduleBatch(NativeArray<SpherecastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        {
+            return ScheduleBatch(commands, results, minCommandsPerJob, 1, dependsOn);
         }
 
         [FreeFunction("ScheduleSpherecastCommandBatch", ThrowsException = true)]
-        unsafe extern private static JobHandle ScheduleSpherecastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob);
+        unsafe extern private static JobHandle ScheduleSpherecastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob, int maxHits);
     }
 
     [NativeHeader("Modules/Physics/BatchCommands/CapsulecastCommand.h")]
     [NativeHeader("Runtime/Jobs/ScriptBindings/JobsBindingsTypes.h")]
-    public struct CapsulecastCommand
+    public partial struct CapsulecastCommand
     {
-        public CapsulecastCommand(Vector3 p1, Vector3 p2, float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        public CapsulecastCommand(Vector3 p1, Vector3 p2, float radius, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.point1 = p1;
             this.point2 = p2;
             this.direction = direction;
             this.radius = radius;
             this.distance = distance;
-            this.layerMask = layerMask;
-            maxHits = 1;
             this.physicsScene = Physics.defaultPhysicsScene;
+            this.queryParameters = queryParameters;
         }
 
-        public CapsulecastCommand(PhysicsScene physicsScene, Vector3 p1, Vector3 p2, float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        public CapsulecastCommand(PhysicsScene physicsScene, Vector3 p1, Vector3 p2, float radius, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.point1 = p1;
             this.point2 = p2;
             this.direction = direction;
             this.radius = radius;
             this.distance = distance;
-            this.layerMask = layerMask;
-            maxHits = 1;
             this.physicsScene = physicsScene;
+            this.queryParameters = queryParameters;
         }
 
         public Vector3 point1 { get; set; }
@@ -133,48 +179,61 @@ public CapsulecastCommand(PhysicsScene physicsScene, Vector3 p1, Vector3 p2, flo
         public float radius {get; set; }
         public Vector3 direction {get; set; }
         public float distance { get; set; }
-        public int layerMask { get; set; }
-        internal int maxHits {get; set; }
         public PhysicsScene physicsScene { get; set; }
+        public QueryParameters queryParameters;
 
-        public unsafe static JobHandle ScheduleBatch(NativeArray<CapsulecastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        public unsafe static JobHandle ScheduleBatch(NativeArray<CapsulecastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, int maxHits, JobHandle dependsOn = new JobHandle())
         {
+            if (maxHits < 1)
+            {
+                Debug.LogWarning("maxHits should be greater than 0.");
+                return new JobHandle();
+            }
+            else if (results.Length < maxHits * commands.Length)
+            {
+                Debug.LogWarning("The supplied results buffer is too small, there should be at least maxHits space per each command in the batch.");
+                return new JobHandle();
+            }
+
             var jobData = new BatchQueryJob<CapsulecastCommand, RaycastHit>(commands, results);
             var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), BatchQueryJobStruct<BatchQueryJob<CapsulecastCommand, RaycastHit>>.Initialize(), dependsOn, ScheduleMode.Parallel);
 
-            return ScheduleCapsulecastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob);
+            return ScheduleCapsulecastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob, maxHits);
+        }
+
+        public unsafe static JobHandle ScheduleBatch(NativeArray<CapsulecastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        {
+            return ScheduleBatch(commands, results, minCommandsPerJob, 1, dependsOn);
         }
 
         [FreeFunction("ScheduleCapsulecastCommandBatch", ThrowsException = true)]
-        unsafe extern private static JobHandle ScheduleCapsulecastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob);
+        unsafe extern private static JobHandle ScheduleCapsulecastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob, int maxHits);
     }
 
     [NativeHeader("Modules/Physics/BatchCommands/BoxcastCommand.h")]
     [NativeHeader("Runtime/Jobs/ScriptBindings/JobsBindingsTypes.h")]
-    public struct BoxcastCommand
+    public partial struct BoxcastCommand
     {
-        public BoxcastCommand(Vector3 center, Vector3 halfExtents, Quaternion orientation, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        public BoxcastCommand(Vector3 center, Vector3 halfExtents, Quaternion orientation, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.center = center;
             this.halfExtents = halfExtents;
             this.orientation = orientation;
             this.direction = direction;
             this.distance = distance;
-            this.layerMask = layerMask;
-            maxHits = 1;
             this.physicsScene = Physics.defaultPhysicsScene;
+            this.queryParameters = queryParameters;
         }
 
-        public BoxcastCommand(PhysicsScene physicsScene, Vector3 center, Vector3 halfExtents, Quaternion orientation, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        public BoxcastCommand(PhysicsScene physicsScene, Vector3 center, Vector3 halfExtents, Quaternion orientation, Vector3 direction, QueryParameters queryParameters, float distance = float.MaxValue)
         {
             this.center = center;
             this.halfExtents = halfExtents;
             this.orientation = orientation;
             this.direction = direction;
             this.distance = distance;
-            this.layerMask = layerMask;
-            maxHits = 1;
             this.physicsScene = physicsScene;
+            this.queryParameters = queryParameters;
         }
 
         public Vector3 center { get; set; }
@@ -182,20 +241,35 @@ public BoxcastCommand(PhysicsScene physicsScene, Vector3 center, Vector3 halfExt
         public Quaternion orientation {get; set; }
         public Vector3 direction {get; set; }
         public float distance { get; set; }
-        public int layerMask { get; set; }
-        internal int maxHits {get; set; }
         public PhysicsScene physicsScene { get; set; }
+        public QueryParameters queryParameters;
 
-        public unsafe static JobHandle ScheduleBatch(NativeArray<BoxcastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        public unsafe static JobHandle ScheduleBatch(NativeArray<BoxcastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, int maxHits, JobHandle dependsOn = new JobHandle())
         {
+            if (maxHits < 1)
+            {
+                Debug.LogWarning("maxHits should be greater than 0.");
+                return new JobHandle();
+            }
+            else if (results.Length < maxHits * commands.Length)
+            {
+                Debug.LogWarning("The supplied results buffer is too small, there should be at least maxHits space per each command in the batch.");
+                return new JobHandle();
+            }
+
             var jobData = new BatchQueryJob<BoxcastCommand, RaycastHit>(commands, results);
             var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), BatchQueryJobStruct<BatchQueryJob<BoxcastCommand, RaycastHit>>.Initialize(), dependsOn, ScheduleMode.Parallel);
 
-            return ScheduleBoxcastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob);
+            return ScheduleBoxcastBatch(ref scheduleParams, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(commands), commands.Length, NativeArrayUnsafeUtility.GetUnsafeBufferPointerWithoutChecks(results), results.Length, minCommandsPerJob, maxHits);
+        }
+
+        public unsafe static JobHandle ScheduleBatch(NativeArray<BoxcastCommand> commands, NativeArray<RaycastHit> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
+        {
+            return ScheduleBatch(commands, results, minCommandsPerJob, 1, dependsOn);
         }
 
         [FreeFunction("ScheduleBoxcastCommandBatch", ThrowsException = true)]
-        unsafe extern private static JobHandle ScheduleBoxcastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob);
+        unsafe extern private static JobHandle ScheduleBoxcastBatch(ref JobsUtility.JobScheduleParameters parameters, void* commands, int commandLen, void* result, int resultLen, int minCommandsPerJob, int maxHits);
     }
 
     [NativeHeader("Modules/Physics/BatchCommands/ClosestPointCommand.h")]
@@ -209,7 +283,6 @@ public ClosestPointCommand(Vector3 point, int colliderInstanceID, Vector3 positi
             this.position = position;
             this.rotation = rotation;
             this.scale = scale;
-            this.maxHits = 1;
         }
 
         public ClosestPointCommand(Vector3 point, Collider collider, Vector3 position, Quaternion rotation, Vector3 scale)
@@ -219,7 +292,6 @@ public ClosestPointCommand(Vector3 point, Collider collider, Vector3 position, Q
             this.position = position;
             this.rotation = rotation;
             this.scale = scale;
-            this.maxHits = 1;
         }
 
         public Vector3 point { get; set; }
@@ -227,7 +299,6 @@ public ClosestPointCommand(Vector3 point, Collider collider, Vector3 position, Q
         public Vector3 position { get; set; }
         public Quaternion rotation { get; set; }
         public Vector3 scale { get; set; }
-        internal int maxHits {get; set; }
 
         public unsafe static JobHandle ScheduleBatch(NativeArray<ClosestPointCommand> commands, NativeArray<Vector3> results, int minCommandsPerJob, JobHandle dependsOn = new JobHandle())
         {
diff --git a/Modules/Physics/ScriptBindings/QueryCommand.deprecated.cs b/Modules/Physics/ScriptBindings/QueryCommand.deprecated.cs
new file mode 100644
index 0000000000..b3bd8a47cb
--- /dev/null
+++ b/Modules/Physics/ScriptBindings/QueryCommand.deprecated.cs
@@ -0,0 +1,130 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections;
+
+
+namespace UnityEngine
+{
+    public partial struct RaycastCommand
+    {
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public RaycastCommand(Vector3 from, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers, int maxHits = 1)
+        {
+            this.from = from;
+            this.direction = direction;
+            this.physicsScene = Physics.defaultPhysicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.distance = distance;
+            this.layerMask = layerMask;
+        }
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public RaycastCommand(PhysicsScene physicsScene, Vector3 from, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers, int maxHits = 1)
+        {
+            this.from = from;
+            this.direction = direction;
+            this.physicsScene = physicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.distance = distance;
+            this.layerMask = layerMask;
+        }
+        [Obsolete("maxHits property was moved to be a part of RaycastCommand.ScheduleBatch.", false)]
+        public int maxHits { get { return 1; } set {} }
+        [Obsolete("Layer Mask is now a part of QueryParameters struct", false)]
+        public int layerMask { get { return queryParameters.layerMask; } set { queryParameters.layerMask = value; }}
+    }
+
+    public partial struct SpherecastCommand
+    {
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public SpherecastCommand(Vector3 origin, float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        {
+            this.origin = origin;
+            this.direction = direction;
+            this.radius = radius;
+            this.distance = distance;
+            this.physicsScene = Physics.defaultPhysicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.layerMask = layerMask;
+        }
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public SpherecastCommand(PhysicsScene physicsScene, Vector3 origin,  float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        {
+            this.origin = origin;
+            this.direction = direction;
+            this.radius = radius;
+            this.distance = distance;
+            this.physicsScene = physicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.layerMask = layerMask;
+        }
+
+        [Obsolete("Layer Mask is now a part of QueryParameters struct", false)]
+        public int layerMask { get { return queryParameters.layerMask; } set { queryParameters.layerMask = value; }}
+    }
+
+    public partial struct CapsulecastCommand
+    {
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public CapsulecastCommand(Vector3 p1, Vector3 p2, float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        {
+            this.point1 = p1;
+            this.point2 = p2;
+            this.direction = direction;
+            this.radius = radius;
+            this.distance = distance;
+            this.physicsScene = Physics.defaultPhysicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.layerMask = layerMask;
+        }
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public CapsulecastCommand(PhysicsScene physicsScene, Vector3 p1, Vector3 p2, float radius, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        {
+            this.point1 = p1;
+            this.point2 = p2;
+            this.direction = direction;
+            this.radius = radius;
+            this.distance = distance;
+            this.physicsScene = physicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.layerMask = layerMask;
+        }
+
+        [Obsolete("Layer Mask is now a part of QueryParameters struct", false)]
+        public int layerMask { get { return queryParameters.layerMask; } set { queryParameters.layerMask = value; }}
+    }
+
+    public partial struct BoxcastCommand
+    {
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public BoxcastCommand(Vector3 center, Vector3 halfExtents, Quaternion orientation, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        {
+            this.center = center;
+            this.halfExtents = halfExtents;
+            this.orientation = orientation;
+            this.direction = direction;
+            this.distance = distance;
+            this.physicsScene = Physics.defaultPhysicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.layerMask = layerMask;
+        }
+        [Obsolete("This struct signature is no longer supported. Use struct with a QueryParameters instead", false)]
+        public BoxcastCommand(PhysicsScene physicsScene, Vector3 center, Vector3 halfExtents, Quaternion orientation, Vector3 direction, float distance = float.MaxValue, int layerMask = Physics.DefaultRaycastLayers)
+        {
+            this.center = center;
+            this.halfExtents = halfExtents;
+            this.orientation = orientation;
+            this.direction = direction;
+            this.distance = distance;
+            this.physicsScene = physicsScene;
+            this.queryParameters = QueryParameters.Default;
+            this.layerMask = layerMask;
+        }
+
+        [Obsolete("Layer Mask is now a part of QueryParameters struct", false)]
+        public int layerMask { get { return queryParameters.layerMask; } set { queryParameters.layerMask = value; }}
+    }
+}
+
diff --git a/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs b/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs
index 6ee0407b8d..7f5487424f 100644
--- a/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs
+++ b/Modules/Physics2D/ScriptBindings/Physics2D.bindings.cs
@@ -2379,6 +2379,21 @@ public enum JointLimitState2D
         EqualLimits = 3,
     }
 
+    public enum JointBreakAction2D
+    {
+        // Ignore any joint break.
+        Ignore = 0,
+
+        // Perform a callback only for a joint break.
+        CallbackOnly = 1,
+
+        // Disable the Joint for a joint break.
+        Disable = 2,
+
+        // Destroy the joint for a joint break.
+        Destroy = 3,
+    }
+
     // Selects source and targets to be used by an Effector2D.
     public enum EffectorSelection2D
     {
@@ -3599,6 +3614,18 @@ extern public bool simulated
         // Gets a count of the colliders attached to this rigidbody.
         extern public int attachedColliderCount { get; }
 
+        // Gets/Sets the total user-applied force added to this body since the last simulation step.
+        extern public Vector2 totalForce { get; set; }
+
+        // Gets/Sets the total user-applied torque added to this body since the last simulation step.
+        extern public float totalTorque { get; set; }
+
+        // Get/Set the Exclude Layers,
+        extern public LayerMask excludeLayers { get; set; }
+
+        // Get/Set the Include Layers,
+        extern public LayerMask includeLayers { get; set; }
+
         // Get whether any attached collider(s) are currently touching a specific collider or not.
         extern public bool IsTouching([NotNull][Writable] Collider2D collider);
 
@@ -3892,6 +3919,21 @@ extern public PhysicsMaterial2D sharedMaterial
             set;
         }
 
+        // Get/Set the Layer Override Priority.
+        extern public int layerOverridePriority { get; set; }
+
+        // Get/Set the Exclude Layers,
+        extern public LayerMask excludeLayers { get; set; }
+
+        // Get/Set the Include Layers,
+        extern public LayerMask includeLayers { get; set; }
+
+        // Get/Set the Force Send Layers.
+        extern public LayerMask forceSendLayers { get; set; }
+
+        // Get/Set the Force Receive Layers.
+        extern public LayerMask forceReceiveLayers { get; set; }
+
         // Gets the effective friction used by the collider.
         extern public float friction { get; }
 
@@ -4542,6 +4584,9 @@ public partial class Joint2D : Behaviour
         // The magnitude of the torque required to break the joint.
         extern public float breakTorque { get; set; }
 
+        // The action required when the joint breaks.
+        extern public JointBreakAction2D breakAction { get; set; }
+
         // Get the reaction force using the fixed time-step (Unit is Newtons).
         extern public Vector2 reactionForce {[NativeMethod("GetReactionForceFixedTime")] get; }
 
diff --git a/Modules/PhysicsEditor/ArticulationBodyEditor.cs b/Modules/PhysicsEditor/ArticulationBodyEditor.cs
index bd665ee875..f29e14f0fb 100644
--- a/Modules/PhysicsEditor/ArticulationBodyEditor.cs
+++ b/Modules/PhysicsEditor/ArticulationBodyEditor.cs
@@ -17,6 +17,12 @@ internal class ArticulationBodyEditor : Editor
         SerializedProperty m_Immovable;
         SerializedProperty m_UseGravity;
 
+        SerializedProperty m_ImplicitCom;
+        SerializedProperty m_ImplicitTensor;
+        SerializedProperty m_CenterOfMass;
+        SerializedProperty m_InertiaTensor;
+        SerializedProperty m_InertiaRotation;
+
         SerializedProperty m_LinearDamping;
         SerializedProperty m_AngularDamping;
         SerializedProperty m_JointFriction;
@@ -45,15 +51,19 @@ internal class ArticulationBodyEditor : Editor
         readonly AnimBool m_ShowInfo = new AnimBool();
         bool m_RequiresConstantRepaint;
 
-        private const float GizmoLinearSize = 0.5f;
-        private const float CapScale = 0.03f;
-
         private class Styles
         {
-            public static GUIContent mass = EditorGUIUtility.TrTextContent("Mass", "Mass of this articulation body");
+            public static GUIContent mass = EditorGUIUtility.TrTextContent("Mass", "Mass of this articulation body.");
             public static GUIContent immovable = EditorGUIUtility.TrTextContent("Immovable", "Is this articulation body immovable by forces and torques? Only applies to the root body of the articulation.");
             public static GUIContent useGravity = EditorGUIUtility.TrTextContent("Use Gravity", "Controls whether gravity affects this articulation body.");
 
+            public static GUIContent implicitCom = EditorGUIUtility.TrTextContent("Automatic Center Of Mass", "Use the calculated center of mass or set it directly.");
+            public static GUIContent implicitTensor = EditorGUIUtility.TrTextContent("Automatic Tensor", "Use the calculated tensor or set it directly.");
+
+            public static GUIContent centerOfMass = EditorGUIUtility.TrTextContent("Center Of Mass", "The local space coordinates of the center of mass.");
+            public static GUIContent inertiaTensor = EditorGUIUtility.TrTextContent("Inertia Tensor", "The diagonal inertia tensor of mass relative to the center of mass.");
+            public static GUIContent inertiaRotation = EditorGUIUtility.TrTextContent("Inertia Tensor Rotation", "The rotation of the inertia tensor.");
+
             public static GUIContent collisionDetectionMode = EditorGUIUtility.TrTextContent("Collision Detection", "The method to use to detect collisions for child colliders: discrete (default) or various modes of continuous collision detection that can help solving fast moving object issues.");
 
             public static GUIContent linearDamping = EditorGUIUtility.TrTextContent("Linear Damping", "Damping factor that affects how this body resists linear motion.");
@@ -98,6 +108,12 @@ public void OnEnable()
             m_Immovable = serializedObject.FindProperty("m_Immovable");
             m_UseGravity = serializedObject.FindProperty("m_UseGravity");
 
+            m_ImplicitCom = serializedObject.FindProperty("m_ImplicitCom");
+            m_ImplicitTensor = serializedObject.FindProperty("m_ImplicitTensor");
+            m_CenterOfMass = serializedObject.FindProperty("m_CenterOfMass");
+            m_InertiaTensor = serializedObject.FindProperty("m_InertiaTensor");
+            m_InertiaRotation = serializedObject.FindProperty("m_InertiaRotation");
+
             m_CollisionDetectionMode = serializedObject.FindProperty("m_CollisionDetectionMode");
 
             m_LinearDamping = serializedObject.FindProperty("m_LinearDamping");
@@ -135,11 +151,6 @@ public void OnDisable()
             m_ShowInfo.valueChanged.RemoveListener(Repaint);
         }
 
-        private void QuaternionAsEulerAnglesPropertyField(GUIContent tag, SerializedProperty quaternionProperty, Quaternion rotation)
-        {
-            quaternionProperty.quaternionValue = Quaternion.Euler(EditorGUILayout.Vector3Field(tag, rotation.eulerAngles));
-        }
-
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
@@ -155,9 +166,22 @@ public override void OnInspectorGUI()
 
             EditorGUILayout.Space(5);
             EditorGUILayout.PropertyField(m_Mass, Styles.mass);
-            CollisionDetectionMode collisionDetectionMode = (CollisionDetectionMode)m_CollisionDetectionMode.intValue;
 
             EditorGUILayout.PropertyField(m_UseGravity, Styles.useGravity);
+            EditorGUILayout.PropertyField(m_ImplicitCom, Styles.implicitCom);
+
+            if (!m_ImplicitCom.boolValue)
+            {
+                EditorGUILayout.PropertyField(m_CenterOfMass, Styles.centerOfMass);
+            }
+
+            EditorGUILayout.PropertyField(m_ImplicitTensor, Styles.implicitTensor);
+            if (!m_ImplicitTensor.boolValue)
+            {
+                EditorGUILayout.PropertyField(m_InertiaTensor, Styles.inertiaTensor);
+                EditorGUILayout.PropertyField(m_InertiaRotation, Styles.inertiaRotation);
+            }
+
             if (body.isRoot)
             {
                 EditorGUILayout.PropertyField(m_Immovable, Styles.immovable);
@@ -167,8 +191,7 @@ public override void OnInspectorGUI()
                     EditorGUILayout.PropertyField(m_AngularDamping, Styles.angularDamping);
                 }
 
-                collisionDetectionMode = (CollisionDetectionMode)EditorGUILayout.EnumPopup(Styles.collisionDetectionMode, collisionDetectionMode);
-                m_CollisionDetectionMode.intValue = (int)collisionDetectionMode;
+                EditorGUILayout.PropertyField(m_CollisionDetectionMode, Styles.collisionDetectionMode);
 
                 EditorGUILayout.HelpBox("This is the root body of the articulation.", MessageType.Info);
             }
@@ -178,9 +201,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_AngularDamping, Styles.angularDamping);
                 EditorGUILayout.PropertyField(m_JointFriction, Styles.jointFriction);
 
-                collisionDetectionMode = (CollisionDetectionMode)EditorGUILayout.EnumPopup(Styles.collisionDetectionMode, collisionDetectionMode);
-                m_CollisionDetectionMode.intValue = (int)collisionDetectionMode;
-
+                EditorGUILayout.PropertyField(m_CollisionDetectionMode, Styles.collisionDetectionMode);
                 EditorGUILayout.PropertyField(m_MatchAnchors, Styles.matchAnchors);
 
                 // Show anchor edit fields and set to joint if changed
@@ -188,7 +209,7 @@ public override void OnInspectorGUI()
                 // If we were to do that, simulation would drift caused by anchors reset relative to current poses
                 EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(m_AnchorPosition, Styles.anchorPosition);
-                QuaternionAsEulerAnglesPropertyField(Styles.anchorRotation, m_AnchorRotation, body.anchorRotation);
+                EditorGUILayout.PropertyField(m_AnchorRotation, Styles.anchorRotation);
                 if (EditorGUI.EndChangeCheck())
                 {
                     Undo.RecordObject(target, "Changing Articulation body anchor position/rotation");
@@ -209,7 +230,7 @@ public override void OnInspectorGUI()
                 {
                     EditorGUI.BeginChangeCheck();
                     EditorGUILayout.PropertyField(m_ParentAnchorPosition, Styles.parentAnchorPosition);
-                    QuaternionAsEulerAnglesPropertyField(Styles.parentAnchorRotation, m_ParentAnchorRotation, body.parentAnchorRotation);
+                    EditorGUILayout.PropertyField(m_ParentAnchorRotation, Styles.parentAnchorRotation);
 
                     if (EditorGUI.EndChangeCheck())
                     {
diff --git a/Modules/PhysicsEditor/ArticulatonBodyAnchorTransformTool.cs b/Modules/PhysicsEditor/ArticulatonBodyAnchorTransformTool.cs
index e39cfb2756..4af01bb5cf 100644
--- a/Modules/PhysicsEditor/ArticulatonBodyAnchorTransformTool.cs
+++ b/Modules/PhysicsEditor/ArticulatonBodyAnchorTransformTool.cs
@@ -2,8 +2,6 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
-using UnityEditor.IMGUI.Controls;
 using UnityEditor.EditorTools;
 using UnityEngine;
 
@@ -69,11 +67,14 @@ public override void OnToolGUI(EditorWindow window)
 
         private void DisplayProperAnchorHandle(ArticulationBody body, ref Vector3 anchorPos, ref Quaternion anchorRot)
         {
-            var bodySpace = Matrix4x4.TRS(body.transform.position, body.transform.rotation, Vector3.one);
+            // Anchors are relative to the body here, and that includes scale.
+            // However, we don't want to pass scale to DrawingScope - because that transforms the gizmos themselves.
+            // For that reason, we add and remove scale manually when drawing.
+            var bodySpace = Matrix4x4.TRS(Vector3.zero, body.transform.rotation, Vector3.one);
             using (new Handles.DrawingScope(bodySpace))
             {
-                anchorPos = Handles.PositionHandle(anchorPos, anchorRot);
-                anchorRot = Handles.RotationHandle(anchorRot, anchorPos);
+                anchorRot = Handles.RotationHandle(anchorRot, body.transform.TransformPoint(anchorPos));
+                anchorPos = body.transform.InverseTransformPoint(Handles.PositionHandle(body.transform.TransformPoint(anchorPos), anchorRot));
             }
         }
     }
diff --git a/Modules/PhysicsEditor/HingeJointEditor.cs b/Modules/PhysicsEditor/HingeJointEditor.cs
index 2174b027cf..428e5152e0 100644
--- a/Modules/PhysicsEditor/HingeJointEditor.cs
+++ b/Modules/PhysicsEditor/HingeJointEditor.cs
@@ -10,14 +10,16 @@ namespace UnityEditor
     [CustomEditor(typeof(HingeJoint)), CanEditMultipleObjects]
     class HingeJointEditor : JointEditor<HingeJoint>
     {
-        static readonly GUIContent s_WarningMessage = EditorGUIUtility.TrTextContent("Min and max limits must be within the range [-180, 180].");
+        static readonly GUIContent s_WarningMessage = EditorGUIUtility.TrTextContent("Min and max limits must be within the range ");
         SerializedProperty m_MinLimit;
         SerializedProperty m_MaxLimit;
+        SerializedProperty m_ExtendedLimits;
 
         void OnEnable()
         {
             m_MinLimit = serializedObject.FindProperty("m_Limits.min");
             m_MaxLimit = serializedObject.FindProperty("m_Limits.max");
+            m_ExtendedLimits = serializedObject.FindProperty("m_ExtendedLimits");
         }
 
         public override void OnInspectorGUI()
@@ -26,9 +28,10 @@ public override void OnInspectorGUI()
 
             float min = m_MinLimit.floatValue;
             float max = m_MaxLimit.floatValue;
+            float maxAngle = m_ExtendedLimits.boolValue ? 360f : 180f;
 
-            if (min < -180f || min > 180f || max < -180f || max > 180f)
-                EditorGUILayout.HelpBox(s_WarningMessage.text, MessageType.Warning);
+            if (min < -maxAngle || min > maxAngle || max < -maxAngle || max > maxAngle)
+                EditorGUILayout.HelpBox(s_WarningMessage.text + $"[-{maxAngle}, {maxAngle}]", MessageType.Warning);
         }
     }
 
diff --git a/Modules/PhysicsEditor/RigidbodyEditor.cs b/Modules/PhysicsEditor/RigidbodyEditor.cs
index 81a3e94b17..dfdf30a2f7 100644
--- a/Modules/PhysicsEditor/RigidbodyEditor.cs
+++ b/Modules/PhysicsEditor/RigidbodyEditor.cs
@@ -14,15 +14,65 @@ namespace UnityEditor
     internal class RigidbodyEditor : Editor
     {
         SerializedProperty m_Constraints;
-        static GUIContent m_FreezePositionLabel = EditorGUIUtility.TrTextContent("Freeze Position");
-        static GUIContent m_FreezeRotationLabel = EditorGUIUtility.TrTextContent("Freeze Rotation");
+        SerializedProperty m_Mass;
+        SerializedProperty m_Drag;
+        SerializedProperty m_AngularDrag;
+
+        SerializedProperty m_ImplicitCom;
+        SerializedProperty m_CenterOfMass;
+        SerializedProperty m_ImplicitTensor;
+        SerializedProperty m_InertiaTensor;
+        SerializedProperty m_InertiaRotation;
+
+        SerializedProperty m_UseGravity;
+        SerializedProperty m_IsKinematic;
+        SerializedProperty m_Interpolate;
+        SerializedProperty m_CollisionDetection;
+
+
+         private class Styles
+        {
+            public static GUIContent mass = EditorGUIUtility.TrTextContent("Mass", "Mass of this rigid body.");
+            public static GUIContent useGravity = EditorGUIUtility.TrTextContent("Use Gravity", "Controls whether gravity affects this rigid body.");
+
+            public static GUIContent drag = EditorGUIUtility.TrTextContent("Drag", "Damping factor that affects how this body resists linear motion.");
+            public static GUIContent angularDrag = EditorGUIUtility.TrTextContent("Angular Drag", "Damping factor that affects how this body resists rotations.");
+            public static GUIContent isKinematic = EditorGUIUtility.TrTextContent("Is Kinematic", "Controls whether physics affects the rigidbody.");
+            public static GUIContent interpolate = EditorGUIUtility.TrTextContent("Interpolate", "Smooths out the effect of running physics at a fixed frame rate.");
+
+            public static GUIContent implicitCom = EditorGUIUtility.TrTextContent("Automatic Center Of Mass", "Use the calculated center of mass or set it directly.");
+            public static GUIContent implicitTensor = EditorGUIUtility.TrTextContent("Automatic Tensor", "Use the calculated tensor or set it directly.");
+            public static GUIContent centerOfMass = EditorGUIUtility.TrTextContent("Center Of Mass", "The local space coordinates of the center of mass.");
+            public static GUIContent inertiaTensor = EditorGUIUtility.TrTextContent("Inertia Tensor", "The diagonal inertia tensor of mass relative to the center of mass.");
+            public static GUIContent inertiaRotation = EditorGUIUtility.TrTextContent("Inertia Tensor Rotation", "The rotation of the inertia tensor.");
+
+            public static GUIContent collisionDetection = EditorGUIUtility.TrTextContent("Collision Detection", "The method to use to detect collisions for child colliders: discrete (default) or various modes of continuous collision detection that can help solving fast moving object issues.");
+
+            public static GUIContent freezePositionLabel = EditorGUIUtility.TrTextContent("Freeze Position");
+            public static GUIContent freezeRotationLabel = EditorGUIUtility.TrTextContent("Freeze Rotation");
+        }
 
         readonly AnimBool m_ShowInfo = new AnimBool();
         private bool m_RequiresConstantRepaint;
 
         public void OnEnable()
         {
+            m_Mass = serializedObject.FindProperty("m_Mass");
+            m_Drag = serializedObject.FindProperty("m_Drag");
+            m_AngularDrag = serializedObject.FindProperty("m_AngularDrag");
+
+            m_ImplicitCom = serializedObject.FindProperty("m_ImplicitCom");
+            m_CenterOfMass = serializedObject.FindProperty("m_CenterOfMass");
+            m_ImplicitTensor = serializedObject.FindProperty("m_ImplicitTensor");
+            m_InertiaTensor = serializedObject.FindProperty("m_InertiaTensor");
+            m_InertiaRotation = serializedObject.FindProperty("m_InertiaRotation");
+
+            m_UseGravity = serializedObject.FindProperty("m_UseGravity");
+            m_IsKinematic = serializedObject.FindProperty("m_IsKinematic");
+            m_Interpolate = serializedObject.FindProperty("m_Interpolate");
+            m_CollisionDetection = serializedObject.FindProperty("m_CollisionDetection");
             m_Constraints = serializedObject.FindProperty("m_Constraints");
+
             m_ShowInfo.valueChanged.AddListener(Repaint);
 
             m_RequiresConstantRepaint = false;
@@ -70,22 +120,41 @@ void ToggleBlock(RigidbodyConstraints constraints, GUIContent label, int x, int
 
         public override void OnInspectorGUI()
         {
-            DrawDefaultInspector();
+            serializedObject.Update();
+
+            EditorGUILayout.PropertyField(m_Mass, Styles.mass);
+            EditorGUILayout.PropertyField(m_Drag, Styles.drag);
+            EditorGUILayout.PropertyField(m_AngularDrag, Styles.angularDrag);
+            EditorGUILayout.PropertyField(m_ImplicitCom, Styles.implicitCom);
+            if (!m_ImplicitCom.boolValue)
+                EditorGUILayout.PropertyField(m_CenterOfMass, Styles.centerOfMass);
+            EditorGUILayout.PropertyField(m_ImplicitTensor, Styles.implicitTensor);
+            if (!m_ImplicitTensor.boolValue)
+            {
+                EditorGUILayout.PropertyField(m_InertiaTensor, Styles.inertiaTensor);
+                EditorGUILayout.PropertyField(m_InertiaRotation, Styles.inertiaRotation);
+            }
+
+            EditorGUILayout.PropertyField(m_UseGravity, Styles.useGravity);
+            EditorGUILayout.PropertyField(m_IsKinematic, Styles.isKinematic);
+            EditorGUILayout.PropertyField(m_Interpolate, Styles.interpolate);
+            EditorGUILayout.PropertyField(m_CollisionDetection, Styles.collisionDetection);
 
             Rect position = EditorGUILayout.GetControlRect();
             EditorGUI.BeginProperty(position, null, m_Constraints);
             m_Constraints.isExpanded = EditorGUI.Foldout(position, m_Constraints.isExpanded, m_Constraints.displayName, true);
             EditorGUI.EndProperty();
 
-            serializedObject.Update();
             RigidbodyConstraints constraints = (RigidbodyConstraints)m_Constraints.intValue;
             if (m_Constraints.isExpanded)
             {
                 EditorGUI.indentLevel++;
-                ToggleBlock(constraints, m_FreezePositionLabel, 1, 2, 3);
-                ToggleBlock(constraints, m_FreezeRotationLabel, 4, 5, 6);
+                ToggleBlock(constraints, Styles.freezePositionLabel, 1, 2, 3);
+                ToggleBlock(constraints, Styles.freezeRotationLabel, 4, 5, 6);
                 EditorGUI.indentLevel--;
             }
+
+            serializedObject.ApplyModifiedProperties();
         }
 
         public override bool RequiresConstantRepaint()
diff --git a/Modules/PresetsEditor/PresetContextMenu.cs b/Modules/PresetsEditor/PresetContextMenu.cs
index fef0d73a95..d215faf84f 100644
--- a/Modules/PresetsEditor/PresetContextMenu.cs
+++ b/Modules/PresetsEditor/PresetContextMenu.cs
@@ -22,10 +22,14 @@ internal static void CreateAndShow(Object[] targets)
 
         void RevertValues()
         {
-            Undo.RecordObjects(m_Targets, "Cancel Preset");
-            for (int i = 0; i < m_Targets.Length; i++)
+            var targets = m_Targets.Where(t => t != null).ToArray();
+            if (targets.Length == 0)
+                return;
+
+            Undo.RecordObjects(targets, "Cancel Preset");
+            for (int i = 0; i < targets.Length; i++)
             {
-                m_Presets[i].ApplyTo(m_Targets[i]);
+                m_Presets[i].ApplyTo(targets[i]);
             }
         }
 
@@ -37,16 +41,25 @@ public override void OnSelectionChanged(Preset selection)
             }
             else
             {
-                Undo.RecordObjects(m_Targets, "Apply Preset " + selection.name);
-                foreach (var target in m_Targets)
-                {
-                    selection.ApplyTo(target);
-                }
+                ApplyValues(selection);
             }
             InspectorWindow.RepaintAllInspectors();
             SettingsService.RepaintAllSettingsWindow();
         }
 
+        void ApplyValues(Preset selection)
+        {
+            var targets = m_Targets.Where(t => t != null).ToArray();
+            if (targets.Length == 0)
+                return;
+
+            Undo.RecordObjects(targets, "Apply Preset " + selection.name);
+            foreach (var target in targets)
+            {
+                selection.ApplyTo(target);
+            }
+        }
+
         public override void OnSelectionClosed(Preset selection)
         {
             OnSelectionChanged(selection);
diff --git a/Modules/PresetsEditor/PresetSelector.cs b/Modules/PresetsEditor/PresetSelector.cs
index 03dd4f3e49..b2c1dab26b 100644
--- a/Modules/PresetsEditor/PresetSelector.cs
+++ b/Modules/PresetsEditor/PresetSelector.cs
@@ -58,83 +58,13 @@ public override void OnSelectionClosed(Preset selection)
 
     class PresetListArea : ObjectListArea
     {
-        public const int saveCurrentToInstanceID = int.MinValue;
-        bool m_CanCreateNew;
-        readonly LocalGroup.ExtraItem m_SaveCurrentToItem;
-
-        public PresetListArea(ObjectListAreaState state, PresetSelector owner, bool canCreateNew)
+        public PresetListArea(ObjectListAreaState state, PresetSelector owner)
             : base(state, owner, true)
         {
-            m_CanCreateNew = canCreateNew;
-
             if (noneItem != null)
             {
-                noneItem.m_Name = "Current";
                 noneItem.m_Icon = EditorGUIUtility.LoadIcon("Preset.Current");
             }
-
-            if (canCreateNew)
-            {
-                m_SaveCurrentToItem = new LocalGroup.ExtraItem()
-                {
-                    m_InstanceID = saveCurrentToInstanceID,
-                    m_Name = "Save current to...",
-                    m_Icon = EditorGUIUtility.LoadIcon("CreateAddNew")
-                };
-            }
-
-            this.keyboardCallback += KeyboardCallback;
-        }
-
-        void KeyboardCallback()
-        {
-            if (m_CanCreateNew && Event.current.type == EventType.KeyDown)
-            {
-                m_LocalAssets.AssetReferenceAtIndex(numItemsDisplayed - 1, out InternalEditorUtility.AssetReference lastItem);
-                switch (Event.current.keyCode)
-                {
-                    case KeyCode.DownArrow:
-                        if (IsSelected(lastItem.instanceID))
-                        {
-                            SetSelection(new[] { saveCurrentToInstanceID }, false);
-                            Event.current.Use();
-                        }
-                        else if (IsSelected(saveCurrentToInstanceID))
-                        {
-                            Event.current.Use();
-                        }
-                        break;
-                    case KeyCode.UpArrow:
-                        if (IsSelected(saveCurrentToInstanceID))
-                        {
-                            SetSelection(new[] { lastItem.instanceID }, false);
-                            Event.current.Use();
-                        }
-                        break;
-                }
-            }
-        }
-
-        public override void OnGUI(Rect pos, int keyboardControlID)
-        {
-            if (m_CanCreateNew)
-            {
-                // The 'Save current to...' item will be "pinned" at the bottom of the area containing the list.
-                // Reducing list area height by the height of one item.
-                var itemHeight = m_LocalAssets.m_Grid.CalcRect(0, 0).height;
-
-                var listPos = new Rect(pos);
-                listPos.height = Math.Max(0, listPos.height - itemHeight);
-                base.OnGUI(listPos, keyboardControlID);
-
-                // Adjusting position of 'Save current to...' item
-                var saveCurrentToItemRect = new Rect(pos.x, pos.y + listPos.height + 2, pos.width, itemHeight);
-                m_LocalAssets.DrawItem(saveCurrentToItemRect, m_SaveCurrentToItem);
-            }
-            else
-            {
-                base.OnGUI(pos, keyboardControlID);
-            }
         }
 
         LocalGroup.ExtraItem noneItem => m_LocalAssets?.NoneList != null && m_LocalAssets.NoneList.Length > 0 ? m_LocalAssets.NoneList[0] : null;
@@ -150,6 +80,8 @@ static class Style
             public static GUIStyle selectedPathLabel = "Label";
         }
 
+        internal static Object[] InspectedObjects { get; set; }
+
         // Filter
         string m_SearchField;
         IEnumerable<Preset> m_Presets;
@@ -177,7 +109,7 @@ static class Style
         string m_SelectedPath;
         GUIContent m_SelectedPathContent = new GUIContent();
 
-        bool canCreateNewPreset => m_CanCreateNew && m_ListArea != null && m_ListArea.IsSelected(PresetListArea.saveCurrentToInstanceID);
+        bool canCreateNewPreset => m_CanCreateNew;
 
         internal static PresetSelector get
         {
@@ -285,9 +217,14 @@ void Init(Object target, Preset currentSelection, bool createNewAllowed, PresetS
 
         static IEnumerable<Preset> FindAllPresetsOfType(PresetType presetType)
         {
+            // If a preset is currently inspected, it doesn't make sense for it to be applied on itself so we filter it from the list.
+            Preset inspectedPreset = null;
+            if (InspectedObjects != null && InspectedObjects.Length == 1 && InspectedObjects[0] is Preset preset)
+                inspectedPreset = preset;
+
             return AssetDatabase.FindAssets("t:Preset")
                 .Select(a => AssetDatabase.LoadAssetAtPath<Preset>(AssetDatabase.GUIDToAssetPath(a)))
-                .Where(preset => preset.GetPresetType() == presetType);
+                .Where(preset => preset.GetPresetType() == presetType && preset != inspectedPreset);
         }
 
         void InitListArea()
@@ -297,7 +234,7 @@ void InitListArea()
 
             if (m_ListArea == null)
             {
-                m_ListArea = new PresetListArea(m_ListAreaState, this, m_CanCreateNew);
+                m_ListArea = new PresetListArea(m_ListAreaState, this);
                 m_ListArea.allowDeselection = false;
                 m_ListArea.allowDragging = false;
                 m_ListArea.allowFocusRendering = false;
@@ -324,8 +261,6 @@ void ListAreaItemSelectedCallback(bool doubleClicked)
         {
             if (doubleClicked)
             {
-                if (canCreateNewPreset)
-                    CreatePreset(m_MainTarget);
                 Close();
                 GUIUtility.ExitGUI();
             }
@@ -373,21 +308,29 @@ void OnGUI()
 
         void DrawBottomBar()
         {
-            using (new EditorGUILayout.HorizontalScope(Style.bottomBarBg, GUILayout.MinHeight(24f)))
+            using (new EditorGUILayout.VerticalScope(Style.bottomBarBg, GUILayout.MinHeight(k_BottomBarHeight)))
             {
-                Rect rect = new Rect(0, position.height - k_BottomBarHeight, position.width, k_BottomBarHeight);
-
-                // File path
-                EditorGUIUtility.SetIconSize(new Vector2(16, 16)); // If not set we see icons scaling down if text is being cropped
-                const float k_Margin = 2;
-                rect.width -= k_Margin * 2;
-                rect.x += k_Margin;
-                rect.height = k_BottomBarHeight;
-
-                GUI.Label(rect, m_SelectedPathContent, Style.selectedPathLabel);
-                EditorGUIUtility.SetIconSize(new Vector2(0, 0));
+                if (canCreateNewPreset)
+                {
+                    using (new EditorGUILayout.HorizontalScope(GUIStyle.none))
+                    {
+                        if (GUILayout.Button("Create new Preset..."))
+                        {
+                            // Since a selection change instantly applies a preset, we clear it so the previous values gets
+                            // used to create the new preset.
+                            Undo.RevertAllDownToGroup(m_ModalUndoGroup);
+                            m_ListArea.InitSelection(Array.Empty<int>());
+                            CreatePreset(m_MainTarget);
+                        }
+                    }
+                }
 
-                GUILayout.FlexibleSpace();
+                using (new EditorGUILayout.HorizontalScope(GUIStyle.none, GUILayout.MinHeight(18)))
+                {
+                    EditorGUIUtility.SetIconSize(new Vector2(16, 16)); // If not set we see icons scaling down if text is being cropped
+                    GUILayout.Label(m_SelectedPathContent, Style.selectedPathLabel);
+                    EditorGUIUtility.SetIconSize(new Vector2(0, 0));
+                }
             }
         }
 
@@ -421,8 +364,6 @@ void HandleKeyInput()
                         break;
                     case KeyCode.KeypadEnter:
                     case KeyCode.Return:
-                        if (canCreateNewPreset)
-                            CreatePreset(m_MainTarget);
                         Close();
                         Event.current.Use();
                         GUIUtility.ExitGUI();
@@ -488,7 +429,7 @@ static bool ApplyImportSettingsBeforeSavingPreset(ref Preset preset, Object targ
                     {
                         if (EditorUtility.DisplayDialog("Unapplied import settings", "Apply settings before creating a new preset", "Apply", "Cancel"))
                         {
-                            editor.ApplyAndImport();
+                            editor.SaveChanges();
                             // after reimporting, the target object has changed, so update the preset with the newly imported values.
                             preset.UpdateProperties(editor.target);
                             return false;
@@ -530,10 +471,14 @@ void CreatePreset(Object target)
 
                     AssetDatabase.SaveAssetIfDirty(oldPreset);
 
-                    // If the preset is opened in any inspectors, rebuild them since the preset has been overwritten
-                    var inspectors = InspectorWindow.GetInspectors().Where(iw => iw.GetInspectedObjects().Any(o => o == oldPreset));
-                    foreach (InspectorWindow inspector in inspectors)
-                        inspector.tracker.ForceRebuild();
+                    // If the preset is opened in any inspectors/property windows, rebuild them since the preset has been overwritten
+                    var propertyEditors = Resources.FindObjectsOfTypeAll<PropertyEditor>().Where(pe =>
+                    {
+                        var editor = InspectorWindowUtils.GetFirstNonImportInspectorEditor(pe.tracker.activeEditors);
+                        return editor != null && editor.targets.Any(o => o == oldPreset);
+                    });
+                    foreach (var pe in propertyEditors)
+                        pe.tracker.ForceRebuild();
                 }
                 else
                 {
diff --git a/Modules/PresetsUIEditor/PresetEditor.cs b/Modules/PresetsUIEditor/PresetEditor.cs
index 96793842fa..459d87fe31 100644
--- a/Modules/PresetsUIEditor/PresetEditor.cs
+++ b/Modules/PresetsUIEditor/PresetEditor.cs
@@ -21,7 +21,6 @@ internal class PresetEditor : Editor
         static class Style
         {
             public static GUIContent presetType = EditorGUIUtility.TrTextContent("Preset Type", "The Object type this Preset can be applied to.");
-            public static GUIStyle inspectorBig = new GUIStyle(EditorStyles.inspectorBig);
             public static GUIStyle centerStyle = new GUIStyle() { alignment = TextAnchor.MiddleCenter };
 
             public static GUIContent addToDefault = EditorGUIUtility.TrTextContent("Add to {0} default", "The Preset will be added first in the default list with an empty filter.");
@@ -33,17 +32,13 @@ static class Style
             public static readonly string excludedBarName = "unity-binding-preset-ignore-bar";
             public static readonly string excludedBarContainerName = "unity-preset-override-bars-container";
             public static readonly string excludedBarUssClassName = "unity-binding__preset-ignore-bar";
-
-            static Style()
-            {
-                inspectorBig.padding.bottom -= 1;
-            }
         }
 
         class ReferenceCount
         {
             public int count;
             public UnityObject reference;
+            public Hash128 presetHash;
         }
         static Dictionary<int, ReferenceCount> s_References = new Dictionary<int, ReferenceCount>();
         List<int> m_PresetsInstanceIds = new List<int>();
@@ -58,6 +53,32 @@ class ReferenceCount
         string m_NotSupportedEditorName = null;
         Texture2D m_UnsupportedIcon = null;
 
+        internal override void OnForceReloadInspector()
+        {
+            base.OnForceReloadInspector();
+            UpdateInvalidReferences();
+        }
+
+        void UpdateInvalidReferences()
+        {
+            foreach (var o in targets)
+            {
+                var instanceID = o.GetInstanceID();
+                if (s_References.ContainsKey(instanceID))
+                {
+                    var presetHash = s_References[instanceID].presetHash;
+                    var currentHash = AssetDatabase.GetAssetDependencyHash(AssetDatabase.GetAssetOrScenePath(o));
+
+                    // The asset changed on disk. Update the reference.
+                    if (presetHash != currentHash)
+                    {
+                        s_References[instanceID].presetHash = currentHash;
+                        s_References[instanceID].reference = (o as Preset)?.GetReferenceObject();
+                    }
+                }
+            }
+        }
+
         public override VisualElement CreateInspectorGUI()
         {
             var root = new VisualElement();
@@ -88,11 +109,6 @@ public override VisualElement CreateInspectorGUI()
             //BindingExtensions.TrackPropertyValue(root, serializedObject.FindProperty("m_ExcludedProperties"), so => UpdateVisualBindings()); // throwing error because it only works on leaf properties.
 
             var innerRoot = new VisualElement();
-            // TODO: we should ideally be able to get those values from the InspectorElement,
-            // but I'm not sure if that's possible at this point.
-            innerRoot.style.marginLeft = -15;
-            innerRoot.style.marginRight = -6;
-            innerRoot.style.marginTop = 4;
             root.Add(innerRoot);
 
             if (m_InternalEditor != null)
@@ -110,25 +126,11 @@ public override VisualElement CreateInspectorGUI()
 
                 if (m_InternalEditor.target is Component)
                 {
-                    innerRoot.Add(new IMGUIContainer(() =>
-                    {
-                        bool wasVisible = InternalEditorUtility.GetIsInspectorExpanded(m_InternalEditor.target);
-                        bool isVisible = EditorGUILayout.InspectorTitlebar(wasVisible, m_InternalEditor);
-                        if (isVisible != wasVisible)
-                        {
-                            internalInspector.style.display = isVisible ? DisplayStyle.Flex : DisplayStyle.None;
-                            InternalEditorUtility.SetIsInspectorExpanded(m_InternalEditor.target, isVisible);
-                        }
-                    }));
+                    innerRoot.Add(new IMGUIContainer(() => DrawComponentTitleBar(internalInspector)));
                 }
                 else
                 {
-                    innerRoot.Add(new IMGUIContainer(() =>
-                    {
-                        EditorGUILayout.BeginVertical();
-                        m_InternalEditor.DrawHeader();
-                        EditorGUILayout.EndVertical();
-                    }));
+                    innerRoot.Add(new IMGUIContainer(DrawInternalEditorHeader));
                 }
 
                 innerRoot.Add(internalInspector);
@@ -143,6 +145,54 @@ public override VisualElement CreateInspectorGUI()
             return root;
         }
 
+        void DrawComponentTitleBar(VisualElement internalInspector)
+        {
+            PresetSelector.InspectedObjects = targets;
+            try
+            {
+                bool wasVisible = InternalEditorUtility.GetIsInspectorExpanded(m_InternalEditor.target);
+                bool isVisible = EditorGUILayout.InspectorTitlebar(wasVisible, m_InternalEditor);
+                if (isVisible != wasVisible)
+                {
+                    internalInspector.style.display = isVisible ? DisplayStyle.Flex : DisplayStyle.None;
+                    InternalEditorUtility.SetIsInspectorExpanded(m_InternalEditor.target, isVisible);
+                }
+            }
+            finally
+            {
+                PresetSelector.InspectedObjects = null;
+            }
+        }
+
+        void DrawInternalEditorHeader()
+        {
+            var prevHierarchyMode = EditorGUIUtility.hierarchyMode;
+            PresetSelector.InspectedObjects = targets;
+            try
+            {
+                // This value is used in Editor.DrawHeader() to Begin/End vertical layout groups and to
+                // override some style properties. It is inconsistent between calls (there's a public
+                // callback there that users/packages can subscribe to) and therefore sometimes breaks
+                // the layout and buttons. Forcing its value here (to any value) prevents this from happening.
+                EditorGUIUtility.hierarchyMode = true;
+                using (new EditorGUILayout.VerticalScope())
+                {
+                    m_InternalEditor.DrawHeader();
+                }
+            }
+            finally
+            {
+                EditorGUIUtility.hierarchyMode = prevHierarchyMode;
+                PresetSelector.InspectedObjects = null;
+            }
+        }
+
+        public override bool UseDefaultMargins()
+        {
+            // Makes inspector be full width
+            return false;
+        }
+
         void UpdateVisualBindings()
         {
             var newExclusion = ((Preset)target).excludedProperties;
@@ -232,41 +282,23 @@ void GenerateInternalEditor()
                 for (var index = 0; index < targets.Length; index++)
                 {
                     var p = (Preset)targets[index];
+                    if (p.GetReferenceObject() == null)
+                    {
+                        // fast exit on NULL targets as we do not support their inspector in Preset.
+                        SetupUnsupportedInspector(p);
+                        return;
+                    }
+
                     ReferenceCount reference = null;
                     var referenceRegistered = s_References.TryGetValue(p.GetInstanceID(), out reference);
                     if (!referenceRegistered || reference.reference == null)
                     {
-                        if (reference == null)
-                        {
-                            reference = new ReferenceCount()
-                            {
-                                count = 0,
-                                reference = p.GetReferenceObject()
-                            };
-                        }
-                        else
-                        {
-                            reference.reference = p.GetReferenceObject();
-                        }
-                        if (reference.reference == null)
+                        reference = new ReferenceCount()
                         {
-                            // fast exit on NULL targets as we do not support their inspector in Preset.
-                            m_NotSupportedEditorName = p.GetTargetTypeName();
-                            m_UnsupportedIcon = EditorGUIUtility.LoadIcon(m_NotSupportedEditorName.Replace('.', '/') + " Icon");
-                            if (m_UnsupportedIcon == null)
-                            {
-                                m_UnsupportedIcon = AssetPreview.GetMiniTypeThumbnailFromType((serializedObject.FindProperty("m_TargetType.m_ManagedTypePPtr").objectReferenceValue as MonoScript)?.GetClass());
-                                if (m_UnsupportedIcon == null)
-                                {
-                                    m_UnsupportedIcon = AssetPreview.GetMiniTypeThumbnailFromClassID(serializedObject.FindProperty("m_TargetType.m_NativeTypeID").intValue);
-                                    if (m_UnsupportedIcon == null)
-                                    {
-                                        m_UnsupportedIcon = AssetPreview.GetMiniTypeThumbnail(typeof(UnityObject));
-                                    }
-                                }
-                            }
-                            return;
-                        }
+                            count = 0,
+                            reference = p.GetReferenceObject(),
+                            presetHash = AssetDatabase.GetAssetDependencyHash(AssetDatabase.GetAssetOrScenePath(p))
+                        };
 
                         reference.reference.name = p.name;
                         if (referenceRegistered)
@@ -277,8 +309,9 @@ void GenerateInternalEditor()
                         {
                             s_References.Add(p.GetInstanceID(), reference);
                         }
-                        m_PresetsInstanceIds.Add(p.GetInstanceID());
                     }
+
+                    m_PresetsInstanceIds.Add(p.GetInstanceID());
                     reference.count++;
                     objs[index] = reference.reference;
                 }
@@ -296,7 +329,8 @@ void GenerateInternalEditor()
                         reference = new ReferenceCount()
                         {
                             count = 0,
-                            reference = m_InternalEditor.targets[index]
+                            reference = m_InternalEditor.targets[index],
+                            presetHash = AssetDatabase.GetAssetDependencyHash(AssetDatabase.GetAssetOrScenePath(targets[index]))
                         };
                         s_References.Add(instanceID, reference);
                     }
@@ -656,9 +690,27 @@ void DisableEnableProperty(GenericMenu menu, SerializedProperty property)
             }
         }
 
+        void SetupUnsupportedInspector(Preset p)
+        {
+            m_NotSupportedEditorName = p.GetTargetTypeName();
+            m_UnsupportedIcon = EditorGUIUtility.LoadIcon(m_NotSupportedEditorName.Replace('.', '/') + " Icon");
+            if (m_UnsupportedIcon == null)
+            {
+                m_UnsupportedIcon = AssetPreview.GetMiniTypeThumbnailFromType((serializedObject.FindProperty("m_TargetType.m_ManagedTypePPtr").objectReferenceValue as MonoScript)?.GetClass());
+                if (m_UnsupportedIcon == null)
+                {
+                    m_UnsupportedIcon = AssetPreview.GetMiniTypeThumbnailFromClassID(serializedObject.FindProperty("m_TargetType.m_NativeTypeID").intValue);
+                    if (m_UnsupportedIcon == null)
+                    {
+                        m_UnsupportedIcon = AssetPreview.GetMiniTypeThumbnail(typeof(UnityObject));
+                    }
+                }
+            }
+        }
+
         void DrawUnsupportedInspector()
         {
-            GUILayout.BeginHorizontal(Style.inspectorBig);
+            GUILayout.BeginHorizontal(EditorStyles.inspectorBig);
             GUILayout.Space(38);
             GUILayout.BeginVertical();
             GUILayout.Space(k_HeaderHeight);
diff --git a/Modules/ProfilerEditor/ProfilerWindow/Chart.cs b/Modules/ProfilerEditor/ProfilerWindow/Chart.cs
index 49b890e970..63b2b6da0b 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/Chart.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/Chart.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using Unity.Profiling.Editor;
 using UnityEngine;
 using UnityEditor;
@@ -378,6 +379,12 @@ void DrawOverlayBox(Rect r, int startFrame, int endFrame, int frameDataLength, b
             if (statisticsAvailabilityMessage != null)
             {
                 message = statisticsAvailabilityMessage(statisticsAvailabilityState);
+
+                if (message != null)
+                {
+                    // Remove hyperlinks for the player settings from tooltip, since they can't be clicked.
+                    message = Regex.Replace(message, @"\(<a playersettingslink=.*<\/a>\)", "");
+                }
                 content = new GUIContent("", message);
             }
             // draw tooltip int
diff --git a/Modules/ProfilerEditor/ProfilerWindow/IProfilerWindowController.cs b/Modules/ProfilerEditor/ProfilerWindow/IProfilerWindowController.cs
index a057d70e6f..45d27ab4de 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/IProfilerWindowController.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/IProfilerWindowController.cs
@@ -44,7 +44,6 @@ internal interface IProfilerWindowController
 
         void CloseModule(ProfilerModule module);
 
-        void SetAreasInUse(IEnumerable<ProfilerArea> areas, bool inUse);
         void Repaint();
     }
 }
diff --git a/Modules/ProfilerEditor/ProfilerWindow/LegacyProfilerAreaUtility.cs b/Modules/ProfilerEditor/ProfilerWindow/LegacyProfilerAreaUtility.cs
new file mode 100644
index 0000000000..9fe86878ed
--- /dev/null
+++ b/Modules/ProfilerEditor/ProfilerWindow/LegacyProfilerAreaUtility.cs
@@ -0,0 +1,35 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using UnityEngine.Profiling;
+
+namespace Unity.Profiling.Editor
+{
+    internal class LegacyProfilerAreaUtility
+    {
+        static readonly Dictionary<ProfilerArea, string> k_ProfilerAreasToCategoriesMap = new Dictionary<ProfilerArea, string>()
+        {
+            { ProfilerArea.CPU, ProfilerCategory.Scripts.Name },
+            { ProfilerArea.GPU, ProfilerCategory.GPU.Name },
+            { ProfilerArea.Rendering, ProfilerCategory.Render.Name },
+            { ProfilerArea.Memory, ProfilerCategory.Memory.Name },
+            { ProfilerArea.Audio, ProfilerCategory.Audio.Name },
+            { ProfilerArea.Video, ProfilerCategory.Video.Name },
+            { ProfilerArea.Physics, ProfilerCategory.Physics.Name },
+            { ProfilerArea.Physics2D, ProfilerCategory.Physics.Name },
+            { ProfilerArea.NetworkMessages, ProfilerCategory.Network.Name },
+            { ProfilerArea.NetworkOperations, ProfilerCategory.Network.Name },
+            { ProfilerArea.UI, ProfilerCategory.Gui.Name },
+            { ProfilerArea.UIDetails, ProfilerCategory.Gui.Name },
+            { ProfilerArea.GlobalIllumination, ProfilerCategory.Lighting.Name },
+            { ProfilerArea.VirtualTexturing, ProfilerCategory.VirtualTexturing.Name },
+        };
+
+        public static string ProfilerAreaToCategoryName(ProfilerArea area)
+        {
+            return k_ProfilerAreasToCategoriesMap.TryGetValue(area, out var categoryName) ? categoryName : null;
+        }
+    }
+}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/Data/CounterCollector.cs b/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/Data/CounterCollector.cs
index 5234c83eb7..ccc2926815 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/Data/CounterCollector.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/Data/CounterCollector.cs
@@ -65,14 +65,11 @@ void AddToCountersCollection(string categoryName, string counterName, SortedDict
         {
             if (collection.TryGetValue(categoryName, out List<string> counters))
             {
-                // If we could use SortedSet rather than List (we are limited to .NET 3.5 currently), it would prevent the need to do this ordering and duplicate checking manually.
-                for (int i = 0; i < counters.Count; i++)
+                // Insert in alphabetical order.
+                int index = counters.BinarySearch(counterName);
+                if (index < 0) // Prevent duplicates.
                 {
-                    int index = counters.BinarySearch(counterName);
-                    if (index < 0) // Prevent duplicates.
-                    {
-                        counters.Insert(~index, counterName);
-                    }
+                    counters.Insert(~index, counterName);
                 }
             }
             else
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleDetailsViewController.cs b/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleDetailsViewController.cs
index 6461a045f5..0a03aa639b 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleDetailsViewController.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleDetailsViewController.cs
@@ -95,8 +95,8 @@ public override void ConfigureView(VisualElement root)
             m_AllCountersTreeView.bindItem = BindTreeViewItem;
             m_AllCountersTreeView.viewDataKey = k_AllCountersTreeViewDataKey;
             m_AllCountersTreeView.selectionType = SelectionType.Multiple;
-            m_AllCountersTreeView.onSelectedIndicesChange += OnTreeViewSelectionChanged;
-            m_AllCountersTreeView.onItemsChosen += OnTreeViewSelectionChosen;
+            m_AllCountersTreeView.selectedIndicesChanged += OnTreeViewSelectionChanged;
+            m_AllCountersTreeView.itemsChosen += OnTreeViewSelectionChosen;
             m_AllCountersAddSelectedButton.text = LocalizationDatabase.GetLocalizedString("Add Selected");
             m_AllCountersAddSelectedButton.clicked += AddSelectedTreeViewCountersToModule;
 
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleListViewController.cs b/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleListViewController.cs
index 19e53541b6..905f2bcc6d 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleListViewController.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ModuleEditor/ModuleListViewController.cs
@@ -41,7 +41,7 @@ public override void ConfigureView(VisualElement root)
             m_ListView.selectionType = SelectionType.Single;
             m_ListView.reorderable = true;
             m_ListView.itemIndexChanged += OnListViewItemMoved;
-            m_ListView.onSelectionChange += OnListViewSelectionChange;
+            m_ListView.selectionChanged += OnListViewSelectionChange;
             m_ListView.itemsSource = m_Modules;
 
             m_CreateButton.text = LocalizationDatabase.GetLocalizedString("Add");
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerAreaReferenceCounter.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerAreaReferenceCounter.cs
deleted file mode 100644
index a3533ac873..0000000000
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerAreaReferenceCounter.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-using Unity.Profiling;
-using UnityEditorInternal;
-using UnityEngine;
-using UnityEngine.Profiling;
-
-namespace UnityEditor.Profiling
-{
-    // With the addition of Profiler Counters, users can create modules than use counters from the built-in ProfilerAreas. Therefore we use a reference count to manage the areas in use and only disable one when no modules are using it.
-    internal class ProfilerAreaReferenceCounter
-    {
-        const int k_InvalidIndex = -1;
-
-        int[] areaReferenceCounts;
-
-        public ProfilerAreaReferenceCounter()
-        {
-            var count = Enum.GetNames(typeof(ProfilerArea)).Length;
-            areaReferenceCounts = new int[count];
-
-            // Profiler areas are enabled and capturing by default. Disable them initially and only enable once reference counted.
-            DisableAllAreas();
-        }
-
-        public void IncrementArea(ProfilerArea area)
-        {
-            var index = IndexForArea(area);
-            if (index == k_InvalidIndex)
-            {
-                return;
-            }
-
-            var referenceCount = areaReferenceCounts[index];
-            bool wasZeroBeforeIncrement = (referenceCount == 0);
-            areaReferenceCounts[index] = referenceCount + 1;
-
-            if (wasZeroBeforeIncrement)
-            {
-                SetAreaEnabled(area, true);
-            }
-        }
-
-        public void DecrementArea(ProfilerArea area)
-        {
-            var index = IndexForArea(area);
-            if (index == k_InvalidIndex)
-            {
-                return;
-            }
-
-            var referenceCount = areaReferenceCounts[index];
-            areaReferenceCounts[index] = Mathf.Max(referenceCount - 1, 0);
-
-            bool isZero = areaReferenceCounts[index] == 0;
-            if (isZero)
-            {
-                SetAreaEnabled(area, false);
-            }
-        }
-
-        void SetAreaEnabled(ProfilerArea area, bool enabled)
-        {
-            // The CPU area should not be explicitly enabled or disabled as that would set Profiler.enabled.
-            if (area == ProfilerArea.CPU)
-                return;
-
-            ProfilerDriver.SetAreaEnabled(area, enabled);
-        }
-
-        void DisableAllAreas()
-        {
-            for (int i = 0; i < areaReferenceCounts.Length; i++)
-            {
-                var area = (ProfilerArea)i;
-                SetAreaEnabled(area, false);
-            }
-        }
-
-        int IndexForArea(ProfilerArea area)
-        {
-            var index = (int)area;
-            if (index < 0 || index >= areaReferenceCounts.Length)
-            {
-                index = k_InvalidIndex;
-            }
-            return index;
-        }
-    }
-
-    internal static class ProfilerAreaReferenceCounterUtility
-    {
-        static readonly Dictionary<string, IEnumerable<ProfilerArea>> k_ProfilerCategoriesToAreasMap = new Dictionary<string, IEnumerable<ProfilerArea>>()
-        {
-            { ProfilerCategory.Render.Name, new ProfilerArea[] { ProfilerArea.Rendering } },
-            { ProfilerCategory.Memory.Name, new ProfilerArea[] { ProfilerArea.Memory } },
-            { ProfilerCategory.Audio.Name, new ProfilerArea[] { ProfilerArea.Audio } },
-            { ProfilerCategory.Video.Name, new ProfilerArea[] { ProfilerArea.Video } },
-            // Both Physics and Physics2D modules will remain active if any counter from the Physics category is active.
-            { ProfilerCategory.Physics.Name, new ProfilerArea[] { ProfilerArea.Physics, ProfilerArea.Physics2D } },
-            // Both NetworkMessages and NetworkOperations modules will remain active if any counter from the Network category is active.
-            { ProfilerCategory.Network.Name, new ProfilerArea[] { ProfilerArea.NetworkMessages, ProfilerArea.NetworkOperations } },
-            // Both UI and UIDetails modules will remain active if any counter from the GUI category is active.
-            { ProfilerCategory.Gui.Name, new ProfilerArea[] { ProfilerArea.UI, ProfilerArea.UIDetails } },
-            { ProfilerCategory.Lighting.Name, new ProfilerArea[] { ProfilerArea.GlobalIllumination } },
-            { ProfilerCategory.VirtualTexturing.Name, new ProfilerArea[] { ProfilerArea.VirtualTexturing } },
-        };
-
-        public static IEnumerable<ProfilerArea> ProfilerCategoryNameToAreas(string categoryName)
-        {
-            // Map a counter's category to on or more built-in Profiler areas. This is part of the transition away from ProfilerArea and to Category/Counter pairs. A counter's category potentially needs to be mapped to a ProfilerArea in order to ensure that an area is not disabled when a module may be using counters associated with the legacy ProfilerArea. It is expected a category that does not correspond to any ProfilerArea returns an empty collection. It is expected that a category that corresponds to many ProfilerAreas returns all corresponding ProfilerAreas. No category corresponds to the CPU or GPU areas. Therefore, all ProfilerAreas should be accounted for here minus CPU and GPU. This is asserted in the test ProfilerAreaReferenceCounterUtilityTests_HandlesEveryBuiltInProfilerAreaExceptCPUAndGPU.
-
-            return k_ProfilerCategoriesToAreasMap.TryGetValue(categoryName, out var areas) ? areas : new ProfilerArea[0];
-        }
-    }
-}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerCategoryActivator.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerCategoryActivator.cs
new file mode 100644
index 0000000000..0249ad5e42
--- /dev/null
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerCategoryActivator.cs
@@ -0,0 +1,51 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using UnityEditorInternal;
+using UnityEngine.Profiling;
+
+namespace Unity.Profiling.Editor
+{
+    // Used by the Profiler window to manage the collection states of Profiler categories. Any categories being used by modules in the Profiler window will be enabled for collection on the target device. Once a category is no longer being used by any modules, it will be disabled for collection on the target device.
+    internal class ProfilerCategoryActivator
+    {
+        Dictionary<string, UInt16> categoryReferenceCounts;
+
+        public ProfilerCategoryActivator()
+        {
+            categoryReferenceCounts = new Dictionary<string, ushort>();
+        }
+
+        public void RetainCategory(string categoryName)
+        {
+            if (string.IsNullOrEmpty(categoryName))
+                return;
+
+            categoryReferenceCounts.TryGetValue(categoryName, out var referenceCount);
+
+            bool wasZero = (referenceCount == 0);
+            categoryReferenceCounts[categoryName] = ++referenceCount;
+
+            if (wasZero)
+                ProfilerDriver.SetCategoryEnabled(categoryName, true);
+        }
+
+        public void ReleaseCategory(string categoryName)
+        {
+            if (string.IsNullOrEmpty(categoryName))
+                return;
+
+            if (categoryReferenceCounts.TryGetValue(categoryName, out var referenceCount))
+            {
+                referenceCount = Math.Max(--referenceCount, (UInt16)0);
+                categoryReferenceCounts[categoryName] = referenceCount;
+
+                if (referenceCount == 0)
+                    ProfilerDriver.SetCategoryEnabled(categoryName, false);
+            }
+        }
+    }
+}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs
index 4b4578e981..47c692f708 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerFrameHierarchyView.cs
@@ -5,8 +5,10 @@
 using UnityEngine;
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEditor.IMGUI.Controls;
+using UnityEditor.MPE;
 using UnityEditor.Profiling;
 using Unity.Profiling;
 
@@ -429,6 +431,26 @@ static string GetProfilerColumnName(int column)
             }
         }
 
+        // Open hyperlinks directing users to specific settings in the Player Settings window.
+        static void EditorGUI_OpenSettingsOnHyperlinkClicked(EditorWindow window, HyperLinkClickedEventArgs args)
+        {
+            if (window.GetType() == typeof(ProfilerWindow) && args.hyperLinkData.ContainsKey("playersettingslink"))
+            {
+                var settings = SettingsWindow.Show(SettingsScope.Project, "Project/Player");
+                if (settings == null)
+                {
+                    Debug.LogError("Could not find Preferences for 'Project/Player'");
+                }
+                else
+                {
+                    string linkString;
+                    args.hyperLinkData.TryGetValue("playersettingssearchstring", out linkString);
+
+                    settings.FilterProviders(linkString);
+                }
+            }
+        }
+
         public void DoGUI(HierarchyFrameDataView frameDataView, bool fetchData, ref bool updateViewLive, ProfilerViewType viewType)
         {
             using (m_DoGUIMarker.Auto())
@@ -458,7 +480,25 @@ public void DoGUI(HierarchyFrameDataView frameDataView, bool fetchData, ref bool
 
                 if (!string.IsNullOrEmpty(dataAvailabilityMessage))
                 {
-                    GUILayout.Label(dataAvailabilityMessage, BaseStyles.label);
+                    GUIStyle style = BaseStyles.label;
+
+                    if (dataAvailabilityMessage.Contains("PlayerSettings."))
+                    {
+                        // Don't do hyperlinks if we're in standalone profiler since we can't easily connect back to the main process.
+                        if(UnityEditor.MPE.ProcessService.level == UnityEditor.MPE.ProcessLevel.Secondary)
+                        {
+                            dataAvailabilityMessage = Regex.Replace(dataAvailabilityMessage, @"\(<a playersettingslink=.*<\/a>\)", "");
+                        }
+                        else
+                        {
+                            style.richText = true;
+                            EditorGUI.hyperLinkClicked -= EditorGUI_OpenSettingsOnHyperlinkClicked;
+                            EditorGUI.hyperLinkClicked += EditorGUI_OpenSettingsOnHyperlinkClicked;
+                        }
+                    }
+
+                    var rect = GUILayoutUtility.GetRect(GUIContent.Temp(dataAvailabilityMessage), style);
+                    EditorGUI.SelectableLabel(rect, dataAvailabilityMessage, style);
                 }
                 else if (!isDataAvailable)
                 {
@@ -647,9 +687,15 @@ public int CompareTo(ThreadInfo other)
             {
                 if (this == other)
                     return 0;
+                // Sort by group
                 if (groupOrder != other.groupOrder)
                     return groupOrder - other.groupOrder;
-                return EditorUtility.NaturalCompare(fullName, other.fullName);
+                // then by name.
+                var result = EditorUtility.NaturalCompare(fullName, other.fullName);
+                if (result != 0)
+                    return result;
+                // and if names are the same use thread index to ensure the order persistence.
+                return threadIndex - other.threadIndex;
             }
 
             public static bool operator==(ThreadInfo lhs, ThreadInfo rhs) => ReferenceEquals(lhs, null) && ReferenceEquals(rhs, null) || !ReferenceEquals(lhs, null) && lhs.Equals(rhs);
@@ -922,8 +968,12 @@ public void SetFrameDataView(HierarchyFrameDataView frameDataView)
         {
             InitIfNeeded();
 
+            bool forceUpdateThreadNames = true;
             if (frameDataView.valid)
             {
+                // Only reset and rebuild threads cache if we change frame. Otherwise preserve the currently selected index and all threads data.
+                forceUpdateThreadNames = frameDataView.frameIndex != m_FrameIndex;
+
                 threadName = frameDataView.threadName;
                 groupName = frameDataView.threadGroupName;
                 threadId = frameDataView.threadId;
@@ -931,7 +981,7 @@ public void SetFrameDataView(HierarchyFrameDataView frameDataView)
                 fullThreadName = string.IsNullOrEmpty(groupName) ? threadName : $"{groupName}.{threadName}";
             }
             m_TreeView.SetFrameDataView(frameDataView);
-            UpdateThreadNamesAndThreadIndex(frameDataView, forceUpdate: true);
+            UpdateThreadNamesAndThreadIndex(frameDataView, forceUpdateThreadNames);
         }
 
         public override void Clear()
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Box2D/Physics2DProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Box2D/Physics2DProfilerModule.cs
index 08e2326e5b..9d0f24476a 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Box2D/Physics2DProfilerModule.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/Box2D/Physics2DProfilerModule.cs
@@ -3,9 +3,13 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using Unity.Profiling;
 using Unity.Profiling.Editor;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.Profiling;
+using System.Collections.Generic;
+using UnityEditor.Profiling;
 
 namespace UnityEditorInternal.Profiling
 {
@@ -13,22 +17,433 @@ namespace UnityEditorInternal.Profiling
     [ProfilerModuleMetadata("Physics (2D)", typeof(LocalizationResource), IconPath = "Profiler.Physics2D")]
     internal class Physics2DProfilerModule : ProfilerModuleBase
     {
+        // Styles used to display the alternating background in the detail view.
+        private static class DefaultStyles
+        {
+            public static GUIStyle backgroundEven = "OL EntryBackEven";
+            public static GUIStyle backgroundOdd = "OL EntryBackOdd";
+        }
+
+        // The profiler view to use.
+        private enum PhysicsProfilerStatsView
+        {
+            Legacy = 0,
+            Current = 1
+        }
+
+        private PhysicsProfilerStatsView m_ShowStatsView;
+        private PhysicsProfilerStatsView m_CachedShowStatsView;
+
+        // Current Counters to display.
+        static readonly ProfilerCounterData[] k_CurrentPhysicsAreaCounterNames =
+        {
+            new ProfilerCounterData()
+            {
+                m_Name = "Total Contacts",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Total Shapes",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Total Queries",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Total Callbacks",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Total Joints",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Total Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Awake Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Dynamic Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Continuous Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Physics Used Memory (2D)",
+                m_Category = k_MemoryCategoryName,
+            }
+        };
+
+        // Legacy Counters to display.
+        static readonly ProfilerCounterData[] k_LegacyPhysicsAreaCounterNames =
+        {
+            new ProfilerCounterData()
+            {
+                m_Name = "Total Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Active Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Sleeping Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Dynamic Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Kinematic Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Static Bodies",
+                m_Category = k_Physics2DCategoryName,
+            },
+            new ProfilerCounterData()
+            {
+                m_Name = "Contacts",
+                m_Category = k_Physics2DCategoryName,
+            }
+        };
+
         const int k_DefaultOrderIndex = 7;
+        private static readonly ushort k_Physics2DCategoryId = ProfilerCategory.Physics2D;
+        private static readonly string k_Physics2DCategoryName = ProfilerCategory.Physics2D.Name;
+        private static readonly string k_MemoryCategoryName = ProfilerCategory.Memory.Name;
+        private static int k_labelWidthTitle = 150;
+        private static int k_labelWidthDetail = 160;
 
+        // Profiler module overrides.
         internal override ProfilerArea area => ProfilerArea.Physics2D;
         public override bool usesCounters => false;
-
         private protected override int defaultOrderIndex => k_DefaultOrderIndex;
         private protected override string legacyPreferenceKey => "ProfilerChartPhysics2D";
 
+        private Dictionary<string, int> m_Markers;
+
+        // Storage for retrieved samples.
+        private struct SampleData
+        {
+            public float timeMs;
+            public int count;
+
+            public override string ToString()
+            {
+                return string.Format("{0:0.00} ms [{1}]", timeMs, count);
+            }
+        }
+        internal override void OnEnable()
+        {
+            m_ShowStatsView = PhysicsProfilerStatsView.Current;
+
+            ProfilerDriver.profileLoaded += OnLoadProfileData;
+
+            LegacyModuleInitialize();
+
+            base.OnEnable();
+        }
+
+        internal override void OnDisable()
+        {
+            ProfilerDriver.profileLoaded -= OnLoadProfileData;
+
+            m_Markers = null;
+
+            base.OnDisable();
+        }
+
+        private void OnLoadProfileData()
+        {
+            using (var frameData = ProfilerDriver.GetRawFrameDataView(ProfilerWindow.GetActiveVisibleFrameIndex(), 0))
+            {
+                if (frameData.valid)
+                {
+                    var physicsQueries = GetCounterValue(frameData, "Total Queries");
+                    if (physicsQueries != -1)
+                    {
+                        m_ShowStatsView = PhysicsProfilerStatsView.Current;
+                    }
+                    else
+                    {
+                        m_ShowStatsView = PhysicsProfilerStatsView.Legacy;
+                    }
+                }
+            }
+        }
+
+        private void InitializeMarkers(RawFrameDataView frameData)
+        {
+            // Fetch all the markers.
+            var markerInfo = new List<FrameDataView.MarkerInfo>();
+            frameData.GetMarkers(markerInfo);
+
+            // Assign the markers.
+            m_Markers = new Dictionary<string, int>(64);
+            foreach(var marker in markerInfo)
+            {
+                if (marker.category == k_Physics2DCategoryId)
+                    m_Markers.Add(marker.name, marker.id);
+            }
+        }
+
+        private long GetPhysicsCounterValue(RawFrameDataView frameData, string markerName)
+        {
+            // Find the marker.
+            if (m_Markers.TryGetValue(markerName, out int markerId))
+                return frameData.GetCounterValueAsLong(markerId);
+
+            // Indicate bad value!
+            return -1;
+        }
+
+        private SampleData GetPhysicsSampleData(RawFrameDataView frameData, string markerName)
+        {
+            SampleData sampleData = default;
+
+            // Find the marker.
+            if (m_Markers.TryGetValue(markerName, out int markerId))
+            {
+                for (var i = 0; i < frameData.sampleCount; ++i)
+                {
+                    // Ignore if it's not the marker we want.
+                    if (markerId != frameData.GetSampleMarkerId(i))
+                        continue;
+
+                    // Accumulate sample data.
+                    sampleData.timeMs += frameData.GetSampleTimeMs(i);
+                    sampleData.count++;
+                }
+            }
+
+            return sampleData;
+        }
+
+        private void UpdatePhysicsChart()
+        {
+            if (m_ShowStatsView == PhysicsProfilerStatsView.Current)
+            {
+                InternalSetChartCounters(ProfilerCounterDataUtility.ConvertFromLegacyCounterDatas(
+                    new List<ProfilerCounterData>(k_CurrentPhysicsAreaCounterNames)));
+            }
+            else
+            {
+                m_ShowStatsView = PhysicsProfilerStatsView.Legacy;
+                InternalSetChartCounters(ProfilerCounterDataUtility.ConvertFromLegacyCounterDatas(
+                    new List<ProfilerCounterData>(k_LegacyPhysicsAreaCounterNames)));
+            }
+
+            RebuildChart();
+        }
+
+        private void DrawAlternateBackground(Rect region, Vector2 scrollPosition, int rowCount)
+        {
+            // Only draw if repainting.
+            if (Event.current.rawType != EventType.Repaint)
+                return;
+
+            // Fetch the label height.
+            var labelHeight = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+
+            // Draw the selected rows.
+            for (int row = 0; row < rowCount; ++row)
+            {
+                // Only draw alternate rows.
+                if (row % 2 == 1)
+                    continue;
+
+                // Calculate and draw the row.
+                var rowRect = new Rect(region.x + scrollPosition.x, region.y + ((row-1) * labelHeight), region.width, labelHeight);
+                DefaultStyles.backgroundEven.Draw(rowRect, false, false, false, false);
+            }
+        }
+
+        protected override List<ProfilerCounterData> CollectDefaultChartCounters()
+        {
+            if (m_ShowStatsView == PhysicsProfilerStatsView.Current)
+                return new List<ProfilerCounterData>(k_CurrentPhysicsAreaCounterNames);
+
+            return new List<ProfilerCounterData>(k_LegacyPhysicsAreaCounterNames);
+        }
+
         public override void DrawToolbar(Rect position)
         {
-            DrawEmptyToolbar();
+            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+            m_ShowStatsView = (PhysicsProfilerStatsView)EditorGUILayout.EnumPopup(m_ShowStatsView, EditorStyles.toolbarDropDownLeft, GUILayout.Width(70f));
+
+            if (m_CachedShowStatsView != m_ShowStatsView)
+            {
+                m_CachedShowStatsView = m_ShowStatsView;
+
+                UpdatePhysicsChart();
+            }
+
+            GUILayout.Space(5f);
+            GUILayout.FlexibleSpace();
+
+            EditorGUILayout.EndHorizontal();
         }
 
         public override void DrawDetailsView(Rect position)
         {
-            DrawDetailsViewText(position);
+            m_PaneScroll = GUILayout.BeginScrollView(m_PaneScroll, ProfilerWindow.Styles.background);
+
+            using (var frameData = ProfilerDriver.GetRawFrameDataView(ProfilerWindow.GetActiveVisibleFrameIndex(), 0))
+            {
+                if (frameData.valid)
+                {
+                    // Initialize the profiler markers.
+                    InitializeMarkers(frameData);
+
+                    bool newCountersAvailable = GetPhysicsCounterValue(frameData, "Total Queries") != -1;
+
+                    if (m_ShowStatsView == PhysicsProfilerStatsView.Current)
+                    {
+                        // Determine if the new counters are available by looking for a counter only available there.
+                        if (newCountersAvailable)
+                        {
+                            // Draw an alternate lined background to make following metrics on the same line easier.
+                            DrawAlternateBackground(position, m_PaneScroll, 10);
+
+                            long physicsMemoryUsed = GetCounterValue(frameData, "Physics Used Memory (2D)");
+                            long totalUsedMemory = GetCounterValue(frameData, "Total Used Memory");
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Physics Used Memory", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Total: " + GetCounterValueAsBytes(frameData, "Physics Used Memory (2D)"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField(string.Format("| Relative: {0:p2}", (float)physicsMemoryUsed / (float)totalUsedMemory), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Bodies", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Total: " + GetPhysicsCounterValue(frameData, "Total Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Awake: " + GetPhysicsCounterValue(frameData, "Awake Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Asleep: " + GetPhysicsCounterValue(frameData, "Asleep Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Dynamic: " + GetPhysicsCounterValue(frameData, "Dynamic Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Kinematic: " + GetPhysicsCounterValue(frameData, "Kinematic Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Static: " + GetPhysicsCounterValue(frameData, "Static Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Discrete: " + GetPhysicsCounterValue(frameData, "Discrete Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Continuous: " + GetPhysicsCounterValue(frameData, "Continuous Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Shapes", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Total: " + GetPhysicsCounterValue(frameData, "Total Shapes"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Awake: " + GetPhysicsCounterValue(frameData, "Awake Shapes"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Asleep: " + GetPhysicsCounterValue(frameData, "Asleep Shapes"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Dynamic: " + GetPhysicsCounterValue(frameData, "Dynamic Shapes"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Kinematic: " + GetPhysicsCounterValue(frameData, "Kinematic Shapes"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Static: " + GetPhysicsCounterValue(frameData, "Static Shapes"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Queries", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Total: " + GetPhysicsCounterValue(frameData, "Total Queries"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Raycast: " + GetPhysicsCounterValue(frameData, "Raycast Queries"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Shapecast: " + GetPhysicsCounterValue(frameData, "Shapecast Queries"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Overlap: " + GetPhysicsCounterValue(frameData, "Overlap Queries"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| IsTouching: " + GetPhysicsCounterValue(frameData, "IsTouching Queries"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| GetContacts: " + GetPhysicsCounterValue(frameData, "GetContacts Queries"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Particle: " + GetPhysicsCounterValue(frameData, "Particle Queries"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Contacts", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Total: " + GetPhysicsCounterValue(frameData, "Total Contacts"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Added: " + GetPhysicsCounterValue(frameData, "Added Contacts"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Removed: " + GetPhysicsCounterValue(frameData, "Removed Contacts"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Broadphase Updates: " + GetPhysicsCounterValue(frameData, "Broadphase Updates"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Broadphase Pairs: " + GetPhysicsCounterValue(frameData, "Broadphase Pairs"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Callbacks", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Total: " + GetPhysicsCounterValue(frameData, "Total Callbacks"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Collision Enter: " + GetPhysicsCounterValue(frameData, "Collision Enter"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Collision Stay: " + GetPhysicsCounterValue(frameData, "Collision Stay"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Collision Exit: " + GetPhysicsCounterValue(frameData, "Collision Exit"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Trigger Enter: " + GetPhysicsCounterValue(frameData, "Trigger Enter"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Trigger Stay: " + GetPhysicsCounterValue(frameData, "Trigger Stay"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Trigger Exit: " + GetPhysicsCounterValue(frameData, "Trigger Exit"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Solver", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| World Count: " + GetPhysicsCounterValue(frameData, "Solver World Count"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Simulation Count: " + GetPhysicsCounterValue(frameData, "Solver Simulation Count"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Discrete Islands: " + GetPhysicsCounterValue(frameData, "Solver Discrete Islands"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Continuous Islands: " + GetPhysicsCounterValue(frameData, "Solver Continuous Islands"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Transform Sync", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Sync Calls: " + GetPhysicsCounterValue(frameData, "Total Transform Sync Calls"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Sync Bodies: " + GetPhysicsCounterValue(frameData, "Transform Sync Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Sync Colliders: " + GetPhysicsCounterValue(frameData, "Transform Sync Colliders"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Parent Sync Bodies: " + GetPhysicsCounterValue(frameData, "Transform Parent Sync Bodies"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Parent Sync Colliders: " + GetPhysicsCounterValue(frameData, "Transform Parent Sync Colliders"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Joints", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Total: " + GetPhysicsCounterValue(frameData, "Total Joints"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+
+                            EditorGUILayout.BeginHorizontal();
+                            EditorGUILayout.LabelField("Timings", GUILayout.Width(k_labelWidthTitle));
+                            EditorGUILayout.LabelField("| Sim: " + GetPhysicsSampleData(frameData, "Physics2D.Simulate"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Sync: " + GetPhysicsSampleData(frameData, "Physics2D.SyncTransformChanges"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Step: " + GetPhysicsSampleData(frameData, "Physics2D.Step"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Write: " + GetPhysicsSampleData(frameData, "Physics2D.UpdateTransforms"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.LabelField("| Callbacks: " + GetPhysicsSampleData(frameData, "Physics2D.CompileContactCallbacks"), GUILayout.Width(k_labelWidthDetail));
+                            EditorGUILayout.EndHorizontal();
+                        }
+                        else
+                        {
+                            EditorGUILayout.LabelField("Current Data not Available.");
+                        }
+                    }
+                    else
+                    {
+                        // Determine if the old counters are available by looking for a counter only available there.
+                        if (!newCountersAvailable)
+                        {
+                            // Old data compatibility.
+                            var activeText = ProfilerDriver.GetOverviewText(ProfilerArea.Physics2D, ProfilerWindow.GetActiveVisibleFrameIndex());
+                            var height = EditorStyles.wordWrappedLabel.CalcHeight(GUIContent.Temp(activeText), position.width);
+                            EditorGUILayout.SelectableLabel(activeText, EditorStyles.wordWrappedLabel, GUILayout.MinHeight(height));
+                        }
+                        else
+                        {
+                            EditorGUILayout.LabelField("Legacy Data not Available.");
+                        }
+                    }
+                }
+            }
+
+            GUILayout.EndScrollView();
         }
     }
 }
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs
index 6e6901d729..0fd1d2d5e9 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/GPU/GPUProfilerModule.cs
@@ -29,9 +29,10 @@ internal class GPUProfilerModule : CPUOrGPUProfilerModule
         static readonly string k_GpuProfilingNotSupportedWithNativeGfxJobs = L10n.Tr("GPU Profiling is currently not supported when using Graphics Jobs.");
         static readonly string k_GpuProfilingNotSupportedByDevice = L10n.Tr("GPU Profiling is currently not supported by this device.");
         static readonly string k_GpuProfilingNotSupportedByGraphicsAPI = L10n.Tr("GPU Profiling is currently not supported by the used graphics API.");
-        static readonly string k_GpuProfilingNotSupportedDueToFrameTimingStatsAndDisjointTimerQuery = L10n.Tr("GPU Profiling is currently not supported on this device when PlayerSettings.enableFrameTimingStats is enabled.");
+        static readonly string k_GpuProfilingNotSupportedDueToFrameTimingStatsAndDisjointTimerQuery = L10n.Tr("GPU Profiling is currently not supported on this device when PlayerSettings.enableFrameTimingStats is enabled. (<a playersettingslink=\"Project/Player\" playersettingssearchstring=\"Frame Timing Stats\">Click here to edit</a>)");
         static readonly string k_GpuProfilingNotSupportedWithVulkan = L10n.Tr("GPU Profiling is currently not supported when using Vulkan.");
         static readonly string k_GpuProfilingNotSupportedWithMetal = L10n.Tr("GPU Profiling is currently not supported when using Metal.");
+        static readonly string k_GpuProfilingNotSupportedWithOpenGLGPURecorders = L10n.Tr("GPU Profiling is currently not supported in OpenGL when PlayerSettings.\nenableOpenGLProfilerGPURecorders is enabled. (<a playersettingslink=\"Project/Player\" playersettingssearchstring=\"OpenGL: Profiler GPU Recorders\">Click here to edit</a>)");
 
         static readonly Dictionary<GpuProfilingStatisticsAvailabilityStates, string> s_StatisticsAvailabilityStateReason
             = new Dictionary<GpuProfilingStatisticsAvailabilityStates, string>()
@@ -46,6 +47,7 @@ static readonly Dictionary<GpuProfilingStatisticsAvailabilityStates, string> s_S
             {GpuProfilingStatisticsAvailabilityStates.NotSupportedDueToFrameTimingStatsAndDisjointTimerQuery , k_GpuProfilingNotSupportedDueToFrameTimingStatsAndDisjointTimerQuery},
             {GpuProfilingStatisticsAvailabilityStates.NotSupportedWithVulkan , k_GpuProfilingNotSupportedWithVulkan},
             {GpuProfilingStatisticsAvailabilityStates.NotSupportedWithMetal , k_GpuProfilingNotSupportedWithMetal},
+            {GpuProfilingStatisticsAvailabilityStates.NotSupportedWithOpenGLGPURecorders , k_GpuProfilingNotSupportedWithOpenGLGPURecorders},
             };
 
         const int k_DefaultOrderIndex = 1;
@@ -94,7 +96,7 @@ static string GetStatisticsAvailabilityStateReason(int statisticsAvailabilitySta
                             if (string.IsNullOrEmpty(combinedReason))
                                 combinedReason = s_StatisticsAvailabilityStateReason[currentBit];
                             else
-                                combinedReason += '\n' + s_StatisticsAvailabilityStateReason[currentBit];
+                                combinedReason += "\n\n" + s_StatisticsAvailabilityStateReason[currentBit];
                         }
                     }
                 }
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModule.cs
index 6cb0e4b85f..7ff6d6f488 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModule.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModule.cs
@@ -221,6 +221,9 @@ internal int orderIndex
         // Legacy modules override this to specify their default order in the menu.
         private protected virtual int defaultOrderIndex => k_UndefinedOrderIndex;
 
+        // For ProfilerModuleBase to access private property.
+        private protected string[] GetAutoEnabledCategoryNames => AutoEnabledCategoryNames;
+
         internal virtual void OnEnable()
         {
             BuildChartIfNecessary();
@@ -319,8 +322,7 @@ private protected virtual void OnDeselected() {}
 
         private protected virtual void ApplyActiveState()
         {
-            var areas = GetProfilerAreas();
-            ProfilerWindow.SetAreasInUse(areas, active);
+            ProfilerWindow.SetCategoriesInUse(AutoEnabledCategoryNames, active);
         }
 
         private protected virtual bool ReadActiveState()
@@ -333,28 +335,6 @@ private protected virtual void SaveActiveState()
             EditorPrefs.SetBool(activeStatePreferenceKey, active);
         }
 
-        // TODO ProfilerModule should replace ProfilerArea with ProfilerCategory completely.
-        private protected HashSet<ProfilerArea> GetProfilerAreas()
-        {
-            var areas = new HashSet<ProfilerArea>();
-            foreach (var categoryInUse in AutoEnabledCategoryNames)
-            {
-                var categoryAreas = ProfilerAreaReferenceCounterUtility.ProfilerCategoryNameToAreas(categoryInUse);
-                foreach (var area in categoryAreas)
-                {
-                    areas.Add(area);
-                }
-            }
-
-            // Legacy modules can define ProfilerArea-based stats instead of counters. In that case, explicitly add the area.
-            if ((uint)area != Profiler.invalidProfilerArea)
-            {
-                areas.Add(area);
-            }
-
-            return areas;
-        }
-
         private protected virtual ProfilerChart InstantiateChart(float defaultChartScale, float chartMaximumScaleInterpolationValue)
         {
             m_Chart = new ProfilerChart(area, ChartType, defaultChartScale, chartMaximumScaleInterpolationValue, ChartCounters.Length, Identifier, DisplayName, IconPath);
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModuleBase.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModuleBase.cs
index 6bc7960a9c..5332992e2a 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModuleBase.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/ProfilerModuleBase.cs
@@ -16,8 +16,6 @@ namespace UnityEditorInternal.Profiling
     [Serializable]
     internal abstract class ProfilerModuleBase : ProfilerModule
     {
-        const string k_NoCategory = "NoCategory";
-
         protected List<ProfilerCounterData> m_LegacyChartCounters;
         protected List<ProfilerCounterData> m_LegacyDetailCounters;
         [SerializeField] protected Vector2 m_PaneScroll;
@@ -83,9 +81,8 @@ public void SetCounters(List<ProfilerCounterData> chartCounters, List<ProfilerCo
 
             if (active)
             {
-                // Decrement existing areas prior to updating counters.
-                var previousAreas = GetProfilerAreas();
-                ProfilerWindow.SetAreasInUse(previousAreas, false);
+                // Release existing categories prior to updating counters.
+                ProfilerWindow.SetCategoriesInUse(GetAutoEnabledCategoryNames, false);
             }
 
             // Capture each chart counter's enabled state prior to assignment.
@@ -127,9 +124,8 @@ public void SetCounters(List<ProfilerCounterData> chartCounters, List<ProfilerCo
 
             if (active)
             {
-                // Increment new areas after updating counters.
-                var areas = GetProfilerAreas();
-                ProfilerWindow.SetAreasInUse(areas, true);
+                // Retain new categories after updating counters.
+                ProfilerWindow.SetCategoriesInUse(GetAutoEnabledCategoryNames, true);
             }
         }
 
@@ -150,12 +146,14 @@ protected virtual List<ProfilerCounterData> CollectDefaultChartCounters()
             var chartCounters = new List<ProfilerCounterData>();
             if (!usesCounters)
             {
+                // Legacy modules can define ProfilerArea-based stats instead of counters. In that case, convert the area to a category name.
                 var legacyStats = ProfilerDriver.GetGraphStatisticsPropertiesForArea(area);
+                var categoryName = LegacyProfilerAreaUtility.ProfilerAreaToCategoryName(area);
                 foreach (var legacyStatName in legacyStats)
                 {
                     var counter = new ProfilerCounterData()
                     {
-                        m_Category = k_NoCategory,
+                        m_Category = categoryName,
                         m_Name = legacyStatName,
                     };
                     chartCounters.Add(counter);
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkDetailStats.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkDetailStats.cs
deleted file mode 100644
index 93731fdf44..0000000000
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkDetailStats.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using UnityEditor.Profiling;
-
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace UnityEditorInternal.Profiling
-{
-    //*undocumented*
-    public static class NetworkingOperationsProfilerOverrides
-    {
-        static public Action<Rect, int> drawDetailsViewOverride = null;
-        static public Func<List<NetworkCounterData>> getCustomChartCounters = null;
-    }
-
-    //*undocumented*
-    public static class NetworkingMessagesProfilerOverrides
-    {
-        static public Action<Rect, int> drawDetailsViewOverride = null;
-        static public Func<List<NetworkCounterData>> getCustomChartCounters = null;
-    }
-
-    //*undocumented*
-    public struct NetworkCounterData
-    {
-        public string category;
-        public string name;
-    }
-
-    internal static class NetworkProfilerUtils
-    {
-        public static ProfilerCounterData ToProfilerCounter(this NetworkCounterData data)
-        {
-            return new ProfilerCounterData() { m_Name = data.name, m_Category = data.category };
-        }
-
-        public static void ToProfilerCounter(this List<NetworkCounterData> data, List<ProfilerCounterData> inData)
-        {
-            if (data.Count > inData.Capacity)
-                throw new ArgumentOutOfRangeException("Count and Capacity must be the same!");
-
-            for (int i = 0; i < data.Count; i++)
-            {
-                inData.Add(data[i].ToProfilerCounter());
-            }
-        }
-    }
-}
-
-namespace UnityEditor
-{
-    [Obsolete("This profiler helper class is deprecated, it's here to support the high level API package until it no longer depends on it and will then be removed.")]
-    public class NetworkDetailStats
-    {
-        public enum NetworkDirection
-        {
-            Incoming,
-            Outgoing
-        }
-
-        // keep this many ticks of packet history
-        const int kPacketHistoryTicks = 20;
-
-        // how often a tick happens
-        const float kPacketTickInterval = 0.5f;
-
-        // a sequence of statistics for a particular operation entry
-        internal class NetworkStatsSequence
-        {
-            int[] m_MessagesPerTick = new int[kPacketHistoryTicks];
-            public int MessageTotal;
-
-            public void Add(int tick, int amount)
-            {
-                m_MessagesPerTick[tick] += amount;
-                MessageTotal += amount;
-            }
-
-            public void NewProfilerTick(int tick)
-            {
-                MessageTotal -= m_MessagesPerTick[tick];
-                m_MessagesPerTick[tick] = 0;
-            }
-
-            public int GetFiveTick(int tick)
-            {
-                // average per ticks over last 5 ticks
-                int count = 0;
-                for (int i = 0; i < 5; i++)
-                {
-                    count += m_MessagesPerTick[(tick - i + kPacketHistoryTicks) % kPacketHistoryTicks];
-                }
-                return (int)(count / 5);
-            }
-
-            public int GetTenTick(int tick)
-            {
-                // average per ticks over last 10 ticks
-                int count = 0;
-                for (int i = 0; i < 10; i++)
-                {
-                    count += m_MessagesPerTick[(tick - i + kPacketHistoryTicks) % kPacketHistoryTicks];
-                }
-                return (int)(count / 10);
-            }
-        }
-
-        // detailed stats for one entry of a network operation, such as a command or rpc-call
-        internal class NetworkOperationEntryDetails
-        {
-            public string m_EntryName;
-            public int m_IncomingTotal;
-            public int m_OutgoingTotal;
-            public NetworkStatsSequence m_IncomingSequence = new NetworkStatsSequence();
-            public NetworkStatsSequence m_OutgoingSequence = new NetworkStatsSequence();
-
-            public void NewProfilerTick(int tickId)
-            {
-                m_IncomingSequence.NewProfilerTick(tickId);
-                m_OutgoingSequence.NewProfilerTick(tickId);
-            }
-
-            public void Clear()
-            {
-                m_IncomingTotal = 0;
-                m_OutgoingTotal = 0;
-            }
-
-            public void AddStat(NetworkDirection direction, int amount)
-            {
-                int tickId = ((int)s_LastTickTime) % kPacketHistoryTicks;
-                switch (direction)
-                {
-                    case NetworkDirection.Incoming:
-                    {
-                        m_IncomingTotal += amount;
-                        m_IncomingSequence.Add(tickId, amount);
-                    }
-                    break;
-
-                    case NetworkDirection.Outgoing:
-                    {
-                        m_OutgoingTotal += amount;
-                        m_OutgoingSequence.Add(tickId, amount);
-                    }
-                    break;
-                }
-            }
-        }
-
-        // detailed stats for one type of network operation (HLAPI MsgId)
-        internal class NetworkOperationDetails
-        {
-            public short MsgId;
-            public float totalIn;
-            public float totalOut;
-            public Dictionary<string, NetworkOperationEntryDetails> m_Entries = new Dictionary<string, NetworkOperationEntryDetails>();
-
-            public void NewProfilerTick(int tickId)
-            {
-                foreach (var entry in m_Entries.Values)
-                {
-                    entry.NewProfilerTick(tickId);
-                }
-#pragma warning disable 618
-                NetworkTransport.SetPacketStat(0, MsgId, (int)totalIn, 1);
-                NetworkTransport.SetPacketStat(1, MsgId, (int)totalOut, 1);
-#pragma warning restore 618
-                totalIn = 0;
-                totalOut = 0;
-            }
-
-            public void Clear()
-            {
-                foreach (var entry in m_Entries.Values)
-                {
-                    entry.Clear();
-                }
-                totalIn = 0;
-                totalOut = 0;
-            }
-
-            public void SetStat(NetworkDirection direction, string entryName, int amount)
-            {
-                NetworkOperationEntryDetails entry;
-                if (m_Entries.ContainsKey(entryName))
-                {
-                    entry = m_Entries[entryName];
-                }
-                else
-                {
-                    entry = new NetworkOperationEntryDetails();
-                    entry.m_EntryName = entryName;
-                    m_Entries[entryName] = entry;
-                }
-                entry.AddStat(direction, amount);
-
-                switch (direction)
-                {
-                    case NetworkDirection.Incoming:
-                    {
-                        totalIn = amount;
-                    }
-                    break;
-
-                    case NetworkDirection.Outgoing:
-                    {
-                        totalOut = amount;
-                    }
-                    break;
-                }
-            }
-
-            public void IncrementStat(NetworkDirection direction, string entryName, int amount)
-            {
-                NetworkOperationEntryDetails entry;
-                if (m_Entries.ContainsKey(entryName))
-                {
-                    entry = m_Entries[entryName];
-                }
-                else
-                {
-                    entry = new NetworkOperationEntryDetails();
-                    entry.m_EntryName = entryName;
-                    m_Entries[entryName] = entry;
-                }
-                entry.AddStat(direction, amount);
-
-                switch (direction)
-                {
-                    case NetworkDirection.Incoming:
-                    {
-                        totalIn += amount;
-                    }
-                    break;
-
-                    case NetworkDirection.Outgoing:
-                    {
-                        totalOut += amount;
-                    }
-                    break;
-                }
-            }
-        }
-
-        static internal Dictionary<short, NetworkOperationDetails> m_NetworkOperations = new Dictionary<short, NetworkOperationDetails>();
-
-        static float s_LastTickTime;
-
-        static public void NewProfilerTick(float newTime)
-        {
-            if (newTime - s_LastTickTime > kPacketTickInterval)
-            {
-                s_LastTickTime = newTime;
-                int tickId = ((int)s_LastTickTime) % kPacketHistoryTicks;
-                foreach (var op in m_NetworkOperations.Values)
-                {
-                    op.NewProfilerTick(tickId);
-                }
-            }
-        }
-
-        static public void SetStat(NetworkDirection direction, short msgId, string entryName, int amount)
-        {
-            NetworkOperationDetails op;
-            if (m_NetworkOperations.ContainsKey(msgId))
-            {
-                op = m_NetworkOperations[msgId];
-            }
-            else
-            {
-                op = new NetworkOperationDetails();
-                op.MsgId = msgId;
-                m_NetworkOperations[msgId] = op;
-            }
-
-            op.SetStat(direction, entryName, amount);
-        }
-
-        static public void IncrementStat(NetworkDirection direction, short msgId, string entryName, int amount)
-        {
-            NetworkOperationDetails op;
-            if (m_NetworkOperations.ContainsKey(msgId))
-            {
-                op = m_NetworkOperations[msgId];
-            }
-            else
-            {
-                op = new NetworkOperationDetails();
-                op.MsgId = msgId;
-                m_NetworkOperations[msgId] = op;
-            }
-
-            op.IncrementStat(direction, entryName, amount);
-        }
-
-        static public void ResetAll()
-        {
-            foreach (var detail in m_NetworkOperations.Values)
-            {
-#pragma warning disable 618
-                NetworkTransport.SetPacketStat(0, detail.MsgId, 0, 1);
-                NetworkTransport.SetPacketStat(1, detail.MsgId, 0, 1);
-#pragma warning restore 618
-            }
-            m_NetworkOperations.Clear();
-        }
-    }
-}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkingMessagesProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkingMessagesProfilerModule.cs
deleted file mode 100644
index 7b19dfa9d9..0000000000
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkingMessagesProfilerModule.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-
-using Unity.Profiling.Editor;
-
-using UnityEditor;
-using UnityEditor.Profiling;
-
-using UnityEngine;
-using UnityEngine.Profiling;
-
-namespace UnityEditorInternal.Profiling
-{
-    [Serializable]
-    [ProfilerModuleMetadata("Network Messages", typeof(LocalizationResource), IconPath = "Profiler.NetworkMessages")]
-    internal class NetworkingMessagesProfilerModule : ProfilerModuleBase
-    {
-        const int k_DefaultOrderIndex = 8;
-
-        static List<ProfilerCounterData> s_CounterData = new List<ProfilerCounterData>();
-
-        public NetworkingMessagesProfilerModule() : base()
-        {
-            InitCounterOverride();
-        }
-
-        private void InitCounterOverride()
-        {
-            if (NetworkingMessagesProfilerOverrides.getCustomChartCounters != null)
-            {
-                s_CounterData.Clear();
-
-                var chartCounters = NetworkingMessagesProfilerOverrides.getCustomChartCounters.Invoke();
-                if (chartCounters != null)
-                {
-                    // If the Capcity is the same value a re-alloc will not happen
-                    s_CounterData.Capacity = chartCounters.Count;
-                    chartCounters.ToProfilerCounter(s_CounterData);
-                }
-
-                SetCounters(s_CounterData, s_CounterData);
-            }
-        }
-
-        protected override List<ProfilerCounterData> CollectDefaultChartCounters()
-        {
-            if (NetworkingMessagesProfilerOverrides.getCustomChartCounters != null)
-            {
-                s_CounterData.Clear();
-
-                var chartCounters = NetworkingMessagesProfilerOverrides.getCustomChartCounters.Invoke();
-                if (chartCounters != null)
-                {
-                    // If the Capcity is the same value a re-alloc will not happen
-                    s_CounterData.Capacity = chartCounters.Count;
-                    chartCounters.ToProfilerCounter(s_CounterData);
-                }
-
-                return s_CounterData;
-            }
-
-            return base.CollectDefaultChartCounters();
-        }
-
-        internal override ProfilerArea area => ProfilerArea.NetworkMessages;
-        public override bool usesCounters => false;
-
-        private protected override int defaultOrderIndex => k_DefaultOrderIndex;
-        private protected override string legacyPreferenceKey => "ProfilerChartNetworkMessages";
-
-        private protected override ProfilerChart InstantiateChart(float defaultChartScale, float chartMaximumScaleInterpolationValue)
-        {
-            var chart = base.InstantiateChart(defaultChartScale, chartMaximumScaleInterpolationValue);
-            chart.m_SharedScale = true;
-            return chart;
-        }
-
-        public override void DrawToolbar(Rect position)
-        {
-            DrawEmptyToolbar();
-        }
-
-        public override void DrawDetailsView(Rect position)
-        {
-            if (NetworkingMessagesProfilerOverrides.drawDetailsViewOverride != null)
-                NetworkingMessagesProfilerOverrides.drawDetailsViewOverride.Invoke(position, ProfilerWindow.GetActiveVisibleFrameIndex());
-            else
-                DrawDetailsViewText(position);
-        }
-    }
-}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkingOperationsProfilerModule.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkingOperationsProfilerModule.cs
deleted file mode 100644
index cb379bb4b6..0000000000
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModules/uNet/NetworkingOperationsProfilerModule.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-
-using Unity.Profiling.Editor;
-using UnityEditor;
-using UnityEditor.Profiling;
-using UnityEditor.StyleSheets;
-using UnityEngine;
-using UnityEngine.Profiling;
-
-namespace UnityEditorInternal.Profiling
-{
-    [Serializable]
-    [ProfilerModuleMetadata("Network Operations", typeof(LocalizationResource), IconPath = "Profiler.NetworkOperations")]
-    internal class NetworkingOperationsProfilerModule : ProfilerModuleBase
-    {
-        const int k_DefaultOrderIndex = 9;
-
-        [SerializeField]
-        SplitterState m_NetworkSplit;
-
-        static SVC<Color> s_SeparatorColor = new SVC<Color>("--theme-profiler-border-color-darker", Color.black);
-        static List<ProfilerCounterData> s_CounterData = new List<ProfilerCounterData>();
-
-        public NetworkingOperationsProfilerModule() : base()
-        {
-            InitCounterOverride();
-        }
-
-        private void InitCounterOverride()
-        {
-            if (NetworkingOperationsProfilerOverrides.getCustomChartCounters != null)
-            {
-                s_CounterData.Clear();
-
-                var chartCounters = NetworkingOperationsProfilerOverrides.getCustomChartCounters.Invoke();
-                if (chartCounters != null)
-                {
-                    // If the Capcity is the same value a re-alloc will not happen
-                    s_CounterData.Capacity = chartCounters.Count;
-                    chartCounters.ToProfilerCounter(s_CounterData);
-                }
-
-                SetCounters(s_CounterData, s_CounterData);
-            }
-        }
-
-        protected override List<ProfilerCounterData> CollectDefaultChartCounters()
-        {
-            if (NetworkingOperationsProfilerOverrides.getCustomChartCounters != null)
-            {
-                s_CounterData.Clear();
-
-                var chartCounters = NetworkingOperationsProfilerOverrides.getCustomChartCounters.Invoke();
-                if (chartCounters != null)
-                {
-                    // If the Capcity is the same value a re-alloc will not happen
-                    s_CounterData.Capacity = chartCounters.Count;
-                    chartCounters.ToProfilerCounter(s_CounterData);
-                }
-
-                return s_CounterData;
-            }
-
-            return base.CollectDefaultChartCounters();
-        }
-
-        internal override ProfilerArea area => ProfilerArea.NetworkOperations;
-        public override bool usesCounters => false;
-
-        private protected override int defaultOrderIndex => k_DefaultOrderIndex;
-        private protected override string legacyPreferenceKey => "ProfilerChartNetworkOperations";
-
-        private protected override ProfilerChart InstantiateChart(float defaultChartScale, float chartMaximumScaleInterpolationValue)
-        {
-            var chart = base.InstantiateChart(defaultChartScale, chartMaximumScaleInterpolationValue);
-            chart.m_SharedScale = true;
-            return chart;
-        }
-
-        internal override void OnEnable()
-        {
-            base.OnEnable();
-
-            if (m_NetworkSplit == null || !m_NetworkSplit.IsValid())
-                m_NetworkSplit = SplitterState.FromRelative(new[] { 20f, 80f }, new[] { 100f, 100f }, null);
-        }
-
-        public override void DrawToolbar(Rect position)
-        {
-            // This module still needs to be broken apart into Toolbar and View.
-        }
-
-        public override void DrawDetailsView(Rect position)
-        {
-            if (NetworkingOperationsProfilerOverrides.drawDetailsViewOverride != null)
-                NetworkingOperationsProfilerOverrides.drawDetailsViewOverride.Invoke(position, ProfilerWindow.GetActiveVisibleFrameIndex());
-            else
-                DrawNetworkOperationsPane(position);
-        }
-
-        [SerializeField]
-        private String[] msgNames =
-        {
-            "UserMessage", "ObjectDestroy", "ClientRpc", "ObjectSpawn", "Owner", "Command", "LocalPlayerTransform", "SyncEvent", "SyncVars", "SyncList", "ObjectSpawnScene", "NetworkInfo", "SpawnFinished", "ObjectHide", "CRC", "ClientAuthority"
-        };
-
-        private bool[] msgFoldouts = { true, true, true, true, true, true, true, true, true, true, true, true, true, true, true };
-
-        void DrawNetworkOperationsPane(Rect position)
-        {
-            SplitterGUILayout.BeginHorizontalSplit(m_NetworkSplit);
-            var overviewLabel = GUIContent.Temp(ProfilerDriver.GetOverviewText(area,
-                ProfilerWindow.GetActiveVisibleFrameIndex()));
-            var labelRect = GUILayoutUtility.GetRect(overviewLabel, EditorStyles.wordWrappedLabel);
-
-            GUI.Label(labelRect, overviewLabel, EditorStyles.wordWrappedLabel);
-
-            m_PaneScroll = GUILayout.BeginScrollView(m_PaneScroll, ProfilerWindow.Styles.background);
-
-            EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
-            EditorGUILayout.LabelField("Operation Detail");
-            EditorGUILayout.LabelField("Over 5 Ticks");
-            EditorGUILayout.LabelField("Over 10 Ticks");
-            EditorGUILayout.LabelField("Total");
-            EditorGUILayout.EndHorizontal();
-
-            EditorGUI.indentLevel += 1;
-
-            for (short msgId = 0; msgId < msgNames.Length; msgId++)
-            {
-#pragma warning disable CS0618
-                if (!NetworkDetailStats.m_NetworkOperations.ContainsKey(msgId))
-#pragma warning restore
-                    continue;
-
-                msgFoldouts[msgId] = EditorGUILayout.Foldout(msgFoldouts[msgId], msgNames[msgId] + ":");
-                if (msgFoldouts[msgId])
-                {
-                    EditorGUILayout.BeginVertical();
-#pragma warning disable CS0618
-                    var detail = NetworkDetailStats.m_NetworkOperations[msgId];
-#pragma warning restore
-
-                    EditorGUI.indentLevel += 1;
-
-                    foreach (var entryName in detail.m_Entries.Keys)
-                    {
-                        int tick = (int)Time.time;
-                        var entry = detail.m_Entries[entryName];
-
-                        if (entry.m_IncomingTotal > 0)
-                        {
-                            EditorGUILayout.BeginHorizontal();
-                            EditorGUILayout.LabelField("IN:" + entryName);
-                            EditorGUILayout.LabelField(entry.m_IncomingSequence.GetFiveTick(tick).ToString());
-                            EditorGUILayout.LabelField(entry.m_IncomingSequence.GetTenTick(tick).ToString());
-                            EditorGUILayout.LabelField(entry.m_IncomingTotal.ToString());
-                            EditorGUILayout.EndHorizontal();
-                        }
-
-                        if (entry.m_OutgoingTotal > 0)
-                        {
-                            EditorGUILayout.BeginHorizontal();
-                            EditorGUILayout.LabelField("OUT:" + entryName);
-                            EditorGUILayout.LabelField(entry.m_OutgoingSequence.GetFiveTick(tick).ToString());
-                            EditorGUILayout.LabelField(entry.m_OutgoingSequence.GetTenTick(tick).ToString());
-                            EditorGUILayout.LabelField(entry.m_OutgoingTotal.ToString());
-                            EditorGUILayout.EndHorizontal();
-                        }
-                    }
-
-                    EditorGUI.indentLevel -= 1;
-                    EditorGUILayout.EndVertical();
-                }
-            }
-            EditorGUI.indentLevel -= 1;
-            GUILayout.EndScrollView();
-            SplitterGUILayout.EndHorizontalSplit();
-
-            // Draw separator
-            var lineRect = new Rect(m_NetworkSplit.realSizes[0] + labelRect.xMin, position.y - EditorGUI.kWindowToolbarHeight - 1, 1,
-                position.height + EditorGUI.kWindowToolbarHeight);
-            EditorGUI.DrawRect(lineRect, s_SeparatorColor);
-        }
-    }
-}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModulesDropdownWindow.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModulesDropdownWindow.cs
index 0ef3edddbc..b1e79b2316 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerModulesDropdownWindow.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerModulesDropdownWindow.cs
@@ -83,7 +83,7 @@ void BuildWindow()
             m_ModulesListView.makeItem = MakeListViewItem;
             m_ModulesListView.bindItem = BindListViewItem;
             m_ModulesListView.selectionType = SelectionType.Single;
-            m_ModulesListView.onSelectionChange += OnModuleSelected;
+            m_ModulesListView.selectionChanged += OnModuleSelected;
             m_ModulesListView.itemsSource = m_Modules;
 
             var configureButton = rootVisualElement.Q<Button>(k_UssSelector_ConfigureButton);
diff --git a/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs b/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs
index be524739aa..ea373d3229 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/ProfilerWindow.cs
@@ -154,8 +154,7 @@ static Styles()
         // This is used by our performance tests to prevent the Profiler window from automatically repainting whilst profiling so we can control the repaints more precisely.
         internal bool IgnoreRepaintAllProfilerWindowsTick { get; set; }
 
-        // Used by ProfilerEditorTests/ProfilerAreaReferenceCounterTests through reflection.
-        ProfilerAreaReferenceCounter m_AreaReferenceCounter;
+        internal ProfilerCategoryActivator m_CategoryActivator;
 
         ProfilerMemoryRecordMode m_CurrentCallstackRecordMode = ProfilerMemoryRecordMode.None;
         [SerializeField]
@@ -394,7 +393,8 @@ void Initialize()
             m_AllModules = InitializeAllModules(existingModules);
 
             m_AttachProfilerState = PlayerConnectionGUIUtility.GetConnectionState(this, OnTargetedEditorConnectionChanged, IsEditorConnectionTargeted, OnConnectedToPlayer) as IConnectionStateInternal;
-            m_AreaReferenceCounter = new ProfilerAreaReferenceCounter();
+            m_CategoryActivator = new ProfilerCategoryActivator();
+
             m_ActiveNativePlatformSupportModuleName = EditorUtility.GetActiveNativePlatformSupportModuleName();
         }
 
@@ -615,9 +615,6 @@ void ResetForClearedOrLoaded(bool cleared)
             {
                 SetCurrentFrameDontPause(FrameDataView.invalidOrCurrentFrameIndex);
                 m_CurrentFrameEnabled = true;
-#pragma warning disable CS0618
-                NetworkDetailStats.m_NetworkOperations.Clear();
-#pragma warning restore
             }
 
             foreach (var module in m_AllModules)
@@ -1060,9 +1057,6 @@ internal void LoadProfilingData(bool keepExistingData)
                     SessionState.SetBool(kProfilerEnabledSessionKey, m_Recording);
                     if (ProfilerUserSettings.rememberLastRecordState)
                         EditorPrefs.SetBool(kProfilerEnabledSessionKey, m_Recording);
-#pragma warning disable CS0618
-                    NetworkDetailStats.m_NetworkOperations.Clear();
-#pragma warning restore
                 }
             }
         }
@@ -1692,22 +1686,14 @@ internal static bool SetEditorDeepProfiling(bool deep)
             return doApply;
         }
 
-        internal void SetAreasInUse(IEnumerable<ProfilerArea> areas, bool inUse)
+        internal void SetCategoriesInUse(IEnumerable<string> categoryNames, bool inUse)
         {
             if (inUse)
-            {
-                foreach (var area in areas)
-                {
-                    m_AreaReferenceCounter.IncrementArea(area);
-                }
-            }
+                foreach (var categoryName in categoryNames)
+                    m_CategoryActivator.RetainCategory(categoryName);
             else
-            {
-                foreach (var area in areas)
-                {
-                    m_AreaReferenceCounter.DecrementArea(area);
-                }
-            }
+                foreach (var categoryName in categoryNames)
+                    m_CategoryActivator.ReleaseCategory(categoryName);
         }
 
         /// <summary>
@@ -1862,7 +1848,6 @@ HierarchyFrameDataView IProfilerWindowController.GetFrameDataView(int threadInde
         ProfilerProperty IProfilerWindowController.CreateProperty() => CreateProperty();
         ProfilerProperty IProfilerWindowController.CreateProperty(int sortType) => CreateProperty(sortType);
         void IProfilerWindowController.CloseModule(ProfilerModule module) => CloseModule(module);
-        void IProfilerWindowController.SetAreasInUse(IEnumerable<ProfilerArea> areas, bool inUse) => SetAreasInUse(areas, inUse);
 
         // This type is kept to avoid "Missing Type" exceptions when deserializing the window layout (a bug). Delete this type once fix for this (https://fogbugz.unity3d.com/f/cases/1273439/) has landed.
         [Serializable] internal class ProfilerWindowControllerProxy {}
diff --git a/Modules/ProfilerEditor/ProfilerWindow/UIElements/MemoryUsageBreakdown.cs b/Modules/ProfilerEditor/ProfilerWindow/UIElements/MemoryUsageBreakdown.cs
index a7fa66c0f5..1907d4feaa 100644
--- a/Modules/ProfilerEditor/ProfilerWindow/UIElements/MemoryUsageBreakdown.cs
+++ b/Modules/ProfilerEditor/ProfilerWindow/UIElements/MemoryUsageBreakdown.cs
@@ -209,7 +209,7 @@ void SetTotalUsed(ulong totalBytes, bool normalized, ulong maxTotalBytesToNormal
 
             if (ShowUnknown || !m_Normalized)
             {
-                var percentage = knownBytes / (float)totalBarByteAmount * 100;
+                var percentage = totalBarByteAmount > 0 ? knownBytes / (float)totalBarByteAmount * 100 : 100;
                 m_Content.style.width = new Length(Mathf.RoundToInt(percentage), LengthUnit.Percent);
             }
             else
@@ -220,7 +220,7 @@ void SetTotalUsed(ulong totalBytes, bool normalized, ulong maxTotalBytesToNormal
                 UIElementsHelper.SetVisibility(m_UnknownBar, ShowUnknown);
             if (ShowUnknown)
             {
-                var percentage = unknownSize / (float)totalBarByteAmount * 100;
+                var percentage = totalBarByteAmount > 0 ? unknownSize / (float)totalBarByteAmount * 100 : 100;
                 m_UnknownBar.style.width = new Length(Mathf.RoundToInt(percentage), LengthUnit.Percent);
 
                 m_UnknownBar.tooltip = MemoryUsageBreakdownElement.BuildTooltipText(HeaderText, UnknownName, (ulong)TotalBytes, unknownSize);
diff --git a/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs b/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs
index d7cc25c9e3..b3b0fd4360 100644
--- a/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs
+++ b/Modules/ProfilerEditor/Public/ProfilerAPI.bindings.cs
@@ -93,6 +93,7 @@ public enum GpuProfilingStatisticsAvailabilityStates
         NotSupportedDueToFrameTimingStatsAndDisjointTimerQuery = 1 << 8,
         NotSupportedWithVulkan = 1 << 9,
         NotSupportedWithMetal = 1 << 10,
+        NotSupportedWithOpenGLGPURecorders = 1 << 11,
     }
 
 
@@ -168,6 +169,10 @@ static public extern string selectedPropertyPath
         [StaticAccessor("profiling::GetProfilerSessionPtr()", StaticAccessorType.Arrow)]
         static public extern bool IsAreaEnabled(ProfilerArea area);
 
+        [NativeMethod("SetCategoryEnabled")]
+        [StaticAccessor("profiling::GetProfilerSessionPtr()", StaticAccessorType.Arrow)]
+        static internal extern void SetCategoryEnabled(string categoryName, bool enabled);
+
         static public bool enabled
         {
             get
@@ -220,11 +225,12 @@ static public extern bool deepProfiling
             set;
         }
 
+        [StaticAccessor("profiling::GetProfilerSessionPtr()", StaticAccessorType.Arrow)]
         static public extern ProfilerMemoryRecordMode memoryRecordMode
         {
-            [FreeFunction("profiler_get_memory_record_mode")]
+            [NativeMethod("GetMemoryRecordMode")]
             get;
-            [FreeFunction("profiler_set_memory_record_mode")]
+            [NativeMethod("SetMemoryRecordMode")]
             set;
         }
 
@@ -464,6 +470,9 @@ static public void GetStatisticsAvailable(ProfilerArea profilerArea, int firstFr
         [StaticAccessor("EditorProfilerConnection::Get()", StaticAccessorType.Dot)]
         static internal extern bool IsDeepProfilingSupported(int guid);
 
+        [StaticAccessor("EditorProfilerConnection::Get()", StaticAccessorType.Dot)]
+        static internal extern string GetConnectionUnityVersion(int guid);
+
         [StaticAccessor("EditorProfilerConnection::Get()", StaticAccessorType.Dot)]
         static internal extern string GetProjectName(int guid);
 
diff --git a/Modules/UIServiceEditor/Progress/ProgressWindow.cs b/Modules/Progress/ProgressWindow.cs
similarity index 100%
rename from Modules/UIServiceEditor/Progress/ProgressWindow.cs
rename to Modules/Progress/ProgressWindow.cs
diff --git a/Modules/UIServiceEditor/Progress/VisualProgressItem.cs b/Modules/Progress/VisualProgressItem.cs
similarity index 100%
rename from Modules/UIServiceEditor/Progress/VisualProgressItem.cs
rename to Modules/Progress/VisualProgressItem.cs
diff --git a/Modules/QuickSearch/Editor/FuzzySearch.cs b/Modules/QuickSearch/Editor/FuzzySearch.cs
index 492d0e7c16..b27c518b56 100644
--- a/Modules/QuickSearch/Editor/FuzzySearch.cs
+++ b/Modules/QuickSearch/Editor/FuzzySearch.cs
@@ -62,6 +62,12 @@ public void Dispose()
             }
         }
 
+        public static bool FuzzyMatch(string pattern, string origin, List<int> matches = null)
+        {
+            long score = 0;
+            return FuzzyMatch(pattern, origin, ref score, matches);
+        }
+
         /// <summary>
         /// Performs a fuzzy search on a string to see if it matches a pattern.
         /// </summary>
@@ -87,6 +93,7 @@ public static bool FuzzyMatch(string pattern, string origin, ref long outScore,
                 if (string.IsNullOrEmpty(pattern)) return true;
 
                 str = origin.ToLowerInvariant();
+                pattern = pattern.ToLowerInvariant();
                 pattern_n = pattern.Length;
 
                 // find [str_start..str_end) that contains pattern's first and last letter
diff --git a/Modules/QuickSearch/Editor/ISearchView.cs b/Modules/QuickSearch/Editor/ISearchView.cs
index c59beb93d2..63301d6af3 100644
--- a/Modules/QuickSearch/Editor/ISearchView.cs
+++ b/Modules/QuickSearch/Editor/ISearchView.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Internal;
 
@@ -197,5 +198,10 @@ public interface ISearchView : IDisposable
         /// Focus the search text field control.
         /// </summary>
         void FocusSearch();
+
+        /// <summary>
+        /// Set table view columns.
+        /// </summary>
+        void SetColumns(IEnumerable<SearchColumn> columns);
     }
 }
diff --git a/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs b/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs
index c7edace66b..7607dd8620 100644
--- a/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs
+++ b/Modules/QuickSearch/Editor/Indexing/AssetIndexer.cs
@@ -154,10 +154,10 @@ public override void IndexDocument(string path, bool checkIfDocumentExists)
                     {
                         IndexTypes(obj.GetType(), documentIndex);
 
-                        if (!AssetDatabase.IsSubAsset(obj))
-                            continue;
-
-                        IndexSubAsset(obj, path, checkIfDocumentExists, hasCustomIndexers);
+                        if (AssetDatabase.IsSubAsset(obj))
+                            IndexSubAsset(obj, path, checkIfDocumentExists, hasCustomIndexers);
+                        else if (!string.IsNullOrEmpty(obj.name))
+                            IndexProperty(documentIndex, "name", obj.name, saveKeyword: true, exact: true);
                     }
 
                     if (isPrefab)
diff --git a/Modules/QuickSearch/Editor/Indexing/IndexManager.cs b/Modules/QuickSearch/Editor/Indexing/IndexManager.cs
index 276da9196c..2ecc887835 100644
--- a/Modules/QuickSearch/Editor/Indexing/IndexManager.cs
+++ b/Modules/QuickSearch/Editor/Indexing/IndexManager.cs
@@ -113,7 +113,7 @@ internal void OnEnable()
             int indexToSelect = AddSearchDatabases(SearchSettings.showPackageIndexes);
 
             m_ListViewIndexSettings = new ListViewIndexSettings(m_IndexSettings, MakeIndexItem, BindIndexItem, CreateNewIndexSettingMenu, DeleteIndexSetting, this, false, 40) { name = "IndexListView" };
-            m_ListViewIndexSettings.ListView.onSelectionChange += OnSelectedIndexChanged;
+            m_ListViewIndexSettings.ListView.selectionChanged += OnSelectedIndexChanged;
 
             m_IndexDetailsElement = new VisualElement() { name = "Details" };
             SearchDatabase.indexLoaded += OnIndexLoaded;
@@ -231,14 +231,14 @@ private IEnumerable<SearchDatabase> EnumerateIndexes(SearchDatabase.IndexLocatio
 
         internal void OnDisable()
         {
-            m_ListViewIndexSettings.ListView.onSelectionChange -= OnSelectedIndexChanged;
+            m_ListViewIndexSettings.ListView.selectionChanged -= OnSelectedIndexChanged;
 
             SearchDatabase.indexLoaded -= OnIndexLoaded;
 
             if (m_DocumentsListView != null)
-                m_DocumentsListView.onSelectionChange -= PingAsset;
+                m_DocumentsListView.selectionChanged -= PingAsset;
             if (m_DependenciesListView != null)
-                m_DependenciesListView.onSelectionChange -= PingAsset;
+                m_DependenciesListView.selectionChanged -= PingAsset;
         }
 
         private void OnSizeChange(GeometryChangedEvent evt)
@@ -376,12 +376,12 @@ private void CreateIndexDetailsElement()
 
             m_DependenciesListView = new UIToolkitListView() { fixedItemHeight = 20, makeItem = () => { return new Label(); }, bindItem = (e, i) => { e.Q<Label>().text = (string)(m_DependenciesListView.itemsSource[i]); } };
             m_DependenciesListView.AddToClassList("PreviewListView");
-            m_DependenciesListView.onSelectionChange += PingAsset;
+            m_DependenciesListView.selectionChanged += PingAsset;
             m_SavedIndexData.Add(m_DependenciesListView);
 
             m_DocumentsListView = new UIToolkitListView() { fixedItemHeight = 20, makeItem = () => { return new Label(); }, bindItem = (e, i) => { e.Q<Label>().text = (string)(m_DocumentsListView.itemsSource[i]); } };
             m_DocumentsListView.AddToClassList("PreviewListView");
-            m_DocumentsListView.onSelectionChange += PingAsset;
+            m_DocumentsListView.selectionChanged += PingAsset;
             m_SavedIndexData.Add(m_DocumentsListView);
 
             m_KeywordsListView = new UIToolkitListView() { fixedItemHeight = 20, makeItem = () => { return new Label(); }, bindItem = (e, i) => { e.Q<Label>().text = (string)(m_KeywordsListView.itemsSource[i]); } };
@@ -1024,9 +1024,9 @@ private void OnSelectedIndexChanged(IEnumerable<object> obj)
             if (selectedIndex != m_PreviousSelectedIndex)
             {
                 if (m_DependenciesListView != null)
-                    m_DependenciesListView.onSelectionChange -= PingAsset;
+                    m_DependenciesListView.selectionChanged -= PingAsset;
                 if (m_DocumentsListView != null)
-                    m_DocumentsListView.onSelectionChange -= PingAsset;
+                    m_DocumentsListView.selectionChanged -= PingAsset;
                 m_IndexDetailsElement.Clear();
 
                 if (obj.Any())
diff --git a/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs b/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs
index 4dbc9a212c..5bdb3b745d 100644
--- a/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs
+++ b/Modules/QuickSearch/Editor/Indexing/IndexerExtensions.cs
@@ -311,6 +311,7 @@ internal static void IndexVector(string propertyName, in Vector4 v, ObjectIndexe
         }
 
         [SceneQueryEngineFilter("material", supportedOperators = new[] { ":" })]
+        [System.ComponentModel.Description("Check if a MeshRenderer uses a specific material")]
         internal static bool FilterMeshRendererMaterials(GameObject go, string op, string value)
         {
             if (!go.TryGetComponent<MeshRenderer>(out var c))
diff --git a/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs b/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs
index d568ff8ac9..293e866b88 100644
--- a/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs
+++ b/Modules/QuickSearch/Editor/Indexing/ObjectIndexer.cs
@@ -28,6 +28,14 @@ internal enum FilePattern
     /// </summary>
     public abstract class ObjectIndexer : SearchIndexer
     {
+        // Define a list of patterns that will automatically skip path entries if they start with it.
+        readonly static string[] BuiltInTransientFilePatterns = new[]
+        {
+            "~",
+            "##ignore",
+            "InitTestScene"
+        };
+
         internal SearchDatabase.Settings settings { get; private set; }
 
         private HashSet<string> m_IgnoredProperties;
@@ -78,6 +86,8 @@ internal override IEnumerable<SearchResult> SearchWord(string word, SearchIndexO
                 var options = FindOptions.Words | FindOptions.Regex | FindOptions.Glob;
                 if (op == SearchIndexOperator.Equal)
                     options = FindOptions.Exact;
+                else if (m_DoFuzzyMatch)
+                    options |= FindOptions.Fuzzy;
 
                 var documents = subset != null ? subset.Select(r => GetDocument(r.index)) : GetDocuments(ignoreNulls: true);
                 foreach (var r in FindProvider.SearchWord(false, word, options, documents))
@@ -88,6 +98,12 @@ internal override IEnumerable<SearchResult> SearchWord(string word, SearchIndexO
             }
         }
 
+        static bool ShouldIgnorePattern(in string pattern, in string path)
+        {
+            var filename = Path.GetFileName(path);
+            return filename.StartsWith(pattern, StringComparison.Ordinal) || filename.EndsWith(pattern, StringComparison.Ordinal);
+        }
+
         /// <summary>
         /// Called when the index is built to see if a specified document needs to be indexed. See <see cref="SearchIndexer.skipEntryHandler"/>
         /// </summary>
@@ -96,11 +112,11 @@ internal override IEnumerable<SearchResult> SearchWord(string word, SearchIndexO
         /// <returns>Returns true if the document doesn't need to be indexed.</returns>
         public override bool SkipEntry(string path, bool checkRoots = false)
         {
-            if (String.IsNullOrEmpty(path))
+            if (string.IsNullOrEmpty(path))
                 return true;
 
-            // Skip files with ~ in their file path
-            if (path.IndexOf('~') != -1)
+            // Skip files with ~ in their file path and built-in transient files
+            if (BuiltInTransientFilePatterns.Any(pattern => ShouldIgnorePattern(pattern, path)))
                 return true;
 
             if (checkRoots)
diff --git a/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs b/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs
index 8df1af236e..aa0dd6fc06 100644
--- a/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs
+++ b/Modules/QuickSearch/Editor/Indexing/SearchDatabase.cs
@@ -31,8 +31,17 @@ public TaskData(byte[] bytes, SearchIndexer combinedIndex)
         public readonly SearchIndexer combinedIndex;
     }
 
+    public interface ISearchDatabase
+    {
+        string name { get; }
+        IReadOnlyCollection<string> roots { get; }
+        IReadOnlyCollection<string> includePatterns { get; }
+        IReadOnlyCollection<string> excludePatterns { get; }
+        IndexingOptions indexingOptions { get; }
+    }
+
     [ExcludeFromPreset]
-    class SearchDatabase : ScriptableObject, ITaskReporter
+    class SearchDatabase : ScriptableObject, ITaskReporter, ISearchDatabase
     {
         // 1- First version
         // 2- Rename ADBIndex for SearchDatabase
@@ -165,6 +174,11 @@ public bool Equals(IndexArtifact other)
             }
         }
 
+        public IReadOnlyCollection<string> roots => settings.roots;
+        public IReadOnlyCollection<string> includePatterns => settings.includes;
+        public IReadOnlyCollection<string> excludePatterns => settings.excludes;
+        public IndexingOptions indexingOptions => (IndexingOptions)settings.options.GetHashCode();
+
         [SerializeField] public Settings settings;
         [SerializeField, HideInInspector] public byte[] bytes;
 
@@ -376,6 +390,15 @@ public static SearchDatabase ImportAsset(string settingsPath)
             return currentDb;
         }
 
+        public static void Unload(SearchDatabase db)
+        {
+            s_DBs?.Remove(db);
+            if (EditorUtility.IsPersistent(db))
+                Resources.UnloadAsset(db);
+            else
+                DestroyImmediate(db);
+        }
+
         internal void OnEnable()
         {
             if (settings == null)
diff --git a/Modules/QuickSearch/Editor/Indexing/SearchDatabaseImporter.cs b/Modules/QuickSearch/Editor/Indexing/SearchDatabaseImporter.cs
index f85c163369..c1f855f82d 100644
--- a/Modules/QuickSearch/Editor/Indexing/SearchDatabaseImporter.cs
+++ b/Modules/QuickSearch/Editor/Indexing/SearchDatabaseImporter.cs
@@ -16,10 +16,10 @@ class SearchDatabaseTemplates
     ""name"": ""Assets"",
     ""roots"": [""Assets""],
     ""includes"": [],
-    ""excludes"": [""Temp/"", ""External/""],
+    ""excludes"": [],
     ""options"": {
         ""types"": true,
-        ""properties"": false,
+        ""properties"": true,
         ""extended"": false,
         ""dependencies"": false
     },
@@ -30,10 +30,10 @@ class SearchDatabaseTemplates
 @"{
     ""roots"": [],
     ""includes"": [],
-    ""excludes"": [""Temp/"", ""External/""],
+    ""excludes"": [""Assets/Temp/"", ""Assets/External/""],
     ""options"": {
         ""types"": true,
-        ""properties"": false,
+        ""properties"": true,
         ""extended"": false,
         ""dependencies"": false
     },
diff --git a/Modules/QuickSearch/Editor/Indexing/SearchIndexEntryImporter.cs b/Modules/QuickSearch/Editor/Indexing/SearchIndexEntryImporter.cs
index e31bccd5f8..ccd19f926e 100644
--- a/Modules/QuickSearch/Editor/Indexing/SearchIndexEntryImporter.cs
+++ b/Modules/QuickSearch/Editor/Indexing/SearchIndexEntryImporter.cs
@@ -34,7 +34,7 @@ static class IndexingOptionsExtensions
 
     abstract class SearchIndexEntryImporter : ScriptedImporter
     {
-        public const int version = SearchIndexEntry.version | (0x0004 << 7);
+        public const int version = SearchIndexEntry.version | (0x0004 << 8);
 
         protected abstract IndexingOptions options { get; }
 
@@ -62,6 +62,7 @@ public override void OnImportAsset(AssetImportContext ctx)
                 using (var fileStream = new FileStream(indexArtifactPath, FileMode.CreateNew, FileAccess.Write, FileShare.None))
                     indexer.Write(fileStream);
 
+                ctx.DependsOnSourceAsset(ctx.assetPath);
                 ctx.DependsOnCustomDependency(GetType().GUID.ToString("N"));
                 ctx.DependsOnCustomDependency(nameof(CustomObjectIndexerAttribute));
 
diff --git a/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs b/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs
index b8f9051a2e..6485e05005 100644
--- a/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs
+++ b/Modules/QuickSearch/Editor/Indexing/SearchIndexer.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -39,7 +40,8 @@ namespace UnityEditor.Search
         // 22- Discard long string properties and add support for hash128 while indexing
         // 23- Improve keyword type encoding
         // 24- Optimize asset path indexing in size
-        internal const int version = 0x024;
+        // 25- Fix SearchDocument concurrency
+        internal const int version = 0x025;
 
         public enum Type : byte
         {
@@ -221,7 +223,7 @@ public override string ToString()
     }
 
     [Flags]
-    enum SearchDocumentFlags
+    public enum SearchDocumentFlags
     {
         None = 0,
         Asset = 1 << 0,
@@ -348,7 +350,7 @@ public class SearchIndexer
         /// <summary>
         /// Time indicating when the index was saved
         /// </summary>
-        internal long timestamp => m_Timestamp;
+        public long timestamp => m_Timestamp;
 
         /// <summary>
         /// Returns how many keywords the index contains.
@@ -395,10 +397,11 @@ internal int indexCount
         private Thread m_IndexerThread;
         private volatile bool m_IndexReady = false;
         private volatile bool m_RebuildFilters = true;
+        [ThreadStatic] internal bool m_DoFuzzyMatch;
 
         private static readonly QueryValidationOptions k_QueryEngineOptions = new QueryValidationOptions {validateFilters = true, skipNestedQueries = true};
         private QueryEngine<SearchResult> m_QueryEngine;
-        private Dictionary<string, Query<SearchResult, object>> m_QueryPool;
+        private ConcurrentDictionary<string, ParsedQuery<SearchResult, object>> m_QueryPool;
 
         private readonly Dictionary<RangeSet, IndexRange> m_FixedRanges;
         private SearchResultCollection m_AllDocumentIndexes;
@@ -408,7 +411,7 @@ internal int indexCount
         private readonly List<SearchIndexEntry> m_BatchIndexes;
 
         // Final documents and entries when the index is ready.
-        private List<SearchDocument> m_Documents;
+        private ConcurrentDictionary<int, SearchDocument> m_Documents;
         private Stack<int> m_UnusedDocumentIndexes;
         private SearchIndexEntry[] m_Indexes;
         private HashSet<string> m_Keywords;
@@ -435,7 +438,7 @@ public SearchIndexer(string name)
             skipEntryHandler = e => false;
 
             m_Keywords = new HashSet<string>();
-            m_Documents = new List<SearchDocument>();
+            m_Documents = new ConcurrentDictionary<int, SearchDocument>();
             m_UnusedDocumentIndexes = new Stack<int>();
             m_IndexByDocuments = new Dictionary<string, int>();
             m_Indexes = new SearchIndexEntry[0];
@@ -446,29 +449,32 @@ public SearchIndexer(string name)
             m_MetaInfo = new Dictionary<string, string>();
         }
 
-        private Query<SearchResult, object> BuildQuery(string searchQuery)
+        private ParsedQuery<SearchResult, object> BuildQuery(string searchQuery)
         {
-            if (m_QueryEngine == null)
+            lock (this)
             {
-                m_QueryEngine = new QueryEngine<SearchResult>(k_QueryEngineOptions);
-                m_QueryEngine.SetSearchDataCallback(e => null, s => s.Length < minWordIndexationLength ? null : s, StringComparison.Ordinal);
-                m_QueryPool = new Dictionary<string, Query<SearchResult, object>>();
-            }
+                if (m_QueryEngine == null)
+                {
+                    m_QueryEngine = new QueryEngine<SearchResult>(k_QueryEngineOptions);
+                    m_QueryEngine.SetSearchDataCallback(e => null, s => s.Length < minWordIndexationLength ? null : s, StringComparison.Ordinal);
+                    m_QueryPool = new ConcurrentDictionary<string, ParsedQuery<SearchResult, object>>();
+                }
 
-            if (m_RebuildFilters)
-            {
-                AddFilters();
-                m_RebuildFilters = false;
+                if (m_RebuildFilters)
+                {
+                    AddFilters();
+                    m_RebuildFilters = false;
+                }
             }
 
-            Query<SearchResult, object> query;
+            ParsedQuery<SearchResult, object> query;
             if (m_QueryPool.TryGetValue(searchQuery, out query) && query.valid)
                 return query;
 
             if (m_QueryPool.Count > 50)
                 m_QueryPool.Clear();
 
-            query = m_QueryEngine.Parse(searchQuery, new SearchIndexerQueryFactory(EvaluateSearchNode));
+            query = m_QueryEngine.ParseQuery(searchQuery, new SearchIndexerQueryFactory(EvaluateSearchNode));
             if (query.valid)
                 m_QueryPool[searchQuery] = query;
             return query;
@@ -659,6 +665,7 @@ public virtual IEnumerable<SearchResult> Search(string query, SearchContext cont
                     context.AddSearchQueryErrors(parsedQuery.errors.Select(e => new SearchQueryError(e, context, provider)));
                 return Enumerable.Empty<SearchResult>();
             }
+            m_DoFuzzyMatch = parsedQuery.HasToggle("fuzzy");
             return parsedQuery.Apply(null).Take(patternMatchLimit);
         }
 
@@ -775,9 +782,9 @@ public void Write(Stream stream)
             st.UnionWith(m_IndexByDocuments.Keys);
             st.UnionWith(m_MetaInfo.Keys);
             st.UnionWith(m_MetaInfo.Values);
-            st.UnionWith(m_Documents.Select(d => d.id));
-            st.UnionWith(m_Documents.Select(d => d.m_Name));
-            st.UnionWith(m_Documents.Select(d => d.m_Source));
+            st.UnionWith(m_Documents.Select(d => d.Value.id));
+            st.UnionWith(m_Documents.Select(d => d.Value.m_Name));
+            st.UnionWith(m_Documents.Select(d => d.Value.m_Source));
             st.UnionWith(m_Keywords);
 
             using (var indexWriter = new BinaryWriter(stream))
@@ -794,13 +801,14 @@ public void Write(Stream stream)
                 indexWriter.Write(m_Documents.Count);
                 foreach (var doc in m_Documents)
                 {
-                    indexWriter.Write(doc.valid);
-                    if (doc.valid)
+                    indexWriter.Write(doc.Key);
+                    indexWriter.Write(doc.Value.valid);
+                    if (doc.Value.valid)
                     {
-                        st.Write(indexWriter, doc.id);
-                        st.Write(indexWriter, doc.m_Name);
-                        st.Write(indexWriter, doc.m_Source);
-                        indexWriter.Write((int)doc.flags);
+                        st.Write(indexWriter, doc.Value.id);
+                        st.Write(indexWriter, doc.Value.m_Name);
+                        st.Write(indexWriter, doc.Value.m_Source);
+                        indexWriter.Write((int)doc.Value.flags);
                     }
                 }
 
@@ -812,7 +820,7 @@ public void Write(Stream stream)
                     indexWriter.Write(kvp.Value.ToString());
                 }
 
-                // Metainfo
+                // Meta info
                 indexWriter.Write(m_MetaInfo.Count);
                 foreach (var kvp in m_MetaInfo)
                 {
@@ -886,9 +894,10 @@ public bool Read(Stream stream, bool checkVersionOnly)
 
                 // Documents
                 var elementCount = indexReader.ReadInt32();
-                var documents = new SearchDocument[elementCount];
+                var documents = new ConcurrentDictionary<int, SearchDocument>();
                 for (int i = 0; i < elementCount; ++i)
                 {
+                    var index = indexReader.ReadInt32();
                     var valid = indexReader.ReadBoolean();
                     if (!valid)
                         continue;
@@ -897,7 +906,7 @@ public bool Read(Stream stream, bool checkVersionOnly)
                     var docName = st.Read(indexReader);
                     var docSource = st.Read(indexReader);
                     var docFlags = (SearchDocumentFlags)indexReader.ReadInt32();
-                    documents[i] = new SearchDocument(docId, string.IsNullOrEmpty(docName) ? null : docName, string.IsNullOrEmpty(docSource) ? null : docSource, int.MaxValue, docFlags);
+                    documents[index] = new SearchDocument(docId, string.IsNullOrEmpty(docName) ? null : docName, string.IsNullOrEmpty(docSource) ? null : docSource, int.MaxValue, docFlags);
                 }
 
                 // Hashes (m_SourceDocuments)
@@ -910,7 +919,7 @@ public bool Read(Stream stream, bool checkVersionOnly)
                     hashes[key] = hash;
                 }
 
-                // Metainfos
+                // Meta infos
                 elementCount = indexReader.ReadInt32();
                 var metainfos = new Dictionary<string, string>();
                 for (int i = 0; i < elementCount; ++i)
@@ -1007,7 +1016,7 @@ public bool LoadBytes(byte[] bytes, Action<bool> finished)
                 }
             });
             t.Start();
-            return t.ThreadState != System.Threading.ThreadState.Unstarted;
+            return t.ThreadState != ThreadState.Unstarted;
         }
 
         internal bool LoadBytes(byte[] bytes)
@@ -1041,7 +1050,12 @@ internal int FindDocumentIndex(string id)
         {
             if (m_IndexByDocuments.TryGetValue(id, out var di))
                 return di;
-            return m_Documents.FindIndex(d => d.valid && d.id.Equals(id, StringComparison.Ordinal));
+            foreach (var d in m_Documents)
+            {
+                if (d.Value.valid && d.Value.id.Equals(id, StringComparison.Ordinal))
+                    return d.Key;
+            }
+            return -1;
         }
 
         private int FindDocumentIndex(SearchDocument doc)
@@ -1082,7 +1096,7 @@ internal void CombineIndexes(IEnumerable<SearchIndexer> artifacts, int baseScore
 
                     progress(i++);
 
-                    int[] updatedDocIndexes = other.m_Documents.Select(d => FindDocumentIndex(d)).ToArray();
+                    int[] updatedDocIndexes = other.m_Documents.Select(d => FindDocumentIndex(d.Value)).ToArray();
                     for (int sourceIndex = 0; sourceIndex < updatedDocIndexes.Length; ++sourceIndex)
                     {
                         var sourceDoc = other.m_Documents[sourceIndex];
@@ -1131,7 +1145,7 @@ void MergeIndexes(in IEnumerable<SearchIndexEntry> entries, int[] docIndexes, in
             }
         }
 
-        internal void Merge(string[] removeDocuments, SearchIndexer other, int baseScore = 0,
+        public void Merge(string[] removeDocuments, SearchIndexer other, int baseScore = 0,
             Action<int, SearchIndexer, int> documentIndexing = null)
         {
             int[] updatedDocIndexes = null;
@@ -1139,7 +1153,7 @@ internal void Merge(string[] removeDocuments, SearchIndexer other, int baseScore
 
             lock (this)
             {
-                updatedDocIndexes = other.m_Documents.Select(d => FindDocumentIndex(d)).ToArray();
+                updatedDocIndexes = other.m_Documents.Select(d => FindDocumentIndex(d.Value)).ToArray();
 
                 var removeDocIndexes = new HashSet<int>(removeDocuments.Concat(other.m_SourceDocuments.Keys).SelectMany(FindDocumentIndexesByPath));
                 if (removeDocIndexes.Count > 0)
@@ -1264,7 +1278,7 @@ internal void ApplyUnsorted()
         }
 
         internal IEnumerable<string> GetKeywords() { lock (this) return m_Keywords; }
-        internal IEnumerable<SearchDocument> GetDocuments(bool ignoreNulls = false) { lock (this) return ignoreNulls ? m_Documents.Where(d => d.valid) : m_Documents; }
+        internal IEnumerable<SearchDocument> GetDocuments(bool ignoreNulls = false) { lock (this) return ignoreNulls ? m_Documents.Values.Where(d => d.valid) : m_Documents.Values; }
 
         /// <summary>
         /// Return a search document by its index.
@@ -1273,12 +1287,11 @@ internal void ApplyUnsorted()
         /// <returns>Indexed search document</returns>
         public SearchDocument GetDocument(int index)
         {
-            lock (this)
-            {
-                if (index < 0 || index >= m_Documents.Count)
-                    return default;
-                return m_Documents[index];
-            }
+            if (index < 0 || index >= m_Documents.Count)
+                return default;
+            if (m_Documents.TryGetValue(index, out var doc))
+                return doc;
+            return default;
         }
 
         internal bool TryGetHash(string id, out Hash128 hash)
@@ -1310,7 +1323,7 @@ public int AddDocument(string document, bool checkIfExists = true)
             return AddDocument(document, null, null, checkIfExists, SearchDocumentFlags.None);
         }
 
-        internal int AddDocument(string document, string name, string source, bool checkIfExists, SearchDocumentFlags flags)
+        public int AddDocument(string document, string name, string source, bool checkIfExists, SearchDocumentFlags flags)
         {
             // Reformat entry to have them all uniformed.
             if (skipEntryHandler(document))
@@ -1336,7 +1349,10 @@ internal int AddDocument(string document, string name, string source, bool check
                     m_Documents[newIndex] = newDocument;
                 }
                 else
-                    m_Documents.Add(newDocument);
+                {
+                    while (!m_Documents.TryAdd(newIndex, newDocument))
+                        newIndex = m_Documents.Count;
+                }
                 m_IndexByDocuments[document] = newIndex;
                 return newIndex;
             }
@@ -1497,7 +1513,7 @@ public void Finish(Action threadCompletedCallback)
             Finish(bytes => threadCompletedCallback?.Invoke(), null, saveBytes: false);
         }
 
-        internal void Finish(Action threadCompletedCallback, string[] removedDocuments)
+        public void Finish(Action threadCompletedCallback, string[] removedDocuments)
         {
             Finish(bytes => threadCompletedCallback?.Invoke(), removedDocuments, saveBytes: false);
         }
@@ -1512,7 +1528,7 @@ public void Finish(Action<byte[]> threadCompletedCallback, string[] removedDocum
             Finish(threadCompletedCallback, removedDocuments, saveBytes: true);
         }
 
-        internal void Finish(Action<byte[]> threadCompletedCallback, string[] removedDocuments, bool saveBytes)
+        public void Finish(Action<byte[]> threadCompletedCallback, string[] removedDocuments, bool saveBytes)
         {
             m_IndexerThread = new Thread(() =>
             {
@@ -1546,7 +1562,7 @@ internal void Finish(Action<byte[]> threadCompletedCallback, string[] removedDoc
             m_IndexerThread.Start();
         }
 
-        internal void Finish(string[] removedDocuments)
+        public void Finish(string[] removedDocuments)
         {
             lock (this)
             {
@@ -1659,7 +1675,7 @@ private IEnumerable<SearchResult> SearchTerm(
             }
 
             IEnumerable<SearchResult> matches = null;
-            if (!String.IsNullOrEmpty(name))
+            if (!string.IsNullOrEmpty(name))
             {
                 name = name.ToLowerInvariant();
 
@@ -1862,9 +1878,9 @@ static IEnumerable<SearchIndexEntry> CompressEntries(IList<SearchIndexEntry> ent
                 yield return le;
         }
 
-        private void ApplyIndexes(IEnumerable<SearchDocument> documents, SearchIndexEntry[] entries, Dictionary<string, Hash128> hashes, Dictionary<string, string> metainfos)
+        private void ApplyIndexes(ConcurrentDictionary<int, SearchDocument> documents, SearchIndexEntry[] entries, Dictionary<string, Hash128> hashes, Dictionary<string, string> metainfos)
         {
-            m_Documents = documents.ToList();
+            m_Documents = documents;
             m_SourceDocuments = hashes;
             m_MetaInfo = metainfos;
             m_Indexes = entries;
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs
index 25ffa2ab7c..62c13622a8 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabase.cs
@@ -14,37 +14,46 @@
 
 namespace UnityEditor.Search
 {
-    interface IPropertyDatabaseView : IDisposable
+    public interface IPropertyDatabaseView : IDisposable
     {
-        bool Store(PropertyDatabaseRecord record);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out object data);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data);
+        public bool Store(string documentId, string propertyPath, object value);
+        public bool Store(ulong documentKey, Hash128 propertyHash, object value);
+        public bool Store(Hash128 propertyHash, object value);
+        public bool Store(in PropertyDatabaseRecordKey recordKey, object value);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data);
         bool TryLoad(ulong documentKey, out IEnumerable<object> data);
         bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records);
         void Invalidate(string documentId);
         void Invalidate(ulong documentKey);
-        void Invalidate(PropertyDatabaseRecordKey recordKey);
-        void Invalidate(uint documentKeyHiWord);
+        void Invalidate(in PropertyDatabaseRecordKey recordKey);
         void InvalidateMask(ulong documentKeyMask);
-        void InvalidateMask(uint documentKeyHiWordMask);
         IEnumerable<IPropertyDatabaseRecord> EnumerateAll();
         void Sync();
         void Clear();
+        public PropertyDatabaseRecordKey CreateRecordKey(string documentId, string propertyPath);
+        public PropertyDatabaseRecordKey CreateRecordKey(ulong documentKey, Hash128 propertyPathHash);
+        public PropertyDatabaseRecordKey CreateRecordKey(string propertyPath);
+        public PropertyDatabaseRecordKey CreateRecordKey(string documentId, Hash128 propertyHash);
+        public PropertyDatabaseRecordKey CreateRecordKey(Hash128 propertyHash);
+        public ulong CreateDocumentKey(string documentId);
+        public Hash128 CreatePropertyHash(string propertyPath);
+        TValue GetValueFromRecord<TValue>(IPropertyDatabaseRecordValue recordValue);
+        public bool IsPersistableType(Type type);
     }
 
-    class PropertyDatabase
+    public class PropertyDatabase
     {
         PropertyDatabaseVolatileMemoryStore m_LocalVolatileStore;
         PropertyDatabaseMemoryStore m_LocalStore;
         PropertyDatabaseFileStore m_FileStore;
         PropertyStringTable m_StringTable;
 
-        public static readonly int version = ((0x50 << 24) | (0x44 << 16) | 0x0006) ^ PropertyStringTable.Version ^ ((InternalEditorUtility.GetUnityVersion().Major & 0xffff) << 16 | InternalEditorUtility.GetUnityVersion().Minor);
+        internal static readonly int version = ((0x50 << 24) | (0x44 << 16) | 0x0006) ^ PropertyStringTable.version ^ ((InternalEditorUtility.GetUnityVersion().Major & 0xffff) << 16 | InternalEditorUtility.GetUnityVersion().Minor);
 
         public string filePath { get; }
-        public string stringTableFilePath { get; }
-        public bool autoBackgroundUpdate { get; }
+        internal string stringTableFilePath { get; }
+        public bool autoFlush { get; }
 
         const double k_DefaultBackgroundUpdateDebounceInSeconds = 5.0;
         Delayer m_Debounce;
@@ -53,7 +62,7 @@ public PropertyDatabase(string filePath)
             : this(filePath, false)
         {}
 
-        public PropertyDatabase(string filePath, bool autoBackgroundUpdate, double backgroundUpdateDebounceInSeconds = k_DefaultBackgroundUpdateDebounceInSeconds)
+        public PropertyDatabase(string filePath, bool autoFlush, double backgroundUpdateDebounceInSeconds = k_DefaultBackgroundUpdateDebounceInSeconds)
         {
             this.filePath = filePath;
             stringTableFilePath = GetStringTablePath(filePath);
@@ -66,9 +75,9 @@ public PropertyDatabase(string filePath, bool autoBackgroundUpdate, double backg
             // causes an assembly leak during the test Unity.IntegrationTests.Scripting.AssemblyReloadTest.AssemblyReloadDoesntLeakAssemblies
             // on MacOs. I haven't found out why exactly does the writing of a file causes an assembly to be held, so instead I deactivate
             // the automatic update during tests.
-            this.autoBackgroundUpdate = autoBackgroundUpdate && !Utils.IsRunningTests();
+            this.autoFlush = autoFlush && !Utils.IsRunningTests();
 
-            m_Debounce = Delayer.Debounce(_ => TriggerPropertyDatabaseBackgroundUpdate(), backgroundUpdateDebounceInSeconds);
+            m_Debounce = Delayer.Debounce(_ => TriggerBackgroundUpdate(), backgroundUpdateDebounceInSeconds);
         }
 
         public bool Store(string documentId, string propertyPath, object value)
@@ -89,36 +98,42 @@ public bool Store(Hash128 propertyHash, object value)
                 return view.Store(propertyHash, value);
         }
 
-        public bool Store(PropertyDatabaseRecordKey recordKey, object value)
+        public bool Store(in PropertyDatabaseRecordKey recordKey, object value)
         {
             using (var view = GetView())
                 return view.Store(recordKey, value);
         }
 
-        public bool Store(PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue value)
+        internal bool Store(in PropertyDatabaseRecordKey recordKey, in PropertyDatabaseRecordValue value)
         {
-            using (var view = GetView())
+            using (var view = (PropertyDatabaseView)GetView())
                 return view.Store(recordKey, value);
         }
 
-        public bool Store(PropertyDatabaseRecord record)
+        internal bool Store(in PropertyDatabaseRecord record)
         {
-            using (var view = GetView())
+            using (var view = (PropertyDatabaseView)GetView())
                 return view.Store(record);
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out object value)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object value)
         {
             using (var view = GetView())
                 return view.TryLoad(recordKey, out value);
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue value)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue value)
         {
             using (var view = GetView())
                 return view.TryLoad(recordKey, out value);
         }
 
+        internal bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue value)
+        {
+            using (var view = (PropertyDatabaseView)GetView())
+                return view.TryLoad(recordKey, out value);
+        }
+
         public bool TryLoad(ulong documentKey, out IEnumerable<object> data)
         {
             using (var view = GetView())
@@ -143,13 +158,13 @@ public void Invalidate(ulong documentKey)
                 view.Invalidate(documentKey);
         }
 
-        public void Invalidate(PropertyDatabaseRecordKey recordKey)
+        public void Invalidate(in PropertyDatabaseRecordKey recordKey)
         {
             using (var view = GetView())
                 view.Invalidate(recordKey);
         }
 
-        public void Invalidate(uint documentKeyHiWord)
+        internal void Invalidate(uint documentKeyHiWord)
         {
             using (var view = GetView())
                 view.Invalidate(documentKeyHiWord);
@@ -161,7 +176,7 @@ public void InvalidateMask(ulong documentKeyMask)
                 view.InvalidateMask(documentKeyMask);
         }
 
-        public void InvalidateMask(uint documentKeyHiWordMask)
+        internal void InvalidateMask(uint documentKeyHiWordMask)
         {
             using (var view = GetView())
                 view.InvalidateMask(documentKeyHiWordMask);
@@ -173,61 +188,61 @@ public void Clear()
                 view.Clear();
         }
 
-        public PropertyDatabaseRecord CreateRecord(string documentId, string propertyPath, object value)
+        internal PropertyDatabaseRecord CreateRecord(string documentId, string propertyPath, object value)
         {
             return CreateRecord(CreateDocumentKey(documentId), CreatePropertyHash(propertyPath), value);
         }
 
-        public PropertyDatabaseRecord CreateRecord(string documentId, string propertyPath, object value, PropertyStringTableView view)
+        internal PropertyDatabaseRecord CreateRecord(string documentId, string propertyPath, object value, PropertyStringTableView view)
         {
             return CreateRecord(CreateDocumentKey(documentId), CreatePropertyHash(propertyPath), value, view);
         }
 
-        public PropertyDatabaseRecord CreateRecord(ulong documentKey, Hash128 propertyPathHash, object value)
+        internal PropertyDatabaseRecord CreateRecord(ulong documentKey, Hash128 propertyPathHash, object value)
         {
             var key = CreateRecordKey(documentKey, propertyPathHash);
             return CreateRecord(key, value);
         }
 
-        public PropertyDatabaseRecord CreateRecord(ulong documentKey, Hash128 propertyPathHash, object value, PropertyStringTableView view)
+        internal PropertyDatabaseRecord CreateRecord(ulong documentKey, Hash128 propertyPathHash, object value, PropertyStringTableView view)
         {
             var key = CreateRecordKey(documentKey, propertyPathHash);
             return CreateRecord(key, value, view);
         }
 
-        public PropertyDatabaseRecord CreateRecord(string propertyPath, object value)
+        internal PropertyDatabaseRecord CreateRecord(string propertyPath, object value)
         {
             return CreateRecord(CreatePropertyHash(propertyPath), value);
         }
 
-        public PropertyDatabaseRecord CreateRecord(string propertyPath, object value, PropertyStringTableView view)
+        internal PropertyDatabaseRecord CreateRecord(string propertyPath, object value, PropertyStringTableView view)
         {
             return CreateRecord(CreatePropertyHash(propertyPath), value, view);
         }
 
-        public PropertyDatabaseRecord CreateRecord(Hash128 propertyPathHash, object value)
+        internal PropertyDatabaseRecord CreateRecord(Hash128 propertyPathHash, object value)
         {
             return CreateRecord(0, propertyPathHash, value);
         }
 
-        public PropertyDatabaseRecord CreateRecord(Hash128 propertyPathHash, object value, PropertyStringTableView view)
+        internal PropertyDatabaseRecord CreateRecord(Hash128 propertyPathHash, object value, PropertyStringTableView view)
         {
             return CreateRecord(0, propertyPathHash, value, view);
         }
 
-        public PropertyDatabaseRecord CreateRecord(PropertyDatabaseRecordKey recordKey, object value)
+        internal PropertyDatabaseRecord CreateRecord(in PropertyDatabaseRecordKey recordKey, object value)
         {
             var recordValue = CreateRecordValue(value);
             return CreateRecord(recordKey, recordValue);
         }
 
-        public PropertyDatabaseRecord CreateRecord(PropertyDatabaseRecordKey recordKey, object value, PropertyStringTableView view)
+        internal PropertyDatabaseRecord CreateRecord(in PropertyDatabaseRecordKey recordKey, object value, PropertyStringTableView view)
         {
             var recordValue = CreateRecordValue(value, view);
             return CreateRecord(recordKey, recordValue);
         }
 
-        public static PropertyDatabaseRecord CreateRecord(PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue recordValue)
+        internal static PropertyDatabaseRecord CreateRecord(in PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue recordValue)
         {
             if (!IsSupportedPropertyType(recordValue.propertyType))
                 throw new ArgumentException($"Property type of {nameof(recordValue)} is not supported.");
@@ -269,27 +284,33 @@ public static ulong CreateDocumentKey(string documentId)
             return string.IsNullOrEmpty(documentId) ? 0UL : (ulong)documentId.GetHashCode();
         }
 
-        public PropertyDatabaseRecordValue CreateRecordValue(object value)
+        internal PropertyDatabaseRecordValue CreateRecordValue(object value)
         {
             using (var view = m_StringTable.GetView())
                 return CreateRecordValue(value, view);
         }
 
-        public PropertyDatabaseRecordValue CreateRecordValue(object value, PropertyStringTableView stringTableView)
+        internal PropertyDatabaseRecordValue CreateRecordValue(object value, PropertyStringTableView stringTableView)
         {
-            if (!IsSupportedValue(value))
+            if (!IsPersistableType(value.GetType()))
                 throw new ArgumentException($"Type \"{value.GetType()}\" is not supported.");
 
             return PropertyDatabaseSerializerManager.Serialize(value, stringTableView);
         }
 
-        public object GetObjectFromRecordValue(PropertyDatabaseRecordValue recordValue)
+        internal object GetObjectFromRecordValue(in PropertyDatabaseRecordValue recordValue)
         {
             using (var view = m_StringTable.GetView())
                 return GetObjectFromRecordValue(recordValue, view);
         }
 
-        public object GetObjectFromRecordValue(PropertyDatabaseRecordValue recordValue, PropertyStringTableView stringTableView)
+        public TValue GetValueFromRecord<TValue>(IPropertyDatabaseRecordValue recordValue)
+        {
+            using (var view = m_StringTable.GetView())
+                return GetValueFromRecord<TValue>(recordValue, view);
+        }
+
+        internal object GetObjectFromRecordValue(in PropertyDatabaseRecordValue recordValue, PropertyStringTableView stringTableView)
         {
             if (!IsSupportedPropertyType(recordValue.propertyType))
                 throw new ArgumentException($"Property type \"{recordValue.propertyType}\" of {nameof(recordValue)} is not supported.");
@@ -297,13 +318,13 @@ public object GetObjectFromRecordValue(PropertyDatabaseRecordValue recordValue,
             return PropertyDatabaseSerializerManager.Deserialize(recordValue, stringTableView);
         }
 
-        public object GetObjectFromRecordValue(IPropertyDatabaseRecordValue recordValue)
+        internal object GetObjectFromRecordValue(IPropertyDatabaseRecordValue recordValue)
         {
             using (var view = m_StringTable.GetView())
                 return GetObjectFromRecordValue(recordValue, view);
         }
 
-        public object GetObjectFromRecordValue(IPropertyDatabaseRecordValue recordValue, PropertyStringTableView stringTableView)
+        internal object GetObjectFromRecordValue(IPropertyDatabaseRecordValue recordValue, PropertyStringTableView stringTableView)
         {
             if (recordValue.type != PropertyDatabaseType.Volatile)
                 return GetObjectFromRecordValue((PropertyDatabaseRecordValue)recordValue, stringTableView);
@@ -312,25 +333,39 @@ public object GetObjectFromRecordValue(IPropertyDatabaseRecordValue recordValue,
             return volatileRecordValue.value;
         }
 
-        public static bool IsSupportedValue(object value)
+        internal TValue GetValueFromRecord<TValue>(IPropertyDatabaseRecordValue recordValue, PropertyStringTableView stringTableView)
+        {
+            if (recordValue.type != PropertyDatabaseType.Volatile)
+                return (TValue)GetObjectFromRecordValue((PropertyDatabaseRecordValue)recordValue, stringTableView);
+
+            var volatileRecordValue = (PropertyDatabaseVolatileRecordValue)recordValue;
+            return (TValue)volatileRecordValue.value;
+        }
+
+        public static bool IsPersistableType(Type type)
         {
-            var type = value.GetType();
             return PropertyDatabaseSerializerManager.SerializerExists(type);
         }
 
-        public static bool IsSupportedPropertyType(byte propertyType)
+        internal static bool IsSupportedPropertyType(byte propertyType)
         {
             return PropertyDatabaseSerializerManager.DeserializerExists((PropertyDatabaseType)propertyType);
         }
 
-        public PropertyDatabaseView GetView(bool delayedSync = false)
+        public IPropertyDatabaseView GetView(bool delayedSync = false)
         {
             {
                 return new PropertyDatabaseView(this, m_LocalVolatileStore, m_LocalStore, m_FileStore, m_StringTable, delayedSync);
             }
         }
 
-        public Task TriggerPropertyDatabaseBackgroundUpdate()
+        public void Flush()
+        {
+            var task = TriggerBackgroundUpdate();
+            task.Wait();
+        }
+
+        internal Task TriggerBackgroundUpdate()
         {
             var task = Task.Run(() =>
             {
@@ -347,9 +382,9 @@ public Task TriggerPropertyDatabaseBackgroundUpdate()
             return task;
         }
 
-        public void StoresChanged()
+        internal void StoresChanged()
         {
-            if (!autoBackgroundUpdate)
+            if (!autoFlush)
                 return;
 
             lock (this)
@@ -436,7 +471,7 @@ struct PropertyDatabaseView : IPropertyDatabaseView
         internal PropertyStringTableView stringTableView => m_StringTableView;
         internal PropertyDatabase database => m_PropertyDatabase;
 
-        public PropertyDatabaseView(PropertyDatabase propertyDatabase, PropertyDatabaseVolatileMemoryStore volatileMemoryStore, PropertyDatabaseMemoryStore memoryStore, PropertyDatabaseFileStore fileStore, PropertyStringTable stringTable, bool delayedSync)
+        internal PropertyDatabaseView(PropertyDatabase propertyDatabase, PropertyDatabaseVolatileMemoryStore volatileMemoryStore, PropertyDatabaseMemoryStore memoryStore, PropertyDatabaseFileStore fileStore, PropertyStringTable stringTable, bool delayedSync)
         {
             m_PropertyDatabase = propertyDatabase;
             m_MemoryStore = memoryStore;
@@ -486,23 +521,23 @@ public bool Store(Hash128 propertyHash, object value)
             return Store(recordKey, value);
         }
 
-        public bool Store(PropertyDatabaseRecordKey recordKey, object value)
+        public bool Store(in PropertyDatabaseRecordKey recordKey, object value)
         {
             {
-                if (!IsSupportedValue(value))
+                if (!IsPersistableType(value.GetType()))
                     return m_VolatileMemoryStoreView.Store(recordKey, value, !m_DelayedSync);
                 var record = m_PropertyDatabase.CreateRecord(recordKey, value, m_StringTableView);
                 return Store(record);
             }
         }
 
-        public bool Store(PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue value)
+        public bool Store(in PropertyDatabaseRecordKey recordKey, in PropertyDatabaseRecordValue value)
         {
             var record = CreateRecord(recordKey, value);
             return Store(record);
         }
 
-        public bool Store(PropertyDatabaseRecord record)
+        public bool Store(in PropertyDatabaseRecord record)
         {
             {
                 if (!record.recordValue.valid)
@@ -516,7 +551,7 @@ public bool Store(PropertyDatabaseRecord record)
             }
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out object data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data)
         {
             {
                 data = null;
@@ -527,7 +562,7 @@ public bool TryLoad(PropertyDatabaseRecordKey recordKey, out object data)
             }
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
         {
             {
                 if (m_MemoryStoreView.TryLoad(recordKey, out data))
@@ -542,7 +577,7 @@ public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRec
             }
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
         {
             {
                 if (m_VolatileMemoryStoreView.TryLoad(recordKey, out data))
@@ -609,7 +644,7 @@ public void Invalidate(ulong documentKey)
             }
         }
 
-        public void Invalidate(PropertyDatabaseRecordKey recordKey)
+        public void Invalidate(in PropertyDatabaseRecordKey recordKey)
         {
             {
                 m_VolatileMemoryStoreView.Invalidate(recordKey, !m_DelayedSync);
@@ -619,7 +654,7 @@ public void Invalidate(PropertyDatabaseRecordKey recordKey)
             }
         }
 
-        public void Invalidate(uint documentKeyHiWord)
+        internal void Invalidate(uint documentKeyHiWord)
         {
             {
                 m_VolatileMemoryStoreView.Invalidate(documentKeyHiWord, !m_DelayedSync);
@@ -639,7 +674,7 @@ public void InvalidateMask(ulong documentKeyMask)
             }
         }
 
-        public void InvalidateMask(uint documentKeyHiWordMask)
+        internal void InvalidateMask(uint documentKeyHiWordMask)
         {
             {
                 m_VolatileMemoryStoreView.InvalidateMask(documentKeyHiWordMask, !m_DelayedSync);
@@ -696,12 +731,12 @@ public PropertyDatabaseRecord CreateRecord(Hash128 propertyPathHash, object valu
             return m_PropertyDatabase.CreateRecord(propertyPathHash, value, m_StringTableView);
         }
 
-        public PropertyDatabaseRecord CreateRecord(PropertyDatabaseRecordKey recordKey, object value)
+        public PropertyDatabaseRecord CreateRecord(in PropertyDatabaseRecordKey recordKey, object value)
         {
             return m_PropertyDatabase.CreateRecord(recordKey, value, m_StringTableView);
         }
 
-        public PropertyDatabaseRecord CreateRecord(PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue recordValue)
+        public PropertyDatabaseRecord CreateRecord(in PropertyDatabaseRecordKey recordKey, in PropertyDatabaseRecordValue recordValue)
         {
             return PropertyDatabase.CreateRecord(recordKey, recordValue);
         }
@@ -746,7 +781,7 @@ public PropertyDatabaseRecordValue CreateRecordValue(object value)
             return m_PropertyDatabase.CreateRecordValue(value, m_StringTableView);
         }
 
-        public object GetObjectFromRecordValue(PropertyDatabaseRecordValue recordValue)
+        public object GetObjectFromRecordValue(in PropertyDatabaseRecordValue recordValue)
         {
             return m_PropertyDatabase.GetObjectFromRecordValue(recordValue, m_StringTableView);
         }
@@ -756,9 +791,14 @@ public object GetObjectFromRecordValue(IPropertyDatabaseRecordValue recordValue)
             return m_PropertyDatabase.GetObjectFromRecordValue(recordValue, m_StringTableView);
         }
 
-        public bool IsSupportedValue(object value)
+        public TValue GetValueFromRecord<TValue>(IPropertyDatabaseRecordValue recordValue)
+        {
+            return m_PropertyDatabase.GetValueFromRecord<TValue>(recordValue, m_StringTableView);
+        }
+
+        public bool IsPersistableType(Type type)
         {
-            return PropertyDatabase.IsSupportedValue(value);
+            return PropertyDatabase.IsPersistableType(type);
         }
 
         public bool IsSupportedPropertyType(byte propertyType)
@@ -766,7 +806,7 @@ public bool IsSupportedPropertyType(byte propertyType)
             return PropertyDatabase.IsSupportedPropertyType(propertyType);
         }
 
-        public void MergeStores()
+        internal void MergeStores()
         {
             var newMemoryStore = new PropertyDatabaseMemoryStore();
             using (m_MemoryStore.LockUpgradeableRead())
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs
index e6b82887d6..0140762fb5 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseRecord.cs
@@ -10,12 +10,12 @@
 
 namespace UnityEditor.Search
 {
-    interface IPropertyDatabaseRecordValue
+    public interface IPropertyDatabaseRecordValue
     {
         PropertyDatabaseType type { get; }
     }
 
-    interface IPropertyDatabaseRecord
+    public interface IPropertyDatabaseRecord
     {
         PropertyDatabaseRecordKey key { get; }
         IPropertyDatabaseRecordValue value { get; }
@@ -31,7 +31,7 @@ public int Compare(IPropertyDatabaseRecord x, IPropertyDatabaseRecord y)
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    readonly struct PropertyDatabaseRecordKey : IComparable<PropertyDatabaseRecordKey>, IEquatable<PropertyDatabaseRecordKey>
+    public readonly struct PropertyDatabaseRecordKey : IComparable<PropertyDatabaseRecordKey>, IEquatable<PropertyDatabaseRecordKey>
     {
         public readonly ulong documentKey;
         public readonly Hash128 propertyKey;
@@ -99,14 +99,14 @@ public override int GetHashCode()
             }
         }
 
-        public void ToBinary(BinaryWriter bw)
+        internal void ToBinary(BinaryWriter bw)
         {
             bw.Write(documentKey);
             bw.Write(propertyKey.u64_0);
             bw.Write(propertyKey.u64_1);
         }
 
-        public static PropertyDatabaseRecordKey FromBinary(BinaryReader br)
+        internal static PropertyDatabaseRecordKey FromBinary(BinaryReader br)
         {
             var documentKey = br.ReadUInt64();
             var u640 = br.ReadUInt64();
@@ -811,25 +811,25 @@ public static PropertyDatabaseRecordValue FromBinary(BinaryReader br)
 
         public static int size => PropertyDatabaseRecordKey.size + sizeof(byte) + PropertyDatabaseRecordValue.size;
 
-        public PropertyDatabaseRecord(ulong documentKey, Hash128 propertyKey, PropertyDatabaseRecordValue recordValue)
+        public PropertyDatabaseRecord(ulong documentKey, Hash128 propertyKey, in PropertyDatabaseRecordValue recordValue)
             : this(new PropertyDatabaseRecordKey(documentKey, propertyKey), recordValue)
         {}
 
-        public PropertyDatabaseRecord(PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue recordValue)
+        public PropertyDatabaseRecord(in PropertyDatabaseRecordKey recordKey, in PropertyDatabaseRecordValue recordValue)
         {
             this.recordKey = recordKey;
             this.recordValue = recordValue;
             valid = 1;
         }
 
-        public PropertyDatabaseRecord(PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue recordValue, bool valid)
+        public PropertyDatabaseRecord(in PropertyDatabaseRecordKey recordKey, in PropertyDatabaseRecordValue recordValue, bool valid)
         {
             this.recordKey = recordKey;
             this.recordValue = recordValue;
             this.valid = valid ? (byte)1 : (byte)0;
         }
 
-        public PropertyDatabaseRecord(PropertyDatabaseRecordKey recordKey, PropertyDatabaseRecordValue recordValue, byte valid)
+        public PropertyDatabaseRecord(in PropertyDatabaseRecordKey recordKey, in PropertyDatabaseRecordValue recordValue, byte valid)
         {
             this.recordKey = recordKey;
             this.recordValue = recordValue;
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseSerializer.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseSerializer.cs
index e51d538cdc..50197b5dd6 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseSerializer.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseSerializer.cs
@@ -7,9 +7,10 @@
 
 namespace UnityEditor.Search
 {
-    enum PropertyDatabaseType : byte
+    public enum PropertyDatabaseType : byte
     {
-        FixedString = 1,
+        None = 0,
+        FixedString,
         String,
         Bool,
         Byte,
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs
index 8ba702e296..1a6c8e085a 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyDatabaseStore.cs
@@ -20,12 +20,12 @@ interface IPropertyLockable
 
     interface IPropertyDatabaseStore : IPropertyLockable
     {
-        bool Store(PropertyDatabaseRecord record);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data);
+        bool Store(in PropertyDatabaseRecord record);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data);
         bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records);
         void Invalidate(ulong documentKey);
-        void Invalidate(PropertyDatabaseRecordKey recordKey);
+        void Invalidate(in PropertyDatabaseRecordKey recordKey);
         void Invalidate(uint documentKeyHiWord);
         void InvalidateMask(ulong documentKeyMask);
         void InvalidateMask(uint documentKeyHiWordMask);
@@ -36,8 +36,8 @@ interface IPropertyDatabaseStore : IPropertyLockable
 
     interface IPropertyDatabaseVolatileStore : IPropertyDatabaseStore
     {
-        bool Store(PropertyDatabaseRecordKey recordKey, object value);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out object data);
+        bool Store(in PropertyDatabaseRecordKey recordKey, object value);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data);
     }
 
     interface IPropertyDatabaseStoreView : IDisposable, IPropertyLockable
@@ -47,25 +47,25 @@ interface IPropertyDatabaseStoreView : IDisposable, IPropertyLockable
 
         PropertyDatabaseRecord this[long index] { get; }
 
-        bool Store(PropertyDatabaseRecord record, bool sync);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data);
+        bool Store(in PropertyDatabaseRecord record, bool sync);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data);
         bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord> records);
         void Invalidate(ulong documentKey, bool sync);
-        void Invalidate(PropertyDatabaseRecordKey recordKey, bool sync);
+        void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync);
         void Invalidate(uint documentKeyHiWord, bool sync);
         void InvalidateMask(ulong documentKeyMask, bool sync);
         void InvalidateMask(uint documentKeyHiWordMask, bool sync);
         IEnumerable<IPropertyDatabaseRecord> EnumerateAll();
         void Clear();
         void Sync();
-        bool Find(PropertyDatabaseRecordKey recordKey, out long index);
+        bool Find(in PropertyDatabaseRecordKey recordKey, out long index);
     }
 
     interface IPropertyDatabaseVolatileStoreView : IPropertyDatabaseStoreView
     {
-        bool Store(PropertyDatabaseRecordKey recordKey, object value, bool sync);
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out object data);
+        bool Store(in PropertyDatabaseRecordKey recordKey, object value, bool sync);
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data);
     }
 
     readonly struct PropertyDatabaseDocumentKeyRange : IBinarySearchRange<PropertyDatabaseRecordKey>
@@ -142,7 +142,7 @@ public bool EndIsInRange(PropertyDatabaseRecordKey end)
 
     static class PropertyDatabaseRecordFinder
     {
-        public static bool Find(IBinarySearchRangeData<PropertyDatabaseRecordKey> store, PropertyDatabaseRecordKey recordKey, out long index)
+        public static bool Find(IBinarySearchRangeData<PropertyDatabaseRecordKey> store, in PropertyDatabaseRecordKey recordKey, out long index)
         {
             if (store.length == 0)
             {
@@ -276,19 +276,19 @@ abstract class BasePropertyDatabaseStore : IPropertyDatabaseStore
     {
         ReaderWriterLockSlim m_Lock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
-        public bool Store(PropertyDatabaseRecord record)
+        public bool Store(in PropertyDatabaseRecord record)
         {
             using (var view = GetView())
                 return view.Store(record, true);
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
         {
             using (var view = GetView())
                 return view.TryLoad(recordKey, out data);
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
         {
             using (var view = GetView())
                 return view.TryLoad(recordKey, out data);
@@ -306,7 +306,7 @@ public void Invalidate(ulong documentKey)
                 view.Invalidate(documentKey, true);
         }
 
-        public void Invalidate(PropertyDatabaseRecordKey recordKey)
+        public void Invalidate(in PropertyDatabaseRecordKey recordKey)
         {
             using (var view = GetView())
                 view.Invalidate(recordKey, true);
@@ -415,7 +415,7 @@ public void Dispose()
             m_Disposed = true;
         }
 
-        public bool Store(PropertyDatabaseRecord record, bool sync)
+        public bool Store(in PropertyDatabaseRecord record, bool sync)
         {
             using (LockUpgradeableRead())
             {
@@ -433,7 +433,7 @@ public bool Store(PropertyDatabaseRecord record, bool sync)
             }
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
         {
             data = PropertyDatabaseRecordValue.invalid;
             using (LockRead())
@@ -451,7 +451,7 @@ public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRec
             }
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
         {
             var success = TryLoad(recordKey, out PropertyDatabaseRecordValue record);
             data = record;
@@ -484,7 +484,7 @@ public bool TryLoad(ulong documentKey, out IEnumerable<IPropertyDatabaseRecord>
         public void Sync()
         {}
 
-        public bool Find(PropertyDatabaseRecordKey recordKey, out long index)
+        public bool Find(in PropertyDatabaseRecordKey recordKey, out long index)
         {
             using (LockRead())
                 return PropertyDatabaseRecordFinder.Find(this, recordKey, out index);
@@ -517,7 +517,7 @@ public void Invalidate(ulong documentKey, bool sync)
             }
         }
 
-        public void Invalidate(PropertyDatabaseRecordKey recordKey, bool sync)
+        public void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync)
         {
             using (LockUpgradeableRead())
             {
@@ -796,13 +796,13 @@ void HandleFileStoreAboutToChange()
             }
         }
 
-        public bool Store(PropertyDatabaseRecord record, bool sync)
+        public bool Store(in PropertyDatabaseRecord record, bool sync)
         {
             // Cannot add anything in this store
             throw new NotSupportedException();
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
         {
             data = PropertyDatabaseRecordValue.invalid;
             using (LockRead())
@@ -820,7 +820,7 @@ public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRec
             }
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
         {
             var success = TryLoad(recordKey, out PropertyDatabaseRecordValue record);
             data = record;
@@ -865,7 +865,7 @@ public void Invalidate(ulong documentKey, bool sync)
             }
         }
 
-        public void Invalidate(PropertyDatabaseRecordKey recordKey, bool sync)
+        public void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync)
         {
             using (LockUpgradeableRead())
             {
@@ -961,7 +961,7 @@ public void Sync()
             }
         }
 
-        public bool Find(PropertyDatabaseRecordKey recordKey, out long index)
+        public bool Find(in PropertyDatabaseRecordKey recordKey, out long index)
         {
             using (LockRead())
                 return PropertyDatabaseRecordFinder.Find(this, recordKey, out index);
@@ -1060,7 +1060,7 @@ PropertyDatabaseRecordKey GetRecordKey(long index)
             return PropertyDatabaseRecordKey.FromBinary(m_Br);
         }
 
-        void WriteRecord(PropertyDatabaseRecord record, long index, bool flush = true)
+        void WriteRecord(in PropertyDatabaseRecord record, long index, bool flush = true)
         {
             if (m_Fs == null)
                 return;
@@ -1139,14 +1139,14 @@ public PropertyDatabaseVolatileRecordValue(object value)
 
         public static int size => PropertyDatabaseRecordKey.size + sizeof(bool) + PropertyDatabaseVolatileRecordValue.size;
 
-        public PropertyDatabaseVolatileRecord(PropertyDatabaseRecordKey key, object value)
+        public PropertyDatabaseVolatileRecord(in PropertyDatabaseRecordKey key, object value)
         {
             this.recordKey = key;
             this.recordValue = new PropertyDatabaseVolatileRecordValue(value);
             valid = true;
         }
 
-        public PropertyDatabaseVolatileRecord(PropertyDatabaseRecordKey key, object value, bool valid)
+        public PropertyDatabaseVolatileRecord(in PropertyDatabaseRecordKey key, object value, bool valid)
         {
             this.recordKey = key;
             this.recordValue = new PropertyDatabaseVolatileRecordValue(value);
@@ -1161,13 +1161,13 @@ public override IPropertyDatabaseStoreView GetView()
             return new PropertyDatabaseVolatileMemoryStoreView(this, m_Store);
         }
 
-        public bool Store(PropertyDatabaseRecordKey recordKey, object value)
+        public bool Store(in PropertyDatabaseRecordKey recordKey, object value)
         {
             using (var view = (PropertyDatabaseVolatileMemoryStoreView)GetView())
                 return view.Store(recordKey, value, true);
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out object data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data)
         {
             using (var view = (PropertyDatabaseVolatileMemoryStoreView)GetView())
                 return view.TryLoad(recordKey, out data);
@@ -1220,17 +1220,17 @@ public IDisposable LockWrite()
 
         public PropertyDatabaseRecord this[long index] => throw new NotSupportedException();
 
-        public bool Store(PropertyDatabaseRecord record, bool sync)
+        public bool Store(in PropertyDatabaseRecord record, bool sync)
         {
             throw new NotSupportedException();
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseRecordValue data)
         {
             throw new NotSupportedException();
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out IPropertyDatabaseRecordValue data)
         {
             var success = TryLoad(recordKey, out PropertyDatabaseVolatileRecordValue record);
             data = record;
@@ -1271,7 +1271,7 @@ public void Invalidate(ulong documentKey, bool sync)
             }
         }
 
-        public void Invalidate(PropertyDatabaseRecordKey recordKey, bool sync)
+        public void Invalidate(in PropertyDatabaseRecordKey recordKey, bool sync)
         {
             using (LockUpgradeableRead())
             {
@@ -1335,13 +1335,13 @@ public void Clear()
         public void Sync()
         {}
 
-        public bool Find(PropertyDatabaseRecordKey recordKey, out long index)
+        public bool Find(in PropertyDatabaseRecordKey recordKey, out long index)
         {
             using (LockRead())
                 return PropertyDatabaseRecordFinder.Find(this, recordKey, out index);
         }
 
-        public bool Store(PropertyDatabaseRecordKey recordKey, object value, bool sync)
+        public bool Store(in PropertyDatabaseRecordKey recordKey, object value, bool sync)
         {
             using (LockUpgradeableRead())
             {
@@ -1360,14 +1360,14 @@ public bool Store(PropertyDatabaseRecordKey recordKey, object value, bool sync)
             }
         }
 
-        public bool TryLoad(PropertyDatabaseRecordKey recordKey, out object data)
+        public bool TryLoad(in PropertyDatabaseRecordKey recordKey, out object data)
         {
             var success = TryLoad(recordKey, out PropertyDatabaseVolatileRecordValue record);
             data = record.value;
             return success;
         }
 
-        bool TryLoad(PropertyDatabaseRecordKey recordKey, out PropertyDatabaseVolatileRecordValue data)
+        bool TryLoad(in PropertyDatabaseRecordKey recordKey, out PropertyDatabaseVolatileRecordValue data)
         {
             data = new PropertyDatabaseVolatileRecordValue();
             using (LockRead())
diff --git a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs
index e246251ea2..2b821ca2cc 100644
--- a/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs
+++ b/Modules/QuickSearch/Editor/PropertyDatabase/PropertyStringTable.cs
@@ -77,25 +77,26 @@ public static int GetSevenBitEncodedIntByteSize(int number)
 
     class PropertyStringTable : IPropertyLockable
     {
-        public const int Version = 0x50535400 | 0x02;
-        public const int StringTableFullSymbol = -1;
-        public const int EmptyStringSymbol = 0;
-        public const int HashFactor = 2;
-        public const int StringLengthByteSize = sizeof(int);
-        public const int SymbolByteSize = sizeof(int);
-        public const int DefaultStringCount = 30;
-        public const int DefaultAverageStringSize = 16;
+        public const int stringTableFullSymbol = -1;
+        public const int emptyStringSymbol = 0;
+
+        internal const int version = 0x50535400 | 0x02;
+        internal const int hashFactor = 2;
+        internal const int stringLengthByteSize = sizeof(int);
+        internal const int symbolByteSize = sizeof(int);
+        internal const int defaultStringCount = 30;
+        internal const int defaultAverageStringSize = 16;
 
         public string filePath { get; }
         public bool autoGrow { get; }
 
-        public static System.Text.Encoding encoding => System.Text.Encoding.Unicode;
+        internal static System.Text.Encoding encoding => System.Text.Encoding.Unicode;
 
         ReaderWriterLockSlim m_Lock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
         event Action<PropertyStringTableHeader> m_StringTableChanged;
 
-        public PropertyStringTable(string filePath, int stringCount, int averageStringLength = DefaultAverageStringSize, bool autoGrow = true)
+        public PropertyStringTable(string filePath, int stringCount, int averageStringLength = defaultAverageStringSize, bool autoGrow = true)
         {
             this.filePath = filePath;
             this.autoGrow = autoGrow;
@@ -104,19 +105,19 @@ public PropertyStringTable(string filePath, int stringCount, int averageStringLe
         }
 
         public PropertyStringTable(string filePath, bool autoGrow = true)
-            : this(filePath, DefaultStringCount, DefaultAverageStringSize, autoGrow)
+            : this(filePath, defaultStringCount, defaultAverageStringSize, autoGrow)
         {}
 
-        void Create(int stringCount, int averageStringLength = DefaultAverageStringSize)
+        void Create(int stringCount, int averageStringLength = defaultAverageStringSize)
         {
             var header = new PropertyStringTableHeader();
-            header.version = Version;
+            header.version = version;
             header.count = 0;
-            header.symbolSlots = Math.Max(stringCount * HashFactor, 1);
+            header.symbolSlots = Math.Max(stringCount * hashFactor, 1);
 
             var bytesPerString = GetStringByteSize(averageStringLength);
             header.allocatedStringBytes = stringCount * bytesPerString;
-            header.usedStringBytes = StringLengthByteSize;
+            header.usedStringBytes = stringLengthByteSize;
 
             var buffer = new byte[GetSymbolsByteSize(header.symbolSlots) + header.allocatedStringBytes];
             using (var bw = new BinaryWriter(File.Open(filePath, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete)))
@@ -131,19 +132,19 @@ public PropertyStringTableView GetView(bool delayedSync = false)
             return new PropertyStringTableView(this, delayedSync);
         }
 
-        public void RegisterStringTableChangedHandler(Action<PropertyStringTableHeader> handler)
+        internal void RegisterStringTableChangedHandler(Action<PropertyStringTableHeader> handler)
         {
             using (LockWrite())
                 m_StringTableChanged += handler;
         }
 
-        public void UnregisterStringTableChangedHandler(Action<PropertyStringTableHeader> handler)
+        internal void UnregisterStringTableChangedHandler(Action<PropertyStringTableHeader> handler)
         {
             using (LockWrite())
                 m_StringTableChanged -= handler;
         }
 
-        public void NotifyStringTableChanged(PropertyStringTableHeader newHeader)
+        internal void NotifyStringTableChanged(PropertyStringTableHeader newHeader)
         {
             using (LockUpgradeableRead())
                 m_StringTableChanged?.Invoke(newHeader);
@@ -152,7 +153,7 @@ public void NotifyStringTableChanged(PropertyStringTableHeader newHeader)
         public static int GetStringByteSize(int stringLength)
         {
             var maxByteCount = encoding.GetMaxByteCount(stringLength);
-            return maxByteCount + PropertyStringHashAndLength.GetSevenBitEncodedIntByteSize(maxByteCount) + StringLengthByteSize;
+            return maxByteCount + PropertyStringHashAndLength.GetSevenBitEncodedIntByteSize(maxByteCount) + stringLengthByteSize;
         }
 
         public static int GetSymbolsByteSize(int symbolCount)
@@ -160,20 +161,35 @@ public static int GetSymbolsByteSize(int symbolCount)
             return symbolCount * sizeof(int);
         }
 
-        public IDisposable LockRead()
+        internal IDisposable LockRead()
         {
             return new ReadLockGuard(m_Lock);
         }
 
-        public IDisposable LockUpgradeableRead()
+        IDisposable IPropertyLockable.LockRead()
+        {
+            return LockRead();
+        }
+
+        internal IDisposable LockUpgradeableRead()
         {
             return new UpgradeableReadLockGuard(m_Lock);
         }
 
-        public IDisposable LockWrite()
+        IDisposable IPropertyLockable.LockUpgradeableRead()
+        {
+            return LockUpgradeableRead();
+        }
+
+        internal IDisposable LockWrite()
         {
             return new WriteLockGuard(m_Lock);
         }
+
+        IDisposable IPropertyLockable.LockWrite()
+        {
+            return LockWrite();
+        }
     }
 
     class PropertyStringTableView : IDisposable, IPropertyLockable
@@ -240,7 +256,7 @@ public long fileSize
             }
         }
 
-        public PropertyStringTableView(PropertyStringTable stringTable, bool delayedSync)
+        internal PropertyStringTableView(PropertyStringTable stringTable, bool delayedSync)
         {
             m_StringTable = stringTable;
             m_Disposed = false;
@@ -257,7 +273,7 @@ public PropertyStringTableView(PropertyStringTable stringTable, bool delayedSync
             m_Header = ReadHeader();
             using (LockUpgradeableRead())
             {
-                if (m_Header.version != PropertyStringTable.Version)
+                if (m_Header.version != PropertyStringTable.version)
                 {
                     Clear();
                 }
@@ -277,25 +293,40 @@ public void Dispose()
             m_StringTable = null;
         }
 
-        public IDisposable LockRead()
+        internal IDisposable LockRead()
         {
             return m_StringTable.LockRead();
         }
 
-        public IDisposable LockUpgradeableRead()
+        IDisposable IPropertyLockable.LockRead()
+        {
+            return LockRead();
+        }
+
+        internal IDisposable LockUpgradeableRead()
         {
             return m_StringTable.LockUpgradeableRead();
         }
 
-        public IDisposable LockWrite()
+        IDisposable IPropertyLockable.LockUpgradeableRead()
+        {
+            return LockUpgradeableRead();
+        }
+
+        internal IDisposable LockWrite()
         {
             return m_StringTable.LockWrite();
         }
 
+        IDisposable IPropertyLockable.LockWrite()
+        {
+            return LockWrite();
+        }
+
         public int ToSymbol(string str)
         {
             if (string.IsNullOrEmpty(str))
-                return PropertyStringTable.EmptyStringSymbol;
+                return PropertyStringTable.emptyStringSymbol;
 
             var hashAndLength = Hash(str);
 
@@ -315,12 +346,12 @@ public int ToSymbol(string str)
                     }
 
 
-                    if (m_Header.count + 1 >= m_Header.symbolSlots || m_Header.symbolSlots / (float)m_Header.count < PropertyStringTable.HashFactor)
+                    if (m_Header.count + 1 >= m_Header.symbolSlots || m_Header.symbolSlots / (float)m_Header.count < PropertyStringTable.hashFactor)
                     {
                         if (m_StringTable.autoGrow)
                         {
                             // Double the string count
-                            Grow(m_Header.symbolSlots / PropertyStringTable.HashFactor * 2);
+                            Grow(m_Header.symbolSlots / PropertyStringTable.hashFactor * 2);
 
                             // Get a new symbol index
                             symbolIndex = (int)(hashAndLength.hash % m_Header.symbolSlots);
@@ -332,19 +363,19 @@ public int ToSymbol(string str)
                             }
                         }
                         else
-                            return PropertyStringTable.StringTableFullSymbol;
+                            return PropertyStringTable.stringTableFullSymbol;
                     }
 
-                    if (m_Header.usedStringBytes + PropertyStringTable.StringLengthByteSize + hashAndLength.length > m_Header.allocatedStringBytes)
+                    if (m_Header.usedStringBytes + PropertyStringTable.stringLengthByteSize + hashAndLength.length > m_Header.allocatedStringBytes)
                     {
                         if (m_StringTable.autoGrow)
                         {
-                            var sizeNeeded = m_Header.usedStringBytes + PropertyStringTable.StringLengthByteSize + hashAndLength.length - m_Header.allocatedStringBytes;
+                            var sizeNeeded = m_Header.usedStringBytes + PropertyStringTable.stringLengthByteSize + hashAndLength.length - m_Header.allocatedStringBytes;
                             m_Fs.SetLength(m_Fs.Length + sizeNeeded);
                             m_Header.allocatedStringBytes += sizeNeeded;
                         }
                         else
-                            return PropertyStringTable.StringTableFullSymbol;
+                            return PropertyStringTable.stringTableFullSymbol;
                     }
 
                     symbol = m_Header.usedStringBytes;
@@ -357,7 +388,7 @@ public int ToSymbol(string str)
         public int Contains(string str)
         {
             if (string.IsNullOrEmpty(str))
-                return PropertyStringTable.EmptyStringSymbol;
+                return PropertyStringTable.emptyStringSymbol;
 
             var hashAndLength = Hash(str);
 
@@ -374,15 +405,15 @@ public int Contains(string str)
                     symbol = GetSymbol(symbolIndex);
                 }
 
-                return PropertyStringTable.StringTableFullSymbol;
+                return PropertyStringTable.stringTableFullSymbol;
             }
         }
 
         public string GetString(int symbol)
         {
-            if (symbol == PropertyStringTable.EmptyStringSymbol)
+            if (symbol == PropertyStringTable.emptyStringSymbol)
                 return string.Empty;
-            if (symbol == PropertyStringTable.StringTableFullSymbol)
+            if (symbol == PropertyStringTable.stringTableFullSymbol)
                 return null;
 
             using (LockRead())
@@ -390,7 +421,7 @@ public string GetString(int symbol)
                 if (symbol >= m_Header.usedStringBytes)
                     return null;
                 var byteOffset = GetStringsOffset() + symbol;
-                if (byteOffset > m_Fs.Length - PropertyStringTable.StringLengthByteSize)
+                if (byteOffset > m_Fs.Length - PropertyStringTable.stringLengthByteSize)
                     return null;
 
                 m_Fs.Seek(byteOffset, SeekOrigin.Begin);
@@ -400,7 +431,7 @@ public string GetString(int symbol)
                     return string.Empty;
                 if (strLength < 0)
                     return null;
-                if (byteOffset + PropertyStringTable.StringLengthByteSize + strLength > m_Fs.Length)
+                if (byteOffset + PropertyStringTable.stringLengthByteSize + strLength > m_Fs.Length)
                     return null;
 
                 return m_Br.ReadString();
@@ -417,9 +448,9 @@ public void Grow(int newStringCount)
 
                 // Compute new sizes
                 var averageBytesPerString = GetAverageBytesPerString();
-                var newSymbolSlots = Math.Max(newStringCount * PropertyStringTable.HashFactor, m_Header.symbolSlots);
-                var newSymbolsByteSize = newSymbolSlots * PropertyStringTable.SymbolByteSize;
-                var newAllocatedStringBytes = (int)(newStringCount * (averageBytesPerString + PropertyStringTable.StringLengthByteSize));
+                var newSymbolSlots = Math.Max(newStringCount * PropertyStringTable.hashFactor, m_Header.symbolSlots);
+                var newSymbolsByteSize = newSymbolSlots * PropertyStringTable.symbolByteSize;
+                var newAllocatedStringBytes = (int)(newStringCount * (averageBytesPerString + PropertyStringTable.stringLengthByteSize));
                 newAllocatedStringBytes = Math.Max(newAllocatedStringBytes, m_Header.allocatedStringBytes);
 
                 if (newSymbolSlots == m_Header.symbolSlots)
@@ -450,13 +481,13 @@ public void Grow(int newStringCount)
                     WriteInt32(0);
                 m_Fs.Seek(newStringsOffset, SeekOrigin.Begin);
                 // Start byteOffset at first string by skipping symbol 0
-                var byteOffset = PropertyStringTable.StringLengthByteSize;
+                var byteOffset = PropertyStringTable.stringLengthByteSize;
                 for (var i = 0; i < m_Header.count; ++i)
                 {
                     var currentString = GetString(byteOffset);
                     if (string.IsNullOrEmpty(currentString))
                     {
-                        byteOffset += PropertyStringTable.StringLengthByteSize;
+                        byteOffset += PropertyStringTable.stringLengthByteSize;
                         continue;
                     }
                     var hashAndLength = Hash(currentString);
@@ -472,7 +503,7 @@ public void Grow(int newStringCount)
                     symbol = byteOffset;
                     WriteSymbol(symbolIndex, symbol);
 
-                    byteOffset += hashAndLength.length + PropertyStringTable.StringLengthByteSize;
+                    byteOffset += hashAndLength.length + PropertyStringTable.stringLengthByteSize;
                 }
 
                 WriteHeader(false);
@@ -486,13 +517,13 @@ public void Clear()
         {
             using (LockWrite())
             {
-                m_Header.version = PropertyStringTable.Version;
+                m_Header.version = PropertyStringTable.version;
                 m_Header.count = 0;
-                m_Header.symbolSlots = Math.Max(PropertyStringTable.DefaultStringCount * PropertyStringTable.HashFactor, 1);
+                m_Header.symbolSlots = Math.Max(PropertyStringTable.defaultStringCount * PropertyStringTable.hashFactor, 1);
 
-                var bytesPerString = PropertyStringTable.GetStringByteSize(PropertyStringTable.DefaultAverageStringSize);
-                m_Header.allocatedStringBytes = PropertyStringTable.DefaultStringCount * bytesPerString;
-                m_Header.usedStringBytes = PropertyStringTable.StringLengthByteSize;
+                var bytesPerString = PropertyStringTable.GetStringByteSize(PropertyStringTable.defaultAverageStringSize);
+                m_Header.allocatedStringBytes = PropertyStringTable.defaultStringCount * bytesPerString;
+                m_Header.usedStringBytes = PropertyStringTable.stringLengthByteSize;
 
                 var newFileSize = PropertyStringTableHeader.size + PropertyStringTable.GetSymbolsByteSize(m_Header.symbolSlots) + m_Header.allocatedStringBytes;
                 m_Fs.Seek(0, SeekOrigin.Begin);
@@ -511,7 +542,7 @@ public long GetAverageBytesPerString()
             {
                 if (m_Header.count == 0)
                     return 0;
-                return (long)Math.Ceiling((m_Header.usedStringBytes - (m_Header.count + 1) * PropertyStringTable.StringLengthByteSize) / (float)m_Header.count);
+                return (long)Math.Ceiling((m_Header.usedStringBytes - (m_Header.count + 1) * PropertyStringTable.stringLengthByteSize) / (float)m_Header.count);
             }
         }
 
@@ -521,7 +552,7 @@ public IList<string> GetAllStrings()
             {
                 var strings = new List<string>(m_Header.count);
                 // Skip the first length for empty string (symbol 0)
-                var startOffset = GetStringsOffset() + PropertyStringTable.StringLengthByteSize;
+                var startOffset = GetStringsOffset() + PropertyStringTable.stringLengthByteSize;
                 m_Fs.Seek(startOffset, SeekOrigin.Begin);
                 for (var i = 0; i < m_Header.count; ++i)
                 {
@@ -531,7 +562,7 @@ public IList<string> GetAllStrings()
                         strings.Add(string.Empty);
                     if (strLength < 0)
                         break;
-                    if (m_Fs.Position + PropertyStringTable.StringLengthByteSize + strLength > m_Fs.Length)
+                    if (m_Fs.Position + PropertyStringTable.stringLengthByteSize + strLength > m_Fs.Length)
                         break;
 
                     var str = m_Br.ReadString();
@@ -583,7 +614,7 @@ int GetSymbol(int symbolIndex)
         {
             using (LockRead())
             {
-                m_Fs.Seek(GetSymbolsOffset() + symbolIndex * PropertyStringTable.SymbolByteSize, SeekOrigin.Begin);
+                m_Fs.Seek(GetSymbolsOffset() + symbolIndex * PropertyStringTable.symbolByteSize, SeekOrigin.Begin);
                 return ReadInt32();
             }
         }
@@ -592,7 +623,7 @@ void WriteSymbol(int symbolIndex, int symbol)
         {
             using (LockWrite())
             {
-                m_Fs.Seek(GetSymbolsOffset() + symbolIndex * PropertyStringTable.SymbolByteSize, SeekOrigin.Begin);
+                m_Fs.Seek(GetSymbolsOffset() + symbolIndex * PropertyStringTable.symbolByteSize, SeekOrigin.Begin);
                 WriteInt32(symbol);
             }
         }
@@ -607,7 +638,7 @@ void WriteStringAtSymbol(int symbolIndex, int symbol, string str, PropertyString
                 m_Bw.Write(str);
 
                 m_Header.count++;
-                m_Header.usedStringBytes += PropertyStringTable.StringLengthByteSize + hashAndLength.length;
+                m_Header.usedStringBytes += PropertyStringTable.stringLengthByteSize + hashAndLength.length;
 
                 // Notify other views that the
                 WriteHeader(false);
@@ -623,7 +654,7 @@ static int GetSymbolsOffset()
 
         int GetStringsOffset()
         {
-            return GetSymbolsOffset() + m_Header.symbolSlots * PropertyStringTable.SymbolByteSize;
+            return GetSymbolsOffset() + m_Header.symbolSlots * PropertyStringTable.symbolByteSize;
         }
 
         int ReadInt32()
diff --git a/Modules/QuickSearch/Editor/Providers/AdbProvider.cs b/Modules/QuickSearch/Editor/Providers/AdbProvider.cs
index 8bc7adc68a..2cfc0ff731 100644
--- a/Modules/QuickSearch/Editor/Providers/AdbProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/AdbProvider.cs
@@ -14,28 +14,21 @@ static class AdbProvider
 
         static ObjectQueryEngine<UnityEngine.Object> m_ResourcesQueryEngine;
 
-        public static IEnumerable<string> EnumeratePaths(string searchQuery, SearchFlags flags)
+        public static IEnumerable<string> EnumeratePaths(in string searchQuery, in Type filterType, in SearchFlags flags)
         {
             var searchFilter = new SearchFilter
             {
                 searchArea = GetSearchArea(flags),
-                showAllHits = true,
+                showAllHits = flags.HasAny(SearchFlags.WantsMore),
                 originalText = searchQuery
             };
-            SearchUtility.ParseSearchString(searchQuery, searchFilter);
+            if (!string.IsNullOrEmpty(searchQuery))
+                SearchUtility.ParseSearchString(searchQuery, searchFilter);
+            if (filterType != null)
+                searchFilter.classNames = new[] { filterType.Name };
             return EnumeratePaths(searchFilter);
         }
 
-        public static IEnumerable<string> EnumeratePaths(Type type, SearchFlags flags)
-        {
-            return EnumeratePaths(new SearchFilter
-            {
-                searchArea = GetSearchArea(flags),
-                showAllHits = true,
-                classNames = new[] { type.Name }
-            });
-        }
-
 
         static SearchFilter.SearchArea GetSearchArea(in SearchFlags searchFlags)
         {
@@ -57,12 +50,11 @@ static IEnumerable<string> EnumeratePaths(SearchFilter searchFilter)
 
         public static IEnumerable<string> EnumeratePaths(SearchContext context)
         {
-            if (!string.IsNullOrEmpty(context.searchQuery))
-                return EnumeratePaths(context.searchQuery, context.options);
-
-            if (context.filterType != null)
-                return EnumeratePaths(context.filterType, context.options);
-            return Enumerable.Empty<string>();
+            if (context.filterType == null && context.empty)
+                return Enumerable.Empty<string>();
+            if (context.userData is SearchFilter legacySearchFilter)
+                return EnumeratePaths(legacySearchFilter);
+            return EnumeratePaths(context.searchQuery, context.filterType, context.options);
         }
 
         static IEnumerable<SearchItem> FetchItems(SearchContext context, SearchProvider provider)
@@ -75,7 +67,7 @@ static IEnumerable<SearchItem> FetchItems(SearchContext context, SearchProvider
 
             // Search asset database
             foreach (var path in EnumeratePaths(context))
-                yield return AssetProvider.CreateItem("ADB", context, provider, null, path, 998, SearchDocumentFlags.Asset);
+                yield return AssetProvider.CreateItem("ADB", context, provider, context.filterType, null, path, 998, SearchDocumentFlags.Asset);
 
             // Search builtin resources
             var resources = AssetDatabase.LoadAllAssetsAtPath("library/unity default resources")
diff --git a/Modules/QuickSearch/Editor/Providers/AssetProvider.cs b/Modules/QuickSearch/Editor/Providers/AssetProvider.cs
index 09ff9f85b3..8862b7f1ac 100644
--- a/Modules/QuickSearch/Editor/Providers/AssetProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/AssetProvider.cs
@@ -105,25 +105,35 @@ public Object obj
             }
 
             public AssetMetaInfo(string path, GlobalObjectId gid, SearchDocumentFlags flags)
+                : this(path, gid, flags, type: null)
+            {
+            }
+
+            public AssetMetaInfo(string path, GlobalObjectId gid, SearchDocumentFlags flags, in Type type)
             {
                 this.path = path;
                 gidString = null;
                 m_GID = gid;
                 m_Source = null;
-                m_HasType = false;
-                m_Type = null;
+                m_Type = type;
+                m_HasType = m_Type != null;
                 m_Object = null;
                 this.flags = flags;
             }
 
             public AssetMetaInfo(string path, string gid, SearchDocumentFlags flags)
+                : this(path, gid, flags, type: null)
+            {
+            }
+
+            public AssetMetaInfo(string path, string gid, SearchDocumentFlags flags, in Type type)
             {
                 this.path = path;
                 this.gidString = gid;
                 m_GID = default;
                 m_Source = null;
-                m_HasType = false;
-                m_Type = null;
+                m_Type = type;
+                m_HasType = m_Type != null;
                 m_Object = null;
                 this.flags = flags;
             }
@@ -180,7 +190,7 @@ private static Texture2D FetchPreview(SearchItem item, Vector2 size, FetchPrevie
 
             var obj = GlobalObjectId.GlobalObjectIdentifierToObjectSlow(info.gid);
             if (obj is GameObject go)
-                return (item.preview = Utils.GetSceneObjectPreview(go, size, options, item.thumbnail));
+                return Utils.GetSceneObjectPreview(go, size, options, item.thumbnail);
             else if (obj)
             {
                 var p = AssetPreview.GetAssetPreview(obj);
@@ -188,7 +198,7 @@ private static Texture2D FetchPreview(SearchItem item, Vector2 size, FetchPrevie
                     return p;
             }
 
-            return (item.preview = Utils.GetAssetPreviewFromPath(info.source, size, options));
+            return Utils.GetAssetPreviewFromPath(info.source, size, options);
         }
 
         private static Texture2D FetchThumbnail(in SearchItem item)
@@ -378,11 +388,16 @@ private static IEnumerable<SearchProposition> FetchQueryBuilderPropositions()
                     yield return t;
             }
 
-            yield return new SearchProposition(category: "Filters", label: "Directory (Name)", replacement: "dir=\"folder name\"", icon: Icons.quicksearch, color: QueryColors.filter);
-            yield return new SearchProposition(category: "Filters", label: "File Size", replacement: "size>=8096", help: "File size in bytes", icon: Icons.quicksearch, color: QueryColors.filter);
-            yield return new SearchProposition(category: "Filters", label: "File Extension", replacement: "ext:png", icon: Icons.quicksearch, color: QueryColors.filter);
+            yield return new SearchProposition(category: "Options", "Fuzzy Matches", "+fuzzy",
+                "Use fuzzy search to match object names", priority: 0, moveCursor: TextCursorPlacement.MoveAutoComplete, icon: Icons.toggles,
+                color: QueryColors.toggle);
+
+            yield return new SearchProposition(category: "Filters", label: "Directory (Name)", replacement: "dir=\"folder name\"", help:"Assets in a specific folder",icon: Icons.quicksearch, color: QueryColors.filter);
+            yield return new SearchProposition(category: "Filters", label: "File Size", replacement: "size>=8096", help: "Assets with a specific size in bytes", icon: Icons.quicksearch, color: QueryColors.filter);
+            yield return new SearchProposition(category: "Filters", label: "File Extension", replacement: "ext:png", help:"Assets with a specific extension", icon: Icons.quicksearch, color: QueryColors.filter);
             yield return new SearchProposition(category: "Filters", label: "Age", replacement: "age>=1.5", help: "In days, when was the file last modified?", icon: Icons.quicksearch, color: QueryColors.filter);
             yield return new SearchProposition(category: "Filters", label: "Sub Asset", replacement: "is:subasset", help: "Yield nested assets (i.e. media from FBX files)", icon: Icons.quicksearch, color: QueryColors.filter);
+            yield return new SearchProposition(category: "Filters", label: "Name", replacement: "name=", help: "Search asset by object name", icon: Icons.quicksearch, color: QueryColors.filter);
 
             var sceneIcon = Utils.LoadIcon("SceneAsset Icon");
             yield return new SearchProposition(category: null, "Reference", "ref=<$object:none,UnityEngine.Object$>", "Find all assets referencing a specific asset.", icon: sceneIcon, color: QueryColors.filter);
@@ -400,6 +415,7 @@ private static IEnumerable<SearchProposition> FetchIndexPropositions()
                     category: "Area",
                     label: db.name,
                     replacement: $"a:{db.name}",
+                    help: $"Search assets index by {db.name}.index",
                     color: QueryColors.type,
                     icon: Icons.quicksearch);
 
@@ -567,6 +583,14 @@ public static SearchItem CreateItem(
             in string tag, in SearchContext context, SearchProvider provider,
             in string gid, in string path, in int itemScore,
             in SearchDocumentFlags flags)
+        {
+            return CreateItem(tag, context, provider, null, gid, path, itemScore, flags);
+        }
+
+        public static SearchItem CreateItem(
+            in string tag, in SearchContext context, SearchProvider provider,
+            in Type type, in string gid, in string path, in int itemScore,
+            in SearchDocumentFlags flags)
         {
             string filename = null;
             if (context.options.HasAny(SearchFlags.Debug) && !string.IsNullOrEmpty(tag))
@@ -579,7 +603,7 @@ public static SearchItem CreateItem(
                 provider = SearchUtils.CreateGroupProvider(provider, GetProviderGroupName(tag, path), provider.priority, cacheProvider: true);
             else if (flags.HasAny(SearchDocumentFlags.Object))
                 provider = SearchUtils.CreateGroupProvider(provider, "Objects", provider.priority, cacheProvider: true);
-            var info = new AssetMetaInfo(path, gid, flags);
+            var info = new AssetMetaInfo(path, gid, flags, type);
             return provider.CreateItem(context, gid ?? info.gid.ToString(), itemScore, filename, null, null, info);
         }
 
@@ -795,7 +819,7 @@ private static bool CanAddScene(IReadOnlyCollection<SearchItem> items)
         [Shortcut("Help/Search/Assets")]
         internal static void PopQuickSearch()
         {
-            QuickSearch.OpenWithContextualProvider(type, Query.type, FindProvider.providerId);
+            QuickSearch.OpenWithContextualProvider(type, FindProvider.providerId);
         }
 
         [SearchTemplate(description = "Find all textures", providerId = type)] internal static string ST1() => @"t:texture";
diff --git a/Modules/QuickSearch/Editor/Providers/FindProvider.cs b/Modules/QuickSearch/Editor/Providers/FindProvider.cs
index 08af937c03..f57ecf7b0d 100644
--- a/Modules/QuickSearch/Editor/Providers/FindProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/FindProvider.cs
@@ -88,20 +88,12 @@ public static IEnumerable<SearchDocument> Search(SearchContext context, SearchPr
             if (string.IsNullOrEmpty(searchQuery) || searchQuery.Length < 2)
                 return Enumerable.Empty<SearchDocument>();
 
-            var tokens = searchQuery.ToLowerInvariant().Split(' ').ToArray();
-            var args = tokens.Where(t => t.Length > 1 && t[0] == '+').ToArray();
-            if (args.Contains("+packages"))
-            {
-                options |= FindOptions.Packages;
-                searchQuery = searchQuery.Replace("+packages", "");
-            }
-
-            return Search(searchQuery, GetRoots(options), context, provider, options);
+            return Search(searchQuery, null, context, provider, options);
         }
 
         public static IEnumerable<SearchDocument> Search(string searchQuery, IEnumerable<string> roots, SearchContext context, SearchProvider provider, FindOptions options)
         {
-            var query = s_QueryEngine.Parse(searchQuery, new FindFilesQueryFactory(args =>
+            var query = s_QueryEngine.ParseQuery(searchQuery, new FindFilesQueryFactory(args =>
             {
                 {
                     if (args.op == SearchIndexOperator.None)
@@ -132,6 +124,12 @@ public static IEnumerable<SearchDocument> Search(string searchQuery, IEnumerable
                 yield break;
             }
 
+            if (query.HasToggle("packages"))
+            {
+                options |= FindOptions.Packages;
+            }
+            roots = roots ?? GetRoots(options);
+
             var results = new ConcurrentBag<SearchDocument>();
             var searchTask = Task.Run(() =>
             {
@@ -358,6 +356,7 @@ private static IEnumerable<SearchProposition> FetchPropositions(SearchContext co
 
         private static IEnumerable<SearchProposition> FetchQueryBuilderPropositions()
         {
+            yield return new SearchProposition(category: "Find", "Search Packages", "+packages", color: QueryColors.toggle);
             yield return new SearchProposition(category: "Find", "File with Spaces", @"\s+", color: QueryColors.word);
             yield return new SearchProposition(category: "Find", "Numeric Files", @"\d+\.\w+$", color: QueryColors.word);
         }
diff --git a/Modules/QuickSearch/Editor/Providers/MenuProvider.cs b/Modules/QuickSearch/Editor/Providers/MenuProvider.cs
index 7011a4ed97..955bf5f0f5 100644
--- a/Modules/QuickSearch/Editor/Providers/MenuProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/MenuProvider.cs
@@ -18,7 +18,7 @@ struct MenuData
             public string[] words;
         }
 
-        private const string type = "menu";
+        internal const string type = "menu";
         private const string displayName = "Menus";
         private const string disabledMenuExecutionWarning = "The menu you are trying to execute is disabled. It will not be executed.";
 
@@ -39,7 +39,8 @@ internal static SearchProvider CreateProvider()
             System.Threading.Tasks.Task.Run(() => BuildMenus(itemNames));
 
             queryEngine = new QueryEngine<MenuData>(k_QueryEngineOptions);
-            queryEngine.AddFilter("id", m => m.path);
+            queryEngine.SetFilter("id", m => m.path)
+                .AddOrUpdatePropositionData(label: "Menu Path", replacement: "id:create/", help: "Filter by menu path.", priority: 9999);
             queryEngine.SetSearchDataCallback(m => m.words, s => Utils.FastToLower(s), StringComparison.Ordinal);
 
             debounce = Delayer.Debounce(_ => TriggerBackgroundUpdate(itemNames, shortcuts));
@@ -115,7 +116,7 @@ private static IEnumerable<SearchItem> FetchItems(SearchContext context, List<Se
         {
             if (string.IsNullOrEmpty(context.searchQuery))
                 yield break;
-            var query = queryEngine.Parse(context.searchQuery);
+            var query = queryEngine.ParseQuery(context.searchQuery);
             if (!query.valid)
             {
                 context.AddSearchQueryErrors(query.errors.Select(e => new SearchQueryError(e, context, provider)));
@@ -161,7 +162,8 @@ static IEnumerable<SearchProposition> FetchPropositions(SearchContext context, S
             if (!options.flags.HasAny(SearchPropositionFlags.QueryBuilder))
                 yield break;
 
-            yield return new SearchProposition(category: null, "Menu Path", "id:create/", "Filter by menu path.", priority: 9999);
+            foreach (var proposition in queryEngine.GetPropositions())
+                yield return proposition;
         }
 
         [SearchActionsProvider]
diff --git a/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs b/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs
index 1fbce6a95a..96a43ab3df 100644
--- a/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs
+++ b/Modules/QuickSearch/Editor/Providers/ObjectQueryEngine.cs
@@ -22,6 +22,11 @@ class ObjectQueryEngine<T> where T : UnityEngine.Object
         protected readonly QueryEngine<T> m_QueryEngine = new QueryEngine<T>(k_QueryEngineOptions);
         protected HashSet<SearchProposition> m_TypePropositions;
 
+        [ThreadStatic] protected bool m_DoFuzzyMatch;
+        [ThreadStatic] List<int> m_FuzzyMatches = new List<int>();
+
+        public QueryEngine<T> engine => m_QueryEngine;
+
         private static readonly char[] s_EntrySeparators = { '/', ' ', '_', '-', '.' };
         private static readonly SearchProposition[] s_FixedPropositions = new SearchProposition[]
         {
@@ -115,9 +120,13 @@ public ObjectQueryEngine(IEnumerable<T> objects)
             m_QueryEngine.AddOperatorHandler(">=", (float? ev, float fv) => ev.HasValue && ev >= fv);
             m_QueryEngine.AddOperatorHandler(">", (float? ev, float fv) => ev.HasValue && ev > fv);
 
+            m_QueryEngine.SetSearchWordMatcher(OnSearchData);
             m_QueryEngine.SetSearchDataCallback(OnSearchData, s => s.ToLowerInvariant(), StringComparison.Ordinal);
         }
 
+        public virtual void SetupQueryEnginePropositions()
+        {}
+
         public virtual IEnumerable<SearchProposition> FindPropositions(SearchContext context, SearchPropositionOptions options)
         {
             if (options.StartsWith("t"))
@@ -164,13 +173,14 @@ static SearchProposition CreateTypeProposition(in Type t, string prefixFilterId)
         #region search_query_error_example
         public IEnumerable<T> Search(SearchContext context, SearchProvider provider, IEnumerable<T> subset = null)
         {
-            var query = m_QueryEngine.Parse(context.searchQuery, true);
+            var query = m_QueryEngine.ParseQuery(context.searchQuery, true);
             if (!query.valid)
             {
                 context.AddSearchQueryErrors(query.errors.Select(e => new SearchQueryError(e, context, provider)));
                 return Enumerable.Empty<T>();
             }
 
+            m_DoFuzzyMatch = query.HasToggle("fuzzy");
             IEnumerable<T> gameObjects = subset ?? m_Objects;
             return query.Apply(gameObjects, false);
         }
@@ -276,7 +286,7 @@ bool OnTypeFilter(T obj, QueryFilterOperator op, string value)
                         types.Add("prefab");
 
                     var gocs = go.GetComponents<Component>();
-                    for (int componentIndex = 1; componentIndex < gocs.Length; ++componentIndex)
+                    for (int componentIndex = 0; componentIndex < gocs.Length; ++componentIndex)
                     {
                         var c = gocs[componentIndex];
                         if (!c || (c.hideFlags & HideFlags.HideInInspector) == HideFlags.HideInInspector)
@@ -296,16 +306,23 @@ private void BuildReferences(UnityEngine.Object obj, ICollection<int> refs)
         {
             if (!obj)
                 return;
-            using (var so = new SerializedObject(obj))
+            try
             {
-                var p = so.GetIterator();
-                var next = p.NextVisible(true);
-                while (next)
+                using (var so = new SerializedObject(obj))
                 {
-                    AddPropertyReferences(obj, p, refs);
-                    next = p.NextVisible(p.hasVisibleChildren);
+                    var p = so.GetIterator();
+                    var next = p.NextVisible(true);
+                    while (next)
+                    {
+                        AddPropertyReferences(obj, p, refs);
+                        next = p.NextVisible(p.hasVisibleChildren);
+                    }
                 }
             }
+            catch
+            {
+                // Do not add any references if an exception occurs because of user code.
+            }
         }
 
         private void AddPropertyReferences(UnityEngine.Object obj, SerializedProperty p, ICollection<int> refs)
@@ -400,12 +417,26 @@ IEnumerable<string> OnSearchData(T go)
             {
                 god.words = SplitName(go.name, s_EntrySeparators)
                     .Select(w => w.ToLowerInvariant())
+                    .Where(w => w.Length > 1)
                     .ToArray();
             }
 
             return god.words;
         }
 
+        bool OnSearchData(string term, bool exactMatch, StringComparison sc, string word)
+        {
+            if (!exactMatch && m_DoFuzzyMatch)
+            {
+                m_FuzzyMatches.Clear();
+                return FuzzySearch.FuzzyMatch(term, word, m_FuzzyMatches);
+            }
+
+            if (exactMatch)
+                return string.Equals(term, word, sc);
+            return word.IndexOf(term, sc) != -1;
+        }
+
         private static IEnumerable<string> SplitName(string entry, char[] entrySeparators)
         {
             yield return entry;
diff --git a/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs b/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs
index f627806bd8..04a9282c3f 100644
--- a/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/PerformanceProvider.cs
@@ -9,6 +9,7 @@
 using System.Text.RegularExpressions;
 using UnityEditorInternal;
 using UnityEngine.Profiling;
+using System.Linq;
 
 namespace UnityEditor.Search.Providers
 {
@@ -41,6 +42,7 @@ public static SearchProvider CreateProvider()
                 fetchColumns = FetchColumns,
                 fetchDescription = FetchDescription,
                 fetchItems = (context, items, provider) => FetchItem(qe, context, provider),
+                tableConfig = GetDefaultTableConfig,
                 actions = new List<SearchAction>(new[]
                 {
                     new SearchAction("open", "Profile...", item => StartProfilerRecording(item.id, true, deepProfile: false), _ => !ProfilerDriver.deepProfiling && !ProfilerDriver.enabled),
@@ -53,6 +55,11 @@ public static SearchProvider CreateProvider()
             };
         }
 
+        private static SearchTable GetDefaultTableConfig(SearchContext context)
+        {
+            return new SearchTable(type, new [] { new SearchColumn("Name", "label") }.Concat(FetchColumns(context, null)));
+        }
+
         [SearchColumnProvider(nameof(PerformanceMetric))]
         public static void PerformanceMetric(SearchColumn column)
         {
@@ -194,7 +201,7 @@ static IEnumerable<string> YieldTrackerWords(string trackerName)
 
         static IEnumerable<SearchItem> FetchItem(QueryEngine<string> qe, SearchContext context, SearchProvider provider)
         {
-            var query = qe.Parse(context.searchQuery);
+            var query = qe.ParseQuery(context.searchQuery);
             if (!query.valid)
                 yield break;
 
diff --git a/Modules/QuickSearch/Editor/Providers/SceneProvider.cs b/Modules/QuickSearch/Editor/Providers/SceneProvider.cs
index bbe942436d..14ecc7741d 100644
--- a/Modules/QuickSearch/Editor/Providers/SceneProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/SceneProvider.cs
@@ -143,7 +143,10 @@ internal SceneQueryEngine queryEngine
             get
             {
                 if (m_SceneQueryEngine == null)
+                {
                     m_SceneQueryEngine = new SceneQueryEngine(SearchUtils.FetchGameObjects());
+                    m_SceneQueryEngine.SetupQueryEnginePropositions();
+                }
                 return m_SceneQueryEngine;
             }
         }
@@ -291,6 +294,7 @@ private IEnumerator SearchItems(SearchContext context, SearchProvider provider)
                 if (m_HierarchyChanged)
                 {
                     m_SceneQueryEngine = new SceneQueryEngine(SearchUtils.FetchGameObjects());
+                    m_SceneQueryEngine.SetupQueryEnginePropositions();
                     m_HierarchyChanged = false;
                 }
 
@@ -386,62 +390,20 @@ private IEnumerable<SearchProposition> FetchQueryBuilderPropositions(SearchConte
             foreach (var t in QueryListBlockAttribute.GetPropositions(typeof(QueryComponentBlock)))
                 yield return t;
 
-            foreach (var t in QueryListBlockAttribute.GetPropositions(typeof(QueryTagBlock)))
-                yield return t;
-
-            foreach (var l in QueryListBlockAttribute.GetPropositions(typeof(QueryLayerBlock)))
-                yield return l;
-
-            foreach (var l in QueryListBlockAttribute.GetPropositions(typeof(QueryPrefabFilterBlock)))
-                yield return l;
-
             foreach (var f in QueryListBlockAttribute.GetPropositions(typeof(QueryIsFilterBlock)))
                 yield return f;
 
-            var goIcon = Utils.LoadIcon("GameObject Icon");
-            yield return new SearchProposition(category: "GameObject", label: "InstanceID", replacement: "id=0", help: "Search object with InstanceID", icon: goIcon, color: QueryColors.filter);
-            yield return new SearchProposition(category: "GameObject", label: "Path", replacement: "path=/root/children1", help: "Search object with Transform path", icon: goIcon, color: QueryColors.filter);
-            yield return new SearchProposition(category: "GameObject", label: "Volume Size", replacement: "size>1", help: "Search object by volume size", icon: goIcon, color: QueryColors.filter);
-            yield return new SearchProposition(category: "GameObject", label: "Components count", replacement: "components>1", help: "Search object with more than # components", icon: goIcon, color: QueryColors.filter);
-            yield return new SearchProposition(category: "GameObject", label: "Active", "active=true", "Search active objects", icon: goIcon, color: QueryColors.filter);
-
-            var filterIcon = Utils.LoadIcon("Filter Icon");
-
-
-            var sceneIcon = Utils.LoadIcon("SceneAsset Icon");
-            var queryEngineFunctions = TypeCache.GetMethodsWithAttribute<SceneQueryEngineFilterAttribute>();
-            foreach (var mi in queryEngineFunctions)
-            {
-                var attr = mi.GetAttribute<SceneQueryEngineFilterAttribute>();
-                var op = attr.supportedOperators == null ? ">" : attr.supportedOperators[0];
-                var value = op == ":" ? "" : "1";
-                var label = attr.token;
-                string help = null;
-
-                if (mi.ReturnType == typeof(Vector4))
-                    value = "(,,,)";
-
-                var replacement = $"{attr.token}{op}{value}";
-
-                var descriptionAttr = mi.GetAttribute<System.ComponentModel.DescriptionAttribute>();
-                if (descriptionAttr != null)
-                {
-                    help = label;
-                    label = descriptionAttr.Description;
-                }
+            foreach (var p in queryEngine.engine.GetPropositions())
+                yield return p;
 
-                yield return new SearchProposition(category: "Custom Scene Filters", label: label, help: help, replacement: replacement, icon: sceneIcon, color: QueryColors.filter);
-            }
+            yield return new SearchProposition(category: "Options", "Fuzzy Matches", "+fuzzy",
+                "Use fuzzy search to match object names", priority: 0, moveCursor: TextCursorPlacement.MoveAutoComplete, icon: Icons.toggles,
+                color: QueryColors.toggle);
 
-            var sceneObjects = context.searchView?.results.Count > 0 ?
+            var sceneObjects = context.searchView?.results.Count > 0 && !context.searchInProgress ?
                 context.searchView.results.Select(r => r.ToObject()).Where(o => o) : SearchUtils.FetchGameObjects();
-            foreach (var p in SearchUtils.EnumeratePropertyPropositions(sceneObjects).Take(100))
+            foreach (var p in SearchUtils.EnumeratePropertyPropositions(sceneObjects))
                 yield return p;
-
-
-            yield return new SearchProposition(category: "Reference", "Reference By Path (Object)", "ref=<$object:none,UnityEngine.Object$>", "Find all objects referencing a specific asset.", icon:sceneIcon, color: QueryColors.filter);
-            yield return new SearchProposition(category: "Reference", "Reference By Instance ID (Number)", "ref=1000", "Find all objects referencing a specific instance ID (Number).", icon: sceneIcon, color: QueryColors.filter);
-            yield return new SearchProposition(category: "Reference", "Reference By Asset Expression", "ref={p: }", "Find all objects referencing for a given asset search.", icon: sceneIcon, color: QueryColors.filter);
         }
     }
 
@@ -464,7 +426,7 @@ internal static IEnumerable<SearchAction> ActionHandlers()
         [Shortcut("Help/Search/Hierarchy")]
         internal static void OpenQuickSearch()
         {
-            QuickSearch.OpenWithContextualProvider(type, Query.type);
+            QuickSearch.OpenWithContextualProvider(type);
         }
 
         [SearchTemplate(description = "Find mesh object", providerId = type)] internal static string ST1() => @"t=MeshFilter vertices>=1024";
diff --git a/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs b/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs
index adc2461796..322198036c 100644
--- a/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs
+++ b/Modules/QuickSearch/Editor/Providers/SceneQueryEngine.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using UnityEngine;
 using System.Text.RegularExpressions;
+using UnityEditorInternal;
 
 namespace UnityEditor.Search.Providers
 {
@@ -72,63 +73,110 @@ public SceneQueryEngine(IEnumerable<GameObject> gameObjects)
             : base(gameObjects)
         {
             m_QueryEngine.AddFilter("active", IsActive);
+            m_QueryEngine.AddFilter("size", GetSize);
+            m_QueryEngine.AddFilter("components", GetComponentCount);
             m_QueryEngine.AddFilter("layer", GetLayer);
             m_QueryEngine.AddFilter("tag", GetTag);
-            m_QueryEngine.AddFilter<string>("prefab", OnPrefabFilter, new[] { ":" });
+            m_QueryEngine.AddFilter<PrefabFilter>("prefab", OnPrefabFilter, new[] { ":" });
             m_QueryEngine.AddFilter<string>("i", OnAttributeFilter, new[] { "=", ":" });
             m_QueryEngine.AddFilter("p", OnPropertyFilter, s => s, StringComparison.OrdinalIgnoreCase);
             m_QueryEngine.AddFilter(SerializedPropertyRx, OnPropertyFilter);
-            m_QueryEngine.AddFilter("size", GetSize);
-            m_QueryEngine.AddFilter("components", GetComponentCount);
             m_QueryEngine.AddFilter("overlap", GetOverlapCount);
 
             m_QueryEngine.AddFiltersFromAttribute<SceneQueryEngineFilterAttribute, SceneQueryEngineParameterTransformerAttribute>();
         }
 
+        public override void SetupQueryEnginePropositions()
+        {
+            var goIcon = Utils.LoadIcon("GameObject Icon");
+            m_QueryEngine.GetFilter("active")
+                .AddOrUpdatePropositionData(category: "GameObject", label: "Active", replacement: "active=true", help: "Search active objects", icon: goIcon, color: QueryColors.filter);
+            m_QueryEngine.GetFilter("size")
+                .AddOrUpdatePropositionData(category: "GameObject", label: "Volume Size", replacement: "size>1", help: "Search object by volume size", icon: goIcon, color: QueryColors.filter);;
+            m_QueryEngine.GetFilter("components")
+                .AddOrUpdatePropositionData(category: "GameObject", label: "Components count", replacement: "components>1", help: "Search object with more than # components", icon: goIcon, color: QueryColors.filter);;;
+            m_QueryEngine.GetFilter("id")
+                .AddOrUpdatePropositionData(category: "GameObject", label: "InstanceID", replacement: "id=0", help: "Search object with InstanceID", icon: goIcon, color: QueryColors.filter);
+            m_QueryEngine.GetFilter("path")
+                .AddOrUpdatePropositionData(category: "GameObject", label: "Path", replacement: "path=/root/children1", help: "Search object with Transform path", icon: goIcon, color: QueryColors.filter);
+
+            var layerFilter = m_QueryEngine.GetFilter("layer")
+                .SetGlobalPropositionData(category: "Layers", icon: Utils.LoadIcon("GUILayer Icon"), color: QueryColors.typeIcon, type: typeof(QueryLayerBlock));
+            for (var i = 0; i < 32; ++i)
+            {
+                var layerName = InternalEditorUtility.GetLayerName(i);
+                if (!string.IsNullOrEmpty(layerName))
+                    layerFilter.AddOrUpdatePropositionData(label: ObjectNames.NicifyVariableName(layerName), data: layerName, replacement: $"<$layer:{i}, {layerName}$>");
+            }
+
+            var tagFilter = m_QueryEngine.GetFilter("tag")
+                .SetGlobalPropositionData(category: "Tags", icon: Utils.LoadIcon("AssetLabelIcon"), color: QueryColors.typeIcon);
+            foreach (var t in InternalEditorUtility.tags)
+            {
+                tagFilter.AddOrUpdatePropositionData(category: "Tags", label: ObjectNames.NicifyVariableName(t), replacement: "tag=" + SearchUtils.GetListMarkerReplacementText(t, InternalEditorUtility.tags, "AssetLabelIcon", QueryColors.typeIcon));
+            }
+
+            m_QueryEngine.GetFilter("prefab")
+                .AddPropositionsFromFilterType(icon: Utils.LoadIcon("Prefab Icon"), category: "Prefabs", priority: 0, type: typeof(QueryListMarkerBlock), color: QueryColors.typeIcon);
+
+            var sceneIcon = Utils.LoadIcon("SceneAsset Icon");
+            m_QueryEngine.GetFilter("ref")
+                .AddOrUpdatePropositionData(category: "Reference", label:"Reference By Path (Object)", replacement:"ref=<$object:none,UnityEngine.Object$>", help: "Find all objects referencing a specific asset.", icon:sceneIcon, color: QueryColors.filter)
+                .AddOrUpdatePropositionData(category: "Reference", label:"Reference By Instance ID (Number)", replacement:"ref=1000", help: "Find all objects referencing a specific instance ID (Number).", icon: sceneIcon, color: QueryColors.filter)
+                .AddOrUpdatePropositionData(category: "Reference", label:"Reference By Asset Expression", replacement:"ref={p: }", help: "Find all objects referencing for a given asset search.", icon: sceneIcon, color: QueryColors.filter);
+
+            m_QueryEngine.AddPropositionsFromFilterAttributes<GameObject, SceneQueryEngineFilterAttribute>(category: "Custom Scene Filters", icon: sceneIcon, color: QueryColors.filter, propositionTransformation: proposition =>
+            {
+                return new SearchProposition(category: proposition.category,
+                    label: proposition.label,
+                    replacement: proposition.replacement,
+                    help: proposition.help,
+                    data: proposition.data,
+                    priority: proposition.priority,
+                    icon: proposition.icon,
+                    type: proposition.type,
+                    color: proposition.color,
+                    moveCursor: proposition.moveCursor);
+            });
+        }
+
         private bool IsActive(GameObject go)
         {
             return go != null && go.activeInHierarchy;
         }
 
-        bool OnPrefabFilter(GameObject go, QueryFilterOperator op, string value)
+        static bool OnPrefabFilter(GameObject go, QueryFilterOperator op, PrefabFilter value)
         {
             if (!PrefabUtility.IsPartOfAnyPrefab(go))
                 return false;
 
-            if (value == "root")
-                return PrefabUtility.IsAnyPrefabInstanceRoot(go);
-
-            if (value == "instance")
-                return PrefabUtility.IsPartOfPrefabInstance(go);
-
-            if (value == "top")
-                return PrefabUtility.IsOutermostPrefabInstanceRoot(go);
-
-            if (value == "nonasset")
-                return PrefabUtility.IsPartOfNonAssetPrefabInstance(go);
-
-            if (value == "asset")
-                return PrefabUtility.IsPartOfPrefabAsset(go);
-
-            if (value == "any")
-                return PrefabUtility.IsPartOfAnyPrefab(go);
-
-            if (value == "model")
-                return PrefabUtility.IsPartOfModelPrefab(go);
-
-            if (value == "regular")
-                return PrefabUtility.IsPartOfRegularPrefab(go);
-
-            if (value == "variant")
-                return PrefabUtility.IsPartOfVariantPrefab(go);
-
-            if (value == "modified")
-                return PrefabUtility.HasPrefabInstanceAnyOverrides(go, false);
-
-            if (value == "altered")
-                return PrefabUtility.HasPrefabInstanceAnyOverrides(go, true);
-
-            return false;
+            switch (value)
+            {
+                case PrefabFilter.Root:
+                    return PrefabUtility.IsAnyPrefabInstanceRoot(go);
+                case PrefabFilter.Instance:
+                    return PrefabUtility.IsPartOfPrefabInstance(go);
+                case PrefabFilter.Top:
+                    return PrefabUtility.IsOutermostPrefabInstanceRoot(go);
+                case PrefabFilter.NonAsset:
+                    return PrefabUtility.IsPartOfNonAssetPrefabInstance(go);
+                case PrefabFilter.Asset:
+                    return PrefabUtility.IsPartOfPrefabAsset(go);
+                case PrefabFilter.Any:
+                    return PrefabUtility.IsPartOfAnyPrefab(go);
+                case PrefabFilter.Model:
+                    return PrefabUtility.IsPartOfModelPrefab(go);
+                case PrefabFilter.Regular:
+                    return PrefabUtility.IsPartOfRegularPrefab(go);
+                case PrefabFilter.Variant:
+                    return PrefabUtility.IsPartOfVariantPrefab(go);
+                case PrefabFilter.Modified:
+                    return PrefabUtility.HasPrefabInstanceAnyOverrides(go, false);
+                case PrefabFilter.Altered:
+                    return PrefabUtility.HasPrefabInstanceAnyOverrides(go, true);
+                default:
+                    return false;
+            }
         }
 
         string GetTag(GameObject go)
diff --git a/Modules/QuickSearch/Editor/Providers/SearchQueryProvider.cs b/Modules/QuickSearch/Editor/Providers/SearchQueryProvider.cs
deleted file mode 100644
index 216505c7ae..0000000000
--- a/Modules/QuickSearch/Editor/Providers/SearchQueryProvider.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System.Collections.Generic;
-
-namespace UnityEditor.Search.Providers
-{
-    static class Query
-    {
-        internal const string type = "query";
-        private const string displayName = "Saved Queries";
-
-        [SearchItemProvider]
-        internal static SearchProvider CreateProvider()
-        {
-            return new SearchProvider(type, displayName)
-            {
-                filterId = "q:",
-                isExplicitProvider = true,
-                fetchItems = (context, items, provider) => Search(context)
-            };
-        }
-
-        private static IEnumerable<SearchItem> Search(SearchContext context)
-        {
-            var queryItems = SearchQueryAsset.GetAllSearchQueryItems(context);
-            if (string.IsNullOrEmpty(context.searchQuery))
-            {
-                foreach (var qi in queryItems)
-                    yield return qi;
-            }
-            else
-            {
-                foreach (var qi in queryItems)
-                {
-                    if (SearchUtils.MatchSearchGroups(context, qi.label, true) ||
-                        SearchUtils.MatchSearchGroups(context, ((SearchQueryAsset)qi.data).text, true))
-                    {
-                        yield return qi;
-                    }
-                }
-            }
-        }
-
-        [SearchActionsProvider]
-        internal static IEnumerable<SearchAction> ActionHandlers()
-        {
-            return new[]
-            {
-                new SearchAction(type, "exec", null, "Execute search query")
-                {
-                    closeWindowAfterExecution = false,
-                    handler = ExecuteQuery
-                },
-                new SearchAction(type, "select", null, "Select search query", (item) =>
-                {
-                    var queryPath = AssetDatabase.GetAssetPath((SearchQueryAsset)item.data);
-                    if (!string.IsNullOrEmpty(queryPath))
-                        Utils.FrameAssetFromPath(queryPath);
-                })
-            };
-        }
-
-        private static void ExecuteQuery(SearchItem item)
-        {
-            if (item.context.searchView is QuickSearch qs && item.data is SearchQueryAsset query)
-                qs.ExecuteSearchQuery(query);
-        }
-    }
-}
diff --git a/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs b/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs
index 6c8cf61491..a99c36afc6 100644
--- a/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/SettingsProvider.cs
@@ -6,6 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEngine;
 
 namespace UnityEditor.Search.Providers
 {
@@ -42,9 +43,15 @@ static SettingsProviderCache()
                 })
                     .ToArray();
 
+                var iconName = "Filter Icon";
+                var icon = Utils.LoadIcon(iconName);
+                var scopeValues = Enum.GetNames(typeof(SettingsScope)).Select(n => Utils.FastToLower(n));
                 queryEngine = new QueryEngine<SettingsProviderInfo>();
                 queryEngine.SetSearchDataCallback(info => info.searchables, s => Utils.FastToLower(s), StringComparison.Ordinal);
-                queryEngine.AddFilter("scope", info => info.scope, new[] {":", "=", "!=", "<", ">", "<=", ">="});
+                queryEngine.SetFilter("scope", info => info.scope, new[] { ":", "=", "!=", "<", ">", "<=", ">=" })
+                    .SetGlobalPropositionData(category: "Scope", priority: 0, icon: icon, color: QueryColors.typeIcon)
+                    .AddOrUpdatePropositionData(label: "Project", replacement: "scope:" + SearchUtils.GetListMarkerReplacementText("project", scopeValues, iconName, QueryColors.typeIcon), help: "Search project settings")
+                    .AddOrUpdatePropositionData(label: "User", replacement: "scope:" + SearchUtils.GetListMarkerReplacementText("user", scopeValues, iconName, QueryColors.typeIcon), help: "Search user settings");
 
                 queryEngine.AddOperatorHandler(":", (SettingsScope ev, SettingsScope fv, StringComparison sc) => ev.ToString().IndexOf(fv.ToString(), sc) != -1);
                 queryEngine.AddOperatorHandler(":", (SettingsScope ev, string fv, StringComparison sc) => ev.ToString().IndexOf(fv, sc) != -1);
@@ -81,7 +88,7 @@ static IEnumerator FetchItems(SearchContext context, SearchProvider provider)
             if (string.IsNullOrEmpty(context.searchQuery))
                 yield break;
 
-            var query = SettingsProviderCache.queryEngine.Parse(context.searchQuery);
+            var query = SettingsProviderCache.queryEngine.ParseQuery(context.searchQuery);
             if (!query.valid)
             {
                 context.AddSearchQueryErrors(query.errors.Select(e => new SearchQueryError(e, context, provider)));
@@ -96,7 +103,7 @@ static IEnumerable<SearchProposition> FetchPropositions(SearchContext context, S
             if (!options.flags.HasAny(SearchPropositionFlags.QueryBuilder))
                 yield break;
 
-            foreach (var f in QueryListBlockAttribute.GetPropositions(typeof(QueryScopeFilterBlock)))
+            foreach (var f in SettingsProviderCache.queryEngine.GetPropositions())
                 yield return f;
         }
 
@@ -116,20 +123,4 @@ internal static IEnumerable<SearchAction> ActionHandlers()
             };
         }
     }
-
-    [QueryListBlock("Scope", "scope", "scope")]
-    class QueryScopeFilterBlock : QueryListBlock
-    {
-        public QueryScopeFilterBlock(IQuerySource source, string id, string value, QueryListBlockAttribute attr)
-            : base(source, id, value, attr)
-        {
-            icon = Utils.LoadIcon("Filter Icon");
-        }
-
-        public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
-        {
-            yield return CreateProposition(flags, "Project", "project", "Search project settings");
-            yield return CreateProposition(flags, "User", "user", "Search user settings");
-        }
-    }
 }
diff --git a/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs b/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs
index 760503d55f..e4ce7b17cb 100644
--- a/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs
+++ b/Modules/QuickSearch/Editor/Providers/StaticMethodProvider.cs
@@ -44,7 +44,7 @@ private static IEnumerable<SearchItem> FetchItems(SearchContext context, SearchP
             if (methods == null)
                 methods = FetchStaticAPIMethodInfo();
 
-            var lowerCasePattern = context.searchQuery.ToLowerInvariant().Replace(" ", "");
+            var casePattern = context.searchQuery.Replace(" ", "");
             var matches = new List<int>();
             foreach (var m in methods)
             {
@@ -53,7 +53,7 @@ private static IEnumerable<SearchItem> FetchItems(SearchContext context, SearchP
                 long score = 0;
                 var fullName = $"{m.DeclaringType.FullName}.{m.Name}";
                 var fullNameLower = fullName.ToLowerInvariant();
-                if (FuzzySearch.FuzzyMatch(lowerCasePattern, fullNameLower, ref score, matches) && score > 300)
+                if (FuzzySearch.FuzzyMatch(casePattern, fullNameLower, ref score, matches) && score > 300)
                 {
                     var visibilityString = m.IsPublic ? string.Empty : "(Non Public)";
                     yield return provider.CreateItem(context, m.Name, m.IsPublic ? ~(int)score - 999 : ~(int)score, m.Name, $"{fullName} {visibilityString}", null, m);
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs
index ccafff0974..6aa21f92d6 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAddNewBlock.cs
@@ -10,9 +10,11 @@ namespace UnityEditor.Search
 {
     class QueryAddNewBlock : QueryBlock, IBlockSource
     {
-        public override bool wantsEvents => true;
+        internal override bool wantsEvents => true;
+        internal override bool draggable => false;
+
         public override string ToString() => null;
-        public override IBlockEditor OpenEditor(in Rect rect) => AddBlock(rect);
+        internal override IBlockEditor OpenEditor(in Rect rect) => AddBlock(rect);
 
         public QueryAddNewBlock(IQuerySource source)
             : base(source)
@@ -20,12 +22,12 @@ public QueryAddNewBlock(IQuerySource source)
             hideMenu = true;
         }
 
-        public override Rect Layout(in Vector2 at, in float availableSpace)
+        internal override Rect Layout(in Vector2 at, in float availableSpace)
         {
             return GetRect(at, 20f, 20f);
         }
 
-        protected override void Draw(in Rect blockRect, in Vector2 mousePosition)
+        internal override void Draw(in Rect blockRect, in Vector2 mousePosition)
         {
             if (EditorGUI.DropdownButton(blockRect, Styles.QueryBuilder.createContent, FocusType.Passive, Styles.dropdownItem))
                 AddBlock(blockRect);
@@ -42,7 +44,7 @@ public override void Apply(in SearchProposition searchProposition)
             source.AddProposition(searchProposition);
         }
 
-        public override IEnumerable<SearchProposition> FetchPropositions()
+        IEnumerable<SearchProposition> IBlockSource.FetchPropositions()
         {
             var options = new SearchPropositionOptions(string.Empty,
                 SearchPropositionFlags.IgnoreRecents |
@@ -61,4 +63,25 @@ public override IEnumerable<SearchProposition> FetchPropositions()
             }
         }
     }
+
+    class QueryInsertBlock : IBlockSource
+    {
+        private readonly IBlockSource insertAfter;
+        private readonly IBlockSource insertWith;
+
+        public QueryInsertBlock(IBlockSource insertAfter, IBlockSource insertWith)
+        {
+            this.insertAfter = insertAfter;
+            this.insertWith = insertWith;
+        }
+
+        public string name => insertAfter.name;
+        public string editorTitle => insertAfter.editorTitle;
+        public SearchContext context => insertAfter.context;
+        public bool formatNames => insertAfter.formatNames;
+
+        public IEnumerable<SearchProposition> FetchPropositions() => insertWith.FetchPropositions();
+        public void Apply(in SearchProposition searchProposition) => insertWith.Apply(searchProposition);
+        public void CloseEditor() => insertAfter.CloseEditor();
+    }
 }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAreaBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAreaBlock.cs
index 6c510199f8..9baf6e03e9 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAreaBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryAreaBlock.cs
@@ -14,8 +14,9 @@ class QueryAreaBlock : QueryBlock
         public const string title = "Select Search Area";
         public string filterId { get; private set; }
 
-        public override bool canExclude => false;
-        public override bool canDisable => false;
+        internal override bool canExclude => false;
+        internal override bool canDisable => false;
+        internal override bool draggable => false;
 
         public QueryAreaBlock(IQuerySource source, in SearchProvider provider)
             : this(source, provider.name, provider.filterId)
@@ -43,7 +44,7 @@ private void Apply(in string providerName, in string filterId)
             this.filterId = filterId;
         }
 
-        public override IEnumerable<SearchProposition> FetchPropositions()
+        internal override IEnumerable<SearchProposition> FetchPropositions()
         {
             return FetchPropositions(context);
         }
@@ -64,7 +65,7 @@ private static bool ExcludeProviderProposition(in string id)
             return string.Equals(id, "expression", System.StringComparison.Ordinal);
         }
 
-        protected override Color GetBackgroundColor()
+        internal override Color GetBackgroundColor()
         {
             return QueryColors.area;
         }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryExpressionBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryExpressionBlock.cs
index efa4d70181..174a787a75 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryExpressionBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryExpressionBlock.cs
@@ -51,10 +51,9 @@ class QueryExpressionBlock : QueryBlock
         private SearchExpression m_Expression;
         private List<QueryBuilder> m_ArgumentBuilders;
 
-        public override bool canDisable => false;
-        public override bool canExclude => false;
-        public override bool wantsEvents => true;
-        //public QueryBuilder builder => m_Builder;
+        internal override bool canDisable => false;
+        internal override bool canExclude => false;
+        internal override bool wantsEvents => true;
 
         public QueryExpressionBlock(IQuerySource source, SearchExpression expression)
             : base(source)
@@ -68,16 +67,14 @@ public QueryExpressionBlock(IQuerySource source, SearchExpression expression)
 
         public override string ToString() => m_Expression.outerText.ToString();
 
-        public override IBlockEditor OpenEditor(in Rect rect)
+        internal override IBlockEditor OpenEditor(in Rect rect)
         {
             return null;
-           // var screenRect = new Rect(rect.position + context.searchView.position.position, rect.size);
-           // return QueryExpressionBlockEditor.Open(screenRect, this);
         }
 
-        protected override Color GetBackgroundColor() => QueryColors.expression;
+        internal override Color GetBackgroundColor() => QueryColors.expression;
 
-        public override Rect Layout(in Vector2 at, in float availableSpace)
+        internal override Rect Layout(in Vector2 at, in float availableSpace)
         {
             var labelStyle = Styles.QueryBuilder.label;
             var nameContent = labelStyle.CreateContent(name);
@@ -93,7 +90,7 @@ public override Rect Layout(in Vector2 at, in float availableSpace)
             return GetRect(at, blockWidth, blockHeight);
         }
 
-        protected override void Draw(in Rect blockRect, in Vector2 mousePosition)
+        internal override void Draw(in Rect blockRect, in Vector2 mousePosition)
         {
             var extendedBlockRect = blockRect;
             var labelStyle = Styles.QueryBuilder.label;
@@ -110,10 +107,6 @@ protected override void Draw(in Rect blockRect, in Vector2 mousePosition)
                 x = builderRect.xMax;
             }
 
-//             var addNewArgRect = new Rect(blockRect.xMax - 22f, blockRect.yMin, 20f, blockRect.height-2f);
-//             if (EditorGUI.DropdownButton(addNewArgRect, Styles.QueryBuilder.createContent, FocusType.Passive, Styles.dropdownItem))
-//                 Debug.LogWarning("TODO: Add argument");
-
             if (Event.current.type == EventType.Repaint)
                 DrawBorders(extendedBlockRect, mousePosition);
         }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs
index 2fcb0b370b..8fe5533b55 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryFilterBlock.cs
@@ -44,9 +44,13 @@ static class InPlaceStyles
         public bool property { get; set; }
 
         public QueryBuilder builder => formatValue as QueryBuilder;
-        public override bool formatNames => true;
-        public override bool wantsEvents => HasInPlaceEditor();
-        public override bool canOpenEditorOnValueClicked => !HasInPlaceEditor();
+        internal override bool formatNames => true;
+        internal override bool wantsEvents => HasInPlaceEditor();
+        internal override bool canOpenEditorOnValueClicked => !HasInPlaceEditor();
+
+        QueryBuilder IQueryExpressionBlock.builder => builder;
+        IQuerySource IQueryExpressionBlock.source => source;
+        IBlockEditor IQueryExpressionBlock.editor => editor;
 
         protected QueryFilterBlock(IQuerySource source, in string id, in string op, in string value)
             : base(source)
@@ -124,7 +128,7 @@ private string FormatFilterName()
             return id;
         }
 
-        public override IBlockEditor OpenEditor(in Rect rect)
+        internal override IBlockEditor OpenEditor(in Rect rect)
         {
             var screenRect = new Rect(rect.position + context.searchView.position.position, rect.size);
             switch (format)
@@ -151,7 +155,7 @@ public override IBlockEditor OpenEditor(in Rect rect)
             return null;
         }
 
-        public override IEnumerable<SearchProposition> FetchPropositions()
+        internal override IEnumerable<SearchProposition> FetchPropositions()
         {
             if (format == QueryBlockFormat.Enum)
             {
@@ -185,7 +189,7 @@ public override IEnumerable<SearchProposition> FetchPropositions()
             }
         }
 
-        public override Rect Layout(in Vector2 at, in float availableSpace)
+        internal override Rect Layout(in Vector2 at, in float availableSpace)
         {
             if (!HasInPlaceEditor())
                 return base.Layout(at, availableSpace);
@@ -197,7 +201,7 @@ public override Rect Layout(in Vector2 at, in float availableSpace)
             return GetRect(at, blockWidth, blockHeight);
         }
 
-        protected override void Draw(in Rect blockRect, in Vector2 mousePosition)
+        internal override void Draw(in Rect blockRect, in Vector2 mousePosition)
         {
             if (!HasInPlaceEditor())
             {
@@ -221,7 +225,7 @@ protected override void Draw(in Rect blockRect, in Vector2 mousePosition)
                 DrawBorders(blockRect, mousePosition);
         }
 
-        protected override Rect DrawSeparator(in Rect at)
+        internal override Rect DrawSeparator(in Rect at)
         {
             var sepRect = new Rect(at.xMax, at.yMin + 1f, 1f, Mathf.Ceil(at.height - 1f));
             var opRect = new Rect(at.xMax - 6f, at.yMin - 1f, 11f, Mathf.Ceil(at.height - 1f));
@@ -239,12 +243,12 @@ protected override Rect DrawSeparator(in Rect at)
             return sepRect;
         }
 
-        protected override Color GetBackgroundColor()
+        internal override Color GetBackgroundColor()
         {
             return (property ? QueryColors.property : QueryColors.filter);
         }
 
-        protected override void AddContextualMenuItems(GenericMenu menu)
+        internal override void AddContextualMenuItems(GenericMenu menu)
         {
             foreach (var _e in Enum.GetValues(typeof(QueryBlockFormat)))
             {
@@ -615,5 +619,20 @@ public void SetValue(object value)
             }
             source.Apply();
         }
+
+        void IQueryExpressionBlock.CloseEditor()
+        {
+            throw new NotImplementedException();
+        }
+
+        void IQueryExpressionBlock.ApplyExpression(string searchText)
+        {
+            throw new NotImplementedException();
+        }
+
+        void IQueryExpressionBlock.DrawArrow(in Rect blockRect, in Vector2 mousePosition, QueryContent arrayContent)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs
index bb4c398c34..42485cb2f3 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlock.cs
@@ -5,19 +5,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using UnityEditorInternal;
 using UnityEngine;
 
 namespace UnityEditor.Search
 {
-    abstract class QueryListBlock : QueryBlock
+    public abstract class QueryListBlock : QueryBlock
     {
         const float iconSize = 16f;
 
         public readonly string id;
         public readonly string category;
         protected string label;
-        protected Texture2D icon;
+        public Texture2D icon { get; protected set; }
+
         protected bool alwaysDrawLabel;
 
         public abstract IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags = SearchPropositionFlags.None);
@@ -32,7 +34,7 @@ protected QueryListBlock(IQuerySource source, string id, string value, QueryList
             this.category = attr.category;
         }
 
-        protected QueryListBlock(IQuerySource source, string id, string op, string value, string category = null)
+        internal QueryListBlock(IQuerySource source, string id, string op, string value, string category = null)
             : base(source)
         {
             this.id = id;
@@ -41,17 +43,17 @@ protected QueryListBlock(IQuerySource source, string id, string op, string value
             this.category = category;
         }
 
-        protected string GetCategory(SearchPropositionFlags flags)
+        internal string GetCategory(SearchPropositionFlags flags)
         {
             return flags.HasAny(SearchPropositionFlags.NoCategory) ? null : category;
         }
 
-        public override IBlockEditor OpenEditor(in Rect rect)
+        internal override IBlockEditor OpenEditor(in Rect rect)
         {
             return QuerySelector.Open(rect, this);
         }
 
-        public override IEnumerable<SearchProposition> FetchPropositions()
+        internal override IEnumerable<SearchProposition> FetchPropositions()
         {
             return GetPropositions(SearchPropositionFlags.NoCategory);
         }
@@ -62,24 +64,24 @@ public override void Apply(in SearchProposition searchProposition)
             source.Apply();
         }
 
-        protected override Color GetBackgroundColor()
+        internal override Color GetBackgroundColor()
         {
             return icon == null ? QueryColors.type : QueryColors.typeIcon;
         }
 
-        protected SearchProposition CreateProposition(SearchPropositionFlags flags, string label, string data, string help = "", int score = 0)
+        internal SearchProposition CreateProposition(SearchPropositionFlags flags, string label, string data, string help = "", int score = 0)
         {
             return new SearchProposition(category: GetCategory(flags), label: label, help: help,
                     data: data, priority: score, icon: icon, type: GetType(), color: GetBackgroundColor());
         }
 
-        protected SearchProposition CreateProposition(SearchPropositionFlags flags, string label, string data, string help, Texture2D icon, int score = 0)
+        internal SearchProposition CreateProposition(SearchPropositionFlags flags, string label, string data, string help, Texture2D icon, int score = 0)
         {
             return new SearchProposition(category: GetCategory(flags), label: label, help: help,
                     data: data, priority: score, icon: icon, type: GetType(), color: GetBackgroundColor());
         }
 
-        public override Rect Layout(in Vector2 at, in float availableSpace)
+        internal override Rect Layout(in Vector2 at, in float availableSpace)
         {
             if (!icon || alwaysDrawLabel)
                 return base.Layout(at, availableSpace);
@@ -90,7 +92,7 @@ public override Rect Layout(in Vector2 at, in float availableSpace)
             return GetRect(at, blockWidth, blockHeight);
         }
 
-        protected override void Draw(in Rect blockRect, in Vector2 mousePosition)
+        internal override void Draw(in Rect blockRect, in Vector2 mousePosition)
         {
             if (!icon || alwaysDrawLabel)
             {
@@ -126,13 +128,13 @@ public override string ToString()
             return $"{id}{op}{value}";
         }
 
-        protected override void AddContextualMenuItems(GenericMenu menu)
+        internal override void AddContextualMenuItems(GenericMenu menu)
         {
             menu.AddItem(EditorGUIUtility.TrTextContent($"Operator/Equal (=)"), string.Equals(op, "=", StringComparison.Ordinal), () => SetOperator("="));
             menu.AddItem(EditorGUIUtility.TrTextContent($"Operator/Contains (:)"), string.Equals(op, ":", StringComparison.Ordinal), () => SetOperator(":"));
         }
 
-        public virtual bool TryGetReplacement(string id, string type, ref Type blockType, out string replacement)
+        internal virtual bool TryGetReplacement(string id, string type, ref Type blockType, out string replacement)
         {
             replacement = string.Empty;
             return false;
@@ -142,34 +144,101 @@ public virtual bool TryGetReplacement(string id, string type, ref Type blockType
     class QueryListMarkerBlock : QueryListBlock
     {
         private QueryMarker m_Marker;
+        Color? m_BackgroundColor;
+        string m_IconName;
+        string[] m_Choices;
 
         public QueryListMarkerBlock(IQuerySource source, string id, string name, string op, QueryMarker value)
             : base(source, id, op, value.value as string)
         {
             m_Marker = value;
             this.name = name ?? id;
+            ExtractArguments(m_Marker);
         }
 
         public QueryListMarkerBlock(IQuerySource source, string id, QueryMarker value, QueryListBlockAttribute attr)
             : base(source, id, value.value as string, attr)
         {
             m_Marker = value;
+            ExtractArguments(m_Marker);
+        }
+
+        internal override Color GetBackgroundColor()
+        {
+            return m_BackgroundColor ?? base.GetBackgroundColor();
         }
 
         public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags = SearchPropositionFlags.None)
         {
-            var args = m_Marker.EvaluateArgs().ToArray();
-            if (args.Length < 2)
+            var args = m_Marker.args;
+            if (m_Choices == null || m_Choices.Length == 0)
                 yield break;
-            else
+
+            foreach (var choice in m_Choices)
+            {
+                yield return new SearchProposition(category: null, label: ObjectNames.NicifyVariableName(choice), replacement: choice, icon: icon, color: m_BackgroundColor ?? default);
+            }
+        }
+
+        public override string ToString()
+        {
+            var markerReplacement = SearchUtils.GetListMarkerReplacementText(value, m_Choices, m_IconName, m_BackgroundColor);
+            return $"{id}{op}{markerReplacement}";
+        }
+
+        void ExtractArguments(QueryMarker marker)
+        {
+            var args = m_Marker.EvaluateArgsNoSpread().ToList();
+            if (args.Count < 2)
+            {
+                m_Choices = new string[]{};
+                return;
+            }
+
+            m_Choices = ExtractChoices(args[1]).ToArray();
+
+            foreach (var arg in args.Skip(2))
             {
-                foreach (var choice in args.Skip(1))
+                if (!(arg is IEnumerable<object> enumerable))
+                    continue;
+
+                var array = enumerable.ToArray();
+                if (array.Length == 0)
+                    continue;
+
+                var argStr = (string)array[0];
+                if (argStr.StartsWith("#"))
                 {
-                    var choiceStr = (string)choice;
-                    yield return new SearchProposition(category: null, label: ObjectNames.NicifyVariableName(choiceStr), replacement: choiceStr);
+                    m_BackgroundColor = ExtractBackgroundColor(argStr);
+                }
+                else
+                {
+                    icon = ExtractIcon(argStr);
+                    if (icon)
+                        m_IconName = argStr;
                 }
             }
         }
+
+        static Color? ExtractBackgroundColor(string colorArg)
+        {
+            if (!ColorUtility.TryParseHtmlString(colorArg, out var color))
+                return null;
+            return color;
+        }
+
+        static Texture2D ExtractIcon(string iconArg)
+        {
+            return Utils.LoadIcon(iconArg);
+        }
+
+        static IEnumerable<string> ExtractChoices(object choiceArg)
+        {
+            if (choiceArg == null || !(choiceArg is IEnumerable<object> enumerable))
+                return Enumerable.Empty<string>();
+
+            return enumerable.Cast<string>();
+        }
     }
 
     [QueryListBlock("Types", "type", "t", ":")]
@@ -250,7 +319,7 @@ public override IEnumerable<SearchProposition> GetPropositions(SearchProposition
         {
             foreach (var l in AssetDatabase.GetAllLabels())
             {
-                yield return CreateProposition(flags, ObjectNames.NicifyVariableName(l.Key), l.Key);
+                yield return CreateProposition(flags, ObjectNames.NicifyVariableName(l.Key), l.Key, $"Assets with label: {l.Key}");
             }
         }
     }
@@ -266,10 +335,9 @@ public QueryTagBlock(IQuerySource source, string id, string value, QueryListBloc
 
         public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
         {
-
             foreach (var t in InternalEditorUtility.tags)
             {
-                yield return CreateProposition(flags, ObjectNames.NicifyVariableName(t), t);
+                yield return CreateProposition(flags, ObjectNames.NicifyVariableName(t), t, $"Assets with tag: {t}");
             }
         }
     }
@@ -295,7 +363,7 @@ public override IEnumerable<SearchProposition> GetPropositions(SearchProposition
                 var layerName = InternalEditorUtility.GetLayerName(i);
                 if (!string.IsNullOrEmpty(layerName))
                 {
-                    yield return CreateProposition(flags, ObjectNames.NicifyVariableName(layerName), layerName);
+                    yield return CreateProposition(flags, ObjectNames.NicifyVariableName(layerName), layerName, $"Assets with layer: {layerName}");
                 }
             }
         }
@@ -312,7 +380,7 @@ public override string ToString()
             return base.ToString();
         }
 
-        public override bool TryGetReplacement(string id, string type, ref Type blockType, out string replacement)
+        internal override bool TryGetReplacement(string id, string type, ref Type blockType, out string replacement)
         {
             replacement = $"{id}{op}{GetDefaultMarker()}";
             return true;
@@ -342,7 +410,7 @@ public QueryPrefabFilterBlock(IQuerySource source, string id, string value, Quer
         public override IEnumerable<SearchProposition> GetPropositions(SearchPropositionFlags flags)
         {
             yield return CreateProposition(flags, "Any", "any", "Search prefabs");
-            yield return CreateProposition(flags, "Base", "Base", "Search base prefabs");
+            yield return CreateProposition(flags, "Base", "base", "Search base prefabs");
             yield return CreateProposition(flags, "Root", "root", "Search prefab roots");
             yield return CreateProposition(flags, "Top", "top", "Search top-level prefab root instances");
             yield return CreateProposition(flags, "Instance", "instance", "Search objects that are part of a prefab instance");
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlockAttribute.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlockAttribute.cs
index ddd8f931a3..cf9420915e 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlockAttribute.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryListBlockAttribute.cs
@@ -5,12 +5,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEditorInternal;
 using UnityEngine;
 
 namespace UnityEditor.Search
 {
-    class QueryListBlockAttribute : Attribute
+    [AttributeUsage(AttributeTargets.Class)]
+    public class QueryListBlockAttribute : Attribute
     {
         static List<QueryListBlockAttribute> s_Attributes;
 
@@ -26,15 +26,15 @@ public QueryListBlockAttribute(string category, string name, string[] ids, strin
             this.op = op;
         }
 
-        public string[] ids;
-        public string name;
-        public string category;
-        public string op;
-        public Type type;
+        public string[] ids { get; set; }
+        public string name { get; set; }
+        public string category { get; set; }
+        public string op { get; set; }
+        public Type type { get; set; }
 
         public string id => ids.Length > 0 ? ids[0] : string.Empty;
 
-        public static QueryListBlock CreateBlock(Type type, IQuerySource source, string value)
+        internal static QueryListBlock CreateBlock(Type type, IQuerySource source, string value)
         {
             var attr = FindBlock(type);
             if (attr != null)
@@ -42,7 +42,7 @@ public static QueryListBlock CreateBlock(Type type, IQuerySource source, string
             return null;
         }
 
-        public static QueryListBlock CreateBlock(string id, string op, IQuerySource source, string value)
+        internal static QueryListBlock CreateBlock(string id, string op, IQuerySource source, string value)
         {
             var attr = FindBlock(id);
             QueryMarker.TryParse(value, out var marker);
@@ -63,7 +63,7 @@ public static QueryListBlock CreateBlock(string id, string op, IQuerySource sour
             return null;
         }
 
-        public static IEnumerable<SearchProposition> GetPropositions(Type type)
+        internal static IEnumerable<SearchProposition> GetPropositions(Type type)
         {
             var block = CreateBlock(type, null, null);
             if (block != null)
@@ -106,7 +106,7 @@ internal static void RefreshQueryListBlock()
             }
         }
 
-        public static bool TryGetReplacement(string id, string type, ref Type blockType, out string replacement)
+        internal static bool TryGetReplacement(string id, string type, ref Type blockType, out string replacement)
         {
             var block = CreateBlock(id, null, null, null);
             if (block != null)
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryTextFieldBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryTextFieldBlock.cs
index c391a069e6..0a11dd5201 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryTextFieldBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryTextFieldBlock.cs
@@ -8,10 +8,10 @@ namespace UnityEditor.Search
 {
     class QueryTextFieldBlock : QueryBlock
     {
-        private SearchField m_SearchField;
-        public override bool wantsEvents => true;
+        private UI.SearchField m_SearchField;
+        internal override bool wantsEvents => true;
 
-        public QueryTextFieldBlock(IQuerySource source, SearchField searchField)
+        public QueryTextFieldBlock(IQuerySource source, UI.SearchField searchField)
             : base(source)
         {
             hideMenu = true;
@@ -20,26 +20,26 @@ public QueryTextFieldBlock(IQuerySource source, SearchField searchField)
         }
 
         public override string ToString() => value;
-        public override IBlockEditor OpenEditor(in Rect rect) => null;
+        internal override IBlockEditor OpenEditor(in Rect rect) => null;
 
-        public override Rect Layout(in Vector2 at, in float availableSpace)
+        internal override Rect Layout(in Vector2 at, in float availableSpace)
         {
             const float blockSpacing = 4f;
 
             if (m_SearchField == null)
-                m_SearchField = new SearchField();
+                m_SearchField = new UI.SearchField();
 
             var spaceLeft = availableSpace - at.x - blockSpacing;
             var size = Styles.queryBuilderSearchField.CalcSize(Utils.GUIContentTemp(value));
             return GetRect(at, Mathf.Max(spaceLeft, size.x), size.y);
         }
 
-        internal SearchField GetSearchField()
+        internal UI.SearchField GetSearchField()
         {
             return m_SearchField;
         }
 
-        protected override void Draw(in Rect blockRect, in Vector2 mousePosition)
+        internal override void Draw(in Rect blockRect, in Vector2 mousePosition)
         {
             var evt = Event.current;
             if (evt.type == EventType.MouseDown && blockRect.Contains(evt.mousePosition))
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs
index 30587c2cb6..8efa0307a6 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/Blocks/QueryWordBlock.cs
@@ -14,19 +14,19 @@ public QueryAndOrBlock(IQuerySource source, string combine)
         {
         }
 
-        public override Rect openRect => drawRect;
+        internal override Rect openRect => drawRect;
 
-        protected override Color GetBackgroundColor()
+        internal override Color GetBackgroundColor()
         {
             return QueryColors.combine;
         }
 
-        public override IBlockEditor OpenEditor(in Rect rect)
+        internal override IBlockEditor OpenEditor(in Rect rect)
         {
             return QuerySelector.Open(rect, this);
         }
 
-        public override IEnumerable<SearchProposition> FetchPropositions()
+        internal override IEnumerable<SearchProposition> FetchPropositions()
         {
             return BuiltInQueryBuilderPropositions(null);
         }
@@ -61,14 +61,14 @@ public QueryWordBlock(IQuerySource source, string searchValue)
             value = searchValue;
         }
 
-        public override Rect Layout(in Vector2 at, in float availableSpace)
+        internal override Rect Layout(in Vector2 at, in float availableSpace)
         {
             var wordContent = Styles.QueryBuilder.label.CreateContent(value);
             var widgetWidth = wordContent.expandedWidth;
             return GetRect(at, widgetWidth, blockHeight);
         }
 
-        protected override void Draw(in Rect widgetRect, in Vector2 mousePosition)
+        internal override void Draw(in Rect widgetRect, in Vector2 mousePosition)
         {
             var wordContent = Styles.QueryBuilder.label.CreateContent(value);
             var widgetWidth = wordContent.expandedWidth;
@@ -79,13 +79,13 @@ protected override void Draw(in Rect widgetRect, in Vector2 mousePosition)
             DrawBorders(widgetRect, mousePosition);
         }
 
-        public override IBlockEditor OpenEditor(in Rect rect)
+        internal override IBlockEditor OpenEditor(in Rect rect)
         {
             var screenRect = new Rect(rect.position + context.searchView.position.position, rect.size);
             return QueryTextBlockEditor.Open(screenRect, this);
         }
 
-        protected override Color GetBackgroundColor()
+        internal override Color GetBackgroundColor()
         {
             return QueryColors.word;
         }
@@ -95,4 +95,44 @@ public override string ToString()
             return EscapeLiteralString(value);
         }
     }
+
+    class QueryToggleBlock : QueryWordBlock
+    {
+        public bool active { get; set; }
+
+        public QueryToggleBlock(IQuerySource source, string toggle)
+            : base(source, toggle)
+        {
+            active = true;
+        }
+
+        internal override bool canExclude => false;
+        internal override bool canOpenEditorOnValueClicked => false;
+        internal override IBlockEditor OpenEditor(in Rect rect)
+        {
+            active = !active;
+            source.Apply();
+            return null;
+        }
+
+        internal override void Draw(in Rect widgetRect, in Vector2 mousePosition)
+        {
+            var oldColor = GUI.color;
+            if (!active)
+                GUI.color *= new Color(1f, 1f, 1f, 0.5f);
+
+            base.Draw(widgetRect, mousePosition);
+            GUI.color = oldColor;
+        }
+
+        public override string ToString()
+        {
+            if (!active)
+                return null;
+            return base.ToString();
+        }
+
+        internal override Rect openRect => drawRect;
+        internal override Color GetBackgroundColor() => QueryColors.toggle;
+    }
 }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/IQuerySource.cs b/Modules/QuickSearch/Editor/QueryBuilder/IQuerySource.cs
index e89be3026e..e06555595b 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/IQuerySource.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/IQuerySource.cs
@@ -4,15 +4,15 @@
 
 namespace UnityEditor.Search
 {
-    interface IQuerySource
+    public interface IQuerySource
     {
         ISearchView searchView { get; }
         SearchContext context { get; }
-        QueryBlock AddBlock(string text);
-        QueryBlock AddBlock(QueryBlock block);
-        QueryBlock AddProposition(in SearchProposition searchProposition);
-        void RemoveBlock(in QueryBlock block);
-        void BlockActivated(in QueryBlock block);
+        internal QueryBlock AddBlock(string text);
+        internal QueryBlock AddBlock(QueryBlock block);
+        internal QueryBlock AddProposition(in SearchProposition searchProposition);
+        internal void RemoveBlock(in QueryBlock block);
+        internal void BlockActivated(in QueryBlock block);
         void Apply();
         void Repaint();
     }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs
index dbb0b1660c..04755fbc29 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryBlock.cs
@@ -8,47 +8,48 @@
 
 namespace UnityEditor.Search
 {
-    abstract class QueryBlock : IBlockSource
+    public abstract class QueryBlock : IBlockSource
     {
-        protected const float arrowOffset = 5f;
-        protected const float blockHeight = SearchField.minSinglelineTextHeight;
-        protected const float blockExtraPadding = 4f;
-        protected const float borderRadius = 8f;
+        protected internal const float arrowOffset = 5f;
+        protected internal const float blockHeight = UI.SearchField.minSinglelineTextHeight;
+        protected internal const float blockExtraPadding = 4f;
+        protected internal const float borderRadius = 8f;
 
-
-        protected Rect arrowRect { get; set; }
-        protected Rect valueRect { get; set; }
+        protected internal Rect arrowRect { get; set; }
+        protected internal Rect valueRect { get; set; }
 
         public IQuerySource source { get; private set; }
         public SearchContext context => source.context; // TODO: Can this be removed from here?
-        public IBlockEditor editor { get; protected set; }
+        internal IBlockEditor editor { get; set; }
 
         public string name { get; protected set; }
         public string value { get; set; }
         public string op { get; protected set; }
-        public bool explicitQuotes { get; protected set; }
-        public virtual bool formatNames => false;
-        public virtual bool visible => true;
-        public virtual bool wantsEvents => false;
-        public virtual bool canExclude => true;
-        public virtual bool canDisable => true;
-        public virtual bool canOpenEditorOnValueClicked => false;
-        public bool hideMenu { get; set; }
-        public bool disabled { get; set; }
-        public bool @readonly { get; set; }
-        public bool disableHovering { get; set; }
-        public bool excluded { get; set; }
-        public bool selected { get; set; }
-        public string tooltip { get; set; }
-        public string editorTitle { get; set; }
-
-        public Rect drawRect { get; set; }
-        public Rect layoutRect { get; set; }
-        public float width => layoutRect.width;
-        public float height => layoutRect.height;
-        public Vector2 size => layoutRect.size;
-
-        public virtual Rect openRect
+        internal bool explicitQuotes { get; set; }
+        bool IBlockSource.formatNames => formatNames;
+        internal virtual bool formatNames => true;
+        internal virtual bool visible => true;
+        internal virtual bool wantsEvents => false;
+        internal virtual bool canExclude => true;
+        internal virtual bool canDisable => true;
+        internal virtual bool canOpenEditorOnValueClicked => false;
+        internal virtual bool draggable => true;
+        internal bool hideMenu { get; set; }
+        internal bool disabled { get; set; }
+        internal bool @readonly { get; set; }
+        internal bool disableHovering { get; set; }
+        internal bool excluded { get; set; }
+        internal bool selected { get; set; }
+        internal string tooltip { get; set; }
+        internal string editorTitle { get; set; }
+
+        internal Rect drawRect { get; set; }
+        internal Rect layoutRect { get; set; }
+        internal float width => layoutRect.width;
+        internal float height => layoutRect.height;
+        internal Vector2 size => layoutRect.size;
+
+        internal virtual Rect openRect
         {
             get
             {
@@ -62,7 +63,11 @@ public virtual Rect openRect
             }
         }
 
-        public QueryBlock(IQuerySource source)
+        string IBlockSource.name => name;
+        string IBlockSource.editorTitle => editorTitle;
+        SearchContext IBlockSource.context => context;
+
+        internal QueryBlock(IQuerySource source)
         {
             this.source = source;
         }
@@ -119,7 +124,7 @@ private void ToggleDisabled()
         }
 
 
-        protected virtual void AddContextualMenuItems(GenericMenu menu) {}
+        internal virtual void AddContextualMenuItems(GenericMenu menu) {}
 
         void OpenEditor(Event evt, in Rect rect)
         {
@@ -136,23 +141,23 @@ void OpenEditor(Event evt, in Rect rect)
             }
         }
 
-        public virtual IBlockEditor OpenEditor(in Rect rect)
+        internal virtual IBlockEditor OpenEditor(in Rect rect)
         {
             return QuerySelector.Open(rect, this);
         }
 
-        public void CloseEditor()
+        internal void CloseEditor()
         {
             editor = null;
             context?.searchView?.Repaint();
         }
 
-        protected Rect GetRect(in Vector2 at, in float width, in float height)
+        internal Rect GetRect(in Vector2 at, in float width, in float height)
         {
             return new Rect(at, new Vector2(width, height));
         }
 
-        protected virtual bool HandleEvents(Event evt, in Rect blockRect)
+        internal virtual bool HandleEvents(Event evt, in Rect blockRect)
         {
             return false;
         }
@@ -210,7 +215,7 @@ private void ToggleExcluded()
             source.Apply();
         }
 
-        public Rect Draw(Event evt, in Rect builderRect)
+        internal Rect Draw(Event evt, in Rect builderRect)
         {
             drawRect = GUIUtility.AlignRectToDevice(new Rect(layoutRect.position + builderRect.position, layoutRect.size));
             if (evt.type == EventType.Repaint || (wantsEvents && !@readonly))
@@ -241,7 +246,7 @@ public Rect Draw(Event evt, in Rect builderRect)
             return drawRect;
         }
 
-        public virtual Rect Layout(in Vector2 at, in float availableSpace)
+        internal virtual Rect Layout(in Vector2 at, in float availableSpace)
         {
             var labelStyle = Styles.QueryBuilder.label;
             var nameContent = labelStyle.CreateContent(name, null, tooltip);
@@ -252,7 +257,7 @@ public virtual Rect Layout(in Vector2 at, in float availableSpace)
             return GetRect(at, blockWidth, blockHeight);
         }
 
-        protected virtual void Draw(in Rect blockRect, in Vector2 mousePosition)
+        internal virtual void Draw(in Rect blockRect, in Vector2 mousePosition)
         {
             var labelStyle = Styles.QueryBuilder.label;
             var nameContent = labelStyle.CreateContent(name, null, tooltip);
@@ -267,7 +272,7 @@ protected virtual void Draw(in Rect blockRect, in Vector2 mousePosition)
             DrawBorders(blockRect, mousePosition);
         }
 
-        protected void DrawValue(in Rect at, in Rect blockRect, in Vector2 mousePosition, in QueryContent valueContent)
+        internal void DrawValue(in Rect at, in Rect blockRect, in Vector2 mousePosition, in QueryContent valueContent)
         {
             var x = at.xMax + valueContent.style.margin.left;
             valueRect = new Rect(x, blockRect.y - 1f, blockRect.width - (x - blockRect.xMin) - valueContent.style.margin.right, blockRect.height);
@@ -277,7 +282,7 @@ protected void DrawValue(in Rect at, in Rect blockRect, in Vector2 mousePosition
                 DrawArrow(blockRect, mousePosition, editor != null ? QueryContent.UpArrow : QueryContent.DownArrow);
         }
 
-        public void DrawArrow(in Rect blockRect, in Vector2 mousePosition, QueryContent arrowContent)
+        internal void DrawArrow(in Rect blockRect, in Vector2 mousePosition, QueryContent arrowContent)
         {
             var arrow = editor != null ? QueryContent.UpArrow : QueryContent.DownArrow;
             arrowRect = new Rect(blockRect.xMax - arrowContent.width - arrowOffset, blockRect.y - 1f, arrow.width, blockRect.height);
@@ -285,14 +290,14 @@ public void DrawArrow(in Rect blockRect, in Vector2 mousePosition, QueryContent
             arrowContent.Draw(arrowRect, mousePosition);
         }
 
-        protected virtual Rect DrawSeparator(in Rect at)
+        internal virtual Rect DrawSeparator(in Rect at)
         {
             var sepRect = new Rect(at.xMax, at.yMin + 1f, 1f, Mathf.Ceil(at.height - 1f));
             GUI.DrawTexture(sepRect, EditorGUIUtility.whiteTexture, ScaleMode.StretchToFill, false, 0f, Styles.QueryBuilder.splitterColor, 0f, 0f);
             return sepRect;
         }
 
-        protected Rect DrawName(in Rect blockRect, in Vector2 mousePosition, QueryContent nameContent)
+        internal Rect DrawName(in Rect blockRect, in Vector2 mousePosition, QueryContent nameContent)
         {
             var nameRect = blockRect;
             nameRect.y -= 1;
@@ -301,7 +306,7 @@ protected Rect DrawName(in Rect blockRect, in Vector2 mousePosition, QueryConten
             return nameContent.Draw(nameRect, mousePosition);
         }
 
-        protected void DrawBorders(in Rect blockRect, in Vector2 mousePosition)
+        internal void DrawBorders(in Rect blockRect, in Vector2 mousePosition)
         {
             if (selected)
             {
@@ -312,7 +317,7 @@ protected void DrawBorders(in Rect blockRect, in Vector2 mousePosition)
             }
         }
 
-        protected void DrawBackground(in Rect blockRect, in Vector2 mousePosition)
+        internal void DrawBackground(in Rect blockRect, in Vector2 mousePosition)
         {
             var borderRadius4 = editor != null ? new Vector4(borderRadius, borderRadius, 0, 0) : new Vector4(borderRadius, borderRadius, borderRadius, borderRadius);
             var bgColor = GetBackgroundColor();
@@ -322,9 +327,9 @@ protected void DrawBackground(in Rect blockRect, in Vector2 mousePosition)
             GUIView.current.MarkHotRegion(GUIClip.UnclipToWindow(blockRect));
         }
 
-        protected virtual Color GetBackgroundColor() => Color.red;
+        internal virtual Color GetBackgroundColor() => Color.red;
 
-        protected string EscapeLiteralString(in string sv)
+        internal string EscapeLiteralString(in string sv)
         {
             if (string.IsNullOrEmpty(sv))
                 return "\"\"";
@@ -333,13 +338,28 @@ protected string EscapeLiteralString(in string sv)
             return sv;
         }
 
-        public void SetOperator(in string op)
+        internal void SetOperator(in string op)
         {
             this.op = op;
             source.Apply();
         }
 
         public virtual void Apply(in SearchProposition searchProposition) => throw new NotSupportedException($"Cannot apply {searchProposition} for {this} control");
-        public virtual IEnumerable<SearchProposition> FetchPropositions() => throw new NotSupportedException($"Cannot fetch propositions for {this} control");
+        internal virtual IEnumerable<SearchProposition> FetchPropositions() => throw new NotSupportedException($"Cannot fetch propositions for {this} control");
+
+        void IBlockSource.Apply(in SearchProposition searchProposition)
+        {
+            Apply(searchProposition);
+        }
+
+        IEnumerable<SearchProposition> IBlockSource.FetchPropositions()
+        {
+            return FetchPropositions();
+        }
+
+        void IBlockSource.CloseEditor()
+        {
+            CloseEditor();
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs
index 70b24d748f..5baa4d6ed1 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryBuilder.cs
@@ -14,21 +14,25 @@ namespace UnityEditor.Search
     class QueryBuilder : IQuerySource
     {
         const float blockSpacing = 4f;
-        const float builderPadding = SearchField.textTopBottomPadding;
-        const float minHeight = SearchField.minSinglelineTextHeight;
+        const float builderPadding = UI.SearchField.textTopBottomPadding;
+        const float minHeight = UI.SearchField.minSinglelineTextHeight;
 
         private Rect m_LayoutRect;
         private float m_BuilderWidth;
         private float m_BuilderHeight;
         private QueryAddNewBlock m_AddBlock;
         private QueryTextFieldBlock m_TextBlock;
-        private SearchField m_SearchField;
+        private UI.SearchField m_SearchField;
         private bool m_ReadOnly;
 
         private readonly string m_SearchText;
         private readonly SearchContext m_Context;
         private readonly QueryEngine<QueryBlock> m_QueryEngine;
 
+        private const string k_TargetDataIdentifier = "Target Query Block";
+        private const string k_SourceDataIdentifier = "Source Query Block";
+        private const string k_DragAndDropTitle = "Dragging Query Block";
+
         public float width => m_BuilderWidth;
         public float height => m_BuilderHeight;
 
@@ -90,7 +94,7 @@ protected QueryBuilder()
             drawBackground = true;
         }
 
-        public QueryBuilder(SearchContext searchContext, SearchField searchField = null)
+        public QueryBuilder(SearchContext searchContext, UI.SearchField searchField = null)
             : this()
         {
             m_Context = searchContext;
@@ -173,10 +177,191 @@ public Rect Draw(Event evt, Rect rect, bool createLayout = true)
                 }
             }
 
+            DragAndDropGUI();
+
+            if (evt.type == EventType.MouseDown && evt.clickCount == 2)
+                HandleDoubleClickBlockInsertion(evt);
+
             DrawBlocks(evt);
             return m_LayoutRect;
         }
 
+        private bool HandleDoubleClickBlockInsertion(in Event evt)
+        {
+            if (m_AddBlock == null)
+                return false;
+
+            // Are we clicking in the query builder region.
+            var mousePosition = evt.mousePosition;
+            if (!m_LayoutRect.Contains(mousePosition))
+                return false;
+
+            // Find adjacent blocks
+            QueryBlock insertAfter = null;
+            foreach (var b in EnumerateBlocks())
+            {
+                var brect = b.drawRect;
+                if (brect.Contains(mousePosition))
+                    return false;
+
+                if (brect.yMin <= mousePosition.y && mousePosition.y <= brect.yMax)
+                {
+                    if (mousePosition.x > brect.xMax || insertAfter == null)
+                        insertAfter = b;
+                }
+            }
+
+            if (insertAfter == null)
+                return false;
+
+            insertAfter.editor = QuerySelector.Open(insertAfter.drawRect, new QueryInsertBlock(insertAfter, m_AddBlock), "Insert Search Filter");
+            if (insertAfter.editor == null)
+                return false;
+            evt.Use();
+            return true;
+        }
+
+        private void OnMouseDragEvent(Event evt)
+        {
+            DragAndDrop.PrepareStartDrag();
+            foreach (var block in blocks)
+            {
+                if (block.drawRect.Contains(evt.mousePosition))
+                {
+                    SetSourceData(block, k_SourceDataIdentifier);
+                    DragAndDrop.StartDrag(k_DragAndDropTitle);
+                    break;
+                }
+            }
+
+            evt.Use();
+        }
+
+        internal void SetSourceData(QueryBlock source, string sourceDataIdentifier)
+        {
+            if (source != null && source.draggable)
+                DragAndDrop.SetGenericData(sourceDataIdentifier, source);
+        }
+
+        private void OnDragUpdatedEvent(Event evt)
+        {
+            var source = DragAndDrop.GetGenericData(k_SourceDataIdentifier) as QueryBlock;
+            if (source == null)
+                return;
+
+            if (m_LayoutRect.Contains(evt.mousePosition))
+                DragAndDrop.visualMode = DragAndDropVisualMode.Move;
+            else
+                DragAndDrop.visualMode = DragAndDropVisualMode.Rejected;
+
+            SetTargetData(evt.mousePosition, source, k_TargetDataIdentifier);
+            evt.Use();
+        }
+
+        internal void SetTargetData(Vector2 mousePosition, QueryBlock source, string targetDataIdentifier)
+        {
+            var sourceIndex = GetBlockIndex(source);
+            for (int i = 0; i < blocks.Count; i++)
+            {
+                if (!blocks[i].drawRect.Contains(mousePosition))
+                    continue;
+
+                if (i != sourceIndex && blocks[i].draggable)
+                {
+                    DragAndDrop.SetGenericData(targetDataIdentifier, blocks[i]);
+                    break;
+                }
+                else if (i == sourceIndex)
+                {
+                    DragAndDrop.SetGenericData(targetDataIdentifier, null);
+                    break;
+                }
+                else if (i != sourceIndex && !blocks[i].draggable)
+                {
+                    var nextTargetIndex = i + 1;
+                    if (nextTargetIndex == sourceIndex || nextTargetIndex > blocks.Count - 1)
+                    {
+                        DragAndDrop.SetGenericData(targetDataIdentifier, null);
+                        break;
+                    }
+
+                    DragAndDrop.SetGenericData(targetDataIdentifier, blocks[nextTargetIndex]);
+                    break;
+                }
+            }
+        }
+
+        private void OnRepaintEvent()
+        {
+            if (DragAndDrop.visualMode == DragAndDropVisualMode.None || DragAndDrop.visualMode == DragAndDropVisualMode.Rejected)
+                return;
+
+            var source = DragAndDrop.GetGenericData(k_SourceDataIdentifier) as QueryBlock;
+            var target = DragAndDrop.GetGenericData(k_TargetDataIdentifier) as QueryBlock;
+            if (source == null || target == null)
+                return;
+
+            var sourceIndex = GetBlockIndex(source);
+            var targetIndex = GetBlockIndex(target);
+            var cursorPosX = source.drawRect.x;
+
+            if (sourceIndex < targetIndex)
+                cursorPosX = target.drawRect.x + target.width + 2f;
+            else if (sourceIndex > targetIndex)
+                cursorPosX = target.drawRect.x - 2f;
+
+            var cursorRect = new Rect(cursorPosX, target.drawRect.y, 1f, target.height);
+            GUI.DrawTexture(cursorRect, EditorGUIUtility.whiteTexture, ScaleMode.StretchToFill, false, 0f, Color.white, 10f, 1f);
+        }
+
+        private void OnDragPerformEvent(Event evt)
+        {
+            DragAndDrop.AcceptDrag();
+
+            var source = DragAndDrop.GetGenericData(k_SourceDataIdentifier) as QueryBlock;
+            var target = DragAndDrop.GetGenericData(k_TargetDataIdentifier) as QueryBlock;
+
+            DropBlock(source, target);
+            evt.Use();
+        }
+
+        internal void DropBlock(QueryBlock source, QueryBlock target)
+        {
+            if (source == null || target == null)
+                return;
+
+            var targetIndex = GetBlockIndex(target);
+            blocks.Remove(source);
+            blocks.Insert(targetIndex, source);
+            Apply();
+        }
+
+        private void DragAndDropGUI()
+        {
+            var evt = Event.current;
+            if (!m_LayoutRect.Contains(evt.mousePosition) || blocks.Count == 0)
+            {
+                DragAndDrop.SetGenericData(k_TargetDataIdentifier, null);
+                return;
+            }
+
+            switch (evt.type)
+            {
+                case EventType.MouseDrag:
+                    OnMouseDragEvent(evt);
+                    break;
+                case EventType.DragUpdated:
+                    OnDragUpdatedEvent(evt);
+                    break;
+                case EventType.Repaint:
+                    OnRepaintEvent();
+                    break;
+                case EventType.DragPerform:
+                    OnDragPerformEvent(evt);
+                    break;
+            }
+        }
+
         private void DrawBackground(in Event evt)
         {
             if (evt.type == EventType.Repaint)
@@ -289,7 +474,7 @@ public bool Build()
                 }
                 else
                 {
-                    var query = m_QueryEngine.Parse(searchQuery);
+                    var query = m_QueryEngine.ParseQuery(searchQuery);
                     if (HasFlag(SearchFlags.ShowErrorsWithResults) && !query.valid)
                         errors.AddRange(query.errors);
 
@@ -308,10 +493,10 @@ public bool Build()
                 var wordText = "";
                 for (int w = newBlocks.Count - 1; w >= 0; --w)
                 {
-                    var wordBlock = newBlocks[w] as QueryWordBlock;
-                    if (wordBlock == null)
+                    if (newBlocks[w].GetType() != typeof(QueryWordBlock))
                         break;
 
+                    var wordBlock = newBlocks[w] as QueryWordBlock;
                     if (!wordBlock.explicitQuotes && newBlocks.Remove(wordBlock))
                         wordText = (wordBlock.value + " " + wordText).Trim();
                 }
@@ -334,22 +519,22 @@ private IList<QueryBlock> Build(string searchText)
             var newBlocks = new List<QueryBlock>();
             var searchQuery = searchText;
 
-            var query = m_QueryEngine.Parse(searchQuery);
+            var query = m_QueryEngine.ParseQuery(searchQuery);
             var rootNode = query.queryGraph.root;
             if (rootNode == null)
                 return null;
 
-            ParseNode(rootNode, newBlocks, exclude: false, @explicit: true);
+            ParseNode(rootNode, newBlocks, exclude: false);
 
             return newBlocks;
         }
 
-        private void ParseNode(in IQueryNode node, List<QueryBlock> blocks, bool exclude = false, bool @explicit = false)
+        private void ParseNode(in IQueryNode node, List<QueryBlock> blocks, bool exclude = false)
         {
             if (!node.leaf)
                 ParseNode(node.children[0], blocks, node.type == QueryNodeType.Not);
 
-            var newBlock = CreateBlock(node, @explicit);
+            var newBlock = CreateBlock(node);
             if (newBlock != null)
             {
                 if (exclude)
@@ -364,7 +549,7 @@ private void ParseNode(in IQueryNode node, List<QueryBlock> blocks, bool exclude
             }
         }
 
-        private QueryBlock CreateBlock(in IQueryNode node, bool @explicit = false)
+        private QueryBlock CreateBlock(in IQueryNode node)
         {
             if (node.type == QueryNodeType.Search && node is SearchNode sn)
                 return new QueryWordBlock(this, sn);
@@ -382,6 +567,9 @@ private QueryBlock CreateBlock(in IQueryNode node, bool @explicit = false)
                 node is NestedQueryNode nqn)
                 return new QueryWordBlock(this, nqn.rawNestedQueryStringView.ToString());
 
+            if (node.type == QueryNodeType.Toggle && node is ToggleNode tn)
+                return new QueryToggleBlock(this, tn.identifier);
+
             if (node.type == QueryNodeType.Aggregator &&
                 (node.parent == null || node.parent.type != QueryNodeType.FilterIn) &&
                 !node.leaf && node.children[0].type == QueryNodeType.NestedQuery &&
@@ -391,7 +579,7 @@ private QueryBlock CreateBlock(in IQueryNode node, bool @explicit = false)
             if (node.type == QueryNodeType.Or)
                 return new QueryAndOrBlock(this, $"or");
 
-            if (node.type == QueryNodeType.And && @explicit)
+            if (node.type == QueryNodeType.And && !string.IsNullOrEmpty(node.token.text))
                 return new QueryAndOrBlock(this, $"and");
 
             if (HasFlag(SearchFlags.Debug))
@@ -399,28 +587,33 @@ private QueryBlock CreateBlock(in IQueryNode node, bool @explicit = false)
             return null;
         }
 
-        public QueryBlock AddProposition(in SearchProposition searchProposition)
+        QueryBlock IQuerySource.AddProposition(in SearchProposition searchProposition) => AddProposition(searchProposition);
+        internal QueryBlock AddProposition(in SearchProposition searchProposition)
         {
             SetSelection(-1);
 
+            QueryBlock insertAt = EnumerateBlocks().FirstOrDefault(b => b.editor != null);
+
             if (searchProposition.data is SearchProvider provider)
-                return AddBlock(new QueryAreaBlock(this, provider));
+                return InsertBlock(insertAt, new QueryAreaBlock(this, provider));
             if (searchProposition.data is QueryBlock block)
-                return AddBlock(block);
+                return InsertBlock(insertAt, block);
 
             if (searchProposition.type != null && typeof(QueryListBlock).IsAssignableFrom(searchProposition.type))
             {
                 var newBlock = QueryListBlockAttribute.CreateBlock(searchProposition.type, this, searchProposition.data?.ToString());
-                return AddBlock(newBlock);
+                if (newBlock == null)
+                    return InsertBlock(insertAt, searchProposition.replacement);
+                return InsertBlock(insertAt, newBlock);
             }
 
             if (searchProposition.type != null && typeof(QueryBlock).IsAssignableFrom(searchProposition.type))
             {
                 var newBlock = (QueryBlock)Activator.CreateInstance(searchProposition.type, new object[] { this, searchProposition.data });
-                return AddBlock(newBlock);
+                return InsertBlock(insertAt, newBlock);
             }
 
-            return AddBlock(searchProposition.replacement);
+            return InsertBlock(insertAt, searchProposition.replacement);
         }
 
         public void Apply()
@@ -431,7 +624,8 @@ public void Apply()
             SetSearchText(queryString);
         }
 
-        public QueryBlock AddBlock(string text)
+        QueryBlock IQuerySource.AddBlock(string text) => AddBlock(text);
+        internal QueryBlock AddBlock(string text)
         {
             var newBlocks = Build(text);
             if (newBlocks == null || newBlocks.Count == 0)
@@ -442,14 +636,43 @@ public QueryBlock AddBlock(string text)
             return newBlocks.FirstOrDefault();
         }
 
-        public QueryBlock AddBlock(QueryBlock newBlock)
+        internal QueryBlock InsertBlock(QueryBlock insertAfter, string text)
         {
-            blocks.Add(newBlock);
+            var newBlocks = Build(text);
+            if (newBlocks == null || newBlocks.Count == 0)
+                return null;
+
+            foreach (var nb in newBlocks)
+                InsertBlock(insertAfter, nb);
+
+            return newBlocks.FirstOrDefault();
+        }
+
+        QueryBlock IQuerySource.AddBlock(QueryBlock newBlock) => AddBlock(newBlock);
+        internal QueryBlock AddBlock(QueryBlock newBlock)
+        {
+            return InsertBlock(null, newBlock);
+        }
+
+        internal QueryBlock InsertBlock(QueryBlock insertAfter, QueryBlock newBlock)
+        {
+            if (insertAfter == null)
+            {
+                blocks.Add(newBlock);
+            }
+            else
+            {
+                var insertAt = blocks.IndexOf(insertAfter);
+                if (insertAt < 0)
+                    insertAt = ~insertAt;
+                blocks.Insert(insertAt+1, newBlock);
+            }
             Apply();
             return newBlock;
         }
 
-        public void RemoveBlock(in QueryBlock block)
+        void IQuerySource.RemoveBlock(in QueryBlock block) => RemoveBlock(block);
+        internal void RemoveBlock(in QueryBlock block)
         {
             var currentIndex = currentBlock == block ? GetBlockIndex(block) : -1;
             blocks.Remove(block);
@@ -460,7 +683,7 @@ public void RemoveBlock(in QueryBlock block)
             Apply();
         }
 
-        public void BlockActivated(in QueryBlock block)
+        void IQuerySource.BlockActivated(in QueryBlock block)
         {
             if (block == m_TextBlock)
                 SetSelection(-1);
@@ -480,6 +703,17 @@ private void SetSearchText(string text)
                 context.searchText = text;
         }
 
+        static bool HasCharacterModifier(in Event evt)
+        {
+            if (evt.modifiers == EventModifiers.None)
+                return false;
+
+            if (evt.modifiers == EventModifiers.FunctionKey)
+                return false;
+
+            return true;
+        }
+
         public bool HandleKeyEvent(in Event evt)
         {
             if (@readonly || context == null || evt.type != EventType.KeyDown)
@@ -491,6 +725,7 @@ public bool HandleKeyEvent(in Event evt)
             var te = m_TextBlock?.GetSearchField().GetTextEditor();
             var cursorAtBeginning = te?.cursorIndex == 0;
             var cursorAtEnd = te?.cursorIndex == te?.text?.Length;
+            var controlPresed = evt.modifiers.HasAny(EventModifiers.Command) || evt.modifiers.HasAny(EventModifiers.Control);
 
             if (evt.keyCode == KeyCode.Home && cursorAtBeginning)
             {
@@ -525,7 +760,7 @@ public bool HandleKeyEvent(in Event evt)
                     return true;
                 }
             }
-            else if (evt.keyCode == KeyCode.LeftArrow && cursorAtBeginning)
+            else if (evt.keyCode == KeyCode.LeftArrow && cursorAtBeginning && !HasCharacterModifier(evt))
             {
                 var currentIndex = GetBlockIndex(currentBlock);
                 var toSelectIndex = -1;
@@ -549,7 +784,7 @@ public bool HandleKeyEvent(in Event evt)
                     return true;
                 }
             }
-            else if (evt.keyCode == KeyCode.RightArrow && cursorAtBeginning)
+            else if (evt.keyCode == KeyCode.RightArrow && cursorAtBeginning && !HasCharacterModifier(evt))
             {
                 var currentIndex = GetBlockIndex(currentBlock);
                 if (currentIndex != -1)
@@ -584,7 +819,7 @@ public bool HandleKeyEvent(in Event evt)
                     return true;
                 }
             }
-            else if ((evt.modifiers.HasAny(EventModifiers.Command) || evt.modifiers.HasAny(EventModifiers.Control)) && evt.keyCode == KeyCode.D)
+            else if (controlPresed && evt.keyCode == KeyCode.D)
             {
                 var cb = currentBlock;
                 if (cb != null)
@@ -601,6 +836,18 @@ public bool HandleKeyEvent(in Event evt)
                     }
                 }
             }
+            else if (m_TextBlock != null && controlPresed && evt.keyCode == KeyCode.Space)
+            {
+                var potentialBlocks = Build(m_TextBlock.ToString());
+                if (potentialBlocks != null && potentialBlocks.Count() > 0)
+                {
+                    foreach (var b in potentialBlocks)
+                        AddBlock(b);
+                    m_TextBlock.value = string.Empty;
+                    evt.Use();
+                    return true;
+                }
+            }
             else
                 SetSelection(-1);
 
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryEnginePropositionsExtensions.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryEnginePropositionsExtensions.cs
new file mode 100644
index 0000000000..3ddd42f117
--- /dev/null
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryEnginePropositionsExtensions.cs
@@ -0,0 +1,316 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace UnityEditor.Search
+{
+    static class QueryEnginePropositionsExtenstion
+    {
+        const string k_BaseSearchPropositionDataKey = "searchproposition_";
+
+        [Serializable]
+        class SearchPropositionDescription
+        {
+            public string label;
+            public string category;
+            public string replacement;
+            public string help;
+            public string data;
+            public int priority;
+            public Texture2D icon;
+            public string type;
+            public TextCursorPlacement moveCursor;
+            public Color color;
+
+            public SearchProposition ToSearchProposition()
+            {
+                Type trueType = string.IsNullOrEmpty(type) ? null : Type.GetType(type);
+                var trueReplacement = string.IsNullOrEmpty(replacement) ? null : replacement;
+                return new SearchProposition(category: category, label: label, replacement: trueReplacement, data: data, help: help, priority: priority, icon: icon, type: trueType, moveCursor: moveCursor, color: color);
+            }
+
+            public static SearchPropositionDescription FromSearchProposition(SearchProposition proposition)
+            {
+                return new SearchPropositionDescription()
+                {
+                    label = proposition.label,
+                    category = proposition.category,
+                    replacement = proposition.replacement,
+                    help = proposition.help,
+                    data = proposition.data?.ToString() ?? Utils.FastToLower(proposition.label),
+                    priority = proposition.priority,
+                    icon = proposition.icon,
+                    type = proposition.type?.FullName,
+                    moveCursor = proposition.moveCursor,
+                    color = proposition.color
+                };
+            }
+        }
+
+        public static IQueryEngineFilter AddOrUpdatePropositionData(this IQueryEngineFilter filter, string label, string category = null, string replacement = null, string help = null, string data = null,
+                                       int priority = 0, Texture2D icon = null, System.Type type = null, Color color = default, TextCursorPlacement moveCursor = TextCursorPlacement.MoveAutoComplete)
+        {
+            var propositionDescription = new SearchPropositionDescription()
+            {
+                label = label,
+                category = category,
+                replacement = replacement,
+                help = help,
+                data = data ?? Utils.FastToLower(label),
+                priority = priority,
+                icon = icon,
+                type = type?.FullName,
+                moveCursor = moveCursor,
+                color = color
+            };
+
+            var propositionKey = GetPropositionKey(label);
+            filter.AddOrUpdateMetaInfo(propositionKey, EditorJsonUtility.ToJson(propositionDescription));
+
+            return filter;
+        }
+
+        static IQueryEngineFilter AddOrUpdatePropositionData(this IQueryEngineFilter filter, SearchProposition proposition)
+        {
+            var propositionDescription = SearchPropositionDescription.FromSearchProposition(proposition);
+
+            var propositionKey = GetPropositionKey(proposition.label);
+            filter.AddOrUpdateMetaInfo(propositionKey, EditorJsonUtility.ToJson(propositionDescription));
+
+            return filter;
+        }
+
+        public static IQueryEngineFilter SetGlobalPropositionData(this IQueryEngineFilter filter, string category = null, string help = null, string data = null,
+            int priority = 0, Texture2D icon = null, System.Type type = null, Color color = default, TextCursorPlacement moveCursor = TextCursorPlacement.MoveAutoComplete)
+        {
+            var propositionDescription = new SearchPropositionDescription()
+            {
+                category = category,
+                help = help,
+                data = data,
+                priority = priority,
+                icon = icon,
+                type = type?.FullName,
+                moveCursor = moveCursor,
+                color = color
+            };
+
+            var propositionKey = GetGlobalPropositionKey();
+            filter.AddOrUpdateMetaInfo(propositionKey, EditorJsonUtility.ToJson(propositionDescription));
+
+            return filter;
+        }
+
+        public static IQueryEngineFilter AddPropositionsFromFilterType(this IQueryEngineFilter filter, string category = null, string help = null, string data = null,
+            int priority = 0, Texture2D icon = null, System.Type type = null, Color color = default, TextCursorPlacement moveCursor = TextCursorPlacement.MoveAutoComplete)
+        {
+            var typePropositions = GetPropositionsFromType(filter, filter.type, category, type, priority, icon, color);
+            var propositionOverride = new SearchProposition(category: category, label: string.Empty, help: help, data: data, priority: priority, icon: icon, type: type, color: color, moveCursor: moveCursor);
+            var propositions = MergePropositions(typePropositions, propositionOverride);
+
+            foreach (var proposition in propositions)
+            {
+                var propositionDescription = SearchPropositionDescription.FromSearchProposition(proposition);
+                var propositionKey = GetPropositionKey(propositionDescription.label);
+                filter.AddOrUpdateMetaInfo(propositionKey, EditorJsonUtility.ToJson(propositionDescription));
+            }
+
+            return filter;
+        }
+
+        public static SearchProposition GetProposition(this IQueryEngineFilter filter, string label)
+        {
+            if (string.IsNullOrEmpty(label))
+                return SearchProposition.invalid;
+
+            var key = GetPropositionKey(label);
+            return GetPropositionFromKey(filter, key);
+        }
+
+        public static SearchProposition GetGlobalProposition(this IQueryEngineFilter filter)
+        {
+            var key = GetGlobalPropositionKey();
+            return GetPropositionFromKey(filter, key);
+        }
+
+        public static SearchProposition GetPropositionFromKey(this IQueryEngineFilter filter, string propositionKey)
+        {
+            if (!filter.metaInfo.TryGetValue(propositionKey, out var propositionDescriptionStr))
+                return SearchProposition.invalid;
+
+            var propositionDescription = new SearchPropositionDescription();
+            EditorJsonUtility.FromJsonOverwrite(propositionDescriptionStr, propositionDescription);
+            return propositionDescription.ToSearchProposition();
+        }
+
+        public static IEnumerable<SearchProposition> GetPropositions(this QueryEngine queryEngine)
+        {
+            return queryEngine.GetPropositions<object>();
+        }
+
+        public static IEnumerable<SearchProposition> GetPropositions<TData>(this QueryEngine<TData> queryEngine)
+        {
+            var filters = queryEngine.GetAllFilters();
+            return filters.SelectMany(f => f.GetPropositions());
+        }
+
+        public static IEnumerable<SearchProposition> GetPropositions(this IQueryEngineFilter filter)
+        {
+            // Here is the order in which the propositions are applied
+            // 1. Global proposition
+            // 2. Custom propositions
+            if (filter.metaInfo == null || filter.metaInfo.Count == 0)
+                return Enumerable.Empty<SearchProposition>();
+
+            var propositionKeys = filter.metaInfo.Keys.Where(key => key.StartsWith(k_BaseSearchPropositionDataKey, StringComparison.Ordinal)).ToList();
+            if (propositionKeys.Count == 0)
+                return Enumerable.Empty<SearchProposition>();
+
+            var globalProposition = GetGlobalProposition(filter);
+            if (!globalProposition.valid)
+                globalProposition = GetDefaultValidProposition();
+            var validPropositions = propositionKeys.Select(key => filter.GetPropositionFromKey(key)).Where(p => p.valid);
+            var customPropositions = MergePropositions(globalProposition, validPropositions);
+            return MergePropositions(globalProposition, customPropositions);
+        }
+
+        static IEnumerable<SearchProposition> MergePropositions(IEnumerable<SearchProposition> basePropositions, IEnumerable<SearchProposition> overridePropositions)
+        {
+            var overrideMap = overridePropositions.ToDictionary(p => p.label);
+            foreach (var baseProposition in basePropositions)
+            {
+                if (!overrideMap.TryGetValue(baseProposition.label, out var overrideProposition))
+                    yield return baseProposition;
+                else
+                {
+                    yield return MergeProposition(baseProposition, overrideProposition);
+                    overrideMap.Remove(baseProposition.label);
+                }
+            }
+
+            foreach (var overrideProposition in overrideMap.Values)
+            {
+                yield return overrideProposition;
+            }
+        }
+
+        static IEnumerable<SearchProposition> MergePropositions(IEnumerable<SearchProposition> basePropositions, SearchProposition overrideProposition)
+        {
+            foreach (var baseProposition in basePropositions)
+            {
+                yield return MergeProposition(baseProposition, overrideProposition);
+            }
+        }
+
+        static IEnumerable<SearchProposition> MergePropositions(SearchProposition baseProposition, IEnumerable<SearchProposition> overridePropositions)
+        {
+            foreach (var overrideProposition in overridePropositions)
+            {
+                yield return MergeProposition(baseProposition, overrideProposition);
+            }
+        }
+
+        static SearchProposition MergeProposition(SearchProposition baseProposition, SearchProposition overrideProposition)
+        {
+            var merged = new SearchProposition(
+                category: string.IsNullOrEmpty(overrideProposition.category) ? baseProposition.category : overrideProposition.category,
+                label: string.IsNullOrEmpty(overrideProposition.label) ? baseProposition.label : overrideProposition.label,
+                replacement: string.IsNullOrEmpty(overrideProposition.replacement) ? baseProposition.replacement : overrideProposition.replacement,
+                help: string.IsNullOrEmpty(overrideProposition.help) ? baseProposition.help : overrideProposition.help,
+                priority: overrideProposition.priority == 0 ? baseProposition.priority : overrideProposition.priority,
+                moveCursor: overrideProposition.moveCursor == TextCursorPlacement.MoveAutoComplete ? baseProposition.moveCursor : overrideProposition.moveCursor,
+                icon: overrideProposition.icon ? overrideProposition.icon : baseProposition.icon,
+                type: overrideProposition.type ?? baseProposition.type,
+                data: (overrideProposition.data == null || (overrideProposition.data is string s && string.IsNullOrEmpty(s))) ? baseProposition.data : overrideProposition.data,
+                color: overrideProposition.color == default(Color) ? baseProposition.color : overrideProposition.color);
+            return merged;
+        }
+
+        static IEnumerable<SearchProposition> GetPropositionsFromType(IQueryEngineFilter filter, Type type, string category = null, Type blockType = null, int priority = 0, Texture2D icon = null, Color color = default)
+        {
+            var filterId = filter.token;
+            var defaultOperator = filter.supportedOperators == null ? ":" : filter.supportedOperators.FirstOrDefault();
+            if (type.IsEnum)
+                return SearchUtils.FetchEnumPropositions(type, category, filterId, defaultOperator, blockType, priority, icon, color);
+
+            return Enumerable.Empty<SearchProposition>();
+        }
+
+        static string GetPropositionKey(string label)
+        {
+            return $"{k_BaseSearchPropositionDataKey}{label}";
+        }
+
+        static string GetGlobalPropositionKey()
+        {
+            return "searchpropositionglobal";
+        }
+
+        static SearchProposition GetDefaultValidProposition()
+        {
+            return new SearchProposition(category: null, label: string.Empty);
+        }
+
+        public static void AddPropositionsFromFilterAttributes<TAttribute>(this QueryEngine engine, string category = null, int priority = 0,
+            string data = null, Type type = null, Texture2D icon = null, Color color = default,
+            TextCursorPlacement moveCursor = TextCursorPlacement.MoveAutoComplete, Func<SearchProposition, SearchProposition> propositionTransformation = null)
+            where TAttribute : QueryEngineFilterAttribute
+        {
+            engine.AddPropositionsFromFilterAttributes<object, TAttribute>(category, priority, data, type, icon, color, moveCursor, propositionTransformation);
+        }
+
+        public static void AddPropositionsFromFilterAttributes<TData, TAttribute>(this QueryEngine<TData> engine, string category = null,
+            int priority = 0, string data = null, Type type = null, Texture2D icon = null, Color color = default,
+            TextCursorPlacement moveCursor = TextCursorPlacement.MoveAutoComplete, Func<SearchProposition, SearchProposition> propositionTransformation = null)
+            where TAttribute : QueryEngineFilterAttribute
+        {
+            var queryEngineFunctions = TypeCache.GetMethodsWithAttribute<TAttribute>();
+            foreach (var mi in queryEngineFunctions)
+            {
+                var attr = mi.GetAttribute<TAttribute>();
+                if (!engine.TryGetFilter(attr.token, out var filter))
+                    continue;
+                var op = attr.supportedOperators == null ? ">" : attr.supportedOperators[0];
+                var value = op == ":" ? "" : "1";
+                var label = attr.token;
+                string help = null;
+
+                if (mi.ReturnType == typeof(Vector2))
+                    value = "(,)";
+                if (mi.ReturnType == typeof(Vector3))
+                    value = "(,,)";
+                if (mi.ReturnType == typeof(Vector4))
+                    value = "(,,,)";
+
+                var replacement = $"{attr.token}{op}{value}";
+
+                var descriptionAttr = mi.GetAttribute<System.ComponentModel.DescriptionAttribute>();
+                if (descriptionAttr != null)
+                {
+                    help = descriptionAttr.Description;
+                }
+
+                var proposition = new SearchProposition(label: label,
+                    category: category,
+                    replacement: replacement,
+                    help: help,
+                    data: data,
+                    priority: priority,
+                    icon: icon,
+                    type: type,
+                    color: color,
+                    moveCursor: moveCursor);
+
+                if (propositionTransformation != null)
+                    proposition = propositionTransformation(proposition);
+
+                filter.AddOrUpdatePropositionData(proposition);
+            }
+        }
+    }
+}
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs b/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs
index 99a885e0a7..346be3a8a0 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QueryMarker.cs
@@ -23,6 +23,14 @@ public IEnumerable<object> Evaluate(SearchContext context, bool reevaluateLitera
                 return new[] { value };
             return expression.Execute(context).Where(item => item != null).Select(item => item.value);
         }
+
+        public IEnumerable<object> Evaluate(bool reevaluateLiterals = false)
+        {
+            using (var context = SearchService.CreateContext(""))
+            {
+                return Evaluate(context, reevaluateLiterals).ToList();
+            }
+        }
     }
 
     // <$CONTROL_TYPE:[VALUE,]EXPRESSION_ARGS$>.
@@ -51,7 +59,7 @@ public static bool TryParse(StringView text, out QueryMarker marker)
             if (!IsQueryMarker(text))
                 return false;
 
-            var innerText = text.Substring(k_StartToken.Length, text.Length - k_StartToken.Length - k_EndToken.Length);
+            var innerText = text.Substring(k_StartToken.Length, text.length - k_StartToken.Length - k_EndToken.Length);
 
             var indexOfColon = innerText.IndexOf(':');
             if (indexOfColon < 0)
@@ -61,7 +69,7 @@ public static bool TryParse(StringView text, out QueryMarker marker)
             var args = new List<StringView>();
             var level = 0;
             var currentArgStart = indexOfColon + 1;
-            for (var i = currentArgStart; i < innerText.Length; ++i)
+            for (var i = currentArgStart; i < innerText.length; ++i)
             {
                 if (ParserUtils.IsOpener(innerText[i]))
                     ++level;
@@ -69,18 +77,18 @@ public static bool TryParse(StringView text, out QueryMarker marker)
                     --level;
                 if (innerText[i] != ',' || level != 0)
                     continue;
-                if (i+1 == innerText.Length)
+                if (i+1 == innerText.length)
                     return false;
 
                 args.Add(innerText.Substring(currentArgStart, i - currentArgStart).Trim());
                 currentArgStart = i + 1;
             }
 
-            if (currentArgStart == innerText.Length)
+            if (currentArgStart == innerText.length)
                 return false; // No arguments
 
             // Extract the final argument, since there is no comma after the last argument
-            args.Add(innerText.Substring(currentArgStart, innerText.Length - currentArgStart).Trim());
+            args.Add(innerText.Substring(currentArgStart, innerText.length - currentArgStart).Trim());
 
             var queryMarkerArguments = new List<QueryMarkerArgument>();
             using (var context = SearchService.CreateContext(""))
@@ -124,7 +132,7 @@ public static QueryMarker[] ParseAllMarkers(string text)
 
         public static QueryMarker[] ParseAllMarkers(StringView text)
         {
-            if (text.Length <= k_StartToken.Length + k_EndToken.Length)
+            if (text.length <= k_StartToken.Length + k_EndToken.Length)
                 return null;
 
             List<QueryMarker> markers = new List<QueryMarker>();
@@ -132,9 +140,9 @@ public static QueryMarker[] ParseAllMarkers(StringView text)
             var endIndex = -1;
             var nestedLevel = 0;
             bool inQuotes = false;
-            for (var i = 0; i < text.Length; ++i)
+            for (var i = 0; i < text.length; ++i)
             {
-                if (i + k_StartToken.Length > text.Length || i + k_EndToken.Length > text.Length)
+                if (i + k_StartToken.Length > text.length || i + k_EndToken.Length > text.length)
                     break;
 
                 if (ParserUtils.IsOpener(text[i]) && !inQuotes)
@@ -211,9 +219,9 @@ public static string ReplaceMarkersWithEvaluatedValues(string text, SearchContex
                     continue;
 
                 var valueStr = value.ToString();
-                modifiedText = modifiedText.Remove(queryMarker.text.startIndex + offset, queryMarker.text.Length);
+                modifiedText = modifiedText.Remove(queryMarker.text.startIndex + offset, queryMarker.text.length);
                 modifiedText = modifiedText.Insert(queryMarker.text.startIndex + offset, valueStr);
-                offset += valueStr.Length - queryMarker.text.Length;
+                offset += valueStr.Length - queryMarker.text.length;
             }
 
             return modifiedText;
@@ -238,6 +246,19 @@ public IEnumerable<object> EvaluateArgs(SearchContext context, bool reevaluateLi
             return args.SelectMany(qma => qma.Evaluate(context, reevaluateLiterals));
         }
 
+        public IEnumerable<object> EvaluateArgsNoSpread(bool reevaluateLiterals = false)
+        {
+            using (var context = SearchService.CreateContext(""))
+            {
+                return EvaluateArgsNoSpread(context, reevaluateLiterals).ToList(); // Calling ToList to force evaluation so context is not used after disposal.
+            }
+        }
+
+        public IEnumerable<object> EvaluateArgsNoSpread(SearchContext context, bool reevaluateLiterals = false)
+        {
+            return args.Select(qma => qma.Evaluate(context, reevaluateLiterals));
+        }
+
         public override string ToString()
         {
             return $"{k_StartToken}{type}:{string.Join(",", EvaluateArgs())}{k_EndToken}";
diff --git a/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs b/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs
index 7dd89286c6..6271a18d74 100644
--- a/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs
+++ b/Modules/QuickSearch/Editor/QueryBuilder/QuerySelector.cs
@@ -56,7 +56,7 @@ public QuerySelectorItemGUI(AdvancedDropdownDataSource dataSource, QuerySelector
 
         internal override Rect GetItemRect(in GUIContent content)
         {
-            return GUILayoutUtility.GetRect(host.window.position.width - 18f, SearchField.minSinglelineTextHeight + 2, lineStyle, GUILayout.ExpandWidth(true));
+            return GUILayoutUtility.GetRect(host.window.position.width - 18f, UI.SearchField.minSinglelineTextHeight + 2, lineStyle, GUILayout.ExpandWidth(true));
         }
 
         internal override Vector2 CalcItemSize(GUIContent content)
@@ -66,7 +66,7 @@ internal override Vector2 CalcItemSize(GUIContent content)
 
         internal override float CalcItemHeight(GUIContent content, float width)
         {
-            return SearchField.minSinglelineTextHeight + 2;
+            return UI.SearchField.minSinglelineTextHeight + 2;
         }
 
         internal override void DrawLineSeparator()
diff --git a/Modules/QuickSearch/Editor/QueryEngine/Query.cs b/Modules/QuickSearch/Editor/QueryEngine/ParsedQuery.cs
similarity index 90%
rename from Modules/QuickSearch/Editor/QueryEngine/Query.cs
rename to Modules/QuickSearch/Editor/QueryEngine/ParsedQuery.cs
index 24a208d07e..922c450e92 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/Query.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/ParsedQuery.cs
@@ -55,7 +55,7 @@ public interface IQueryHandlerFactory<TData, out TQueryHandler, TPayload>
     /// </summary>
     /// <typeparam name="TData">The filtered data type.</typeparam>
     /// <typeparam name="TPayload">The payload type.</typeparam>
-    public class Query<TData, TPayload>
+    public class ParsedQuery<TData, TPayload>
         where TPayload : class
     {
         /// <summary>
@@ -78,10 +78,10 @@ public class Query<TData, TPayload>
 
         internal IQueryHandler<TData, TPayload> graphHandler { get; set; }
 
-        internal QueryGraph evaluationGraph { get; }
-        internal QueryGraph queryGraph { get; }
+        public QueryGraph evaluationGraph { get; }
+        public QueryGraph queryGraph { get; }
 
-        internal Query(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles)
+        internal ParsedQuery(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles)
         {
             this.text = text;
             this.evaluationGraph = evaluationGraph;
@@ -91,7 +91,7 @@ internal Query(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, I
             this.toggles = toggles;
         }
 
-        internal Query(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles, IQueryHandler<TData, TPayload> graphHandler)
+        internal ParsedQuery(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles, IQueryHandler<TData, TPayload> graphHandler)
             : this(text, evaluationGraph, queryGraph, errors, tokens, toggles)
         {
             if (valid)
@@ -181,7 +181,7 @@ static IQueryNode GetNodeAtPosition(IQueryNode root, int position)
     /// A Query defines an operation that can be used to filter a data set.
     /// </summary>
     /// <typeparam name="T">The filtered data type.</typeparam>
-    public class Query<T> : Query<T, IEnumerable<T>>
+    public class ParsedQuery<T> : ParsedQuery<T, IEnumerable<T>>
     {
         /// <summary>
         /// Boolean indicating if the original payload should be return when the query is empty.
@@ -189,7 +189,7 @@ public class Query<T> : Query<T, IEnumerable<T>>
         /// </summary>
         public bool returnPayloadIfEmpty { get; set; } = true;
 
-        internal Query(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles, IQueryHandler<T, IEnumerable<T>> graphHandler)
+        internal ParsedQuery(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles, IQueryHandler<T, IEnumerable<T>> graphHandler)
             : base(text, evaluationGraph, queryGraph, errors, tokens, toggles, graphHandler)
         {}
 
diff --git a/Modules/QuickSearch/Editor/QueryEngine/Query.Deprecated.cs b/Modules/QuickSearch/Editor/QueryEngine/Query.Deprecated.cs
new file mode 100644
index 0000000000..a4a9292e6e
--- /dev/null
+++ b/Modules/QuickSearch/Editor/QueryEngine/Query.Deprecated.cs
@@ -0,0 +1,188 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace UnityEditor.Search
+{
+    [Obsolete("Query has been deprecated. Use ParsedQuery instead (UnityUpgradable) -> ParsedQuery<TData, TPayload>", false)]
+    public class Query<TData, TPayload>
+        where TPayload : class
+    {
+        /// <summary>
+        /// The text that generated this query.
+        /// </summary>
+        public string text { get; }
+
+        /// <summary> Indicates if the query is valid or not. </summary>
+        public bool valid => errors.Count == 0 && evaluationGraph != null;
+
+        /// <summary> List of QueryErrors. </summary>
+        public ICollection<QueryError> errors { get; }
+
+        /// <summary>
+        /// List of tokens found in the query.
+        /// </summary>
+        public ICollection<string> tokens { get; }
+
+        internal ICollection<QueryToggle> toggles { get; }
+
+        internal IQueryHandler<TData, TPayload> graphHandler { get; set; }
+
+        public QueryGraph evaluationGraph { get; }
+        public QueryGraph queryGraph { get; }
+
+        internal Query(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles)
+        {
+            this.text = text;
+            this.evaluationGraph = evaluationGraph;
+            this.queryGraph = queryGraph;
+            this.errors = errors;
+            this.tokens = tokens;
+            this.toggles = toggles;
+        }
+
+        internal Query(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles, IQueryHandler<TData, TPayload> graphHandler)
+            : this(text, evaluationGraph, queryGraph, errors, tokens, toggles)
+        {
+            if (valid)
+            {
+                this.graphHandler = graphHandler;
+            }
+        }
+
+        /// <summary>
+        /// Apply the filtering on a payload.
+        /// </summary>
+        /// <param name="payload">The data to filter</param>
+        /// <returns>A filtered IEnumerable.</returns>
+        public virtual IEnumerable<TData> Apply(TPayload payload = null)
+        {
+            if (!valid)
+                return null;
+            return graphHandler.Eval(payload);
+        }
+
+        /// <summary>
+        /// Optimize the query by optimizing the underlying filtering graph.
+        /// </summary>
+        /// <param name="propagateNotToLeaves">Propagate "Not" operations to leaves, so only leaves can have "Not" operations as parents.</param>
+        /// <param name="swapNotToRightHandSide">Swaps "Not" operations to the right hand side of combining operations (i.e. "And", "Or"). Useful if a "Not" operation is slow.</param>
+        public void Optimize(bool propagateNotToLeaves, bool swapNotToRightHandSide)
+        {
+            evaluationGraph?.Optimize(propagateNotToLeaves, swapNotToRightHandSide);
+        }
+
+        /// <summary>
+        /// Optimize the query by optimizing the underlying filtering graph.
+        /// </summary>
+        /// <param name="options">Optimization options.</param>
+        public void Optimize(QueryGraphOptimizationOptions options)
+        {
+            evaluationGraph?.Optimize(options);
+        }
+
+        /// <summary>
+        /// Get the query node located at the specified position in the query.
+        /// </summary>
+        /// <param name="position">The position of the query node in the text.</param>
+        /// <returns>An IQueryNode.</returns>
+        public IQueryNode GetNodeAtPosition(int position)
+        {
+            // Allow position at Length, to support cursor at end of word.
+            if (position < 0 || position > text.Length)
+                throw new ArgumentOutOfRangeException(nameof(position));
+
+            if (queryGraph == null || queryGraph.empty)
+                return null;
+
+            return GetNodeAtPosition(queryGraph.root, position);
+        }
+
+        internal bool HasToggle(string toggle)
+        {
+            return HasToggle(toggle, StringComparison.Ordinal);
+        }
+
+        internal bool HasToggle(string toggle, StringComparison stringComparison)
+        {
+            return toggles.Any(s => s.value.Equals(toggle, stringComparison));
+        }
+
+        static IQueryNode GetNodeAtPosition(IQueryNode root, int position)
+        {
+            if (root.type == QueryNodeType.Where || root.type == QueryNodeType.Group)
+                return GetNodeAtPosition(root.children[0], position);
+
+            if (!string.IsNullOrEmpty(root.token.text) && position >= root.token.position && position <= root.token.position + root.token.length)
+                return root;
+
+            if (root.leaf || root.children == null)
+                return null;
+
+            if (root.children.Count == 1)
+                return GetNodeAtPosition(root.children[0], position);
+
+            // We have no more than two children
+            return GetNodeAtPosition(position < root.token.position ? root.children[0] : root.children[1], position);
+        }
+    }
+
+    [Obsolete("Query has been deprecated. Use ParsedQuery instead (UnityUpgradable) -> ParsedQuery<T>", false)]
+    public class Query<T> : Query<T, IEnumerable<T>>
+    {
+        /// <summary>
+        /// Boolean indicating if the original payload should be return when the query is empty.
+        /// If set to false, an empty array is returned instead.
+        /// </summary>
+        public bool returnPayloadIfEmpty { get; set; } = true;
+
+        internal Query(string text, QueryGraph evaluationGraph, QueryGraph queryGraph, ICollection<QueryError> errors, ICollection<string> tokens, ICollection<QueryToggle> toggles, IQueryHandler<T, IEnumerable<T>> graphHandler)
+            : base(text, evaluationGraph, queryGraph, errors, tokens, toggles, graphHandler)
+        {}
+
+        /// <summary>
+        /// Apply the filtering on an IEnumerable data set.
+        /// </summary>
+        /// <param name="data">The data to filter</param>
+        /// <returns>A filtered IEnumerable.</returns>
+        public override IEnumerable<T> Apply(IEnumerable<T> data)
+        {
+            return Apply(data, returnPayloadIfEmpty);
+        }
+
+        internal IEnumerable<T> Apply(IEnumerable<T> data, bool returnInputIfEmpty)
+        {
+            if (!valid)
+                return new T[] {};
+
+            if (evaluationGraph.empty)
+            {
+                return returnInputIfEmpty ? data : new T[] {};
+            }
+
+            return graphHandler.Eval(data);
+        }
+
+        /// <summary>
+        /// Test the query on a single object. Returns true if the test passes.
+        /// </summary>
+        /// <param name="element">A single object to be tested.</param>
+        /// <returns>True if the object passes the query, false otherwise.</returns>
+        public bool Test(T element)
+        {
+            if (!valid)
+                return false;
+
+            if (evaluationGraph.empty)
+            {
+                return returnPayloadIfEmpty;
+            }
+
+            return graphHandler.Eval(element);
+        }
+    }
+}
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryEngine.Deprecated.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryEngine.Deprecated.cs
new file mode 100644
index 0000000000..1efb2f0f45
--- /dev/null
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryEngine.Deprecated.cs
@@ -0,0 +1,28 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEditor.Search
+{
+    public partial class QueryEngine<TData>
+    {
+        [Obsolete("Parse has been deprecated. Use ParseQuery instead (UnityUpgradable) -> ParseQuery(*)")]
+        public Query<TData> Parse(string text, bool useFastYieldingQueryHandler = false)
+        {
+            var handlerFactory = new DefaultQueryHandlerFactory<TData>(this, useFastYieldingQueryHandler);
+            var pq = BuildQuery(text, handlerFactory, (evalGraph, queryGraph, errors, tokens, toggles, handler) => new ParsedQuery<TData>(text, evalGraph, queryGraph, errors, tokens, toggles, handler));
+            return new Query<TData>(pq.text, pq.evaluationGraph, pq.queryGraph, pq.errors, pq.tokens, pq.toggles, pq.graphHandler);
+        }
+
+        [Obsolete("Parse has been deprecated. Use ParseQuery instead (UnityUpgradable) -> ParseQuery<TQueryHandler, TPayload>(*)")]
+        public Query<TData, TPayload> Parse<TQueryHandler, TPayload>(string text, IQueryHandlerFactory<TData, TQueryHandler, TPayload> queryHandlerFactory)
+            where TQueryHandler : IQueryHandler<TData, TPayload>
+            where TPayload : class
+        {
+            var pq = BuildQuery(text, queryHandlerFactory, (evalGraph, queryGraph, errors, tokens, toggles, handler) => new ParsedQuery<TData, TPayload>(text, evalGraph, queryGraph, errors, tokens, toggles, handler));
+            return new Query<TData, TPayload>(pq.text, pq.evaluationGraph, pq.queryGraph, pq.errors, pq.tokens, pq.toggles, pq.graphHandler);
+        }
+    }
+}
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryEngine.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryEngine.cs
index d53b12f0d8..3e539a0b07 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryEngine.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryEngine.cs
@@ -757,7 +757,7 @@ protected override bool ConsumeCombiningToken(string text, int startIndex, int e
             }
 
             newNode.token = new QueryToken(in sv, startIndex);
-            userData.nodesToStringPosition.Add(newNode, new QueryToken(startIndex, sv.Length));
+            userData.nodesToStringPosition.Add(newNode, new QueryToken(startIndex, sv.length));
             userData.expressionNodes.Add(newNode);
             userData.tokens.Add(token);
             return true;
@@ -913,10 +913,10 @@ protected override bool ConsumeNestedQuery(string text, int startIndex, int endI
             var nestedQueryAggregator = GetStringViewFromMatch(text, aggregatorGroup);
             var queryString = GetStringViewFromMatch(text, nestedGroup);
 
-            var nestedQueryString = queryString.Substring(1, queryString.Length - 2);
+            var nestedQueryString = queryString.Substring(1, queryString.length - 2);
             nestedQueryString = nestedQueryString.Trim();
             var nestedQueryNode = new NestedQueryNode(in nestedQueryString, in queryString, m_NestedQueryHandler);
-            nestedQueryNode.token = new QueryToken(startIndex + (nestedQueryAggregator.IsNullOrEmpty() ? 0 : nestedQueryAggregator.Length), queryString.Length);
+            nestedQueryNode.token = new QueryToken(startIndex + (nestedQueryAggregator.IsNullOrEmpty() ? 0 : nestedQueryAggregator.length), queryString.length);
             userData.nodesToStringPosition.Add(nestedQueryNode, nestedQueryNode.token);
             if (validationOptions.skipNestedQueries)
             {
@@ -934,12 +934,12 @@ protected override bool ConsumeNestedQuery(string text, int startIndex, int endI
                 var lowerAggregator = nestedQueryAggregator.ToString().ToLowerInvariant();
                 if (!m_NestedQueryAggregators.TryGetValue(lowerAggregator, out var aggregator) && validationOptions.validateFilters && !validationOptions.validateSyntaxOnly)
                 {
-                    errors.Add(new QueryError(startIndex, nestedQueryAggregator.Length, $"Unknown nested query aggregator \"{nestedQueryAggregator}\""));
+                    errors.Add(new QueryError(startIndex, nestedQueryAggregator.length, $"Unknown nested query aggregator \"{nestedQueryAggregator}\""));
                     return false;
                 }
 
                 var aggregatorNode = new AggregatorNode(in nestedQueryAggregator, aggregator);
-                aggregatorNode.token = new QueryToken(startIndex, nestedQueryAggregator.Length + nestedQueryNode.token.length);
+                aggregatorNode.token = new QueryToken(startIndex, nestedQueryAggregator.length + nestedQueryNode.token.length);
                 userData.nodesToStringPosition.Add(aggregatorNode, aggregatorNode.token);
                 aggregatorNode.children.Add(nestedQueryNode);
                 nestedQueryNode.parent = aggregatorNode;
@@ -990,7 +990,7 @@ IQueryNode CreateFilterToken(IFilter filter, string text, in StringView token, M
 
             if (!filterTypeGroup.Success || !filterOperatorGroup.Success || !filterValueGroup.Success)
             {
-                errors.Add(new QueryError(index, token.Length, $"Could not parse filter block \"{token}\"."));
+                errors.Add(new QueryError(index, token.length, $"Could not parse filter block \"{token}\"."));
                 return null;
             }
 
@@ -1023,13 +1023,13 @@ IQueryNode CreateFilterToken(IFilter filter, in CreateFilterTokenArgs args)
         {
             if (!GetFilterOperator(filter, in args.filterOperator, out var op))
             {
-                args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.Length, $"Unknown filter operator \"{args.filterOperator.ToString()}\"."));
+                args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.length, $"Unknown filter operator \"{args.filterOperator.ToString()}\"."));
                 return null;
             }
 
             if (!validationOptions.validateSyntaxOnly && filter.supportedOperators.Any() && !filter.supportedOperators.Any(filterOp => filterOp.Equals(op.token)))
             {
-                args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.Length, $"The operator \"{op.token}\" is not supported for this filter."));
+                args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.length, $"The operator \"{op.token}\" is not supported for this filter."));
                 return null;
             }
 
@@ -1047,15 +1047,15 @@ IQueryNode CreateFilterToken(IFilter filter, in CreateFilterTokenArgs args)
 
                 if (validationOptions.validateFilters && m_NestedQueryHandler == null && !validationOptions.validateSyntaxOnly)
                 {
-                    args.errors.Add(new QueryError(args.filterValueIndex, args.filterValue.Length, $"Cannot use a nested query without setting the handler first."));
+                    args.errors.Add(new QueryError(args.filterValueIndex, args.filterValue.length, $"Cannot use a nested query without setting the handler first."));
                     return null;
                 }
 
                 filterNode = new InFilterNode(filter, args.filterType, in op, args.filterOperator, filterValue, rawFilterValue, args.filterParam, args.token);
 
                 var startIndex = filterValue.IndexOf('{');
-                var rawNestedQuery = filterValue.Substring(startIndex, filterValue.Length - startIndex);
-                filterValue = rawNestedQuery.Substring(1, rawNestedQuery.Length - 2);
+                var rawNestedQuery = filterValue.Substring(startIndex, filterValue.length - startIndex);
+                filterValue = rawNestedQuery.Substring(1, rawNestedQuery.length - 2);
                 filterValue = filterValue.Trim();
                 var nestedQueryNode = new NestedQueryNode(in filterValue, in rawNestedQuery, in args.filterType, m_NestedQueryHandler);
                 nestedQueryNode.token = new QueryToken(filterValue, args.filterValueIndex);
@@ -1065,7 +1065,7 @@ IQueryNode CreateFilterToken(IFilter filter, in CreateFilterTokenArgs args)
                     var lowerAggregator = args.nestedQueryAggregator.ToString().ToLowerInvariant();
                     if (!m_NestedQueryAggregators.TryGetValue(lowerAggregator, out var aggregator) && validationOptions.validateFilters && !validationOptions.validateSyntaxOnly)
                     {
-                        args.errors.Add(new QueryError(args.filterValueIndex, args.nestedQueryAggregator.Length, $"Unknown nested query aggregator \"{args.nestedQueryAggregator}\""));
+                        args.errors.Add(new QueryError(args.filterValueIndex, args.nestedQueryAggregator.length, $"Unknown nested query aggregator \"{args.nestedQueryAggregator}\""));
                         return null;
                     }
 
@@ -1100,7 +1100,7 @@ IQueryNode CreateBooleanFilterToken(IFilter filter, string text, in StringView t
         {
             if (match.Groups.Count != 3) // There is 3 groups
             {
-                errors.Add(new QueryError(index, token.Length, $"Could not parse filter block \"{token}\"."));
+                errors.Add(new QueryError(index, token.length, $"Could not parse filter block \"{token}\"."));
                 return null;
             }
 
@@ -1114,7 +1114,7 @@ IQueryNode CreateBooleanFilterToken(IFilter filter, string text, in StringView t
                 filterParam = filterParam.Trim('(', ')');
             }
 
-            var args = new CreateFilterTokenArgs(in token, match, index, errors, in filterType, in filterParam, in StringView.Empty, in StringView.Empty, in StringView.Empty, filterTypeIndex, 0, 0);
+            var args = new CreateFilterTokenArgs(in token, match, index, errors, in filterType, in filterParam, in StringView.empty, in StringView.empty, in StringView.empty, filterTypeIndex, 0, 0);
             if (filter == null && !GetFilter(in args, out var queryNode, out filter))
             {
                 return queryNode;
@@ -1128,7 +1128,7 @@ IQueryNode CreateBooleanFilterToken(IFilter filter, in CreateFilterTokenArgs arg
             var filterOperator = "=".GetStringView();
             if (!GetFilterOperator(filter, in filterOperator, out var op))
             {
-                args.errors.Add(new QueryError(args.index, args.token.Length, $"Boolean filter not supported."));
+                args.errors.Add(new QueryError(args.index, args.token.length, $"Boolean filter not supported."));
                 return null;
             }
 
@@ -1171,7 +1171,7 @@ IQueryNode CreatePartialFilterToken(IFilter filter, string text, in StringView t
                 return new FilterNode(in filterType, in filterOperator, in filterValue, in filterValue, in filterParam, in token) { skipped = true };
             }
 
-            var args = new CreateFilterTokenArgs(in token, match, index, errors, in filterType, in filterParam, in filterOperator, in filterValue, in StringView.Empty, filterTypeIndex, filterOperatorIndex, filterValueIndex);
+            var args = new CreateFilterTokenArgs(in token, match, index, errors, in filterType, in filterParam, in filterOperator, in filterValue, in StringView.empty, filterTypeIndex, filterOperatorIndex, filterValueIndex);
             if (filter == null && !GetFilter(in args, out var queryNode, out filter))
             {
                 return queryNode;
@@ -1186,14 +1186,14 @@ IQueryNode CreatePartialFilterToken(IFilter filter, in CreateFilterTokenArgs arg
             {
                 if (!GetFilterOperator(filter, in args.filterOperator, out op))
                 {
-                    args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.Length, $"Unknown filter operator \"{args.filterOperator}\"."));
+                    args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.length, $"Unknown filter operator \"{args.filterOperator}\"."));
                     return null;
                 }
 
                 var opToken = op.token;
                 if (!validationOptions.validateSyntaxOnly && filter.supportedOperators.Any() && !filter.supportedOperators.Any(filterOp => filterOp.Equals(opToken)))
                 {
-                    args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.Length, $"The operator \"{op.token}\" is not supported for this filter."));
+                    args.errors.Add(new QueryError(args.filterOperatorIndex, args.filterOperator.length, $"The operator \"{op.token}\" is not supported for this filter."));
                     return null;
                 }
             }
@@ -1202,7 +1202,7 @@ IQueryNode CreatePartialFilterToken(IFilter filter, in CreateFilterTokenArgs arg
             var filterValue = RemoveQuotes(in rawFilterValue);
 
             var filterNode = new FilterNode(filter, in args.filterType, in op, in args.filterOperator, in filterValue, in rawFilterValue, in args.filterParam, in args.token);
-            args.errors.Add(new QueryError(args.index, args.token.Length, $"The filter \"{args.filterType}\" is incomplete."));
+            args.errors.Add(new QueryError(args.index, args.token.length, $"The filter \"{args.filterType}\" is incomplete."));
 
             return filterNode;
         }
@@ -1222,7 +1222,7 @@ bool GetFilter(in CreateFilterTokenArgs args, out IQueryNode queryNode, out IFil
 
                 if (!validationOptions.validateSyntaxOnly && !HasDefaultHandler(!args.filterParam.IsNullOrEmpty()) && validationOptions.validateFilters)
                 {
-                    args.errors.Add(new QueryError(args.filterTypeIndex, args.filterType.Length, $"Unknown filter \"{filterTypeStr}\"."));
+                    args.errors.Add(new QueryError(args.filterTypeIndex, args.filterType.length, $"Unknown filter \"{filterTypeStr}\"."));
                     queryNode = null;
                     return false;
                 }
@@ -1367,7 +1367,7 @@ IQueryNode CreateWordExpressionNode(string text, in StringView token, Match matc
             var localToken = token;
             var isExact = localToken.StartsWith("!");
             if (isExact)
-                localToken = localToken.Substring(1, token.Length - 1);
+                localToken = localToken.Substring(1, token.length - 1);
             var rawToken = localToken;
             localToken = RemoveQuotes(localToken);
 
@@ -2200,7 +2200,7 @@ public override void AddQuoteDelimiter(in QueryTextDelimiter textDelimiter, IEnu
 
         void AddCustomPartialFilterWithQuotesTokenHandler(int handlerId, int priority, in QueryTextDelimiter textDelimiter, IEnumerable<string> operators, bool sort = true)
         {
-            AddCustomPartialFilterWithQuotesTokenHandler(handlerId, priority, BuildPartialFilterNamePatternFromToken("[\\w.]+", operators), BuildPartialFilterValuePatternFromQuoteDelimiter(textDelimiter), textDelimiter, operators, sort);
+            AddCustomPartialFilterWithQuotesTokenHandler(handlerId, priority, BuildPartialFilterNamePatternFromToken(QueryRegexValues.k_BaseFilterNameRegex, operators), BuildPartialFilterValuePatternFromQuoteDelimiter(textDelimiter), textDelimiter, operators, sort);
         }
 
         void AddCustomPartialFilterWithQuotesTokenHandler(int handlerId, int priority, string filterNamePattern, string filterValuePattern, in QueryTextDelimiter textDelimiter, IEnumerable<string> operators, bool sort = true)
@@ -2216,7 +2216,7 @@ void AddCustomPartialFilterWithQuotesTokenHandler(int handlerId, int priority, s
 
         void RebuildAllBasicPartialFilterRegex(IEnumerable<string> operators, bool sort = true)
         {
-            m_PartialFilterRx = BuildPartialFilterRegex(BuildPartialFilterNamePatternFromToken("[\\w.]+", operators), operators);
+            m_PartialFilterRx = BuildPartialFilterRegex(BuildPartialFilterNamePatternFromToken(QueryRegexValues.k_BaseFilterNameRegex, operators), operators);
 
             // Rebuild all token handlers for partial filters with quotes
             RemoveQueryTokenHandlers(handler => handler.priority == (int)ExtendedTokenHandlerPriority.PartialWithQuotes);
@@ -2232,7 +2232,7 @@ void RebuildAllBasicPartialFilterRegex(IEnumerable<string> operators, bool sort
         static StringView GetStringViewFromMatch(string text, Group matchGroup)
         {
             if (matchGroup.Length == 0)
-                return StringView.Empty;
+                return StringView.empty;
             return new StringView(text, matchGroup.Index, matchGroup.Index + matchGroup.Length);
         }
     }
@@ -2242,7 +2242,7 @@ static StringView GetStringViewFromMatch(string text, Group matchGroup)
     /// It can be customized to support custom filters and operators.
     /// </summary>
     /// <typeparam name="TData">The filtered data type.</typeparam>
-    public class QueryEngine<TData>
+    public partial class QueryEngine<TData>
     {
         QueryEngineImpl<TData> m_Impl;
 
@@ -3129,36 +3129,36 @@ public void SetGlobalStringComparisonOptions(StringComparison stringComparison)
         }
 
         /// <summary>
-        /// Parse a query string into a Query operation. This Query operation can then be used to filter any data set of type TData.
+        /// Parse a query string into a ParsedQuery operation. This ParsedQuery operation can then be used to filter any data set of type TData.
         /// </summary>
         /// <param name="text">The query input string.</param>
         /// <param name="useFastYieldingQueryHandler">Set to true to get a query that will yield null results for elements that don't pass the query, instead of only the elements that pass the query.</param>
-        /// <returns>Query operation of type TData.</returns>
-        public Query<TData> Parse(string text, bool useFastYieldingQueryHandler = false)
+        /// <returns>ParsedQuery operation of type TData.</returns>
+        public ParsedQuery<TData> ParseQuery(string text, bool useFastYieldingQueryHandler = false)
         {
             var handlerFactory = new DefaultQueryHandlerFactory<TData>(this, useFastYieldingQueryHandler);
-            return BuildQuery(text, handlerFactory, (evalGraph, queryGraph, errors, tokens, toggles, handler) => new Query<TData>(text, evalGraph, queryGraph, errors, tokens, toggles, handler));
+            return BuildQuery(text, handlerFactory, (evalGraph, queryGraph, errors, tokens, toggles, handler) => new ParsedQuery<TData>(text, evalGraph, queryGraph, errors, tokens, toggles, handler));
         }
 
         /// <summary>
-        /// Parse a query string into a Query operation. This Query operation can then be used to filter any data set of type TData.
+        /// Parse a query string into a ParsedQuery operation. This ParsedQuery operation can then be used to filter any data set of type TData.
         /// </summary>
         /// <typeparam name="TQueryHandler">Type of the underlying query handler. See IQueryHandler.</typeparam>
         /// <typeparam name="TPayload">Type of the payload that the query handler receives.</typeparam>
         /// <param name="text">The query input string.</param>
         /// <param name="queryHandlerFactory">A factory object that creates query handlers of type TQueryHandler. See IQueryHandlerFactory.</param>
-        /// <returns>Query operation of type TData and TPayload.</returns>
-        public Query<TData, TPayload> Parse<TQueryHandler, TPayload>(string text, IQueryHandlerFactory<TData, TQueryHandler, TPayload> queryHandlerFactory)
+        /// <returns>ParsedQuery operation of type TData and TPayload.</returns>
+        public ParsedQuery<TData, TPayload> ParseQuery<TQueryHandler, TPayload>(string text, IQueryHandlerFactory<TData, TQueryHandler, TPayload> queryHandlerFactory)
             where TQueryHandler : IQueryHandler<TData, TPayload>
             where TPayload : class
         {
-            return BuildQuery(text, queryHandlerFactory, (evalGraph, queryGraph, errors, tokens, toggles, handler) => new Query<TData, TPayload>(text, evalGraph, queryGraph, errors, tokens, toggles, handler));
+            return BuildQuery(text, queryHandlerFactory, (evalGraph, queryGraph, errors, tokens, toggles, handler) => new ParsedQuery<TData, TPayload>(text, evalGraph, queryGraph, errors, tokens, toggles, handler));
         }
 
         TQuery BuildQuery<TQuery, TQueryHandler, TPayload>(string text, IQueryHandlerFactory<TData, TQueryHandler, TPayload> queryHandlerFactory, Func<QueryGraph, QueryGraph, ICollection<QueryError>, ICollection<string>, ICollection<QueryToggle>, TQueryHandler, TQuery> queryCreator)
             where TQueryHandler : IQueryHandler<TData, TPayload>
             where TPayload : class
-            where TQuery : Query<TData, TPayload>
+            where TQuery : ParsedQuery<TData, TPayload>
         {
             var errors = new List<QueryError>();
             var tokens = new List<string>();
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryEngineUtils.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryEngineUtils.cs
index 5e78717983..c252a63ed5 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryEngineUtils.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryEngineUtils.cs
@@ -12,11 +12,11 @@ static class QueryEngineUtils
 
         public static bool IsNestedQueryToken(in StringView token)
         {
-            if (token.Length < 2)
+            if (token.length < 2)
                 return false;
             var startIndex = token.IndexOf('{');
             var endIndex = token.LastIndexOf('}');
-            return startIndex != -1 && endIndex == token.Length - 1 && startIndex < endIndex;
+            return startIndex != -1 && endIndex == token.length - 1 && startIndex < endIndex;
         }
 
         public static bool IsWhiteSpaceChar(char c)
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryFilterOperations.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryFilterOperations.cs
index fa974edc34..117c33221b 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryFilterOperations.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryFilterOperations.cs
@@ -207,7 +207,7 @@ internal abstract class BaseFilterOperation<TData> : IFilterOperation
     {
         public string filterName => filter.token;
         public StringView filterValueString { get; }
-        public virtual StringView filterParams => StringView.Empty;
+        public virtual StringView filterParams => StringView.empty;
         public IFilter filter { get; }
         public QueryFilterOperator queryFilterOperator { get; }
 
@@ -279,7 +279,7 @@ public FilterOperation(Filter<TData, TParam, TFilterLhs> filter, in QueryFilterO
             : base(filter, in queryFilterOperator, filterValue)
         {
             this.m_Operation = operation;
-            m_ParamValue = StringView.Empty;
+            m_ParamValue = StringView.empty;
             m_Param = default;
         }
 
@@ -287,7 +287,7 @@ public FilterOperation(RegexFilter<TData, TParam, TFilterLhs> filter, in QueryFi
             : base(filter, in queryFilterOperator, filterValue)
         {
             this.m_Operation = operation;
-            m_ParamValue = StringView.Empty;
+            m_ParamValue = StringView.empty;
             m_Param = default;
         }
 
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryNodes.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryNodes.cs
index d2542acaff..fd18d10614 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryNodes.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryNodes.cs
@@ -132,6 +132,11 @@ public interface IFilterNode : IQueryNode
         /// </summary>
         string paramValue { get; }
 
+        /// <summary>
+        /// Indicates if the filter uses a parameter.
+        /// </summary>
+        bool usesParameter { get; }
+
         /// <summary>
         /// The operator identifier. This can be null or empty if the operator has not been written yet.
         /// </summary>
@@ -187,6 +192,7 @@ class FilterNode : IFilterNode, ICopyableNode
         public virtual List<IQueryNode> children => null;
         public virtual bool leaf => true;
         public virtual bool skipped { get; set; }
+        public bool usesParameter => filter?.usesParameter ?? false;
 
         string m_Identifier;
         public string identifier => m_Identifier ??= filterStringView.ToString();
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryToken.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryToken.cs
index d0aaba1dfe..79f0694b9a 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryToken.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryToken.cs
@@ -50,7 +50,7 @@ public QueryToken(string text, int position, int length)
         }
 
         internal QueryToken(in StringView stringView, int position)
-            : this(stringView, position, stringView.Length)
+            : this(stringView, position, stringView.length)
         {}
 
         internal QueryToken(in StringView stringView, int position, int length)
@@ -62,7 +62,7 @@ internal QueryToken(in StringView stringView, int position, int length)
         }
 
         internal QueryToken(int position, int length)
-            : this(StringView.Empty, position, length)
+            : this(StringView.empty, position, length)
         {}
     }
 }
diff --git a/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs b/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs
index 05115697c1..f136979b11 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/QueryTokenizer.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace UnityEditor.Search
@@ -20,15 +21,16 @@ static class QueryRegexValues
     {
         // To match a regex at a specific index, use \\G and Match(input, startIndex)
 
+        public const string k_BaseWordPattern = "[\\w.]+";
         public const string k_FilterOperatorsInnerPattern = "[^\\w\\s-{}()\"\\[\\].,/|\\`]+";
         // This is a balanced group for {} with an optional aggregator name
         public const string k_NestedFilterPattern = "(?<agg>[a-zA-Z0-9]*?)(?<nested>\\{(?>(?<c>\\{)|[^{}]+|(?<-c>\\}))*(?(c)(?!))\\})";
         public static readonly string k_FilterOperatorsPattern = $"(?<op>{k_FilterOperatorsInnerPattern})";
         public static readonly string k_PartialFilterOperatorsPattern = $"(?<op>{k_FilterOperatorsInnerPattern})?";
 
-        public const string k_FilterNamePattern = "\\G(?<name>[\\w.]+)";
+        public static readonly string k_FilterNamePattern = $"\\G(?<name>{k_BaseWordPattern})";
         // To begin matching a partial filter, the name of the filter must be followed by either "(" or an operator
-        public static readonly string k_PartialFilterNamePattern = $"\\G(?<name>[\\w.]+(?=\\(|(?:{k_FilterOperatorsInnerPattern})))";
+        public static readonly string k_PartialFilterNamePattern = $"\\G(?<name>{k_BaseWordPattern})(?=\\(|(?:{k_FilterOperatorsInnerPattern}))";
 
         public const string k_FilterFunctionPattern = "(?<f1>\\([^\\(\\)]+\\))?";
         // This matches either a parenthesis opened with no space like "(asd", a close parenthesis with no space like "(asd)", or a close parenthesis with spaces like "( asd )"
@@ -37,10 +39,9 @@ static class QueryRegexValues
         public static readonly string k_FilterValuePattern = $"(?<value>{k_NestedFilterPattern}|[^\\s{{}}]+)";
         public static readonly string k_PartialFilterValuePattern = $"(?<value>(?(op)({k_NestedFilterPattern}|[^\\s{{}}]+)))?";
 
+        public static readonly Regex k_BaseFilterNameRegex = new Regex(k_BaseWordPattern, RegexOptions.Compiled);
         public static readonly Regex k_WordRx = new Regex("\\G!?\\S+", RegexOptions.Compiled);
         public static readonly Regex k_NestedQueryRx = new Regex($"\\G{k_NestedFilterPattern}", RegexOptions.Compiled);
-
-        public static readonly Regex k_FilterNameDecomposeRx = new Regex("(?<beforeCapture>.*)(?!\\(\\?:)\\((?<name>\\?<.+?>)?(?<token>.+?)\\)", RegexOptions.Compiled);
     }
 
     [Flags]
@@ -402,17 +403,17 @@ public bool IsPhraseToken(string token)
 
         public StringView RemoveQuotes(in StringView token)
         {
-            if (token.Length < 2)
+            if (token.length < 2)
                 return token;
 
             foreach (var quoteDelimiter in m_QuoteDelimiters)
             {
-                if (token.Length < (quoteDelimiter.openingToken.Length + quoteDelimiter.closingToken.Length))
+                if (token.length < (quoteDelimiter.openingToken.Length + quoteDelimiter.closingToken.Length))
                     continue;
 
                 if (token.StartsWith(quoteDelimiter.openingToken) && token.EndsWith(quoteDelimiter.closingToken))
                 {
-                    return token.Substring(quoteDelimiter.openingToken.Length, token.Length - quoteDelimiter.openingToken.Length - quoteDelimiter.closingToken.Length);
+                    return token.Substring(quoteDelimiter.openingToken.Length, token.length - quoteDelimiter.openingToken.Length - quoteDelimiter.closingToken.Length);
                 }
             }
 
@@ -496,47 +497,162 @@ public static Regex BuildPartialFilterRegex(string filterNamePattern, string fil
         }
 
         public static string BuildFilterNamePatternFromToken(string token)
+        {
+            token = Regex.Escape(token);
+            return BuildBasicFilterNamePattern(token);
+        }
+
+        static string BuildBasicFilterNamePattern(string token)
         {
             return $"\\G(?<name>{token})";
         }
 
         public static string BuildFilterNamePatternFromToken(Regex token)
         {
-            var tokenString = token.ToString();
-            var match = QueryRegexValues.k_FilterNameDecomposeRx.Match(tokenString);
-            if (!match.Success)
-                return tokenString;
+            var tokenString = token.ToString().GetStringView();
+            if (tokenString.StartsWith("\\G"))
+                tokenString = tokenString.Substring(2, tokenString.length - 2);
+
+            var capturedGroup = GetCapturedGroup(tokenString);
+            if (!capturedGroup.valid || capturedGroup.length <= 2)
+                return BuildBasicFilterNamePattern(tokenString.ToString());
+
+            var capturePattern = GetCapturePattern(capturedGroup);
+
+            var sb = new StringBuilder(tokenString.length);
+            if (!tokenString.StartsWith("\\G"))
+                sb.Append("\\G");
+            for (var i = 0; i < capturedGroup.startIndex; ++i)
+                sb.Append(tokenString[i]);
+            sb.Append($"(?<name>{capturePattern})");
+            for (var i = capturedGroup.endIndex; i < tokenString.length; ++i)
+                sb.Append(tokenString[i]);
+
+            return sb.ToString();
+        }
+
+        static StringView GetCapturedGroup(StringView tokenString)
+        {
+            var startIndex = -1;
+            var nestedLevel = 0;
+
+            for (var i = 0; i < tokenString.length; ++i)
+            {
+                if (IsEscaped(tokenString, i))
+                    continue;
+
+                // We can only get capture group that we can name or are already named.
+                if (startIndex == -1 && IsValidCaptureOpener(tokenString, i))
+                {
+                    startIndex = i;
+                }
+
+                if (startIndex != -1 && tokenString[i] == '(')
+                    nestedLevel++;
+
+                if (startIndex != -1 && IsValidCaptureCloser(tokenString, i))
+                {
+                    --nestedLevel;
+                    if (nestedLevel == 0)
+                    {
+                        var endIndex = i + 1;
+                        return tokenString.Substring(startIndex, endIndex - startIndex);
+                    }
+                }
+            }
+
+            return StringView.nil;
+        }
+
+        static StringView GetCapturePattern(StringView captureGroup)
+        {
+            // We suppose the captureGroup was validated with IsValidCaptureOpener and IsValidCaptureClose
+
+            if (!captureGroup.valid)
+                return StringView.nil;
+            if (!captureGroup.StartsWith('(') || !captureGroup.EndsWith(')'))
+                return StringView.nil;
+            if (captureGroup.length == 2)
+                return StringView.empty;
+            if (captureGroup[1] != '?')
+                return captureGroup.Substring(1, captureGroup.length - 2);
+
 
-            var capturePattern = match.Groups["token"].Value;
-            var beforeCaptureValue = string.Empty;
-            var beforeCaptureGroup = match.Groups["beforeCapture"];
-            if (beforeCaptureGroup.Success)
-                beforeCaptureValue = beforeCaptureGroup.Value;
+            for (var i = 2; i < captureGroup.length - 1; ++i)
+            {
+                // End of the capture name
+                if (captureGroup[i] == '>')
+                    return captureGroup.Substring(i + 1, captureGroup.length - i - 2);
+            }
+
+            return StringView.nil;
+        }
+
+        static bool IsEscaped(StringView tokenString, int index)
+        {
+            if (index < 1 || index >= tokenString.length)
+                return false;
+            if (tokenString[index - 1] == '\\')
+                return true;
+            return false;
+        }
+
+        static bool IsValidCaptureOpener(StringView tokenString, int index)
+        {
+            if (index < 0 || index >= tokenString.length)
+                return false;
+            if (tokenString[index] != '(')
+                return false;
+            if (IsEscaped(tokenString, index))
+                return false;
+            if (index < tokenString.length - 1 && tokenString[index + 1] != '?')
+                return true;
+            index = index + 2;
+            if (index >= tokenString.length)
+                return false;
+            if (tokenString[index] != '<')
+                return false;
+            ++index;
+            if (index >= tokenString.length)
+                return false;
+            if (tokenString[index] == '=' || tokenString[index] == '!')
+                return false;
+
+            for (; index < tokenString.length; ++index)
+            {
+                if (tokenString[index] == '-')
+                    return false;
+                if (tokenString[index] == '>')
+                    return true;
+            }
+
+            return false;
+        }
 
-            return $"\\G{beforeCaptureValue}(?<name>{capturePattern})";
+        static bool IsValidCaptureCloser(StringView tokenString, int index)
+        {
+            if (index < 0 || index >= tokenString.length)
+                return false;
+            if (tokenString[index] != ')')
+                return false;
+            if (IsEscaped(tokenString, index))
+                return false;
+            return true;
         }
 
         public static string BuildPartialFilterNamePatternFromToken(string token, IEnumerable<string> operators)
         {
+            var filterNamePattern = BuildFilterNamePatternFromToken(token);
             var innerOperatorsPattern = BuildInnerOperatorsPattern(operators);
-            return $"\\G(?<name>{token}(?=\\(|(?:{innerOperatorsPattern})))";
+            return $"{filterNamePattern}(?=\\(|(?:{innerOperatorsPattern}))";
         }
 
         public static string BuildPartialFilterNamePatternFromToken(Regex token, IEnumerable<string> operators)
         {
+            var filterNamePattern = BuildFilterNamePatternFromToken(token);
             var innerOperatorsPattern = BuildInnerOperatorsPattern(operators);
-            var tokenString = token.ToString();
-            var match = QueryRegexValues.k_FilterNameDecomposeRx.Match(tokenString);
-            if (!match.Success)
-                return tokenString;
-
-            var capturePattern = match.Groups["token"].Value;
-            var beforeCaptureValue = string.Empty;
-            var beforeCaptureGroup = match.Groups["beforeCapture"];
-            if (beforeCaptureGroup.Success)
-                beforeCaptureValue = beforeCaptureGroup.Value;
 
-            return $"\\G{beforeCaptureValue}(?<name>{capturePattern}(?=\\(|(?:{innerOperatorsPattern})))";
+            return $"{filterNamePattern}(?=\\(|(?:{innerOperatorsPattern}))";
         }
 
         public static Regex BuildPhraseRegex(in QueryTextDelimiter textDelimiter)
@@ -643,7 +759,7 @@ static int MatchCombiningToken(string text, int startIndex, int endIndex, IColle
                 if (sv.Equals(combiningToken, StringComparison.OrdinalIgnoreCase))
                 {
                     matched = true;
-                    return sv.Length;
+                    return sv.length;
                 }
             }
 
diff --git a/Modules/QuickSearch/Editor/QueryEngine/WhereEnumerable.cs b/Modules/QuickSearch/Editor/QueryEngine/WhereEnumerable.cs
index b7602c731e..d49e0742d1 100644
--- a/Modules/QuickSearch/Editor/QueryEngine/WhereEnumerable.cs
+++ b/Modules/QuickSearch/Editor/QueryEngine/WhereEnumerable.cs
@@ -153,7 +153,7 @@ private Func<T, bool> BuildFunctionFromNode<T>(IQueryNode node, QueryEngine<T> e
 
         private static BaseFilterOperation<T> GenerateFilterOperation<T>(FilterNode node, QueryEngine<T> engine, ICollection<QueryError> errors)
         {
-            var operatorIndex = node.token.position + node.filter.token.Length + (node.paramValueStringView.IsNullOrEmpty() ? 0 : node.paramValueStringView.Length);
+            var operatorIndex = node.token.position + node.filter.token.Length + (node.paramValueStringView.IsNullOrEmpty() ? 0 : node.paramValueStringView.length);
             var filterValueIndex = operatorIndex + node.op.token.Length;
 
             Type filterValueType;
@@ -162,7 +162,7 @@ private static BaseFilterOperation<T> GenerateFilterOperation<T>(FilterNode node
             {
                 if (node.filter?.nestedQueryHandlerTransformer == null)
                 {
-                    errors.Add(new QueryError(filterValueIndex, node.filterValueStringView.Length, $"No nested query handler transformer set on filter \"{node.filter.token}\"."));
+                    errors.Add(new QueryError(filterValueIndex, node.filterValueStringView.length, $"No nested query handler transformer set on filter \"{node.filter.token}\"."));
                     return null;
                 }
                 filterValueType = node.filter.nestedQueryHandlerTransformer.rightHandSideType;
@@ -172,7 +172,7 @@ private static BaseFilterOperation<T> GenerateFilterOperation<T>(FilterNode node
                 parseResult = engine.ParseFilterValue(node.filterValue, node.filter, in node.op, out filterValueType);
                 if (!parseResult.success)
                 {
-                    errors.Add(new QueryError(filterValueIndex, node.filterValueStringView.Length, $"The value \"{node.filterValue}\" could not be converted to any of the supported handler types."));
+                    errors.Add(new QueryError(filterValueIndex, node.filterValueStringView.length, $"The value \"{node.filterValue}\" could not be converted to any of the supported handler types."));
                     return null;
                 }
             }
@@ -180,7 +180,7 @@ private static BaseFilterOperation<T> GenerateFilterOperation<T>(FilterNode node
             IFilterOperationGenerator generator = engine.GetGeneratorForType(filterValueType);
             if (generator == null)
             {
-                errors.Add(new QueryError(filterValueIndex, node.filterValueStringView.Length, $"Unknown type \"{filterValueType}\". Did you set an operator handler for this type?"));
+                errors.Add(new QueryError(filterValueIndex, node.filterValueStringView.length, $"Unknown type \"{filterValueType}\". Did you set an operator handler for this type?"));
                 return null;
             }
 
diff --git a/Modules/QuickSearch/Editor/SearchAction.cs b/Modules/QuickSearch/Editor/SearchAction.cs
index 9f14694242..e73d3c43ee 100644
--- a/Modules/QuickSearch/Editor/SearchAction.cs
+++ b/Modules/QuickSearch/Editor/SearchAction.cs
@@ -138,7 +138,7 @@ public SearchAction(string providerId, string name, Texture2D icon = null, strin
         /// <summary>
         /// GUI content used to display the action in the search view.
         /// </summary>
-        internal GUIContent content;
+        public GUIContent content;
 
         /// <summary>
         /// Callback used to check if the action is enabled based on the current context.
diff --git a/Modules/QuickSearch/Editor/SearchContext.cs b/Modules/QuickSearch/Editor/SearchContext.cs
index 3172632fcd..e818cc49be 100644
--- a/Modules/QuickSearch/Editor/SearchContext.cs
+++ b/Modules/QuickSearch/Editor/SearchContext.cs
@@ -209,7 +209,7 @@ public bool wantsMore
             }
         }
 
-        internal bool empty => string.IsNullOrEmpty(m_SearchText);
+        public bool empty => string.IsNullOrEmpty(m_SearchText);
 
         /// <summary>
         /// Raw search text (i.e. what is in the search text box)
@@ -453,6 +453,11 @@ public override int GetHashCode()
         /// </summary>
         internal List<SearchItem> subset { get; set; }
 
+        /// <summary>
+        /// The user data field can be used to store private data when running a custom query.
+        /// </summary>
+        internal object userData { get; set; }
+
         /// <summary>
         /// Add a new query error on this context.
         /// </summary>
@@ -524,5 +529,13 @@ public override string ToString()
         {
             return $"[{GetProviders().Count}, {options}] {searchText.Replace("\n", "")}";
         }
+
+        internal bool Tick()
+        {
+            if (!options.HasAny(SearchFlags.Synchronous))
+                return true;
+            sessions.Tick();
+            return Dispatcher.ProcessOne();
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchEngines.cs b/Modules/QuickSearch/Editor/SearchEngines.cs
index 7c8ac06cfa..0fe44ce01e 100644
--- a/Modules/QuickSearch/Editor/SearchEngines.cs
+++ b/Modules/QuickSearch/Editor/SearchEngines.cs
@@ -146,7 +146,8 @@ public override void BeginSession(ISearchContext context)
             var engineProvider = SearchService.GetProvider(providerId);
 
             var adbProvider = SearchService.GetProvider(AdbProvider.type);
-            searchSessions.Add(context.guid, new SearchApiSession(adbProvider, engineProvider));
+            var searchSession = new SearchApiSession(adbProvider, engineProvider);
+            searchSessions.Add(context.guid, searchSession);
         }
 
         public virtual IEnumerable<string> Search(ISearchContext context, string query, Action<IEnumerable<string>> asyncItemsReceived)
@@ -155,6 +156,7 @@ public virtual IEnumerable<string> Search(ISearchContext context, string query,
                 return new string[] {};
 
             var searchSession = searchSessions[context.guid];
+            var projectSearchContext = (ProjectSearchContext)context;
 
             if (asyncItemsReceived != null)
             {
@@ -169,8 +171,27 @@ public virtual IEnumerable<string> Search(ISearchContext context, string query,
             {
                 searchSession.context.filterType = null;
             }
+
             searchSession.context.searchText = query;
-            searchSession.context.options |= SearchFlags.Packages;
+            searchSession.context.options &= ~SearchFlags.Packages;
+            if (projectSearchContext.searchFilter != null)
+            {
+                searchSession.context.userData = projectSearchContext.searchFilter;
+                if (projectSearchContext.searchFilter.searchArea == SearchFilter.SearchArea.InAssetsOnly)
+                {
+                    searchSession.context.searchText = $"a:assets {query}";
+                }
+                else if (projectSearchContext.searchFilter.searchArea == SearchFilter.SearchArea.InPackagesOnly)
+                {
+                    searchSession.context.options |= SearchFlags.Packages;
+                    searchSession.context.searchText = $"a:packages {query}";
+                }
+                else if (projectSearchContext.searchFilter.searchArea == SearchFilter.SearchArea.AllAssets)
+                {
+                    searchSession.context.options |= SearchFlags.Packages;
+                }
+            }
+
             var items = SearchService.GetItems(searchSession.context);
             return items.Select(item => ToPath(item));
         }
@@ -289,7 +310,10 @@ internal static IEnumerable<SearchProvider> GetObjectSelectorProviders(ObjectSel
             bool allowSceneObjects = (context.visibleObjects & VisibleObjects.Scene) == VisibleObjects.Scene;
 
             if (allowAssetObjects)
+            {
+                yield return SearchService.GetProvider(AdbProvider.type);
                 yield return SearchService.GetProvider(AssetProvider.type);
+            }
             if (allowSceneObjects)
                 yield return SearchService.GetProvider(BuiltInSceneObjectsProvider.type);
         }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/AggregateEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/AggregateEvaluator.cs
new file mode 100644
index 0000000000..0476fa6e61
--- /dev/null
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/AggregateEvaluator.cs
@@ -0,0 +1,103 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using System.ComponentModel;
+
+namespace UnityEditor.Search
+{
+    static partial class Evaluators
+    {
+        // aggregate{set, template[, iteration_count, field_name, KEEP | SORTED]}
+        [Description("Aggregate multiple iterations of a templated expression."), Category("Transformers")]
+        [SearchExpressionEvaluator(SearchExpressionType.Iterable, SearchExpressionType.AnyValue,
+            SearchExpressionType.Number | SearchExpressionType.Optional,
+            SearchExpressionType.QueryString | SearchExpressionType.Text | SearchExpressionType.Optional,
+            SearchExpressionType.Keyword | SearchExpressionType.Optional | SearchExpressionType.Variadic)]
+        public static IEnumerable<SearchItem> Aggregate(SearchExpressionContext c)
+        {
+            var initialSet = c.args[0].Execute(c);
+            var templateQuery = c.args[1];
+            var iterationCount = 1;
+            var fieldName = "";
+            var setField = false;
+            var keep = false;
+            var sorted = false;
+            if (c.args.Length > 2)
+            {
+                iterationCount = (int)c.args[2].GetNumberValue(iterationCount);
+            }
+            if (c.args.Length > 3)
+            {
+                if (c.args[3].types.HasAny(SearchExpressionType.Keyword))
+                {
+                    keep |= c.args[3].IsKeyword(SearchExpressionKeyword.Keep);
+                    sorted |= c.args[3].IsKeyword(SearchExpressionKeyword.Sort);
+                }
+                else
+                {
+                    fieldName = c.args[3].innerText.ToString();
+                    setField = !string.IsNullOrEmpty(fieldName);
+                }
+            }
+            if (c.args.Length > 4)
+            {
+                keep |= c.args[4].IsKeyword(SearchExpressionKeyword.Keep);
+                sorted |= c.args[4].IsKeyword(SearchExpressionKeyword.Sort);
+            }
+            if (c.args.Length > 5)
+            {
+                keep |= c.args[5].IsKeyword(SearchExpressionKeyword.Keep);
+                sorted |= c.args[5].IsKeyword(SearchExpressionKeyword.Sort);
+            }
+
+            // Evaluate initial set and decide if we yield it or not (keep)
+            var yieldedItems = new HashSet<SearchItem>();
+            var currentIteration = 0;
+            var itemScore = 0;
+            foreach (var item in initialSet)
+            {
+                if (yieldedItems.Add(item) && keep)
+                {
+                    if (setField)
+                        item.SetField(fieldName, currentIteration);
+                    if (sorted)
+                        item.score = itemScore++;
+                    yield return item;
+                }
+            }
+
+            // For each iteration resolve templateQuery for each item are previous iteration.
+            var toProcessItems = new List<SearchItem>(yieldedItems);
+            currentIteration++;
+            while (currentIteration <= iterationCount && toProcessItems.Count > 0)
+            {
+                var currentBatchOfItems = new List<SearchItem>();
+                foreach (var sourceItem in toProcessItems)
+                {
+                    using (c.runtime.Push(sourceItem))
+                    {
+                        foreach (var itemInBatch in templateQuery.Execute(c))
+                        {
+                            if (!yieldedItems.Add(itemInBatch))
+                                continue;
+                            currentBatchOfItems.Add(itemInBatch);
+                            if (setField)
+                                itemInBatch.SetField(fieldName, currentIteration);
+
+                            // Sort items by batch by multiplying their score per batch number.
+                            if (sorted)
+                            {
+                                itemInBatch.score = itemScore++;
+                            }
+                            yield return itemInBatch;
+                        }
+                    }
+                }
+                toProcessItems = currentBatchOfItems;
+                currentIteration++;
+            }
+        }
+    }
+}
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/AliasEvaluators.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/AliasEvaluators.cs
index 274bd177bf..7e446fd049 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/AliasEvaluators.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/AliasEvaluators.cs
@@ -16,7 +16,7 @@ public static IEnumerable<SearchItem> Alias(SearchExpressionContext c)
         {
             var aliasSelector = c.args.Last();
             if (c.HasFlag(SearchExpressionExecutionFlags.Expand))
-                yield return EvaluatorUtils.CreateSearchExpressionItem(new SearchExpression(c.args[0], newAlias: aliasSelector.innerText));
+                yield return SearchExpression.CreateSearchExpressionItem(new SearchExpression(c.args[0], newAlias: aliasSelector.innerText));
             else
             {
                 foreach (var r in c.args[0].Execute(c))
@@ -27,10 +27,10 @@ public static IEnumerable<SearchItem> Alias(SearchExpressionContext c)
                         continue;
                     }
 
-                    var hasFormatString = EvaluatorUtils.GetFormatString(aliasSelector, out var formatStr);
+                    var hasFormatString = SearchExpression.GetFormatString(aliasSelector, out var formatStr);
                     if (hasFormatString && aliasSelector.types.HasAny(SearchExpressionType.Text))
                     {
-                        r.label = EvaluatorUtils.FormatItem(c.search, r, formatStr);
+                        r.label = SearchExpression.FormatItem(c.search, r, formatStr);
                     }
                     else if (aliasSelector.types.HasAny(SearchExpressionType.Selector))
                     {
@@ -56,7 +56,7 @@ public static IEnumerable<SearchItem> Alias(SearchExpressionContext c)
                         }
 
                         if (!valueSelected)
-                            r.label = r.label = EvaluatorUtils.FormatItem(c.search, r, aliasSelector.innerText.ToString());
+                            r.label = r.label = SearchExpression.FormatItem(c.search, r, aliasSelector.innerText.ToString());
                     }
                     else
                         c.ThrowError($"Alias selector `{aliasSelector.outerText}` not supported", aliasSelector.outerText);
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ControlFlowEvaluators.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ControlFlowEvaluators.cs
index efa739412a..684c0cdb3d 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ControlFlowEvaluators.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ControlFlowEvaluators.cs
@@ -25,7 +25,7 @@ public static IEnumerable<SearchItem> If(SearchExpressionContext c)
                     yield return null;
                 else
                 {
-                    cond |= EvaluatorUtils.IsTrue(item);
+                    cond |= SearchExpression.IsTrue(item);
                     if (!cond)
                         break;
                 }
@@ -50,7 +50,7 @@ public static IEnumerable<SearchItem> If(SearchExpressionContext c)
         [SearchExpressionEvaluator(SearchExpressionType.AnyValue | SearchExpressionType.Variadic)]
         public static IEnumerable<SearchItem> Empty(SearchExpressionContext c)
         {
-            return c.args.Select(e => EvaluatorUtils.CreateItem(!e.Execute(c).Any()));
+            return c.args.Select(e => SearchExpression.CreateItem(!e.Execute(c).Any()));
         }
 
         [Description("Return true if each elements evaluates has being true."), Category("Filters")]
@@ -66,13 +66,13 @@ public static IEnumerable<SearchItem> IsTrue(SearchExpressionContext c)
                         yield return null;
                     else
                     {
-                        isTrue |= EvaluatorUtils.IsTrue(item);
+                        isTrue |= SearchExpression.IsTrue(item);
                         if (!isTrue)
                             break;
                     }
                 }
 
-                yield return EvaluatorUtils.CreateItem(isTrue, c.ResolveAlias(e, "IsTrue"));
+                yield return SearchExpression.CreateItem(isTrue, c.ResolveAlias(e, "IsTrue"));
             }
         }
 
@@ -94,7 +94,7 @@ public static IEnumerable<SearchItem> Apply(SearchExpressionContext c)
             {
                 var templateExpr = c.expression.parameters[i];
                 var currentStreamName = $"apply@stream#{i}";
-                var currentStream = EvaluatorUtils.CreateStreamExpression(resultStreamExpr, currentStreamName);
+                var currentStream = SearchExpression.CreateStreamExpression(resultStreamExpr, currentStreamName);
                 var args = new[] { currentStream }.Concat(templateExpr.parameters).ToArray();
                 var innerText = templateExpr.innerText;
                 var evaluator = templateExpr.evaluator;
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ConverterEvaluators.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ConverterEvaluators.cs
index 779d938691..c4898a7a0a 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ConverterEvaluators.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/ConverterEvaluators.cs
@@ -16,8 +16,8 @@ public static IEnumerable<SearchItem> ToNumber(SearchExpressionContext c)
         {
             return c.args.SelectMany(e => e.Execute(c)).Select(item =>
             {
-                EvaluatorUtils.TryConvertToDouble(item, out var value);
-                return EvaluatorUtils.CreateItem(value);
+                SearchExpression.TryConvertToDouble(item, out var value);
+                return SearchExpression.CreateItem(value);
             });
         }
 
@@ -27,10 +27,10 @@ public static IEnumerable<SearchItem> ToNumber(SearchExpressionContext c)
         public static IEnumerable<SearchItem> Format(SearchExpressionContext c)
         {
             var skipCount = 0;
-            if (EvaluatorUtils.GetFormatString(c.args[0], out var formatStr))
+            if (SearchExpression.GetFormatString(c.args[0], out var formatStr))
                 skipCount++;
             var items = c.args.Skip(skipCount).SelectMany(e => e.Execute(c));
-            var dataSet = EvaluatorUtils.ProcessValues(items, null, item => EvaluatorUtils.FormatItem(c.search, item, formatStr));
+            var dataSet = SearchExpression.ProcessValues(items, null, item => SearchExpression.FormatItem(c.search, item, formatStr));
             return dataSet;
         }
 
@@ -38,7 +38,7 @@ public static IEnumerable<SearchItem> Format(SearchExpressionContext c)
         [SearchExpressionEvaluator(SearchExpressionType.Iterable | SearchExpressionType.Literal | SearchExpressionType.Variadic)]
         public static IEnumerable<SearchItem> ToBoolean(SearchExpressionContext c)
         {
-            return c.args.SelectMany(e => e.Execute(c)).Select(item => EvaluatorUtils.CreateItem(EvaluatorUtils.IsTrue(item)));
+            return c.args.SelectMany(e => e.Execute(c)).Select(item => SearchExpression.CreateItem(SearchExpression.IsTrue(item)));
         }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs
index 493df372fc..a16e327d42 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/EnvarEvaluators.cs
@@ -40,7 +40,7 @@ public static IEnumerable<SearchItem> CurrentFolder(SearchExpressionContext c)
 
             if (!string.IsNullOrEmpty(currentSelectedPath))
                 currentSelectedPath = currentSelectedPath.ConvertSeparatorsToUnity();
-            yield return EvaluatorUtils.CreateItem(currentSelectedPath, c.ResolveAlias("CurrentFolder"));
+            yield return SearchExpression.CreateItem(currentSelectedPath, c.ResolveAlias("CurrentFolder"));
         }
 
         [Description("Returns the name of the current project."), Category("Env")]
@@ -48,7 +48,7 @@ public static IEnumerable<SearchItem> CurrentFolder(SearchExpressionContext c)
         public static IEnumerable<SearchItem> ProjectName(SearchExpressionContext c)
         {
             var desc = TaskEvaluatorManager.EvaluateMainThread(() => EditorApplication.GetApplicationTitleDescriptor());
-            yield return EvaluatorUtils.CreateItem(desc.projectName ?? string.Empty, c.ResolveAlias("ProjectName"));
+            yield return SearchExpression.CreateItem(desc.projectName ?? string.Empty, c.ResolveAlias("ProjectName"));
         }
 
         [Description("Returns the name of the currently opened scene."), Category("Env")]
@@ -56,7 +56,7 @@ public static IEnumerable<SearchItem> ProjectName(SearchExpressionContext c)
         public static IEnumerable<SearchItem> SceneName(SearchExpressionContext c)
         {
             var desc = TaskEvaluatorManager.EvaluateMainThread(() => EditorApplication.GetApplicationTitleDescriptor());
-            yield return EvaluatorUtils.CreateItem(desc.activeSceneName ?? string.Empty, c.ResolveAlias("SceneName"));
+            yield return SearchExpression.CreateItem(desc.activeSceneName ?? string.Empty, c.ResolveAlias("SceneName"));
         }
 
         readonly struct SelectionResult
@@ -87,9 +87,9 @@ public static IEnumerable<SearchItem> Selection(SearchExpressionContext c)
             foreach (var selectionResult in selection)
             {
                 if (string.IsNullOrEmpty(selectionResult.assetPath))
-                    yield return EvaluatorUtils.CreateItem(selectionResult.instanceId, c.ResolveAlias("Selection"));
+                    yield return SearchExpression.CreateItem(selectionResult.instanceId, c.ResolveAlias("Selection"));
                 else
-                    yield return EvaluatorUtils.CreateItem(selectionResult.assetPath, c.ResolveAlias("Selection"));
+                    yield return SearchExpression.CreateItem(selectionResult.assetPath, c.ResolveAlias("Selection"));
             }
         }
 
@@ -98,7 +98,7 @@ public static IEnumerable<SearchItem> Selection(SearchExpressionContext c)
         public static IEnumerable<SearchItem> DataPath(SearchExpressionContext c)
         {
             var dataPath = TaskEvaluatorManager.EvaluateMainThread(() => Application.dataPath);
-            yield return EvaluatorUtils.CreateItem(dataPath ?? string.Empty, c.ResolveAlias("DataPath"));
+            yield return SearchExpression.CreateItem(dataPath ?? string.Empty, c.ResolveAlias("DataPath"));
         }
 
         static Dictionary<string, MethodInfo> s_EnvFunctions = null;
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/GroupByEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/GroupByEvaluator.cs
index ac5eaf5ede..7e59d42a90 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/GroupByEvaluator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/GroupByEvaluator.cs
@@ -35,7 +35,7 @@ public static IEnumerable<SearchItem> GroupBy(SearchExpressionContext c)
                         groupId.GetStringView(), groupId.GetStringView(), (group.Key?.ToString() ?? groupId).GetStringView(),
                         evaluator);
 
-                    yield return EvaluatorUtils.CreateSearchExpressionItem(genExpr);
+                    yield return SearchExpression.CreateSearchExpressionItem(genExpr);
                 }
                 else
                 {
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/MathEvaluators.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/MathEvaluators.cs
index 8eb5195066..04c2263646 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/MathEvaluators.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/MathEvaluators.cs
@@ -16,7 +16,7 @@ static partial class Evaluators
         public static IEnumerable<SearchItem> Count(SearchExpressionContext c)
         {
             foreach (var arg in c.args)
-                yield return EvaluatorUtils.CreateItem(arg.Execute(c).Count(), c.ResolveAlias(arg, "Count"));
+                yield return SearchExpression.CreateItem(arg.Execute(c).Count(), c.ResolveAlias(arg, "Count"));
         }
 
         [Description("Find the minimal value for each expression."), Category("Math")]
@@ -37,7 +37,7 @@ public static IEnumerable<SearchItem> Min(SearchExpressionContext c)
                 double min = double.MaxValue;
                 foreach (var r in arg.Execute(c))
                     min = Aggregate(r, selector, min, (d, _min) => d < _min);
-                yield return EvaluatorUtils.CreateItem(min, c.ResolveAlias(arg, "Min"));
+                yield return SearchExpression.CreateItem(min, c.ResolveAlias(arg, "Min"));
             }
         }
 
@@ -59,7 +59,7 @@ public static IEnumerable<SearchItem> Max(SearchExpressionContext c)
                 double max = double.MinValue;
                 foreach (var r in arg.Execute(c))
                     max = Aggregate(r, selector, max, (d, _max) => d > _max);
-                yield return EvaluatorUtils.CreateItem(max, c.ResolveAlias(arg, "Max"));
+                yield return SearchExpression.CreateItem(max, c.ResolveAlias(arg, "Max"));
             }
         }
 
@@ -81,7 +81,7 @@ public static IEnumerable<SearchItem> Avg(SearchExpressionContext c)
                 var avg = Average.Zero;
                 foreach (var r in arg.Execute(c))
                     avg = Aggregate(r, selector, avg, (d, _avg) => _avg.Add(d));
-                yield return EvaluatorUtils.CreateItem(avg.result, c.ResolveAlias(arg, "Average"));
+                yield return SearchExpression.CreateItem(avg.result, c.ResolveAlias(arg, "Average"));
             }
         }
 
@@ -103,7 +103,7 @@ public static IEnumerable<SearchItem> Sum(SearchExpressionContext c)
                 var sum = 0d;
                 foreach (var r in arg.Execute(c))
                     sum = Aggregate(r, selector, sum, (d, _sum) => _sum + d);
-                yield return EvaluatorUtils.CreateItem(sum, c.ResolveAlias(arg, "Sum"));
+                yield return SearchExpression.CreateItem(sum, c.ResolveAlias(arg, "Sum"));
             }
         }
 
@@ -111,7 +111,7 @@ public static IEnumerable<SearchItem> Sum(SearchExpressionContext c)
         static T Aggregate<T>(SearchItem item, string selector, T agg, Func<double, T, T> aggregator) where T : struct => Aggregate(item, selector, agg, (d, v) => true, aggregator);
         static T Aggregate<T>(SearchItem item, string selector, T agg, Func<double, T, bool> comparer, Func<double, T, T> aggregator) where T : struct
         {
-            if (item != null && EvaluatorUtils.TryConvertToDouble(item, out var d, selector) && comparer(d, agg))
+            if (item != null && SearchExpression.TryConvertToDouble(item, out var d, selector) && comparer(d, agg))
                 return aggregator(d, agg);
             return agg;
         }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrimitiveEvaluators.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrimitiveEvaluators.cs
index e13ad6b049..8c7abc16c6 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrimitiveEvaluators.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrimitiveEvaluators.cs
@@ -12,7 +12,7 @@ namespace UnityEditor.Search
     static partial class Evaluators
     {
         [Description("Return the first result for each expression."), Category("Primitives")]
-        [SearchExpressionEvaluator(SearchExpressionType.Function | SearchExpressionType.Literal)]
+        [SearchExpressionEvaluator(SearchExpressionType.Literal)]
         public static IEnumerable<SearchItem> Constant(SearchExpressionContext c)
         {
             if (c.expression.types.HasAny(SearchExpressionType.Function))
@@ -21,11 +21,11 @@ public static IEnumerable<SearchItem> Constant(SearchExpressionContext c)
                     yield return Constant(c.runtime.current).First();
             }
             else if (c.expression.types.HasAny(SearchExpressionType.Number))
-                yield return EvaluatorUtils.CreateItem(c.expression.GetNumberValue(), c.expression.alias.ToString());
+                yield return SearchExpression.CreateItem(c.expression.GetNumberValue(), c.expression.alias.ToString());
             else if (c.expression.types.HasAny(SearchExpressionType.Text | SearchExpressionType.Keyword))
-                yield return EvaluatorUtils.CreateItem(c.expression.innerText.ToString(), c.expression.alias.ToString());
+                yield return SearchExpression.CreateItem(c.expression.innerText.ToString(), c.expression.alias.ToString());
             else if (c.expression.types.HasAny(SearchExpressionType.Boolean))
-                yield return EvaluatorUtils.CreateItem(c.expression.GetBooleanValue(), c.expression.alias.ToString());
+                yield return SearchExpression.CreateItem(c.expression.GetBooleanValue(), c.expression.alias.ToString());
             else
                 c.ThrowError($"Invalid constant expression");
         }
@@ -44,7 +44,7 @@ public static IEnumerable<SearchItem> Text(SearchExpressionContext c)
             if (c.args.Length == 0)
                 c.ThrowError("Text needs 1 argument");
 
-            return c.args.Select(e => EvaluatorUtils.CreateItem(e.outerText.ToString()));
+            return c.args.Select(e => SearchExpression.CreateItem(e.outerText.ToString()));
         }
 
         [SearchExpressionEvaluator(SearchExpressionType.Iterable | SearchExpressionType.Variadic)]
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrintEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrintEvaluator.cs
index e7d6668a9c..c1be093bc8 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrintEvaluator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/PrintEvaluator.cs
@@ -17,7 +17,7 @@ static partial class Evaluators
         public static IEnumerable<SearchItem> Print(SearchExpressionContext c)
         {
             var skipCount = 0;
-            if (EvaluatorUtils.GetFormatString(c.args[0], out var formatStr))
+            if (SearchExpression.GetFormatString(c.args[0], out var formatStr))
                 skipCount++;
 
             var outputValueFieldName = System.Guid.NewGuid().ToString("N");
@@ -30,9 +30,9 @@ public static IEnumerable<SearchItem> Print(SearchExpressionContext c)
                 }
 
                 var str = new List<string>();
-                var dataSet = EvaluatorUtils.ProcessValues(expr.Execute(c), outputValueFieldName, item =>
+                var dataSet = SearchExpression.ProcessValues(expr.Execute(c), outputValueFieldName, item =>
                 {
-                    var valueStr = EvaluatorUtils.FormatItem(c.search, item, formatStr);
+                    var valueStr = SearchExpression.FormatItem(c.search, item, formatStr);
                     str.Add(valueStr);
                     return valueStr;
                 });
@@ -82,7 +82,7 @@ public static IEnumerable<SearchItem> Range(SearchExpressionContext c)
                 c.ThrowError("Incomplete range");
 
             for (double d = range.start.Value; d < range.end.Value; d += 1d)
-                yield return EvaluatorUtils.CreateItem(d, alias);
+                yield return SearchExpression.CreateItem(d, alias);
         }
 
         static bool GetRange(SearchItem item, ref RangeDouble range)
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs
index 667ed757e3..3d8a7363c3 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/QueryEvaluator.cs
@@ -93,7 +93,7 @@ private static IEnumerable<SearchItem> SpreadExpression(string query, SearchExpr
             {
                 if (c.flags.HasFlag(SearchExpressionExecutionFlags.Expand))
                 {
-                    yield return EvaluatorUtils.CreateSearchExpressionItem(s.query, s.alias);
+                    yield return SearchExpression.CreateSearchExpressionItem(s.query, s.alias);
                 }
                 else
                 {
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SelectEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SelectEvaluator.cs
index 491875350e..00184a32a0 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SelectEvaluator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SelectEvaluator.cs
@@ -17,7 +17,7 @@ public static IEnumerable<SearchItem> Selector(SearchExpressionContext c)
             if (!c.expression.types.IsText())
                 c.ThrowError($"Invalid selector");
 
-            yield return EvaluatorUtils.CreateItem(c.ResolveAlias("Selector"), c.expression.innerText, c.expression.innerText.ToString());
+            yield return SearchExpression.CreateItem(c.ResolveAlias("Selector"), c.expression.innerText, c.expression.innerText.ToString());
         }
 
         [SearchExpressionEvaluator(SearchExpressionEvaluationHints.DoNotValidateSignature)]
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SortEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SortEvaluator.cs
index a1a2f38eb2..5c64187e30 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SortEvaluator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Evaluators/SortEvaluator.cs
@@ -22,7 +22,7 @@ public static IEnumerable<SearchItem> Sort(SearchExpressionContext c)
             if (c.args.Length == 3)
             {
                 var sortAscendExpr = c.args[2];
-                if (sortAscendExpr.IsKeyword(SearchExpressionKeyword.desc))
+                if (sortAscendExpr.IsKeyword(SearchExpressionKeyword.Desc))
                     sortAscend = false;
                 else
                     sortAscend = sortAscendExpr.GetBooleanValue(sortAscend);
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Parsers/ConstantExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/Parsers/ConstantExpressionParser.cs
index 76ad5ef511..7497b4746a 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Parsers/ConstantExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Parsers/ConstantExpressionParser.cs
@@ -39,14 +39,14 @@ internal static SearchExpression ImplicitStringParser(SearchExpressionParserArgs
                 return null;
 
             var text = args.text;
-            if (text.Length > 2)
+            if (text.length > 2)
             {
                 if (ParserUtils.IsQuote(text[0]))
                 {
-                    if (text[0] == text[text.Length - 1])
+                    if (text[0] == text[text.length - 1])
                         return null;
                 }
-                if (ParserUtils.IsOpener(text[0]) && ParserUtils.IsCloser(text[text.Length - 1]))
+                if (ParserUtils.IsOpener(text[0]) && ParserUtils.IsCloser(text[text.length - 1]))
                     return null;
             }
 
@@ -58,14 +58,14 @@ internal static SearchExpression ExplicitStringParser(SearchExpressionParserArgs
         {
             var outerText = args.text;
             var text = ParserUtils.SimplifyExpression(outerText);
-            if (text.Length < 2 || !ParserUtils.HasQuotes(text))
+            if (text.length < 2 || !ParserUtils.HasQuotes(text))
                 return null;
 
             // Check for any string, since enclosed strings are not allowed, if we find a string token that means there are multiple strings in the text
-            for (int i = 1; i < text.Length - 2; ++i)
+            for (int i = 1; i < text.length - 2; ++i)
                 if (ParserUtils.IsQuote(text[i]))
                     return null;
-            return new SearchExpression(SearchExpressionType.Text, outerText, text.Substring(1, text.Length - 2), ConstantEvaluator);
+            return new SearchExpression(SearchExpressionType.Text, outerText, text.Substring(1, text.length - 2), ConstantEvaluator);
         }
 
         [SearchExpressionParser("keyword", BuiltinParserPriority.Keyword)]
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs
index b2b1ec9516..df36b8fc26 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Parsers/NamedExpressionParser.cs
@@ -24,11 +24,11 @@ internal static SearchExpression NamedParser(SearchExpressionParserArgs args)
                 return null;
 
             var expressionName = match.Groups["name"].Value;
-            if ((expressionName.Length + expressionsStartAndLength[0].Length) != text.Length)
+            if ((expressionName.Length + expressionsStartAndLength[0].length) != text.length)
                 return null;
 
             var evaluator = EvaluatorManager.GetEvaluatorByNameDuringParsing(expressionName, text.Substring(0, expressionName.Length));
-            var parametersText = text.Substring(expressionName.Length, text.Length - expressionName.Length);
+            var parametersText = text.Substring(expressionName.Length, text.length - expressionName.Length);
             var parametersPositions = ParserUtils.ExtractArguments(parametersText, expressionName);
             var parameters = new List<SearchExpression>();
 
@@ -48,7 +48,7 @@ internal static SearchExpression NamedParser(SearchExpressionParserArgs args)
                     SearchExpressionValidator.ValidateExpressionArguments(evaluator, parameters.ToArray(), signatures, text);
             }
 
-            var expressionText = ParserUtils.SimplifyExpression(expressionsStartAndLength[0].Substring(1, expressionsStartAndLength[0].Length - 2));
+            var expressionText = ParserUtils.SimplifyExpression(expressionsStartAndLength[0].Substring(1, expressionsStartAndLength[0].length - 2));
             return new SearchExpression(SearchExpressionType.Function, args.text, expressionText, evaluator, parameters.ToArray());
         }
 
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs
index 1ea6251928..05bce2ee9e 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Parsers/QueryExpressionParser.cs
@@ -28,10 +28,10 @@ internal static SearchExpression QueryParser(SearchExpressionParserArgs args)
                         exprName = match.Groups["name"].Value;
                 }
 
-                var paramText = args.With(text.Substring(expression.startIndex - text.startIndex - exprName.Length, expression.Length + exprName.Length));
+                var paramText = args.With(text.Substring(expression.startIndex - text.startIndex - exprName.Length, expression.length + exprName.Length));
                 var nestedExpression = ParserManager.Parse(paramText);
                 nestedExpressions.Add(nestedExpression);
-                lastExpressionEndIndex = expression.startIndex + expression.Length;
+                lastExpressionEndIndex = expression.startIndex + expression.length - text.startIndex;
             }
 
             return new SearchExpression(SearchExpressionType.QueryString, args.text, text, QueryEvaluator, nestedExpressions.ToArray());
diff --git a/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs
index 238a8810ff..154a0ec503 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/Parsers/SetExpressionParser.cs
@@ -15,17 +15,17 @@ internal static SearchExpression FixedSetParser(SearchExpressionParserArgs args)
         {
             var outerText = args.text;
             var text = ParserUtils.SimplifyExpression(outerText);
-            if (text.Length < 2 || text[0] != '[' || text[text.Length - 1] != ']')
+            if (text.length < 2 || text[0] != '[' || text[text.length - 1] != ']')
                 return null;
             var expressions = ParserUtils.GetExpressionsStartAndLength(text, out _);
-            if (expressions.Length != 1 || expressions[0].startIndex != text.startIndex || expressions[0].Length != text.Length)
+            if (expressions.Length != 1 || expressions[0].startIndex != text.startIndex || expressions[0].length != text.length)
                 return null;
 
             var parameters = ParserUtils.ExtractArguments(text)
                 .Select(paramText => ParserManager.Parse(args.With(paramText).With(SearchExpressionParserFlags.ImplicitLiterals)))
                 .ToArray();
 
-            var innerText = ParserUtils.SimplifyExpression(text.Substring(1, text.Length - 2));
+            var innerText = ParserUtils.SimplifyExpression(text.Substring(1, text.length - 2));
             return new SearchExpression(SearchExpressionType.Set, outerText, innerText, SetEvaluator, parameters);
         }
 
@@ -33,13 +33,13 @@ internal static SearchExpression FixedSetParser(SearchExpressionParserArgs args)
         internal static SearchExpression ExpressionSetParser(SearchExpressionParserArgs args)
         {
             var outerText = args.text;
-            if (outerText.Length < 2)
+            if (outerText.length < 2)
                 return null;
             var innerText = ParserUtils.SimplifyExpression(outerText, false);
-            if (outerText.Length == innerText.Length)
+            if (outerText.length == innerText.length)
                 return null;
-            var text = outerText.Substring(innerText.startIndex - outerText.startIndex - 1, innerText.Length + 2);
-            if (text[0] != '{' || text[text.Length - 1] != '}')
+            var text = outerText.Substring(innerText.startIndex - outerText.startIndex - 1, innerText.length + 2);
+            if (text[0] != '{' || text[text.length - 1] != '}')
                 return null;
 
             var expressions = ParserUtils.GetExpressionsStartAndLength(innerText, out var rootHasParameters);
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs
index 422d7e6f14..bc2dfe58e0 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpression.cs
@@ -3,13 +3,14 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
 
 namespace UnityEditor.Search
 {
     [Flags]
-    enum SearchExpressionType
+    public enum SearchExpressionType
     {
         Nil = 0,
 
@@ -36,13 +37,15 @@ enum SearchExpressionType
         AnyExpression = Literal | Iterable | Selector
     }
 
-    enum SearchExpressionKeyword
+    public enum SearchExpressionKeyword
     {
-        asc,
-        desc,
-        any,
-        all,
-        none
+        None,
+        Asc,
+        Desc,
+        Any,
+        All,
+        Keep,
+        Sort
     }
 
     static class SearchExpressionTypeExtensions
@@ -70,7 +73,7 @@ public static bool IsText(this SearchExpressionType type)
         }
     }
 
-    class SearchExpression
+    public class SearchExpression
     {
         public string name => evaluator.name ?? outerText.ToString();
 
@@ -81,10 +84,10 @@ class SearchExpression
         public readonly StringView alias;
 
         // Evaluation fields
-        public readonly SearchExpressionEvaluator evaluator;
+        internal readonly SearchExpressionEvaluator evaluator;
         public readonly SearchExpression[] parameters;
 
-        public SearchExpression(SearchExpressionType types,
+        internal SearchExpression(SearchExpressionType types,
                                 StringView outerText, StringView innerText, StringView alias,
                                 SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
         {
@@ -96,47 +99,47 @@ public SearchExpression(SearchExpressionType types,
             this.evaluator = evaluator;
         }
 
-        public SearchExpression(SearchExpressionType types, StringView text)
-            : this(types, text, StringView.Null, StringView.Null, default, null)
+        internal SearchExpression(SearchExpressionType types, StringView text)
+            : this(types, text, StringView.nil, StringView.nil, default, null)
         {
         }
 
-        public SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText)
-            : this(types, outerText, innerText, StringView.Null, default, null)
+        internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText)
+            : this(types, outerText, innerText, StringView.nil, default, null)
         {
         }
 
-        public SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, SearchExpressionEvaluator evaluator)
-            : this(types, outerText, innerText, StringView.Null, evaluator, null)
+        internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, SearchExpressionEvaluator evaluator)
+            : this(types, outerText, innerText, StringView.nil, evaluator, null)
         {
         }
 
-        public SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
-            : this(types, outerText, innerText, StringView.Null, evaluator, parameters)
+        internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
+            : this(types, outerText, innerText, StringView.nil, evaluator, parameters)
         {
         }
 
-        public SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, StringView alias, SearchExpressionEvaluator evaluator)
+        internal SearchExpression(SearchExpressionType types, StringView outerText, StringView innerText, StringView alias, SearchExpressionEvaluator evaluator)
             : this(types, outerText, innerText, alias, evaluator, null)
         {
         }
 
-        public SearchExpression(SearchExpressionType types, StringView text, SearchExpressionEvaluator evaluator)
-            : this(types, text, text, StringView.Null, evaluator, null)
+        internal SearchExpression(SearchExpressionType types, StringView text, SearchExpressionEvaluator evaluator)
+            : this(types, text, text, StringView.nil, evaluator, null)
         {
         }
 
-        public SearchExpression(SearchExpressionType types, StringView text, SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
-            : this(types, text, text, StringView.Null, evaluator, parameters)
+        internal SearchExpression(SearchExpressionType types, StringView text, SearchExpressionEvaluator evaluator, SearchExpression[] parameters)
+            : this(types, text, text, StringView.nil, evaluator, parameters)
         {
         }
 
-        public SearchExpression(SearchExpression ex, SearchExpressionType types, StringView outerText, StringView innerText)
+        internal SearchExpression(SearchExpression ex, SearchExpressionType types, StringView outerText, StringView innerText)
             : this(types, outerText, innerText, ex.alias, ex.evaluator, ex.parameters)
         {
         }
 
-        public SearchExpression(SearchExpression ex, StringView newAlias)
+        internal SearchExpression(SearchExpression ex, StringView newAlias)
             : this(ex.types, ex.outerText, ex.innerText, newAlias, ex.evaluator, ex.parameters)
         {
         }
@@ -166,23 +169,22 @@ public double GetNumberValue(double defaultValue = double.NaN)
             return defaultValue;
         }
 
-        public static SearchExpression Parse(SearchExpressionParserArgs args)
+        public bool IsKeyword(SearchExpressionKeyword keyword)
         {
-            return ParserManager.Parse(args);
+            return innerText.Equals(keyword.ToString(), StringComparison.OrdinalIgnoreCase);
         }
 
-        public static SearchExpression Parse(string text, SearchExpressionParserFlags options = SearchExpressionParserFlags.Default)
+        public IEnumerable<SearchItem> Execute(SearchContext searchContext)
         {
-            var searchContext = SearchService.CreateContext(text);
-            return Parse(searchContext, options);
+            return Execute(searchContext, SearchExpressionExecutionFlags.Root);
         }
 
-        public static SearchExpression Parse(SearchContext context, SearchExpressionParserFlags options = SearchExpressionParserFlags.Default)
+        public IEnumerable<SearchItem> Execute(SearchExpressionContext c)
         {
-            return ParserManager.Parse(new SearchExpressionParserArgs(context.searchText.GetStringView(), context, options));
+            return Execute(c, SearchExpressionExecutionFlags.None);
         }
 
-        public IEnumerable<SearchItem> Execute(SearchContext searchContext, SearchExpressionExecutionFlags executionFlags = SearchExpressionExecutionFlags.Root)
+        internal IEnumerable<SearchItem> Execute(SearchContext searchContext, SearchExpressionExecutionFlags executionFlags)
         {
             var runtime = new SearchExpressionRuntime(searchContext, executionFlags);
             if (executionFlags.HasFlag(SearchExpressionExecutionFlags.ThreadedEvaluation))
@@ -190,19 +192,19 @@ public IEnumerable<SearchItem> Execute(SearchContext searchContext, SearchExpres
             return Execute(runtime.current, executionFlags);
         }
 
-        public IEnumerable<SearchItem> Execute(SearchExpressionContext c, SearchExpressionExecutionFlags flags = SearchExpressionExecutionFlags.None)
+        internal IEnumerable<SearchItem> Execute(SearchExpressionContext c, SearchExpressionExecutionFlags executionFlags)
         {
             if (!evaluator.valid || evaluator.execute == null)
                 c.ThrowError("Invalid expression evaluator");
             try
             {
                 if (!evaluator.hints.HasFlag(SearchExpressionEvaluationHints.ThreadNotSupported))
-                    return Evaluate(c, flags);
+                    return Evaluate(c, executionFlags);
 
                 // We cannot only return the IEnumerable of the evaluator, as the iteration itself needs to be
                 // done on the main thread. If we return the IEnumerable itself, we will unroll the items and call the evaluator
                 // in the evaluation thread.
-                return TaskEvaluatorManager.EvaluateMainThreadUnroll(() => Evaluate(c, flags));
+                return TaskEvaluatorManager.EvaluateMainThreadUnroll(() => Evaluate(c, executionFlags));
             }
             catch (SearchExpressionEvaluatorException ex)
             {
@@ -211,6 +213,22 @@ public IEnumerable<SearchItem> Execute(SearchExpressionContext c, SearchExpressi
             }
         }
 
+        internal static SearchExpression Parse(SearchExpressionParserArgs args)
+        {
+            return ParserManager.Parse(args);
+        }
+
+        internal static SearchExpression Parse(string text, SearchExpressionParserFlags options = SearchExpressionParserFlags.Default)
+        {
+            var searchContext = SearchService.CreateContext(text);
+            return Parse(searchContext, options);
+        }
+
+        internal static SearchExpression Parse(SearchContext context, SearchExpressionParserFlags options = SearchExpressionParserFlags.Default)
+        {
+            return ParserManager.Parse(new SearchExpressionParserArgs(context.searchText.GetStringView(), context, options));
+        }
+
         private IEnumerable<SearchItem> Evaluate(SearchExpressionContext c, SearchExpressionExecutionFlags flags)
         {
             var args = new List<SearchExpression>();
@@ -285,17 +303,165 @@ private IEnumerable<SearchItem> Evaluate(SearchExpressionContext c, SearchExpres
             }
         }
 
-        public SearchExpression Apply(string functionName, params SearchExpression[] args)
+        internal SearchExpression Apply(string functionName, params SearchExpression[] args)
         {
             var see = EvaluatorManager.GetEvaluatorByNameDuringParsing(functionName, innerText);
             var seeArgs = new List<SearchExpression> { this };
             seeArgs.AddRange(args);
-            return new SearchExpression(SearchExpressionType.Function, StringView.Null, innerText, alias, see, seeArgs.ToArray());
+            return new SearchExpression(SearchExpressionType.Function, StringView.nil, innerText, alias, see, seeArgs.ToArray());
         }
 
-        public bool IsKeyword(SearchExpressionKeyword keyword)
+        public static bool TryConvertToDouble(SearchItem item, out double value, string selector = null)
         {
-            return innerText.Equals(keyword.ToString(), StringComparison.OrdinalIgnoreCase);
+            value = double.NaN;
+            object itemValue = SelectorManager.SelectValue(item, null, selector);
+            if (itemValue == null)
+                return false;
+            return Utils.TryGetNumber(itemValue, out value);
+        }
+
+        public static string CreateId()
+        {
+            return Guid.NewGuid().ToString("N");
+        }
+
+        public static SearchItem CreateItem(string label, object value, string description)
+        {
+            return SearchServiceProvider.CreateItem(CreateId(), label, description, value);
+        }
+
+        public static SearchItem CreateItem(string value, string label = null)
+        {
+            return CreateItem(label, value, value.ToString());
+        }
+
+        public static SearchItem CreateItem(double value, string label = null)
+        {
+            return CreateItem(label, value, null);
+        }
+
+        public static SearchItem CreateItem(int value, string label = null)
+        {
+            return CreateItem((double)value, label);
+        }
+
+        internal static SearchItem CreateItem(bool booleanValue, string label = null)
+        {
+            return CreateItem(label, booleanValue, booleanValue.ToString().ToLowerInvariant());
+        }
+
+        public static bool GetFormatString(SearchExpression expr, out string formatStr)
+        {
+            formatStr = null;
+            if (expr.types.HasFlag(SearchExpressionType.Text))
+            {
+                formatStr = expr.innerText.ToString();
+                return true;
+            }
+
+            if (expr.types.HasFlag(SearchExpressionType.Selector))
+            {
+                formatStr = expr.outerText.ToString();
+                return true;
+            }
+
+            return false;
+        }
+
+        public static string FormatItem(SearchContext ctx, SearchItem item, string formatString)
+        {
+            if (formatString == null)
+            {
+                var value = SelectorManager.SelectValue(item, ctx, null);
+                return value == null ? "null" : value.ToString();
+            }
+            return ParserUtils.ReplaceSelectorInExpr(formatString, (selector, cleanedSelector) =>
+            {
+                var value = SelectorManager.SelectValue(item, ctx, cleanedSelector);
+                return value == null ? "<no value>" : value.ToString();
+            });
+        }
+
+        public static IEnumerable<SearchItem> ProcessValues<T>(IEnumerable<SearchItem> items, string outputValueFieldName, Func<SearchItem, T> processHandler)
+        {
+            var selectedItems = new List<SearchItem>(items);
+            return TaskEvaluatorManager.EvaluateMainThread<SearchItem>((yielder) =>
+            {
+                foreach (var item in selectedItems)
+                {
+                    var selectedValue = processHandler(item);
+                    if (selectedValue == null)
+                        continue;
+
+                    if (outputValueFieldName == null)
+                        item.value = selectedValue;
+                    else
+                        item.SetField(outputValueFieldName, selectedValue);
+
+                    yielder(item);
+                }
+            });
         }
+
+        public static bool IsTrue(SearchItem item)
+        {
+            var value = false;
+            if (item.value != null)
+            {
+                if (item.value is string argValue)
+                {
+                    value = argValue != "";
+                }
+                else if (item.value is bool itemValue)
+                {
+                    value = itemValue;
+                }
+                else if (item.value is int i)
+                {
+                    value = i != 0;
+                }
+                else if (item.value is double d)
+                {
+                    value = d != 0.0;
+                }
+                else if (item.value is float f)
+                {
+                    value = f != 0.0f;
+                }
+            }
+            return value;
+        }
+
+        public static bool Check(SearchExpression e, SearchExpressionContext c)
+        {
+            var result = e.Execute(c);
+            var count = result.Count();
+            if (count == 0)
+                return false;
+            if (count == 1)
+                return IsTrue(result.First());
+            return true;
+        }
+
+        internal static SearchExpression CreateStreamExpression(SearchExpression currentStream, string name = "<streamexpr>")
+        {
+            var exp = new SearchExpression(SearchExpressionType.Function, name.GetStringView(),
+                new SearchExpressionEvaluator("StreamEvaluator", context => currentStream.Execute(context), SearchExpressionEvaluationHints.Default));
+            return exp;
+        }
+
+        internal static SearchItem CreateSearchExpressionItem(string queryString, string alias = null)
+        {
+            var queryView = queryString.GetStringView();
+            return CreateSearchExpressionItem(new SearchExpression(
+                SearchExpressionType.QueryString, queryView, queryView, alias.GetStringView(),
+                EvaluatorManager.GetConstantEvaluatorByName("query")));
+        }
+
+        internal static SearchItem CreateSearchExpressionItem(SearchExpression expr)
+        {
+            return new SearchItem("") { data = expr };
+        }
+
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionContext.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionContext.cs
index c3002c664c..ae36c043d4 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionContext.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionContext.cs
@@ -8,7 +8,7 @@
 namespace UnityEditor.Search
 {
     [Flags]
-    enum SearchExpressionExecutionFlags
+    internal enum SearchExpressionExecutionFlags
     {
         None = 0,
 
@@ -31,19 +31,19 @@ enum SearchExpressionExecutionFlags
         TransferedFlags = ThreadedEvaluation
     }
 
-    readonly struct SearchExpressionContext
+    public readonly struct SearchExpressionContext
     {
         public readonly SearchExpressionRuntime runtime;
         public readonly SearchExpression expression;
         public readonly SearchExpression[] args;
-        public readonly SearchExpressionExecutionFlags flags;
+        internal readonly SearchExpressionExecutionFlags flags;
 
         public bool valid => runtime.valid && expression != null;
         public SearchContext search => runtime.search;
-        public ExecutionState state => runtime.state;
+        internal ExecutionState state => runtime.state;
         public IReadOnlyCollection<SearchItem> items => runtime.items;
 
-        public SearchExpressionContext(SearchExpressionRuntime runtime, SearchExpression expression, SearchExpression[] args, SearchExpressionExecutionFlags flags)
+        internal SearchExpressionContext(SearchExpressionRuntime runtime, SearchExpression expression, SearchExpression[] args, SearchExpressionExecutionFlags flags)
         {
             this.runtime = runtime;
             this.expression = expression;
@@ -58,7 +58,7 @@ public override string ToString()
 
         public void ThrowError(string message)
         {
-            ThrowError(message, StringView.Null);
+            ThrowError(message, StringView.nil);
         }
 
         public void ThrowError(string message, StringView errorPosition)
@@ -69,12 +69,12 @@ public void ThrowError(string message, StringView errorPosition)
                 throw new SearchExpressionEvaluatorException(message, expression.outerText, this);
         }
 
-        public ArgumentEnumerable ForEachArgument(OnArgument onArgumentCallback, int argumentSkipCount = 0)
+        internal ArgumentEnumerable ForEachArgument(OnArgument onArgumentCallback, int argumentSkipCount = 0)
         {
             return ArgumentEnumerable.ForEachArgument(this, onArgumentCallback, argumentSkipCount);
         }
 
-        public ArgumentEnumerable ForEachArgument(int argumentSkipCount = 0)
+        internal ArgumentEnumerable ForEachArgument(int argumentSkipCount = 0)
         {
             return ArgumentEnumerable.ForEachArgument(this, argumentSkipCount);
         }
@@ -104,7 +104,7 @@ public void ResetIterationControl()
             state.ResetIterationControl();
         }
 
-        public bool HasFlag(SearchExpressionExecutionFlags checkFlag)
+        internal bool HasFlag(SearchExpressionExecutionFlags checkFlag)
         {
             return flags.HasFlag(checkFlag);
         }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionEvaluator.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionEvaluator.cs
index ed3e0513cd..e81daba2c7 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionEvaluator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionEvaluator.cs
@@ -11,10 +11,10 @@
 
 namespace UnityEditor.Search
 {
-    delegate IEnumerable<SearchItem> SearchExpressionEvaluatorHandler(SearchExpressionContext context);
+    internal delegate IEnumerable<SearchItem> SearchExpressionEvaluatorHandler(SearchExpressionContext context);
 
     [Flags]
-    enum SearchExpressionEvaluationHints
+    public enum SearchExpressionEvaluationHints
     {
         ThreadSupported = 1 << 0,
         ThreadNotSupported = 1 << 1,
@@ -28,7 +28,7 @@ enum SearchExpressionEvaluationHints
     }
 
     [AttributeUsage(AttributeTargets.Method)]
-    class SearchExpressionEvaluatorAttribute : Attribute
+    public class SearchExpressionEvaluatorAttribute : Attribute
     {
         public SearchExpressionEvaluatorAttribute(params SearchExpressionType[] signatureArgumentTypes) : this(null, SearchExpressionEvaluationHints.Default, new SearchExpressionValidator.Signature(signatureArgumentTypes)) {}
         public SearchExpressionEvaluatorAttribute(string name, params SearchExpressionType[] signatureArgumentTypes) : this(name, SearchExpressionEvaluationHints.Default, new SearchExpressionValidator.Signature(signatureArgumentTypes)) {}
@@ -43,13 +43,13 @@ private SearchExpressionEvaluatorAttribute(string name, SearchExpressionEvaluati
             this.hints = hints;
         }
 
-        public string name { get; private set; }
-        public SearchExpressionValidator.Signature signature { get; private set; }
-        public SearchExpressionEvaluationHints hints { get; private set; }
+        internal string name { get; private set; }
+        internal SearchExpressionValidator.Signature signature { get; private set; }
+        internal SearchExpressionEvaluationHints hints { get; private set; }
     }
 
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
-    class SearchExpressionEvaluatorSignatureOverloadAttribute : Attribute
+    public class SearchExpressionEvaluatorSignatureOverloadAttribute : Attribute
     {
         public SearchExpressionEvaluatorSignatureOverloadAttribute(params SearchExpressionType[] signatureArgumentTypes) : this(new SearchExpressionValidator.Signature(signatureArgumentTypes)) {}
 
@@ -58,7 +58,7 @@ private SearchExpressionEvaluatorSignatureOverloadAttribute(SearchExpressionVali
             this.signature = signature;
         }
 
-        public SearchExpressionValidator.Signature signature { get; private set; }
+        internal SearchExpressionValidator.Signature signature { get; private set; }
     }
 
     static class EvaluatorManager
@@ -97,7 +97,7 @@ private static SearchExpressionEvaluator GetEvaluatorByName(string name, StringV
             if (!evaluator.valid)
             {
                 if (duringParsing)
-                    throw new SearchExpressionParseException(GetEvaluatorNameExceptionMessage(name), errorView.startIndex, errorView.Length);
+                    throw new SearchExpressionParseException(GetEvaluatorNameExceptionMessage(name), errorView.startIndex, errorView.length);
                 else
                     context.ThrowError(GetEvaluatorNameExceptionMessage(name), errorView);
             }
@@ -231,28 +231,19 @@ private static StringView GetErrorStringView(SearchExpressionContext c, Exceptio
         public readonly SearchExpressionEvaluatorHandler execute;
         public readonly SearchExpressionEvaluationHints hints;
         public bool valid => execute != null;
-        public readonly SearchExpressionParserFlags with;
-        public readonly SearchExpressionParserFlags without;
 
-        public SearchExpressionEvaluator(string name, string description, string category, SearchExpressionEvaluatorHandler execute, SearchExpressionEvaluationHints hints)
-            : this(name, description, category, execute, hints, SearchExpressionParserFlags.None, SearchExpressionParserFlags.None)
-        {
-        }
-
-        public SearchExpressionEvaluator(string name, SearchExpressionEvaluatorHandler execute, SearchExpressionEvaluationHints hints)
-            : this(name, description : null , category : "General", execute, hints, SearchExpressionParserFlags.None, SearchExpressionParserFlags.None)
-        {
-        }
-
-        public SearchExpressionEvaluator(string name, string description, string category, SearchExpressionEvaluatorHandler execute, SearchExpressionEvaluationHints hints, SearchExpressionParserFlags with, SearchExpressionParserFlags without)
+        internal SearchExpressionEvaluator(string name, string description, string category, SearchExpressionEvaluatorHandler execute, SearchExpressionEvaluationHints hints)
         {
             this.name = name;
             this.description = description;
             this.category = category;
             this.execute = execute;
             this.hints = hints;
-            this.with = with;
-            this.without = without;
+        }
+
+        internal SearchExpressionEvaluator(string name, SearchExpressionEvaluatorHandler execute, SearchExpressionEvaluationHints hints)
+            : this(name, description : null , category : "General", execute, hints)
+        {
         }
 
         public override string ToString()
@@ -270,159 +261,4 @@ public int GetHashCode(SearchExpressionEvaluator obj)
             return obj.name.GetHashCode();
         }
     }
-
-    static class EvaluatorUtils
-    {
-        public static bool TryConvertToDouble(SearchItem item, out double value, string selector = null)
-        {
-            value = double.NaN;
-            object itemValue = SelectorManager.SelectValue(item, null, selector);
-            if (itemValue == null)
-                return false;
-            return Utils.TryGetNumber(itemValue, out value);
-        }
-
-        public static string CreateId()
-        {
-            return Guid.NewGuid().ToString("N");
-        }
-
-        public static SearchItem CreateItem(string label, object value, string description)
-        {
-            return SearchServiceProvider.CreateItem(CreateId(), label, description, value);
-        }
-
-        public static SearchItem CreateItem(string value, string label = null)
-        {
-            return CreateItem(label, value, value.ToString());
-        }
-
-        public static SearchItem CreateItem(double value, string label = null)
-        {
-            return CreateItem(label, value, null);
-        }
-
-        public static SearchItem CreateItem(int value, string label = null)
-        {
-            return CreateItem((double)value, label);
-        }
-
-        internal static SearchItem CreateItem(bool booleanValue, string label = null)
-        {
-            return CreateItem(label, booleanValue, booleanValue.ToString().ToLowerInvariant());
-        }
-
-        internal static bool IsTrue(SearchItem item)
-        {
-            var value = false;
-            if (item.value != null)
-            {
-                if (item.value is string argValue)
-                {
-                    value = argValue != "";
-                }
-                else if (item.value is bool itemValue)
-                {
-                    value = itemValue;
-                }
-                else if (item.value is int i)
-                {
-                    value = i != 0;
-                }
-                else if (item.value is double d)
-                {
-                    value = d != 0.0;
-                }
-                else if (item.value is float f)
-                {
-                    value = f != 0.0f;
-                }
-            }
-            return value;
-        }
-
-        internal static bool Check(SearchExpression e, SearchExpressionContext c)
-        {
-            var result = e.Execute(c);
-            var count = result.Count();
-            if (count == 0)
-                return false;
-            if (count == 1)
-                return IsTrue(result.First());
-            return true;
-        }
-
-        public static bool GetFormatString(SearchExpression expr, out string formatStr)
-        {
-            formatStr = null;
-            if (expr.types.HasFlag(SearchExpressionType.Text))
-            {
-                formatStr = expr.innerText.ToString();
-                return true;
-            }
-
-            if (expr.types.HasFlag(SearchExpressionType.Selector))
-            {
-                formatStr = expr.outerText.ToString();
-                return true;
-            }
-
-            return false;
-        }
-
-        public static string FormatItem(SearchContext ctx, SearchItem item, string formatString)
-        {
-            if (formatString == null)
-            {
-                var value = SelectorManager.SelectValue(item, ctx, null);
-                return value == null ? "null" : value.ToString();
-            }
-            return ParserUtils.ReplaceSelectorInExpr(formatString, (selector, cleanedSelector) =>
-            {
-                var value = SelectorManager.SelectValue(item, ctx, cleanedSelector);
-                return value == null ? "<no value>" : value.ToString();
-            });
-        }
-
-        public static SearchExpression CreateStreamExpression(SearchExpression currentStream, string name = "<streamexpr>")
-        {
-            var exp = new SearchExpression(SearchExpressionType.Function, name.GetStringView(),
-                new SearchExpressionEvaluator("StreamEvaluator", context => currentStream.Execute(context), SearchExpressionEvaluationHints.Default));
-            return exp;
-        }
-
-        public static SearchItem CreateSearchExpressionItem(string queryString, string alias = null)
-        {
-            var queryView = queryString.GetStringView();
-            return CreateSearchExpressionItem(new SearchExpression(
-                SearchExpressionType.QueryString, queryView, queryView, alias.GetStringView(),
-                EvaluatorManager.GetConstantEvaluatorByName("query")));
-        }
-
-        public static SearchItem CreateSearchExpressionItem(SearchExpression expr)
-        {
-            return new SearchItem("") { data = expr };
-        }
-
-        public static IEnumerable<SearchItem> ProcessValues<T>(IEnumerable<SearchItem> items, string outputValueFieldName, Func<SearchItem, T> processHandler)
-        {
-            var selectedItems = new List<SearchItem>(items);
-            return TaskEvaluatorManager.EvaluateMainThread<SearchItem>((yielder) =>
-            {
-                foreach (var item in selectedItems)
-                {
-                    var selectedValue = processHandler(item);
-                    if (selectedValue == null)
-                        continue;
-
-                    if (outputValueFieldName == null)
-                        item.value = selectedValue;
-                    else
-                        item.SetField(outputValueFieldName, selectedValue);
-
-                    yielder(item);
-                }
-            });
-        }
-    }
 }
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs
index 465de5f386..68efad5b10 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionParser.cs
@@ -179,7 +179,7 @@ public static SearchExpression Parse(SearchExpressionParserArgs args)
             }
 
             throw new SearchExpressionParseException($"Expression `{args.text}` cannot be parsed.\n" +
-                $"{string.Join("\n", args.context.GetAllErrors().Select(e => e.reason))}".Trim(), args.text.startIndex, args.text.Length);
+                $"{string.Join("\n", args.context.GetAllErrors().Select(e => e.reason))}".Trim(), args.text.startIndex, args.text.length);
         }
     }
 
@@ -201,7 +201,7 @@ public static StringView[] ExtractArguments(StringView text, string errorPrefix
             openersStack.Push(paramsBlock[0]);
             int currentStringTokenIndex = -1;
             var i = 1;
-            for (; i < paramsBlock.Length; ++i)
+            for (; i < paramsBlock.length; ++i)
             {
                 if (paramsBlock[i] == ' ')
                     continue;
@@ -240,6 +240,7 @@ public static StringView[] ExtractArguments(StringView text, string errorPrefix
                             ++i;
                             break;
                         }
+
                         continue;
                     }
                 }
@@ -302,7 +303,7 @@ public static bool IsCloser(char c)
 
         public static bool HasQuotes(StringView sv)
         {
-            if (sv.Length < 2)
+            if (sv.length < 2)
                 return false;
             var c = sv[0];
             if (!IsQuote(c))
@@ -317,7 +318,7 @@ public static StringView[] GetExpressionsStartAndLength(StringView text, out boo
             var expressions = new List<StringView>();
             int firstOpenerIndex = -1;
             int currentStringTokenIndex = -1;
-            for (int i = 0; i < text.Length; ++i)
+            for (int i = 0; i < text.length; ++i)
             {
                 if (text[i] == ' ')
                     continue;
@@ -364,9 +365,9 @@ public static StringView[] GetExpressionsStartAndLength(StringView text, out boo
                     rootHasParameters = true;
             }
             if (currentStringTokenIndex != -1)
-                throw new SearchExpressionParseException($"The string \"{text.Substring(currentStringTokenIndex)}\" is not closed correctly", text.startIndex + currentStringTokenIndex, text.Length - currentStringTokenIndex);
+                throw new SearchExpressionParseException($"The string \"{text.Substring(currentStringTokenIndex)}\" is not closed correctly", text.startIndex + currentStringTokenIndex, text.length - currentStringTokenIndex);
             if (openersStack.Any())
-                throw new SearchExpressionParseException($"Missing \"{GetCorrespondingCloser(openersStack.Peek())}\" in \"{text}\"", text.startIndex + firstOpenerIndex, text.Length - firstOpenerIndex);
+                throw new SearchExpressionParseException($"Missing \"{GetCorrespondingCloser(openersStack.Peek())}\" in \"{text}\"", text.startIndex + firstOpenerIndex, text.length - firstOpenerIndex);
             return expressions.ToArray();
         }
 
@@ -375,7 +376,7 @@ public static StringView SimplifyExpression(StringView outerText, bool trimLastW
             // First we look for the closers that could be trimmed
             Stack<int> nestedLevelsEnd = new Stack<int>();
             Stack<int> nestedLevelsStart = new Stack<int>();
-            for (int i = outerText.Length - 1; i >= 0; --i)
+            for (int i = outerText.length - 1; i >= 0; --i)
             {
                 if (char.IsWhiteSpace(outerText[i]))
                     continue;
@@ -393,7 +394,7 @@ public static StringView SimplifyExpression(StringView outerText, bool trimLastW
                 bool inNonTrimmableText = false;
                 int nonTrimmableOpeners = 0;
                 bool isInString = false;
-                for (int i = 0; i < outerText.Length; ++i)
+                for (int i = 0; i < outerText.length; ++i)
                 {
                     if (char.IsWhiteSpace(outerText[i]))
                         continue;
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionRuntime.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionRuntime.cs
index 7614ee45a0..5641161482 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionRuntime.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionRuntime.cs
@@ -46,17 +46,17 @@ public void ResetIterationControl()
         }
     }
 
-    readonly struct SearchExpressionRuntime
+    public readonly struct SearchExpressionRuntime
     {
         public readonly SearchContext search;
-        public readonly ExecutionState state;
+        internal readonly ExecutionState state;
         public readonly Stack<SearchItem> items;
         public readonly Stack<SearchExpressionContext> frames;
 
         public bool valid => frames != null && frames.Count > 0;
         public SearchExpressionContext current => frames.Peek();
 
-        public SearchExpressionRuntime(SearchContext searchContext, SearchExpressionExecutionFlags flags)
+        internal SearchExpressionRuntime(SearchContext searchContext, SearchExpressionExecutionFlags flags)
         {
             search = searchContext;
             frames = new Stack<SearchExpressionContext>();
@@ -80,7 +80,7 @@ public IDisposable Push(SearchExpression searchExpression, IEnumerable<SearchExp
             return new PushPopScope<SearchExpressionContext>(frames);
         }
 
-        public IDisposable Push(SearchExpression searchExpression, IEnumerable<SearchExpression> args, SearchExpressionExecutionFlags flags)
+        internal IDisposable Push(SearchExpression searchExpression, IEnumerable<SearchExpression> args, SearchExpressionExecutionFlags flags)
         {
             flags |= frames.Peek().flags & SearchExpressionExecutionFlags.TransferedFlags;
             frames.Push(new SearchExpressionContext(this, searchExpression, args.ToArray(), flags));
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionValidator.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionValidator.cs
index 55774be063..033ac4ae94 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionValidator.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchExpressionValidator.cs
@@ -113,7 +113,7 @@ public static void ValidateExpressionArguments(SearchExpressionContext c, IEnume
             // First pass to get all valid argument number signatures (must do a ToList to separate the 2 passes)
             // Second pass to validate the argument types. The last error is kept (lowest number of arguments if no signature matches the number of argument, wrong type if there is at least one)
             var lastError = "";
-            var errorPosition = StringView.Null;
+            var errorPosition = StringView.nil;
             if (signatures.Where(s => ValidateExpressionArgumentsCount(c.expression.evaluator.name, c.args, s, (msg, errorPos) => { lastError = msg; errorPosition = errorPos; })).ToList()
                 .Any(s => ValidateExpressionArguments(c.expression.evaluator.name, c.args, s, (msg, errorPos) => { lastError = msg; errorPosition = errorPos; })))
                 return;
@@ -128,14 +128,14 @@ public static void ValidateExpressionArguments(SearchExpressionEvaluator evaluat
             // First pass to get all valid argument number signatures (must do a ToList to separate the 2 passes)
             // Second pass to validate the argument types. The last error is kept (lowest number of arguments if no signature matches the number of argument, wrong type if there is at least one)
             var lastError = "";
-            var errorPosition = StringView.Null;
+            var errorPosition = StringView.nil;
             if (signatures.Where(s => ValidateExpressionArgumentsCount(evaluator.name, args, s, (msg, errorPos) => { lastError = msg; errorPosition = errorPos; })).ToList()
                 .Any(s => ValidateExpressionArguments(evaluator.name, args, s, (msg, errorPos) => { lastError = msg; errorPosition = errorPos; })))
                 return;
 
             if (!errorPosition.valid)
                 errorPosition = expressionInnerText;
-            throw new SearchExpressionParseException($"Syntax error: {lastError}", errorPosition.startIndex, errorPosition.Length);
+            throw new SearchExpressionParseException($"Syntax error: {lastError}", errorPosition.startIndex, errorPosition.length);
         }
 
         public static bool ValidateExpressionArgumentsCount(string name, SearchExpression[] args, Signature signature, Action<string, StringView> errorHandler)
@@ -148,12 +148,12 @@ public static bool ValidateExpressionArgumentsCount(string name, SearchExpressio
             var mandatoryArgumentNumber = signature.mandatoryArgumentNumber;
             if (actualArgsCount > expectedArgsCount && (expectedArgsCount == 0 || !signature.arguments.Last().variadic))
             {
-                errorHandler($"{name} takes a maximum of {expectedArgsCount} arguments and was passed: {actualArgsCount}.", StringView.Null);
+                errorHandler($"{name} takes a maximum of {expectedArgsCount} arguments and was passed: {actualArgsCount}.", StringView.nil);
                 return false;
             }
             if (actualArgsCount < mandatoryArgumentNumber)
             {
-                errorHandler($"{name} takes a minimum of {mandatoryArgumentNumber} arguments and was passed: {actualArgsCount}.", StringView.Null);
+                errorHandler($"{name} takes a minimum of {mandatoryArgumentNumber} arguments and was passed: {actualArgsCount}.", StringView.nil);
                 return false;
             }
             return true;
diff --git a/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs b/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs
index 07b2855aa3..a587b7ae38 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/SearchItemQueryEngine.cs
@@ -655,7 +655,7 @@ public SearchItemQueryEngine()
         public IEnumerable<SearchItem> Where(SearchExpressionContext context, IEnumerable<SearchItem> dataSet, string queryStr)
         {
             m_Context = context;
-            var query = Parse(queryStr, true);
+            var query = ParseQuery(queryStr, true);
             if (query.errors.Count != 0)
             {
                 var errorStr = string.Join("\n", query.errors.Select(err => $"Invalid where query expression at {err.index}: {err.reason}"));
@@ -678,7 +678,7 @@ public IEnumerable<SearchItem> Where(SearchExpressionContext context, IEnumerabl
         public IEnumerable<SearchItem> WhereMainThread(SearchExpressionContext context, IEnumerable<SearchItem> dataSet, string queryStr)
         {
             m_Context = context;
-            var query = Parse(queryStr, true);
+            var query = ParseQuery(queryStr, true);
             if (query.errors.Count != 0)
             {
                 var errorStr = string.Join("\n", query.errors.Select(err => $"Invalid where query expression at {err.index}: {err.reason}"));
diff --git a/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs b/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs
index 7ea6961882..ca4b9be448 100644
--- a/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs
+++ b/Modules/QuickSearch/Editor/SearchExpression/TaskEvaluatorManager.cs
@@ -59,7 +59,7 @@ public void Dispose()
             }
         }
 
-        public static IEnumerable<SearchItem> Evaluate(SearchExpressionContext c, SearchExpression expression)
+        internal static IEnumerable<SearchItem> Evaluate(SearchExpressionContext c, SearchExpression expression)
         {
             var concurrentList = new ConcurrentBag<SearchItem>();
             var yieldSignal = new EventWaitHandle(false, EventResetMode.AutoReset);
diff --git a/Modules/QuickSearch/Editor/SearchFilterEnumTypes.cs b/Modules/QuickSearch/Editor/SearchFilterEnumTypes.cs
new file mode 100644
index 0000000000..d079fc2d5e
--- /dev/null
+++ b/Modules/QuickSearch/Editor/SearchFilterEnumTypes.cs
@@ -0,0 +1,37 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+
+using UnityEngine;
+
+namespace UnityEditor.Search
+{
+    enum PrefabFilter
+    {
+        [System.ComponentModel.Description("Search prefab roots")]
+        Root,
+        [System.ComponentModel.Description("Search objects that are part of a prefab instance")]
+        Instance,
+        [System.ComponentModel.Description("Search top-level prefab root instances")]
+        Top,
+        [System.ComponentModel.Description("Search prefab objects that are not part of an asset")]
+        NonAsset,
+        [System.ComponentModel.Description("Search prefab objects that are part of an asset")]
+        Asset,
+        [System.ComponentModel.Description("Search prefabs")]
+        Any,
+        [System.ComponentModel.Description("Search prefab objects that are part of a model")]
+        Model,
+        [System.ComponentModel.Description("Search regular prefab objects")]
+        Regular,
+        [System.ComponentModel.Description("Search variant prefab objects")]
+        Variant,
+        [System.ComponentModel.Description("Search modified prefab assets")]
+        Modified,
+        [System.ComponentModel.Description("Search modified prefab instances")]
+        Altered,
+        [System.ComponentModel.Description("Search base prefabs")] //TODO: This isn't used?
+        Base
+    }
+}
diff --git a/Modules/QuickSearch/Editor/SearchItem.cs b/Modules/QuickSearch/Editor/SearchItem.cs
index c8a6b0ce8e..f63b722718 100644
--- a/Modules/QuickSearch/Editor/SearchItem.cs
+++ b/Modules/QuickSearch/Editor/SearchItem.cs
@@ -98,7 +98,7 @@ public class SearchItem : IEquatable<SearchItem>, IComparable<SearchItem>, IComp
         /// <summary>
         /// Used to map value to a search item
         /// </summary>
-        internal object value { get => m_Value ?? id; set => m_Value = value; }
+        public object value { get => m_Value ?? id; set => m_Value = value; }
         private object m_Value = null;
 
         /// <summary>
@@ -120,17 +120,31 @@ public class SearchItem : IEquatable<SearchItem>, IComparable<SearchItem>, IComp
             actions = new List<SearchAction> { new SearchAction("select", "select", null, null, (SearchItem item) => {}) }
         };
 
+        [Obsolete("Use SearchItem.clear instead. (UnityUpgradable) -> clear", error: false)]
+        public static readonly SearchItem none;
+
         /// <summary>
         /// A search item representing none, usually used to clear the selection.
         /// </summary>
-        public static readonly SearchItem none = new SearchItem(Guid.NewGuid().ToString())
+        private static SearchItem s_ClearItem;
+        public static SearchItem clear
         {
-            label = "None",
-            description = "Clear the current value",
-            score = int.MinValue,
-            thumbnail = Icons.clear,
-            provider = defaultProvider
-        };
+            get
+            {
+                if (s_ClearItem == null)
+                {
+                    s_ClearItem = new SearchItem(Guid.NewGuid().ToString())
+                    {
+                        label = "None",
+                        description = "Clear the current value",
+                        score = int.MinValue,
+                        thumbnail = Icons.clear,
+                        provider = defaultProvider
+                    };
+                }
+                return s_ClearItem;
+            }
+        }
 
         /// <summary>
         /// Construct a search item. Minimally a search item need to have a unique id for a given search query.
@@ -457,79 +471,29 @@ public static int Compare(SearchItem x, SearchItem y, SearchItemSorting sortBy =
             }
         }
 
-        internal readonly struct Field : IEquatable<Field>
-        {
-            public readonly string name;
-            public readonly string alias;
-            public readonly object value;
-
-            public string label => alias ?? name;
-
-            public Field(string name)
-            {
-                this.name = name;
-                this.alias = null;
-                this.value = null;
-            }
-
-            public Field(string name, object value)
-            {
-                this.name = name;
-                this.alias = null;
-                this.value = value;
-            }
-
-            public Field(string name, string alias, object value)
-            {
-                this.name = name;
-                this.alias = alias;
-                this.value = value;
-            }
-
-            public override string ToString() => $"{name}[{label}]={value}";
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    return name.GetHashCode();
-                }
-            }
-
-            public override bool Equals(object other)
-            {
-                return other is SearchIndexEntry l && Equals(l);
-            }
-
-            public bool Equals(Field other)
-            {
-                return string.Equals(name, other.name, StringComparison.Ordinal);
-            }
-        }
-
-        private Dictionary<string, Field> m_Fields;
-        internal void SetField(string name, object value)
+        private Dictionary<string, SearchField> m_Fields;
+        public void SetField(string name, object value)
         {
             SetField(name, null, value);
         }
 
-        internal void SetField(string name, string alias, object value)
+        public void SetField(string name, string alias, object value)
         {
             if (m_Fields == null)
-                m_Fields = new Dictionary<string, Field>();
+                m_Fields = new Dictionary<string, SearchField>();
 
-            var f = new Field(name, alias, value);
+            var f = new SearchField(name, alias, value);
             m_Fields[name] = f;
         }
 
-        internal bool RemoveField(string name)
+        public bool RemoveField(string name)
         {
             if (m_Fields == null)
                 return false;
             return m_Fields.Remove(name);
         }
 
-        internal bool TryGetField(string name, out Field field)
+        public bool TryGetField(string name, out SearchField field)
         {
             if (m_Fields != null && m_Fields.TryGetValue(name, out field))
                 return true;
@@ -537,16 +501,16 @@ internal bool TryGetField(string name, out Field field)
             return false;
         }
 
-        internal bool TryGetValue(string name, out Field field)
+        public bool TryGetValue(string name, out SearchField field)
         {
             return TryGetValue(name, null, out field);
         }
 
-        internal bool TryGetValue(string name, SearchContext context, out Field field)
+        public bool TryGetValue(string name, SearchContext context, out SearchField field)
         {
             if (name == null)
             {
-                field = new Field(name, m_Value);
+                field = new SearchField(name, m_Value);
                 return true;
             }
 
@@ -555,61 +519,116 @@ internal bool TryGetValue(string name, SearchContext context, out Field field)
 
             if (string.Equals("id", name, StringComparison.Ordinal))
             {
-                field = new Field(name, id);
+                field = new SearchField(name, id);
                 return true;
             }
             if (string.Equals("value", name, StringComparison.Ordinal))
             {
-                field = new Field(name, m_Value);
+                field = new SearchField(name, m_Value);
                 return true;
             }
             if (string.Equals("label", name, StringComparison.OrdinalIgnoreCase))
             {
                 options |= SearchItemOptions.Compacted;
-                field = new Field(name, GetLabel(context ?? this.context, true));
+                field = new SearchField(name, GetLabel(context ?? this.context, true));
                 options &= ~SearchItemOptions.Compacted;
                 return field.value != null;
             }
             if (string.Equals("description", name, StringComparison.OrdinalIgnoreCase))
             {
                 options |= SearchItemOptions.Compacted;
-                field = new Field(name, GetDescription(context ?? this.context, true));
+                field = new SearchField(name, GetDescription(context ?? this.context, true));
                 options &= ~SearchItemOptions.Compacted;
                 return field.value != null;
             }
+            if (string.Equals("score", name, StringComparison.Ordinal))
+            {
+                field = new SearchField(name, score);
+                return true;
+            }
 
             field = default;
             return false;
         }
 
-        internal object GetValue(string name = null, SearchContext context = null)
+        public object GetValue(string name = null, SearchContext context = null)
         {
             if (TryGetValue(name, context, out var field))
                 return field.value;
             return null;
         }
 
-        internal object this[string name] => GetValue(name);
+        public object this[string name] => GetValue(name);
 
-        internal int GetFieldCount()
+        public int GetFieldCount()
         {
             if (m_Fields == null)
                 return 0;
             return m_Fields.Count;
         }
 
-        internal string[] GetFieldNames()
+        public string[] GetFieldNames()
         {
             if (m_Fields == null)
                 return new string[0];
             return m_Fields.Keys.ToArray();
         }
 
-        internal IEnumerable<Field> GetFields()
+        public IEnumerable<SearchField> GetFields()
         {
             if (m_Fields == null)
-                return Enumerable.Empty<Field>();
+                return Enumerable.Empty<SearchField>();
             return m_Fields.Values;
         }
     }
+
+    public readonly struct SearchField : IEquatable<SearchField>
+    {
+        public readonly string name;
+        public readonly string alias;
+        public readonly object value;
+
+        public string label => alias ?? name;
+
+        public SearchField(string name)
+        {
+            this.name = name;
+            this.alias = null;
+            this.value = null;
+        }
+
+        public SearchField(string name, object value)
+        {
+            this.name = name;
+            this.alias = null;
+            this.value = value;
+        }
+
+        public SearchField(string name, string alias, object value)
+        {
+            this.name = name;
+            this.alias = alias;
+            this.value = value;
+        }
+
+        public override string ToString() => $"{name}[{label}]={value}";
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return name.GetHashCode();
+            }
+        }
+
+        public override bool Equals(object other)
+        {
+            return other is SearchIndexEntry l && Equals(l);
+        }
+
+        public bool Equals(SearchField other)
+        {
+            return string.Equals(name, other.name, StringComparison.Ordinal);
+        }
+    }
 }
diff --git a/Modules/QuickSearch/Editor/SearchList.cs b/Modules/QuickSearch/Editor/SearchList.cs
index d01e070a3c..16c041f76d 100644
--- a/Modules/QuickSearch/Editor/SearchList.cs
+++ b/Modules/QuickSearch/Editor/SearchList.cs
@@ -132,8 +132,7 @@ public IEnumerable<TResult> Select<TResult>(Func<SearchItem, TResult> selector)
         {
             return Fetch().Where(item =>
             {
-                if (context.options.HasAny(SearchFlags.Synchronous))
-                    Dispatcher.ProcessOne();
+                context.Tick();
                 return item != null;
             }).Select(item => selector(item));
         }
@@ -209,9 +208,8 @@ public override IEnumerable<SearchItem> Fetch()
 
             while (context.searchInProgress)
             {
-                if (context.options.HasAny(SearchFlags.Synchronous))
-                    Dispatcher.ProcessOne();
-                yield return null;
+                if (context.Tick())
+                    yield return null;
             }
 
             var it = GetEnumerator();
@@ -798,9 +796,8 @@ public override IEnumerable<SearchItem> Fetch()
                 }
                 else
                 {
-                    if (context.options.HasAny(SearchFlags.Synchronous))
-                        Dispatcher.ProcessOne();
-                    yield return null; // Wait for more items...
+                    if (context.Tick())
+                        yield return null; // Wait for more items...
                 }
             }
 
diff --git a/Modules/QuickSearch/Editor/SearchMonitor.cs b/Modules/QuickSearch/Editor/SearchMonitor.cs
index fd2db01f14..7be026a393 100644
--- a/Modules/QuickSearch/Editor/SearchMonitor.cs
+++ b/Modules/QuickSearch/Editor/SearchMonitor.cs
@@ -10,14 +10,13 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using UnityEditor.Profiling;
 using UnityEditor.SceneManagement;
 using UnityEngine;
 
 
 namespace UnityEditor.Search
 {
-    readonly struct AssetIndexChangeSet
+    public readonly struct AssetIndexChangeSet
     {
         public readonly string[] updated;
         public readonly string[] removed;
@@ -29,19 +28,18 @@ public AssetIndexChangeSet(string[] updated, string[] removed)
         }
 
         public AssetIndexChangeSet(IEnumerable<string> updated, IEnumerable<string> removed, IEnumerable<string> moved, Func<string, bool> predicate)
+            : this(updated.Concat(moved).Distinct(), removed, predicate)
         {
-            this.updated = updated.Concat(moved).Distinct().Where(predicate).ToArray();
-            this.removed = removed.Distinct().Where(predicate).ToArray();
         }
 
         public AssetIndexChangeSet(IEnumerable<string> updated, IEnumerable<string> removed, Func<string, bool> predicate)
         {
-            this.updated = updated.Where(predicate).ToArray();
+            this.updated = updated.Except(removed).Where(predicate).ToArray();
             this.removed = removed.Distinct().Where(predicate).ToArray();
         }
 
         public bool empty => updated?.Length == 0 && removed?.Length == 0;
-        public IEnumerable<string> all => updated.Concat(removed).Distinct();
+        public IEnumerable<string> all => updated?.Concat(removed ?? new string[0]).Distinct() ?? Enumerable.Empty<string>();
     }
 
     class AssetChangedListener : AssetPostprocessor
@@ -55,11 +53,11 @@ internal static void OnPostprocessAllAssets(string[] imported, string[] deleted,
         }
     }
 
-    struct SearchMonitorView : IDisposable
+    public struct SearchMonitorView : IDisposable
     {
         static ConcurrentDictionary<int, SearchMonitorView> s_PropertyDatabaseViews = new ConcurrentDictionary<int, SearchMonitorView>();
-        internal PropertyDatabaseView propertyDatabaseView { get; }
-        internal PropertyDatabaseView propertyAliasesView { get; }
+        internal IPropertyDatabaseView propertyDatabaseView { get; }
+        internal IPropertyDatabaseView propertyAliasesView { get; }
 
         bool m_Disposed;
         bool m_NeedsDispose;
@@ -182,7 +180,7 @@ public void Invalidate(PropertyDatabaseRecordKey recordKey)
     }
 
     [InitializeOnLoad]
-    static class SearchMonitor
+    public static class SearchMonitor
     {
         static volatile bool s_Initialize = false;
         static bool s_ContentRefreshedEnabled;
@@ -309,13 +307,13 @@ public static void RaiseContentRefreshed(string[] updated, string[] removed, str
             }
         }
 
-        public static Task TriggerPropertyDatabaseBackgroundUpdate()
+        internal static Task TriggerPropertyDatabaseBackgroundUpdate()
         {
-            return Task.WhenAll(propertyDatabase.TriggerPropertyDatabaseBackgroundUpdate(), propertyAliases.TriggerPropertyDatabaseBackgroundUpdate());
+            return Task.WhenAll(propertyDatabase.TriggerBackgroundUpdate(), propertyAliases.TriggerBackgroundUpdate());
         }
 
 
-        public static void PrintInfo()
+        internal static void PrintInfo()
         {
             var sb = new StringBuilder();
             sb.Append(propertyDatabase.GetInfo());
@@ -510,7 +508,7 @@ public static void Log(string message, ulong documentKey = 0UL)
         }
 
         [System.Diagnostics.Conditional("DEBUG_SEARCH_MONITOR")]
-        public static void Log(string message, PropertyDatabaseRecordKey recordKey, object value = null)
+        internal static void Log(string message, PropertyDatabaseRecordKey recordKey, object value = null)
         {
             Debug.LogFormat(LogType.Log, LogOption.NoStacktrace, null, $"{message}: <b>{recordKey.documentKey}</b>, {recordKey.propertyKey}={value}");
         }
diff --git a/Modules/QuickSearch/Editor/SearchProvider.cs b/Modules/QuickSearch/Editor/SearchProvider.cs
index c2977364d1..6b61b7a31a 100644
--- a/Modules/QuickSearch/Editor/SearchProvider.cs
+++ b/Modules/QuickSearch/Editor/SearchProvider.cs
@@ -292,7 +292,9 @@ internal void RecordFetchTime(double t)
 
         /// <summary>Unique id of the provider.</summary>
         public string id { get; private set; }
-        internal string type { get; set; }
+
+        /// <summary>Non-unique id of the provider. This is used for specialized or grouped providers.</summary>
+        public string type { get; set; }
 
         /// <summary>Display name of the provider.</summary>
         public string name { get; private set; }
@@ -370,6 +372,12 @@ internal void RecordFetchTime(double t)
         /// </summary>
         public Func<SearchContext, IEnumerable<SearchItem>, IEnumerable<SearchColumn>> fetchColumns;
 
+        /// <summary>
+        /// Returns a default table configuration for the current provider if any.
+        /// TODO: Make public when 22.2 Search API lands
+        /// </summary>
+        internal Func<SearchContext, SearchTable> tableConfig;
+
         /// <summary>
         /// Called when the QuickSearchWindow is opened. Allow the Provider to perform some caching.
         /// </summary>
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchQuery.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchQuery.cs
index 40b988be6b..0e307584c7 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchQuery.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchQuery.cs
@@ -6,19 +6,18 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using UnityEditor.Profiling;
 using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.Search;
 
 namespace UnityEditor.Search
 {
-    interface ISearchQuery
+    public interface ISearchQuery
     {
         string searchText { get; }
         string displayName { get; set; }
         string details { get; set; }
-        Texture2D thumbnail { get; }
+        Texture2D thumbnail { get; set; }
         string filePath { get; }
         string guid { get; }
         long creationTime { get; }
@@ -26,7 +25,9 @@ interface ISearchQuery
         int itemCount { get; }
         bool isSearchTemplate { get; }
 
-        SearchViewState GetResultViewState();
+        string GetName();
+        SearchTable GetSearchTable();
+        SearchViewState GetViewState();
         IEnumerable<string> GetProviderIds();
         IEnumerable<string> GetProviderTypes();
     }
@@ -41,20 +42,18 @@ enum SearchQuerySortOrder
     }
 
     [Serializable]
-    class SearchQuery : ISearchQuery, ISerializationCallbackReceiver
+    class SearchQuery : ISearchQuery
     {
         public static string userSearchSettingsFolder => Utils.CleanPath(Path.Combine(InternalEditorUtility.unityPreferencesFolder, "Search"));
         public string searchText
         {
             get
             {
-                return viewState.context == null ? viewState.searchText : viewState.context.searchText;
+                return viewState.text;
             }
             set
             {
-                viewState.searchText = value;
-                if (viewState.context != null)
-                    viewState.context.searchText = value;
+                viewState.text = value;
             }
         }
 
@@ -69,7 +68,6 @@ public string searchText
         public string description;
         public string name;
         public SearchViewState viewState;
-        public SearchTable tableConfig;
 
         public string filePath { get; set; }
 
@@ -177,14 +175,18 @@ public SearchQuery(SearchViewState state, SearchTable table)
             name = description = Utils.Simplify(state.context.searchText);
         }
 
+        public string GetName()
+        {
+            return name;
+        }
+
         public void Set(SearchViewState state, SearchTable table)
         {
             if (viewState == null)
                 viewState = new SearchViewState();
             viewState.Assign(state);
-            tableConfig = table?.Clone();
-            if (tableConfig != null)
-                viewState.tableConfig = tableConfig;
+            if (table != null)
+                viewState.tableConfig = table.Clone();
         }
 
         public IEnumerable<string> GetProviderIds()
@@ -197,16 +199,26 @@ public IEnumerable<string> GetProviderTypes()
             return viewState.GetProviderTypes();
         }
 
-        public SearchViewState GetResultViewState()
+        public SearchViewState GetViewState()
         {
             return viewState;
         }
 
+        public SearchTable GetSearchTable()
+        {
+            return viewState?.tableConfig;
+        }
+
         public override int GetHashCode()
         {
             return string.IsNullOrEmpty(filePath) ? filePath.GetHashCode() : m_GUID.GetHashCode();
         }
 
+        public override string ToString()
+        {
+            return $"{searchText}";
+        }
+
         #region UserQueryManagement
         public static bool IsUserQuery(SearchQuery query)
         {
@@ -288,13 +300,19 @@ private static SearchQuery LoadSearchQuery(string path)
 
         public static ISearchView Open(ISearchQuery query, SearchFlags additionalFlags)
         {
-            var providerIds = QuickSearch.GetMergedProviders(QuickSearch.GetCurrentSearchWindowProviders(), query.GetProviderIds()).Select(p => p.id);
-            var searchWindow = QuickSearch.OpenWithContextualProvider(query.searchText, providerIds.ToArray(), additionalFlags, "Unity");
-            searchWindow.ExecuteSearchQuery(query);
-            return searchWindow;
+            var viewState = query.GetViewState();
+            viewState.text = query.searchText;
+            if (viewState.context != null)
+                viewState.context.options |= additionalFlags;
+            else
+            {
+                viewState.searchFlags |= additionalFlags;
+                viewState.BuildContext();
+            }
+            return SearchService.ShowWindow(viewState);
         }
 
-        public static void ShowQueryIconPicker(Action<UnityEngine.Texture2D, bool> selectIcon)
+        public static void ShowQueryIconPicker(Action<Texture2D, bool> selectIcon)
         {
             var pickIconContext = SearchService.CreateContext(new[] { "adb", "asset" }, "", SearchFlags.WantsMore);
             var viewState = new SearchViewState(pickIconContext,
@@ -311,18 +329,8 @@ public static Texture2D GetIcon(ISearchQuery query)
         {
             if (query.thumbnail)
                 return query.thumbnail;
-            var displayMode = QuickSearch.GetDisplayModeFromItemSize(query.GetResultViewState().itemSize);
+            var displayMode = QuickSearch.GetDisplayModeFromItemSize(query.GetViewState().itemSize);
             return QuickSearch.GetIconFromDisplayMode(displayMode);
         }
-
-        public void OnBeforeSerialize()
-        {
-        }
-
-        public void OnAfterDeserialize()
-        {
-            if (viewState.tableConfig == null && tableConfig != null)
-                viewState.tableConfig = tableConfig;
-        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs
index 96fc1511f0..70ba5c366c 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryAsset.cs
@@ -80,7 +80,11 @@ public string details
             set => description = value;
         }
 
-        public Texture2D thumbnail => icon;
+        public Texture2D thumbnail
+        {
+            get => icon;
+            set => icon = value;
+        }
         public string filePath => AssetDatabase.GetAssetPath(this);
 
         private string m_GUID;
@@ -101,11 +105,8 @@ public string guid
 
         [Multiline]
         public string description;
-
         public List<string> providerIds;
-
         public SearchViewState viewState;
-
         public Texture2D icon;
 
         [SerializeField] private bool m_IsSearchTemplate;
@@ -163,6 +164,11 @@ private static IEnumerable<SearchQueryAsset> EnumerateAll()
             }
         }
 
+        public string GetName()
+        {
+            return name;
+        }
+
         public static SearchQueryAsset Create(SearchContext context, string description = null)
         {
             return Create(context.searchText, context.GetProviders(), description);
@@ -227,18 +233,6 @@ public static IEnumerable<SearchQueryAsset> GetFilteredSearchQueries(SearchConte
             return savedQueries.Where(query => query && (query.providerIds.Count == 0 || query.providerIds.Any(id => context.IsEnabled(id))));
         }
 
-        public static IEnumerable<SearchItem> GetAllSearchQueryItems(SearchContext context)
-        {
-            var icon = Utils.FindTextureForType(typeof(SearchQueryAsset));
-            var queryProvider = SearchService.GetProvider(Providers.Query.type);
-            return GetFilteredSearchQueries(context).Select(query =>
-            {
-                var id = GlobalObjectId.GetGlobalObjectIdSlow(query).ToString();
-                var description = string.IsNullOrEmpty(query.description) ? $"{query.text}" : $"{query.description} ({query.text})";
-                return queryProvider.CreateItem(context, id, query.name, description, icon, query);
-            }).OrderBy(item => item.label);
-        }
-
         public static void ResetSearchQueryItems()
         {
             s_SavedQueries = null;
@@ -265,7 +259,7 @@ public static void AddToRecentSearch(ISearchQuery query)
 
         public SearchQuery ToSearchQuery()
         {
-            var viewState = GetResultViewState();
+            var viewState = GetViewState();
             return new SearchQuery(viewState, viewState.tableConfig);
         }
 
@@ -293,9 +287,14 @@ public IEnumerable<string> GetProviderTypes()
             return GetProviders().Select(p => p.type).Distinct();
         }
 
-        public SearchViewState GetResultViewState()
+        public SearchViewState GetViewState()
         {
             return viewState;
         }
+
+        public SearchTable GetSearchTable()
+        {
+            return viewState?.tableConfig;
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs
index 3a7193c446..ba752f75b2 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryEditor.cs
@@ -203,7 +203,7 @@ void SelectIcon(UnityEngine.Object obj, bool isCanceled)
 
             if (EditorGUI.DropdownButton(position, GUIContent.none, FocusType.Passive, s_IconButtonStyle))
             {
-                SearchQuery.ShowQueryIconPicker(SelectIcon);
+                SearchUtils.ShowIconPicker(SelectIcon);
                 GUIUtility.ExitGUI();
             }
 
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeView.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeView.cs
index 99dee9b26b..d232544547 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeView.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeView.cs
@@ -386,7 +386,7 @@ public void Add(ISearchQuery query, bool select = true)
                 SortBy(m_ProjectQueries, m_SortOrder);
 
                 var evt = searchView.CreateEvent(SearchAnalytics.GenericEventType.QuickSearchCreateSearchQuery, query.searchText, query.filePath, "project");
-                evt.intPayload1 = query.GetResultViewState().tableConfig != null ? 1 : 0;
+                evt.intPayload1 = query.GetViewState().tableConfig != null ? 1 : 0;
                 SearchAnalytics.SendEvent(evt);
             }
             else if (query is SearchQuery sq && SearchQuery.IsUserQuery(sq))
@@ -397,7 +397,7 @@ public void Add(ISearchQuery query, bool select = true)
                 SortBy(m_UserQueries, m_SortOrder);
 
                 var evt = searchView.CreateEvent(SearchAnalytics.GenericEventType.QuickSearchCreateSearchQuery, query.searchText, "", "user");
-                evt.intPayload1 = query.GetResultViewState().tableConfig != null ? 1 : 0;
+                evt.intPayload1 = query.GetViewState().tableConfig != null ? 1 : 0;
                 SearchAnalytics.SendEvent(evt);
             }
 
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeViewItem.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeViewItem.cs
index 54e44a414e..2a03c5c8a3 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeViewItem.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchQueryTreeViewItem.cs
@@ -111,7 +111,7 @@ public override void OpenContextualMenu()
             });
             menu.AddSeparator("");
             menu.AddItem(new GUIContent("Rename"), false, () => treeView.BeginRename(this, 0f));
-            menu.AddItem(new GUIContent("Set Icon..."), false, () => SearchQuery.ShowQueryIconPicker((newIcon, canceled) =>
+            menu.AddItem(new GUIContent("Set Icon..."), false, () => SearchUtils.ShowIconPicker((newIcon, canceled) =>
             {
                 if (canceled)
                     return;
@@ -180,7 +180,7 @@ public override void OpenContextualMenu()
             });
             menu.AddSeparator("");
             menu.AddItem(new GUIContent("Rename"), false, () => treeView.BeginRename(this, 0f));
-            menu.AddItem(new GUIContent("Set Icon..."), false, () => SearchQuery.ShowQueryIconPicker((newIcon, canceled) =>
+            menu.AddItem(new GUIContent("Set Icon..."), false, () => SearchUtils.ShowIconPicker((newIcon, canceled) =>
             {
                 if (canceled)
                     return;
diff --git a/Modules/QuickSearch/Editor/SearchQuery/SearchTemplateAttribute.cs b/Modules/QuickSearch/Editor/SearchQuery/SearchTemplateAttribute.cs
index d511252958..c014943f55 100644
--- a/Modules/QuickSearch/Editor/SearchQuery/SearchTemplateAttribute.cs
+++ b/Modules/QuickSearch/Editor/SearchQuery/SearchTemplateAttribute.cs
@@ -37,9 +37,16 @@ IEnumerable<ISearchQuery> CreateQuery()
             foreach (var query in queries)
             {
                 var q = new SearchQuery();
-                q.searchText = query;
-                q.displayName = query;
-                q.viewState.providerIds = new[] { providerId };
+                var provider = SearchService.GetProvider(providerId);
+                var searchText = query;
+                if (provider != null && !query.StartsWith(provider.filterId))
+                {
+                    searchText = $"{provider.filterId} {query}";
+                }
+                q.searchText = searchText;
+                q.displayName = searchText;
+                if (!string.IsNullOrEmpty(providerId))
+                    q.viewState.providerIds = new[] { providerId };
                 q.description = description;
                 q.viewState.SetSearchViewFlags(viewFlags);
                 yield return q;
diff --git a/Modules/QuickSearch/Editor/SearchService.cs b/Modules/QuickSearch/Editor/SearchService.cs
index b0922c9637..196549013f 100644
--- a/Modules/QuickSearch/Editor/SearchService.cs
+++ b/Modules/QuickSearch/Editor/SearchService.cs
@@ -575,7 +575,8 @@ public static ISearchView ShowWindow(SearchContext context = null, string topic
         /// <returns></returns>
         public static ISearchView ShowWindow(SearchViewState viewState)
         {
-            return QuickSearch.Create(viewState).ShowWindow();
+            return QuickSearch.Create(viewState).ShowWindow(viewState.windowSize.x, viewState.windowSize.y,
+                SearchFlags.OpenDefault | (viewState.context?.options ?? SearchFlags.None));
         }
 
         /// <summary>
@@ -647,7 +648,7 @@ public static ISearchView ShowPicker(SearchViewState viewState)
             return SearchPickerWindow.ShowPicker(viewState);
         }
 
-        internal static IEnumerable<SearchProvider> GetActiveProviders()
+        public static IEnumerable<SearchProvider> GetActiveProviders()
         {
             return Providers.Where(p => p.active);
         }
@@ -727,6 +728,12 @@ public static void CreateIndex(
             TrackCreateIndex(db, options, indexName, indexPath, onIndexReady, 1d);
         }
 
+        public static IEnumerable<ISearchDatabase> EnumerateDatabases()
+        {
+            foreach (var db in SearchDatabase.EnumerateAll())
+                yield return db;
+        }
+
         /// <summary>
         /// Checks if a search index is ready to be used.
         /// </summary>
@@ -752,10 +759,23 @@ static void TrackCreateIndex(SearchDatabase db, IndexingOptions options, string
             {
                 onIndexReady?.Invoke(indexName, indexPath.Replace("\\", "/"), () =>
                 {
-                    if (EditorUtility.IsPersistent(db))
-                        Resources.UnloadAsset(db);
-                    if (options.HasNone(IndexingOptions.Keep))
-                        AssetDatabase.DeleteAsset(indexPath);
+                    SearchDatabase.Unload(db);
+
+                    try
+                    {
+                        if (options.HasNone(IndexingOptions.Keep) && System.IO.File.Exists(indexPath))
+                        {
+                            if (options.HasAny(IndexingOptions.Temporary))
+                                System.IO.File.Delete(indexPath);
+                            else
+                                AssetDatabase.DeleteAsset(indexPath);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        // Ignore any file IO errors (for the user)
+                        Console.WriteLine(ex.Message);
+                    }
                 });
             }
             else
@@ -824,7 +844,7 @@ static bool EvaluateExpression(SearchContext context, IEnumerator<SearchItem> it
             }
             catch (SearchExpressionEvaluatorException ex)
             {
-                var queryError = new SearchQueryError(ex.errorView.startIndex, ex.errorView.Length, ex.Message,
+                var queryError = new SearchQueryError(ex.errorView.startIndex, ex.errorView.length, ex.Message,
                     context, s_SearchServiceProvider, fromSearchQuery: false, SearchQueryErrorType.Error);
                 context.AddSearchQueryError(queryError);
                 return false;
diff --git a/Modules/QuickSearch/Editor/SearchSession.cs b/Modules/QuickSearch/Editor/SearchSession.cs
index 050c0da8b4..a983d1de2a 100644
--- a/Modules/QuickSearch/Editor/SearchSession.cs
+++ b/Modules/QuickSearch/Editor/SearchSession.cs
@@ -336,5 +336,11 @@ public void Clear()
             m_SearchSessions.Clear();
             asyncItemReceived = null;
         }
+
+        public void Tick()
+        {
+            foreach (var searchSession in m_SearchSessions)
+                searchSession.Value.OnUpdate();
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/SearchSettings.cs b/Modules/QuickSearch/Editor/SearchSettings.cs
index b1b1446fc7..b4b9591c84 100644
--- a/Modules/QuickSearch/Editor/SearchSettings.cs
+++ b/Modules/QuickSearch/Editor/SearchSettings.cs
@@ -73,42 +73,42 @@ IEnumerator IEnumerable.GetEnumerator()
         public void Remove(object key) { throw new NotSupportedException(); }
     }
 
-    static class SearchSettings
+    public static class SearchSettings
     {
-        public static readonly string projectLocalSettingsFolder = Utils.CleanPath(new DirectoryInfo("UserSettings").FullName);
-        public static readonly string projectLocalSettingsPath = $"{projectLocalSettingsFolder}/Search.settings";
+        internal static readonly string projectLocalSettingsFolder = Utils.CleanPath(new DirectoryInfo("UserSettings").FullName);
+        internal static readonly string projectLocalSettingsPath = $"{projectLocalSettingsFolder}/Search.settings";
 
         const string k_ItemIconSizePrefKey = "Search.ItemIconSize";
-        public const string settingsPreferencesKey = "Preferences/Search";
+        internal const string settingsPreferencesKey = "Preferences/Search";
 
         // Per project settings
-        public static bool trackSelection { get; set; }
-        public static bool fetchPreview { get; set; }
-        public static bool wantsMore { get; set; }
-        public static bool keepOpen { get; set; }
-        public static string queryFolder { get; set; }
-        public static bool onBoardingDoNotAskAgain { get; set; }
-        public static bool showPackageIndexes { get; set; }
-        public static bool showStatusBar { get; set; }
-        public static SearchQuerySortOrder savedSearchesSortOrder { get; set; }
-        public static bool showSavedSearchPanel { get; set; }
-        public static Dictionary<string, string> scopes { get; private set; }
-        public static Dictionary<string, SearchProviderSettings> providers { get; private set; }
-        public static bool queryBuilder { get; set; }
-        public static string ignoredProperties { get; set; }
-        public static string helperWidgetCurrentArea { get; set; }
-
-        public static int[] expandedQueries { get; set; }
+        internal static bool trackSelection { get; set; }
+        internal static bool fetchPreview { get; set; }
+        internal static bool wantsMore { get; set; }
+        internal static bool keepOpen { get; set; }
+        internal static string queryFolder { get; set; }
+        internal static bool onBoardingDoNotAskAgain { get; set; }
+        internal static bool showPackageIndexes { get; set; }
+        internal static bool showStatusBar { get; set; }
+        internal static SearchQuerySortOrder savedSearchesSortOrder { get; set; }
+        internal static bool showSavedSearchPanel { get; set; }
+        internal static Dictionary<string, string> scopes { get; private set; }
+        internal static Dictionary<string, SearchProviderSettings> providers { get; private set; }
+        internal static bool queryBuilder { get; set; }
+        internal static string ignoredProperties { get; set; }
+        internal static string helperWidgetCurrentArea { get; set; }
+
+        internal static int[] expandedQueries { get; set; }
 
         // User editor pref
-        public static float itemIconSize { get; set; } = (float)DisplayMode.List;
+        internal static float itemIconSize { get; set; } = (float)DisplayMode.List;
 
-        public const int k_RecentSearchMaxCount = 20;
-        public static List<string> recentSearches = new List<string>(k_RecentSearchMaxCount);
+        internal const int k_RecentSearchMaxCount = 20;
+        internal static List<string> recentSearches = new List<string>(k_RecentSearchMaxCount);
 
         static string s_DisabledIndexersString;
         static HashSet<string> s_DisabledIndexers;
-        public static HashSet<string> disabledIndexers
+        internal static HashSet<string> disabledIndexers
         {
             get
             {
@@ -122,11 +122,11 @@ public static HashSet<string> disabledIndexers
         }
 
         public static HashSet<string> searchItemFavorites = new HashSet<string>();
-        public static HashSet<string> searchQueryFavorites = new HashSet<string>();
+        internal static HashSet<string> searchQueryFavorites = new HashSet<string>();
 
         internal static event Action<string, bool> providerActivationChanged;
 
-        public static int debounceMs
+        internal static int debounceMs
         {
             get { return UnityEditor.SearchUtils.debounceThresholdMs; }
 
@@ -194,7 +194,7 @@ private static void Load()
             LoadFavorites();
         }
 
-        public static void Save()
+        internal static void Save()
         {
             var settings = new Dictionary<string, object>
             {
@@ -228,29 +228,29 @@ public static void Save()
             AssetDatabaseAPI.RegisterCustomDependency("SearchIndexIgnoredProperties", Hash128.Compute(ignoredProperties));
         }
 
-        public static void SetScopeValue(string prefix, int hash, string value)
+        internal static void SetScopeValue(string prefix, int hash, string value)
         {
             scopes[$"{prefix}.{hash:X8}"] = value;
         }
 
-        public static void SetScopeValue(string prefix, int hash, int value)
+        internal static void SetScopeValue(string prefix, int hash, int value)
         {
             scopes[$"{prefix}.{hash:X8}"] = value.ToString();
         }
 
-        public static void SetScopeValue(string prefix, int hash, float value)
+        internal static void SetScopeValue(string prefix, int hash, float value)
         {
             scopes[$"{prefix}.{hash:X8}"] = value.ToString();
         }
 
-        public static string GetScopeValue(string prefix, int hash, string defaultValue)
+        internal static string GetScopeValue(string prefix, int hash, string defaultValue)
         {
             if (scopes.TryGetValue($"{prefix}.{hash:X8}", out var value))
                 return value;
             return defaultValue;
         }
 
-        public static int GetScopeValue(string prefix, int hash, int defaultValue)
+        internal static int GetScopeValue(string prefix, int hash, int defaultValue)
         {
             if (scopes.TryGetValue($"{prefix}.{hash:X8}", out var value))
             {
@@ -259,7 +259,7 @@ public static int GetScopeValue(string prefix, int hash, int defaultValue)
             return defaultValue;
         }
 
-        public static float GetScopeValue(string prefix, int hash, float defaultValue)
+        internal static float GetScopeValue(string prefix, int hash, float defaultValue)
         {
             if (scopes.TryGetValue($"{prefix}.{hash:X8}", out var value))
             {
@@ -268,7 +268,7 @@ public static float GetScopeValue(string prefix, int hash, float defaultValue)
             return defaultValue;
         }
 
-        public static SearchFlags GetContextOptions()
+        internal static SearchFlags GetContextOptions()
         {
             SearchFlags options = SearchFlags.Default;
             if (wantsMore)
@@ -276,7 +276,7 @@ public static SearchFlags GetContextOptions()
             return options;
         }
 
-        public static SearchFlags ApplyContextOptions(SearchFlags options)
+        internal static SearchFlags ApplyContextOptions(SearchFlags options)
         {
             if (wantsMore)
                 options |= SearchFlags.WantsMore;
@@ -284,12 +284,12 @@ public static SearchFlags ApplyContextOptions(SearchFlags options)
             return options;
         }
 
-        public static void ApplyContextOptions(SearchContext context)
+        internal static void ApplyContextOptions(SearchContext context)
         {
             context.options = ApplyContextOptions(context.options);
         }
 
-        public static void AddRecentSearch(string search)
+        internal static void AddRecentSearch(string search)
         {
             recentSearches.Insert(0, search);
             if (recentSearches.Count > k_RecentSearchMaxCount)
@@ -554,7 +554,8 @@ private static void DrawProviderSettings()
 
                 using (new EditorGUI.DisabledGroupScope(!p.active))
                 {
-                    GUILayout.Label(new GUIContent(p.name, $"{p.id}"), GUILayout.Width(175));
+                    var content = p.name + " (" + $"{p.filterId}" + ")";
+                    GUILayout.Label(new GUIContent(content), GUILayout.Width(175));
                 }
 
                 if (!p.isExplicitProvider)
@@ -604,7 +605,7 @@ private static void DrawProviderSettings()
             GUILayout.EndHorizontal();
         }
 
-        public static SearchProviderSettings GetProviderSettings(string providerId)
+        internal static SearchProviderSettings GetProviderSettings(string providerId)
         {
             if (TryGetProviderSettings(providerId, out var settings))
                 return settings;
@@ -617,7 +618,7 @@ public static SearchProviderSettings GetProviderSettings(string providerId)
             return providers[providerId];
         }
 
-        public static bool TryGetProviderSettings(string providerId, out SearchProviderSettings settings)
+        internal static bool TryGetProviderSettings(string providerId, out SearchProviderSettings settings)
         {
             return providers.TryGetValue(providerId, out settings);
         }
@@ -685,7 +686,7 @@ private static void SetDefaultAction(string providerId, string actionId)
             SortActionsPriority();
         }
 
-        public static void SortActionsPriority()
+        internal static void SortActionsPriority()
         {
             foreach (var searchProvider in SearchService.Providers)
                 SortActionsPriority(searchProvider);
@@ -714,7 +715,7 @@ private static void SortActionsPriority(SearchProvider searchProvider)
             });
         }
 
-        public static string GetFullQueryFolderPath()
+        internal static string GetFullQueryFolderPath()
         {
             var initialFolder = Utils.CleanPath(new DirectoryInfo(queryFolder).FullName);
             if (!Directory.Exists(initialFolder) || !Utils.IsPathUnderProject(initialFolder))
@@ -752,13 +753,13 @@ static class Styles
             public static GUIContent debounceThreshold = EditorGUIUtility.TrTextContent("Select the typing debounce threshold (ms)");
         }
 
-        public static void AddSearchFavorite(string searchText)
+        internal static void AddSearchFavorite(string searchText)
         {
             searchQueryFavorites.Add(searchText);
             SaveFavorites();
         }
 
-        public static void RemoveSearchFavorite(string searchText)
+        internal static void RemoveSearchFavorite(string searchText)
         {
             searchQueryFavorites.Remove(searchText);
             SaveFavorites();
@@ -776,13 +777,13 @@ public static void RemoveItemFavorite(SearchItem item)
             SearchAnalytics.SendEvent(null, SearchAnalytics.GenericEventType.QuickSearchRemoveFavoriteItem, item.provider.id);
         }
 
-        public static void LoadFavorites()
+        internal static void LoadFavorites()
         {
             var favoriteString = EditorPrefs.GetString("SearchQuery.Favorites", "");
             searchQueryFavorites.UnionWith(favoriteString.Split(new string[] { ";;;" }, StringSplitOptions.RemoveEmptyEntries));
         }
 
-        public static void SaveFavorites()
+        internal static void SaveFavorites()
         {
             EditorPrefs.SetString("SearchQuery.Favorites", string.Join(";;;", searchQueryFavorites));
         }
diff --git a/Modules/QuickSearch/Editor/SearchUtils.cs b/Modules/QuickSearch/Editor/SearchUtils.cs
index 12e7685532..356cc10556 100644
--- a/Modules/QuickSearch/Editor/SearchUtils.cs
+++ b/Modules/QuickSearch/Editor/SearchUtils.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
@@ -49,6 +50,11 @@ public static string[] FindShiftLeftVariations(string word)
             return variations.ToArray();
         }
 
+        public static Texture2D GetSceneObjectPreview(GameObject obj, Vector2 size, FetchPreviewOptions options, Texture2D thumbnail)
+        {
+            return Utils.GetSceneObjectPreview(obj, size, options, thumbnail);
+        }
+
         /// <summary>
         /// Tokenize a string each Capital letter.
         /// </summary>
@@ -71,7 +77,18 @@ internal static string UppercaseFirst(string s)
             return char.ToUpper(s[0]) + s.Substring(1);
         }
 
-        internal static string ToPascalWithSpaces(string s)
+        internal static string LowercaseFirst(string s)
+        {
+            // Check for empty string.
+            if (string.IsNullOrEmpty(s))
+            {
+                return string.Empty;
+            }
+            // Return char and concat substring.
+            return char.ToLower(s[0]) + s.Substring(1);
+        }
+
+        internal static string ToPascalWithSpaces(string s, bool uppercaseFirstWordOnly = false)
         {
             // Check for empty string.
             if (string.IsNullOrEmpty(s))
@@ -81,7 +98,12 @@ internal static string ToPascalWithSpaces(string s)
 
             var tokens = Regex.Split(s, @"-+|_+|\s+|(?<!^)(?=[A-Z0-9])")
                 .Where(t => !string.IsNullOrWhiteSpace(t))
-                .Select(UppercaseFirst);
+                .Select((word, index) =>
+                {
+                    if (uppercaseFirstWordOnly && index != 0)
+                        return LowercaseFirst(word);
+                    return UppercaseFirst(word);
+                });
             return string.Join(" ", tokens);
         }
 
@@ -436,7 +458,7 @@ internal static ISet<string> GetReferences(UnityEngine.Object obj, int level = 1
         }
 
         static readonly Dictionary<string, SearchProvider> s_GroupProviders = new Dictionary<string, SearchProvider>();
-        internal static SearchProvider CreateGroupProvider(SearchProvider templateProvider, string groupId, int groupPriority, bool cacheProvider = false)
+        public static SearchProvider CreateGroupProvider(SearchProvider templateProvider, string groupId, int groupPriority, bool cacheProvider = false)
         {
             if (cacheProvider && s_GroupProviders.TryGetValue(groupId, out var groupProvider))
                 return groupProvider;
@@ -483,12 +505,6 @@ internal static IEnumerable<SearchProposition> FetchTypePropositions<T>(string c
         {
             if (category != null)
             {
-                yield return new SearchProposition(
-                    priority: priority,
-                    category: null,
-                    label: category,
-                    icon: EditorGUIUtility.FindTexture("FilterByType"));
-
                 yield return new SearchProposition(category: category, label: "Prefabs", replacement: "t:prefab",
                     icon: GetTypeIcon(typeof(GameObject)), data: typeof(GameObject), type: blockType, priority: priority, color: QueryColors.type);
             }
@@ -525,6 +541,7 @@ internal static IEnumerable<SearchProposition> FetchTypePropositions<T>(string c
                     label: t.Name,
                     replacement: $"t:{t.Name}",
                     data: t,
+                    help: $"Search {t.Name}",
                     type: blockType,
                     icon: GetTypeIcon(t),
                     color: QueryColors.type);
@@ -558,8 +575,55 @@ internal static SearchProposition CreateKeywordProposition(in string keyword)
                     GetTypeIcon(ownerType));
         }
 
+        internal static IEnumerable<SearchProposition> FetchEnumPropositions<T>(string category = null, string replacementId = null, string replacementOp = null, Type blockType = null, int priority = 0, Texture2D icon = null, Color color = default) where T : Enum
+        {
+            var type = typeof(T);
+            return FetchEnumPropositions(type, category, replacementId, replacementOp, blockType, priority, icon, color);
+        }
+
+        internal static IEnumerable<SearchProposition> FetchEnumPropositions(Type enumType, string category = null, string replacementId = null, string replacementOp = null, Type blockType = null, int priority = 0, Texture2D icon = null, Color color = default)
+        {
+            if (!enumType?.IsEnum ?? true)
+                throw new ArgumentException("Type should of an enum.", nameof(enumType));
+
+            if (blockType == null)
+                blockType = typeof(QueryFilterBlock);
+
+            var replacementBase = $"{replacementId}{replacementOp}";
+
+            var enumNames = Enum.GetNames(enumType).Select(n => Utils.FastToLower(n)).ToList();
+            var fields = enumType.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
+            foreach (var fieldInfo in fields)
+            {
+                if (fieldInfo.FieldType != enumType)
+                    continue;
+
+                var enumName = fieldInfo.Name;
+                var label = ToPascalWithSpaces(enumName, true);
+                var data = Utils.FastToLower(enumName);
+                var replacement = label;
+                if (blockType == typeof(QueryFilterBlock))
+                {
+                    replacement = $"{replacementBase}<$enum:{enumName},{enumType.Name}$>";
+                }
+                else if (blockType == typeof(QueryListMarkerBlock))
+                {
+                    replacement = $"{replacementBase}{GetListMarkerReplacementText(data, enumNames, Utils.GetIconSkinAgnosticName(icon), color)}";
+                    data = replacement;
+                }
+
+                string help = null;
+                var descriptionAttribute = fieldInfo.GetCustomAttribute<System.ComponentModel.DescriptionAttribute>();
+                if (descriptionAttribute != null)
+                    help = descriptionAttribute.Description;
+
+                yield return new SearchProposition(category: category, label: label, replacement: replacement, help: help,
+                    data: data, priority: priority, icon: icon, type: blockType, color: color);
+            }
+        }
+
         static Dictionary<Type, Texture2D> s_TypeIcons = new Dictionary<Type, Texture2D>();
-        internal static Texture2D GetTypeIcon(in Type type)
+        public static Texture2D GetTypeIcon(in Type type)
         {
             if (s_TypeIcons.TryGetValue(type, out var t) && t)
                 return t;
@@ -874,5 +938,133 @@ internal static IEnumerable<Type> FindTypes<T>(string typeString)
                 }
             }
         }
+
+        internal static string GetListMarkerReplacementText(string currentValue, IEnumerable<string> choices, string iconName = null, Color? color = null)
+        {
+            var sb = new StringBuilder($"<$list:{currentValue}, [{string.Join(", ", choices)}]");
+            if (!string.IsNullOrEmpty(iconName))
+                sb.Append($", {iconName}");
+            if (color.HasValue)
+                sb.Append($", #{ColorUtility.ToHtmlStringRGBA(color.Value)}");
+
+            sb.Append("$>");
+
+            return sb.ToString();
+        }
+
+        public static ISearchQuery CreateQuery(in string name, SearchContext context, SearchTable tableConfig)
+        {
+            return new SearchQuery()
+            {
+                name = name,
+                viewState = new SearchViewState(context),
+                displayName = name
+            };
+        }
+
+        public static ISearchQuery FindQuery(string guid)
+        {
+            return SearchQuery.searchQueries.FirstOrDefault(sq => sq.guid == guid);
+        }
+
+        public static ISearchView OpenQuery(ISearchQuery sq, SearchFlags flags)
+        {
+            return SearchQuery.Open(sq, flags);
+        }
+
+        public static IEnumerable<ISearchQuery> EnumerateAllQueries()
+        {
+            return SearchQuery.searchQueries.Cast<ISearchQuery>().Concat(SearchQueryAsset.savedQueries);
+        }
+
+        public static SearchItem CreateSceneResult(SearchContext context, SearchProvider sceneProvider, GameObject go)
+        {
+            return Providers.SceneProvider.AddResult(context, sceneProvider, go);
+        }
+
+        public static void ShowIconPicker(Action<Texture2D, bool> iconSelectedHandler)
+        {
+            var pickIconContext = SearchService.CreateContext(new[] { "adb", "asset" }, "", SearchFlags.WantsMore);
+            var viewState = new SearchViewState(pickIconContext,
+                (newIcon, canceled) => iconSelectedHandler(newIcon as Texture2D, canceled),
+                null,
+                "Texture",
+                typeof(Texture2D))
+            {
+                title = "Icon"
+            };
+            viewState.SetSearchViewFlags(UnityEngine.Search.SearchViewFlags.GridView);
+            SearchService.ShowPicker(viewState);
+        }
+
+        public static void ShowColumnSelector(Action<IEnumerable<SearchColumn>, int> columnsAddedHandler, IEnumerable<SearchColumn> columns, Vector2 mousePosition, int activeColumnIndex)
+        {
+            Utils.CallDelayed(() => ColumnSelector.AddColumns(columnsAddedHandler, columns, mousePosition, activeColumnIndex));
+        }
+
+        public static EditorWindow ShowColumnEditor(IMGUI.Controls.MultiColumnHeaderState.Column column, Action<IMGUI.Controls.MultiColumnHeaderState.Column> editHandler)
+        {
+            return ColumnEditor.ShowWindow(column, editHandler);
+        }
+
+        public static bool TryParse<T>(string expression, out T result)
+        {
+            return Utils.TryParse<T>(expression, out result);
+        }
+
+        public static string FormatCount(ulong count)
+        {
+            return Utils.FormatCount(count);
+        }
+
+        public static string FormatBytes(long byteCount)
+        {
+            return Utils.FormatBytes(byteCount);
+        }
+
+        public static int GetMainAssetInstanceID(string assetPath)
+        {
+            return Utils.GetMainAssetInstanceID(assetPath);
+        }
+
+        public static void PingAsset(string assetPath)
+        {
+            Utils.PingAsset(assetPath);
+        }
+
+        public static void StartDrag(UnityEngine.Object[] objects, string label = null)
+        {
+            Utils.StartDrag(objects, label);
+        }
+
+        public static void StartDrag(UnityEngine.Object[] objects, string[] paths, string label = null)
+        {
+            Utils.StartDrag(objects, paths, label);
+        }
+
+        public static Rect GetMainWindowCenteredPosition(Vector2 size)
+        {
+            return Utils.GetMainWindowCenteredPosition(size);
+        }
+
+        public static Texture2D GetAssetThumbnailFromPath(string path)
+        {
+            return Utils.GetAssetThumbnailFromPath(path);
+        }
+
+        public static Texture2D GetAssetPreviewFromPath(string path, FetchPreviewOptions previewOptions)
+        {
+            return Utils.GetAssetPreviewFromPath(path, previewOptions);
+        }
+
+        public static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize, FetchPreviewOptions previewOptions)
+        {
+            return Utils.GetAssetPreviewFromPath(path, previewSize, previewOptions);
+        }
+
+        public static void FrameAssetFromPath(string path)
+        {
+            Utils.FrameAssetFromPath(path);
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Selectors/ItemSelectors.cs b/Modules/QuickSearch/Editor/Selectors/ItemSelectors.cs
index d7886076fa..443faee83b 100644
--- a/Modules/QuickSearch/Editor/Selectors/ItemSelectors.cs
+++ b/Modules/QuickSearch/Editor/Selectors/ItemSelectors.cs
@@ -8,7 +8,7 @@
 
 namespace UnityEditor.Search
 {
-    static class ItemSelectors
+    public static class ItemSelectors
     {
         [SearchSelector("id", priority: 1)] static object GetSearchItemID(SearchItem item) => item.id;
         [SearchSelector("label", priority: 1)] static object GetSearchItemLabel(SearchItem item) => item.GetLabel(item.context);
diff --git a/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs b/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs
index 2d46e85626..81a95d0902 100644
--- a/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs
+++ b/Modules/QuickSearch/Editor/Selectors/SearchColumn.cs
@@ -155,17 +155,17 @@ public class SearchColumn : IEquatable<SearchColumn>, ISerializationCallbackRece
 
         public string name => ParseName(path ?? string.Empty);
 
-        internal SearchColumn(string path, GUIContent content = null, SearchColumnFlags options = SearchColumnFlags.Default)
+        public SearchColumn(string path, GUIContent content = null, SearchColumnFlags options = SearchColumnFlags.Default)
             : this(path, path, content, options)
         {
         }
 
-        internal SearchColumn(string path, string selector, GUIContent content = null, SearchColumnFlags options = SearchColumnFlags.Default)
+        public SearchColumn(string path, string selector, GUIContent content = null, SearchColumnFlags options = SearchColumnFlags.Default)
             : this(path, selector, string.Empty, content, options)
         {
         }
 
-        internal SearchColumn(string path, string selector, string provider, GUIContent content = null, SearchColumnFlags options = SearchColumnFlags.Default)
+        public SearchColumn(string path, string selector, string provider, GUIContent content = null, SearchColumnFlags options = SearchColumnFlags.Default)
         {
             this.path = path;
             this.selector = selector;
@@ -226,7 +226,7 @@ internal static string ParseName(string path)
             return name;
         }
 
-        internal void InitFunctors()
+        public void InitFunctors()
         {
             getter = getter ?? DefaultSelect;
             if (!string.IsNullOrEmpty(provider))
@@ -250,7 +250,7 @@ internal object SelectValue(SearchItem item, SearchContext context)
             return SelectorManager.SelectValue(item, context, selector);
         }
 
-        internal static List<SearchColumn> Enumerate(SearchContext context, IEnumerable<SearchItem> items)
+        public static List<SearchColumn> Enumerate(SearchContext context, IEnumerable<SearchItem> items)
         {
             var columns = new List<SearchColumn>(ItemSelectors.Enumerate(items));
 
diff --git a/Modules/QuickSearch/Editor/Selectors/SearchSelector.cs b/Modules/QuickSearch/Editor/Selectors/SearchSelector.cs
index aab527c42c..e4973221fc 100644
--- a/Modules/QuickSearch/Editor/Selectors/SearchSelector.cs
+++ b/Modules/QuickSearch/Editor/Selectors/SearchSelector.cs
@@ -255,7 +255,7 @@ public static object SelectValue(SearchItem item, SearchContext context, string
 
         public static IEnumerable<SearchItem> SelectValues(SearchContext context, IEnumerable<SearchItem> items, string selector, string setFieldName)
         {
-            return EvaluatorUtils.ProcessValues(items, setFieldName, item => SelectValue(item, context, selector)?.ToString());
+            return SearchExpression.ProcessValues(items, setFieldName, item => SelectValue(item, context, selector)?.ToString());
         }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Table/ColumnEditor.cs b/Modules/QuickSearch/Editor/Table/ColumnEditor.cs
index aa46340ca4..d21bf4d858 100644
--- a/Modules/QuickSearch/Editor/Table/ColumnEditor.cs
+++ b/Modules/QuickSearch/Editor/Table/ColumnEditor.cs
@@ -18,7 +18,7 @@ class ColumnEditor : EditorWindow
         public MultiColumnHeaderState.Column column { get; private set; }
         public Action<MultiColumnHeaderState.Column> editCallback { get; private set; }
 
-        internal static ColumnEditor ShowWindow(MultiColumnHeaderState.Column column, Action<MultiColumnHeaderState.Column> editCallback)
+        public static ColumnEditor ShowWindow(MultiColumnHeaderState.Column column, Action<MultiColumnHeaderState.Column> editCallback)
         {
             var w = GetWindowDontShow<ColumnEditor>();
             w.column = column;
diff --git a/Modules/QuickSearch/Editor/Table/ColumnSelector.cs b/Modules/QuickSearch/Editor/Table/ColumnSelector.cs
index aa11d73836..f34a852960 100644
--- a/Modules/QuickSearch/Editor/Table/ColumnSelector.cs
+++ b/Modules/QuickSearch/Editor/Table/ColumnSelector.cs
@@ -15,13 +15,11 @@ class ColumnSelector : AdvancedDropdown
         const string k_AddlAllItemName = "Add all...";
         private readonly string m_Title;
         private readonly IEnumerable<SearchColumn> m_Columns;
-        private readonly AddColumnsHandler m_AddColumnsHandler;
+        private readonly Action<IEnumerable<SearchColumn>, int> m_AddColumnsHandler;
         private readonly int m_ActiveColumnIndex;
         private readonly Dictionary<int, SearchColumn> m_ColumnIndexes = new Dictionary<int, SearchColumn>();
 
-        public delegate void AddColumnsHandler(IEnumerable<SearchColumn> descriptors, int activeColumnIndex);
-
-        public ColumnSelector(IEnumerable<SearchColumn> descriptors, string title, AddColumnsHandler addColumnsHandler, int activeColumnIndex)
+        public ColumnSelector(IEnumerable<SearchColumn> descriptors, string title, Action<IEnumerable<SearchColumn>, int> addColumnsHandler, int activeColumnIndex)
             : base(new AdvancedDropdownState())
         {
             m_Title = title;
@@ -32,7 +30,7 @@ public ColumnSelector(IEnumerable<SearchColumn> descriptors, string title, AddCo
             minimumSize = new Vector2(250, 350);
         }
 
-        public static AdvancedDropdown AddColumns(AddColumnsHandler addColumnsHandler, IEnumerable<SearchColumn> descriptors, Vector2 mousePosition, int activeColumnIndex)
+        public static AdvancedDropdown AddColumns(Action<IEnumerable<SearchColumn>, int> addColumnsHandler, IEnumerable<SearchColumn> descriptors, Vector2 mousePosition, int activeColumnIndex)
         {
             var dropdown = new ColumnSelector(descriptors, "Select column...", addColumnsHandler, activeColumnIndex);
             dropdown.Show(new Rect(mousePosition.x, mousePosition.y, 1, 1));
diff --git a/Modules/QuickSearch/Editor/Table/PropertyTable.cs b/Modules/QuickSearch/Editor/Table/PropertyTable.cs
index 9f7cb0f4fa..a4370ebb77 100644
--- a/Modules/QuickSearch/Editor/Table/PropertyTable.cs
+++ b/Modules/QuickSearch/Editor/Table/PropertyTable.cs
@@ -11,9 +11,10 @@
 
 namespace UnityEditor.Search
 {
-    interface ITableView
+    public interface ITableView
     {
         SearchContext context { get; }
+        bool readOnly { get; }
         void AddColumn(Vector2 mousePosition, int activeColumnIndex);
         void AddColumns(IEnumerable<SearchColumn> descriptors, int activeColumnIndex);
         void SetupColumns(IEnumerable<SearchItem> elements = null);
@@ -25,12 +26,11 @@ interface ITableView
         IEnumerable<SearchItem> GetRows();
         SearchTable GetSearchTable();
         void SetSelection(IEnumerable<SearchItem> items);
-        void DoubleClick(SearchItem item);
+        void OnItemExecuted(SearchItem item);
         void SetDirty();
         void AddColumnHeaderContextMenuItems(GenericMenu menu, SearchColumn sourceColumn);
         bool AddColumnHeaderContextMenuItems(GenericMenu menu);
         bool OpenContextualMenu(Event evt, SearchItem item);
-        bool IsReadOnly();
     }
 
     class PropertyItem : TreeViewItem
@@ -55,7 +55,7 @@ public PropertyColumn(SearchColumn c)
         }
     }
 
-    class PropertyTable : TreeView, IDisposable
+    public class PropertyTable : TreeView, IDisposable
     {
         static class Constants
         {
@@ -149,7 +149,7 @@ protected override void AddColumnHeaderContextMenuItems(GenericMenu menu)
                 }
 
                 // If the table view is readonly, we can't change the columns
-                if (m_TableView.IsReadOnly())
+                if (m_TableView.readOnly)
                     return;
 
                 menu.AddSeparator("");
@@ -209,7 +209,7 @@ private static string GetDisplayLabel(GUIContent content)
             public override void OnGUI(Rect rect, float xScroll)
             {
                 // If the table view is readonly, we can't change the columns or export the table
-                if (m_TableView.IsReadOnly())
+                if (m_TableView.readOnly)
                 {
                     base.OnGUI(rect, xScroll);
                     return;
@@ -388,7 +388,7 @@ protected override void SelectionChanged(IList<int> selectedIds)
 
         protected override void DoubleClickedItem(int id)
         {
-            m_TableView.DoubleClick(((PropertyItem)FindItem(id, rootItem)).GetData());
+            m_TableView.OnItemExecuted(((PropertyItem)FindItem(id, rootItem)).GetData());
         }
 
         protected override void KeyEvent()
diff --git a/Modules/QuickSearch/Editor/Table/SearchReportWindow.cs b/Modules/QuickSearch/Editor/Table/SearchReportWindow.cs
index f02f593abc..706148671e 100644
--- a/Modules/QuickSearch/Editor/Table/SearchReportWindow.cs
+++ b/Modules/QuickSearch/Editor/Table/SearchReportWindow.cs
@@ -22,7 +22,7 @@ class SearchReportWindow : EditorWindow, ITableView, IHasCustomMenu
         private List<SearchItem> m_Items;
         private QueryEngine<int> m_QueryEngine = null;
         private static readonly QueryValidationOptions k_QueryEngineOptions = new QueryValidationOptions { validateFilters = true, skipNestedQueries = true };
-        private SearchField m_SearchField;
+        private UI.SearchField m_SearchField;
 
         [MenuItem("Window/Search/Open Report...", priority = 13000)]
         static void OpenWindow()
@@ -30,10 +30,7 @@ static void OpenWindow()
             OpenWindow(SearchReport.Import());
         }
 
-        public bool IsReadOnly()
-        {
-            return true;
-        }
+        public bool readOnly => true;
 
         internal static void OpenWindow(string reportPath)
         {
@@ -120,7 +117,7 @@ private SearchValue ToSearchValue(SearchReport.Value value)
 
         internal void OnEnable()
         {
-            m_SearchField = new SearchField();
+            m_SearchField = new UI.SearchField();
             if (!string.IsNullOrEmpty(m_ReportPath))
                 InitializeReport(m_ReportPath);
         }
@@ -255,7 +252,7 @@ public IEnumerable<SearchItem> GetElements()
         {
             if (string.IsNullOrEmpty(m_SearchText) || m_QueryEngine == null)
                 return m_Items;
-            var query = m_QueryEngine.Parse(m_SearchText);
+            var query = m_QueryEngine.ParseQuery(m_SearchText);
             if (!query.valid)
                 return m_Items;
             return query.Apply(Enumerable.Range(0, m_Items.Count), false).Select(i => m_Items[i]);
@@ -340,7 +337,7 @@ public void SetSelection(IEnumerable<SearchItem> items)
             // Selection not handled
         }
 
-        public void DoubleClick(SearchItem item)
+        public void OnItemExecuted(SearchItem item)
         {
         }
 
diff --git a/Modules/QuickSearch/Editor/Table/SearchTable.cs b/Modules/QuickSearch/Editor/Table/SearchTable.cs
index 15413d5b76..d55646d8c9 100644
--- a/Modules/QuickSearch/Editor/Table/SearchTable.cs
+++ b/Modules/QuickSearch/Editor/Table/SearchTable.cs
@@ -11,7 +11,7 @@
 namespace UnityEditor.Search
 {
     [Serializable]
-    class SearchTable
+    public class SearchTable
     {
         [SerializeField] public string id;
         [SerializeField] public string name;
@@ -35,12 +35,12 @@ public SearchTable(SearchTable other, string newName = null)
         {
         }
 
-        internal SearchTable Clone(string newName = null)
+        public SearchTable Clone(string newName = null)
         {
             return new SearchTable(this, newName);
         }
 
-        internal void InitFunctors()
+        public void InitFunctors()
         {
             // This is called to ensure members not serialized are properly init.
             foreach (var searchColumn in columns)
diff --git a/Modules/QuickSearch/Editor/Table/TableView.cs b/Modules/QuickSearch/Editor/Table/TableView.cs
index b1de26a586..67ea473449 100644
--- a/Modules/QuickSearch/Editor/Table/TableView.cs
+++ b/Modules/QuickSearch/Editor/Table/TableView.cs
@@ -12,8 +12,6 @@ namespace UnityEditor.Search
 {
     class TableView : ResultView, ITableView
     {
-        const string TableConfigSessionKey = "CurrentSearchTableConfig_V1";
-
         private PropertyTable m_PropertyTable;
         private bool m_Disposed = false;
         private SearchTable m_TableConfig;
@@ -29,8 +27,7 @@ class TableView : ResultView, ITableView
         public TableView(ISearchView hostView, SearchTable tableConfig)
             : base(hostView)
         {
-            m_TableId = Guid.NewGuid().ToString("N");
-            s_ActiveSearchTable = m_TableConfig = tableConfig ?? s_ActiveSearchTable;
+            SetSearchTable(tableConfig ?? s_ActiveSearchTable);
         }
 
         ~TableView() => Dispose(false);
@@ -40,10 +37,7 @@ public override void Dispose()
             Dispose(true);
         }
 
-        public bool IsReadOnly()
-        {
-            return false;
-        }
+        public bool readOnly => false;
 
         public IEnumerable<SearchItem> GetElements()
         {
@@ -75,7 +69,7 @@ public override void Draw(Rect screenRect, ICollection<int> selection)
         public override void Refresh(RefreshFlags flags = RefreshFlags.Default)
         {
             base.Refresh(flags);
-            Update();
+            Update(flags);
         }
 
         public override SearchViewState SaveViewState(string name)
@@ -247,13 +241,14 @@ public void SetSelection(IEnumerable<SearchItem> items)
             searchView.SetSelection(items.Select(e => searchView.results.IndexOf(e)).Where(i => i != -1).ToArray());
         }
 
-        public void DoubleClick(SearchItem item)
+        public void OnItemExecuted(SearchItem item)
         {
             searchView.ExecuteSelection();
         }
 
         public void SetDirty()
         {
+            s_ActiveSearchTable = m_TableConfig;
             if (m_TableConfig == null)
                 return;
             searchView.Repaint();
@@ -271,7 +266,7 @@ protected virtual void Dispose(bool disposing)
             m_PropertyTable?.Dispose();
 
             if (m_TableConfig != null)
-                SessionState.SetString(TableConfigSessionKey, m_TableConfig.Export());
+                ExportTableConfig();
 
             m_Disposed = true;
         }
@@ -282,22 +277,60 @@ private void Schedule(Action nextFrame)
             searchView?.Repaint();
         }
 
-        private void Update()
+        private void Update(RefreshFlags flags)
         {
             if (items == null)
                 return;
 
             // Set a default configuration if none
             if (m_TableConfig == null)
+                SetSearchTable(LoadDefaultTableConfig(reset: false));
+
+            if ((flags & RefreshFlags.ItemsChanged) == RefreshFlags.ItemsChanged)
+                UpdatePropertyTable();
+        }
+
+        string GetDefaultGroupId(string id = null)
+        {
+            var key = "CurrentSearchTableConfig_V2";
+            if (id == null && searchView is QuickSearch qs)
             {
-                var sessionSearchTableData = SessionState.GetString(TableConfigSessionKey, null);
-                if (string.IsNullOrEmpty(sessionSearchTableData))
-                    SetSearchTable(SearchTable.CreateDefault());
-                else
-                    SetSearchTable(SearchTable.Import(sessionSearchTableData));
+                var providers = qs.context.GetProviders();
+                if (providers.Count == 1)
+                    key += "_" + providers[0].id;
+                else if (!string.IsNullOrEmpty(qs.currentGroup))
+                    key += "_" + qs.currentGroup;
             }
+            else if (!string.IsNullOrEmpty(id))
+                key += "_" + id;
+            return key;
+        }
 
-            UpdatePropertyTable();
+        void ExportTableConfig(string id = null)
+        {
+            if (m_TableConfig == null)
+                return;
+            SessionState.SetString(GetDefaultGroupId(id), m_TableConfig.Export());
+        }
+
+        SearchTable LoadDefaultTableConfig(bool reset, string id = null, SearchTable defaultConfig = null)
+        {
+            if (!reset)
+            {
+                var sessionSearchTableData = SessionState.GetString(GetDefaultGroupId(id), null);
+                if (!string.IsNullOrEmpty(sessionSearchTableData))
+                    return SearchTable.Import(sessionSearchTableData);
+            }
+
+            if (searchView is QuickSearch qs)
+            {
+                var providers = qs.context.GetProviders();
+                var provider = providers.Count == 1 ? providers.FirstOrDefault() : SearchService.GetProvider(qs.currentGroup);
+                if (provider?.tableConfig != null)
+                    return provider.tableConfig(context);
+            }
+
+            return defaultConfig ?? SearchTable.CreateDefault();
         }
 
         private void UpdatePropertyTable()
@@ -308,11 +341,24 @@ private void UpdatePropertyTable()
             searchView.Repaint();
         }
 
-        public void SetSearchTable(SearchTable tableConfig)
+        public bool SetSearchTable(SearchTable tableConfig)
         {
+            if (tableConfig == m_TableConfig)
+                return false;
+
             m_TableId = Guid.NewGuid().ToString("N");
-            s_ActiveSearchTable = m_TableConfig = tableConfig;
-            UpdatePropertyTable();
+            m_TableConfig = tableConfig;
+            if (m_TableConfig != null)
+            {
+                if (m_TableConfig.columns.Length == 0)
+                    SetupColumns();
+                else
+                    UpdatePropertyTable();
+
+                return true;
+            }
+
+            return false;
         }
 
         public SearchTable GetSearchTable()
@@ -327,7 +373,7 @@ public void SetupColumns(IEnumerable<SearchItem> items = null)
 
         public void SetupColumns(IEnumerable<SearchItem> items, SearchColumnFlags options)
         {
-            var fields = new HashSet<SearchItem.Field>();
+            var fields = new HashSet<SearchField>();
             foreach (var e in items ?? GetElements())
                 fields.UnionWith(e.GetFields().Where(f => f.value != null));
 
@@ -337,16 +383,16 @@ public void SetupColumns(IEnumerable<SearchItem> items, SearchColumnFlags option
                 SetSearchTable(m_TableConfig);
             }
             else
-                SetSearchTable(SearchTable.CreateDefault());
+                SetSearchTable(LoadDefaultTableConfig(reset: true));
         }
 
-        public void SetupColumns(IList<SearchItem.Field> fields)
+        public void SetupColumns(IList<SearchField> fields)
         {
             SearchTable tableConfig = GetSearchTable();
 
             var columns = new List<SearchColumn>(tableConfig.columns.Where(c =>
             {
-                var fp = fields.IndexOf(new SearchItem.Field(c.selector));
+                var fp = fields.IndexOf(new SearchField(c.selector));
                 if (fp != -1)
                 {
                     if (!string.IsNullOrEmpty(fields[fp].alias))
@@ -374,6 +420,13 @@ public void SetupColumns(IList<SearchItem.Field> fields)
             }
         }
 
+        public override void OnGroupChanged(string prevGroupId, string newGroupId)
+        {
+            base.OnGroupChanged(prevGroupId, newGroupId);
+            if (!SetSearchTable(LoadDefaultTableConfig(reset: false, newGroupId, m_TableConfig)))
+                UpdatePropertyTable();
+        }
+
         public static void SetupColumns(SearchContext context, SearchExpression expression)
         {
             if (!(context.searchView is QuickSearch qs) || !(qs.resultView is TableView tv))
@@ -382,7 +435,7 @@ public static void SetupColumns(SearchContext context, SearchExpression expressi
             if (expression.evaluator.name == nameof(Evaluators.Select))
             {
                 var selectors = expression.parameters.Skip(1).Where(e => Evaluators.IsSelectorLiteral(e));
-                var tableViewFields = new List<SearchItem.Field>(selectors.Select(s => new SearchItem.Field(s.innerText.ToString(), s.alias.ToString())));
+                var tableViewFields = new List<SearchField>(selectors.Select(s => new SearchField(s.innerText.ToString(), s.alias.ToString())));
                 tv.SetupColumns(tableViewFields);
             }
         }
diff --git a/Modules/QuickSearch/Editor/UI/AutoComplete.cs b/Modules/QuickSearch/Editor/UI/AutoComplete.cs
index 8b007567b4..ae75134c8b 100644
--- a/Modules/QuickSearch/Editor/UI/AutoComplete.cs
+++ b/Modules/QuickSearch/Editor/UI/AutoComplete.cs
@@ -16,8 +16,6 @@ static class AutoComplete
         private static string s_LastInput;
         private static int s_CurrentSelection = 0;
         private static List<SearchProposition> s_FilteredList = null;
-        private static List<float> s_ItemLabelWidths = null;
-        private static List<float> s_ItemTooltipWidths = null;
 
         private static Rect position;
         private static Rect parent { get; set; }
@@ -51,7 +49,7 @@ public static int count
             }
         }
 
-        public static bool Show(SearchContext context, Rect parentRect, SearchField searchField)
+        public static bool Show(SearchContext context, Rect parentRect, UI.SearchField searchField)
         {
             var te = searchField.GetTextEditor();
             if (te.controlID != GUIUtility.keyboardControl)
@@ -70,7 +68,7 @@ public static bool Show(SearchContext context, Rect parentRect, SearchField sear
             return true;
         }
 
-        public static string Draw(SearchField searchField)
+        public static string Draw(UI.SearchField searchField)
         {
             if (!enabled)
                 return null;
@@ -224,8 +222,6 @@ public static void Clear()
             s_CurrentSelection = 0;
             s_LastInput = null;
             s_FilteredList = null;
-            s_ItemTooltipWidths = null;
-            s_ItemLabelWidths = null;
         }
 
         private static void UpdateCompleteList(in TextEditor te, in SearchPropositionOptions baseOptions = null)
@@ -236,9 +232,6 @@ private static void UpdateCompleteList(in TextEditor te, in SearchPropositionOpt
             var maxVisibleCount = Mathf.FloorToInt(position.height / EditorStyles.toolbarDropDown.fixedHeight);
             BuildCompleteList(options.tokens, maxVisibleCount, 0.4f);
 
-            s_ItemLabelWidths = new List<float>();
-            s_ItemTooltipWidths = new List<float>();
-
             var maxLabelSize = 100f;
             var gc = new GUIContent();
             foreach (var e in s_FilteredList)
@@ -246,14 +239,12 @@ private static void UpdateCompleteList(in TextEditor te, in SearchPropositionOpt
                 var sf = 5.0f;
                 gc.text = e.label;
                 Styles.autoCompleteItemLabel.CalcMinMaxWidth(gc, out var minWidth, out var maxWidth);
-                s_ItemLabelWidths.Add(maxWidth);
                 sf += maxWidth;
 
                 if (!string.IsNullOrEmpty(e.help))
                 {
                     gc.text = e.help;
                     Styles.autoCompleteTooltip.CalcMinMaxWidth(gc, out minWidth, out maxWidth);
-                    s_ItemTooltipWidths.Add(maxWidth);
                     sf += maxWidth;
                 }
 
@@ -347,7 +338,7 @@ private static bool DrawItems(Event evt, out SearchProposition result)
                 Rect lineRect = new Rect(1, 10, position.width - 2, Styles.autoCompleteItemLabel.fixedHeight);
                 for (int i = 0; i < cnt; i++)
                 {
-                    if (DrawItem(evt, lineRect, i == s_CurrentSelection, s_FilteredList[i], i))
+                    if (DrawItem(evt, lineRect, i == s_CurrentSelection, s_FilteredList[i]))
                     {
                         result = s_FilteredList[i];
                         return true;
@@ -377,13 +368,20 @@ private static string HightlightLabel(string label)
             return label;
         }
 
-        private static bool DrawItem(Event evt, Rect rect, bool selected, SearchProposition item, int index)
+        private static bool DrawItem(Event evt, Rect rect, bool selected, SearchProposition item)
         {
             var itemSelected = selected && evt.type == EventType.KeyDown && IsKeySelection(evt);
+            var tooltipSize = Styles.autoCompleteTooltip.CalcSize(new GUIContent(item.help));
+            var labelSize = Styles.autoCompleteItemLabel.CalcSize(new GUIContent(item.label));
+            var availableLabelWidth = position.width - tooltipSize.x;
             string trimmedLabel;
-            if (s_ItemLabelWidths[index] > position.width)
+
+            if (labelSize.x > availableLabelWidth)
             {
-                var width = position.width - s_ItemTooltipWidths[index] - 20f;
+                var width = availableLabelWidth - 20f;
+                if (width < 30f)
+                    width = position.width;
+
                 var numCharacters = Utils.GetNumCharactersThatFitWithinWidth(Styles.autoCompleteItemLabel, item.label, width);
                 trimmedLabel = Utils.TrimText(HightlightLabel(item.label), numCharacters);
             }
@@ -399,6 +397,14 @@ private static bool DrawItem(Event evt, Rect rect, bool selected, SearchProposit
                 return true;
             }
 
+            // If there is an overlap between the label and the tooltip, we don't show the tooltip.
+            labelSize = Styles.autoCompleteItemLabel.CalcSize(new GUIContent(trimmedLabel));
+            var labelRect = new Rect(position.x, position.y, labelSize.x, labelSize.y);
+            var tooltipRect = Rect.MinMaxRect(position.width + position.x, position.y, position.width + position.x - tooltipSize.x, position.y + tooltipSize.y);
+
+            if (labelRect.Overlaps(tooltipRect, true))
+                return false;
+
             if (!string.IsNullOrEmpty(item.help))
                 GUI.Label(rect, Utils.TrimText(item.help), Styles.autoCompleteTooltip);
 
@@ -415,7 +421,7 @@ private static Rect CalcRect(TextEditor te, Vector2 popupSize, bool setMinMax =
             var itemHeight = Styles.autoCompleteItemLabel.fixedHeight;
             if (setMinMax)
                 popupSize = new Vector2(popupSize.x, Mathf.Max(115f, Mathf.Min(propositions.Count * itemHeight, popupSize.y)));
-            var popupOffset = new Vector2(te.position.xMin, SearchField.searchFieldSingleLineHeight);
+            var popupOffset = new Vector2(te.position.xMin, UI.SearchField.searchFieldSingleLineHeight);
             return new Rect(te.graphicalCursorPos + popupOffset, popupSize);
         }
     }
diff --git a/Modules/QuickSearch/Editor/UI/Dispatcher.cs b/Modules/QuickSearch/Editor/UI/Dispatcher.cs
index 0f8de5745d..6f17d75b2f 100644
--- a/Modules/QuickSearch/Editor/UI/Dispatcher.cs
+++ b/Modules/QuickSearch/Editor/UI/Dispatcher.cs
@@ -7,21 +7,21 @@
 
 namespace UnityEditor.Search
 {
-    static class Dispatcher
+    public static class Dispatcher
     {
         readonly struct Task
         {
             readonly Action handler;
-            readonly double delay;
+            readonly double delayInSeconds;
             readonly long timestamp;
 
             public bool valid => handler != null;
-            public bool expired => delay == 0d || TimeSpan.FromTicks(DateTime.UtcNow.Ticks - timestamp).TotalSeconds >= delay;
+            public bool expired => delayInSeconds == 0d || TimeSpan.FromTicks(DateTime.UtcNow.Ticks - timestamp).TotalSeconds >= delayInSeconds;
 
-            public Task(in Action handler, in double delay)
+            public Task(in Action handler, in double delayInSeconds)
             {
                 this.handler = handler;
-                this.delay = delay;
+                this.delayInSeconds = delayInSeconds;
                 timestamp = DateTime.UtcNow.Ticks;
             }
 
@@ -46,9 +46,9 @@ public static void Enqueue(Action action)
             Enqueue(action, 0.0d);
         }
 
-        public static void Enqueue(Action action, double delay)
+        public static void Enqueue(Action action, double delayInSeconds)
         {
-            Enqueue(new Task(action, delay));
+            Enqueue(new Task(action, delayInSeconds));
         }
 
         private static void Enqueue(in Task task)
@@ -82,5 +82,10 @@ static void Update()
                 if (!Process(task))
                     break;
         }
+
+        public static Action CallDelayed(EditorApplication.CallbackFunction callback, double seconds = 0)
+        {
+            return Utils.CallDelayed(callback, seconds);
+        }
     }
 }
diff --git a/Modules/QuickSearch/Editor/UI/Icons.cs b/Modules/QuickSearch/Editor/UI/Icons.cs
index 637e6e212c..4d9a629081 100644
--- a/Modules/QuickSearch/Editor/UI/Icons.cs
+++ b/Modules/QuickSearch/Editor/UI/Icons.cs
@@ -2,15 +2,12 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System;
-using System.IO;
-using UnityEditor;
-using UnityEditor.Experimental;
 using UnityEngine;
 
+
 namespace UnityEditor.Search
 {
-    internal static class Icons
+    static class Icons
     {
         public static string iconFolder = $"Icons/QuickSearch";
         public static Texture2D quicksearch = EditorGUIUtility.FindTexture("Search Icon");
@@ -29,5 +26,6 @@ internal static class Icons
         public static Texture2D packageInstalled = EditorGUIUtility.LoadIcon($"{iconFolder}/package_installed.png");
         public static Texture2D packageUpdate = EditorGUIUtility.LoadIcon($"{iconFolder}/package_update.png");
         public static Texture2D dependencies = EditorGUIUtility.LoadIcon("UnityEditor.FindDependencies");
+        public static Texture2D toggles = EditorGUIUtility.FindTexture("MoreOptions");
     }
 }
diff --git a/Modules/QuickSearch/Editor/UI/ListView.cs b/Modules/QuickSearch/Editor/UI/ListView.cs
index 74a07eba04..4456430287 100644
--- a/Modules/QuickSearch/Editor/UI/ListView.cs
+++ b/Modules/QuickSearch/Editor/UI/ListView.cs
@@ -45,11 +45,14 @@ public override void Draw(Rect screenRect, ICollection<int> selection)
 
             var itemIndex = 0;
             var itemRect = new Rect(screenRect.x, topSpaceSkipped + screenRect.y, viewRect.width, itemRowHeight);
+            var visibleRect = new Rect(screenRect.x, screenRect.y + m_ScrollPosition.y, screenRect.width, screenRect.height);
+            var mousePosition = evt.mousePosition;
+            var eventType = evt.type;
             foreach (var item in items)
             {
                 if (itemIndex >= itemSkipCount && itemIndex <= itemSkipCount + limitCount)
                 {
-                    DrawItem(evt, item, itemRect, itemIndex, selection);
+                    DrawItem(eventType, item, itemRect, mousePosition, visibleRect, itemIndex, selection);
                     itemRect.y += itemRect.height;
                 }
                 else
@@ -79,40 +82,68 @@ public override int GetDisplayItemCount()
             return Math.Max(0, Math.Min(itemCount, Mathf.RoundToInt(m_DrawItemsRect.height / m_ItemRowHeight)));
         }
 
-        private void DrawItem(in Event evt, in SearchItem item, in Rect itemRect, in int itemIndex, in ICollection<int> selection)
+        private void DrawItem(in EventType eventType, in SearchItem item, in Rect itemRect, in Vector2 mousePosition, in Rect visibleRect, in int itemIndex, in ICollection<int> selection)
         {
             bool isItemSelected = selection.Contains(itemIndex);
-            if (evt.type == EventType.Repaint)
+            if (eventType == EventType.Repaint)
             {
                 // Draw item background
                 var bgStyle = itemIndex % 2 == 0 ? Styles.itemBackground1 : Styles.itemBackground2;
                 if (isItemSelected)
                     bgStyle = Styles.selectedItemBackground;
-                bgStyle.Draw(itemRect, itemRect.Contains(evt.mousePosition), false, false, false);
+                bgStyle.Draw(itemRect, itemRect.Contains(mousePosition), false, false, false);
             }
 
             // Draw action dropdown
-            var hovered = itemRect.Contains(evt.mousePosition);
+            var hovered = itemRect.Contains(mousePosition) && visibleRect.Contains(mousePosition);
             var buttonWidth = Styles.actionButton.fixedWidth + Styles.actionButton.margin.right;
             var buttonRect = new Rect(itemRect.xMax - buttonWidth, itemRect.y + (itemRect.height - Styles.actionButton.fixedHeight) / 2f,
                 Styles.actionButton.fixedWidth, Styles.actionButton.fixedHeight);
             var markedAsFavorite = SearchSettings.searchItemFavorites.Contains(item.id);
             if (hovered || markedAsFavorite)
-                buttonRect = DrawFavoriteButton(item, markedAsFavorite, buttonWidth, buttonRect);
+            {
+                if (markedAsFavorite)
+                {
+                    if (eventType == EventType.Repaint)
+                    {
+                        Styles.actionButton.Draw(buttonRect, Styles.searchFavoriteOnButtonContent, hovered, false, false, false);
+                        EditorGUIUtility.AddCursorRect(buttonRect, MouseCursor.Link);
+                    }
+                    else if (eventType == EventType.MouseDown && buttonRect.Contains(mousePosition))
+                        SearchSettings.RemoveItemFavorite(item);
+                }
+                else
+                {
+                    if (eventType == EventType.Repaint)
+                    {
+                        using (new Utils.ColorScope(new Color(0.9f, 0.9f, 0.9f, 0.4f)))
+                            Styles.actionButton.Draw(buttonRect, Styles.searchFavoriteButtonContent, hovered, false, false, false);
+                        EditorGUIUtility.AddCursorRect(buttonRect, MouseCursor.Link);
+                    }
+                    else if (eventType == EventType.MouseDown && buttonRect.Contains(mousePosition))
+                        SearchSettings.AddItemFavorite(item);
+                }
+
+                buttonRect.x -= buttonWidth;
+            }
 
             if (hovered)
             {
                 bool hasActionDropdown = searchView.selectCallback == null && searchView.selection.Count <= 1 && item.provider.actions.Count > 1;
                 if (hasActionDropdown)
                 {
-                    bool actionHover = buttonRect.Contains(evt.mousePosition);
-                    GUI.Label(buttonRect, Styles.moreActionsContent, actionHover ? Styles.actionButtonHovered : Styles.actionButton);
-                    EditorGUIUtility.AddCursorRect(buttonRect, MouseCursor.Link);
-                    if (evt.type == EventType.MouseDown && actionHover)
+                    bool actionHover = buttonRect.Contains(mousePosition);
+                    if (eventType == EventType.Repaint)
                     {
-                        var contextRect = new Rect(evt.mousePosition, new Vector2(1, 1));
+                        var actionStyle = actionHover ? Styles.actionButtonHovered : Styles.actionButton;
+                        actionStyle.Draw(buttonRect, Styles.moreActionsContent, actionHover, false, false, false);
+                        EditorGUIUtility.AddCursorRect(buttonRect, MouseCursor.Link);
+                    }
+                    else if (eventType == EventType.MouseDown && actionHover)
+                    {
+                        var contextRect = new Rect(mousePosition, new Vector2(1, 1));
                         searchView.ShowItemContextualMenu(item, contextRect);
-                        evt.Use();
+                        Event.current.Use();
                         GUIUtility.ExitGUI();
                     }
 
@@ -120,7 +151,7 @@ private void DrawItem(in Event evt, in SearchItem item, in Rect itemRect, in int
                 }
             }
 
-            if (evt.type == EventType.Repaint)
+            if (eventType == EventType.Repaint)
             {
                 // Draw thumbnail
                 var thumbnailRect = DrawListThumbnail(item, itemRect);
@@ -139,45 +170,25 @@ private void DrawItem(in Event evt, in SearchItem item, in Rect itemRect, in int
                 if (!compactView)
                 {
                     var label = item.provider.fetchLabel(item, context);
-                    GUI.Label(labelRect, label, labelStyle);
+                    labelStyle.Draw(labelRect, label, hovered, false, false, false);
                     labelRect.y = labelRect.yMax + labelStyle.margin.bottom;
 
                     // Draw description
                     var labelContent = SearchContent.FormatDescription(item, context, maxWidth);
                     labelStyle = isItemSelected ? Styles.selectedItemDescription : Styles.itemDescription;
                     labelRect.y += labelStyle.margin.top;
-                    GUI.Label(labelRect, labelContent, labelStyle);
+                    labelStyle.Draw(labelRect, labelContent, hovered, false, false, false);
                 }
                 else
                 {
                     item.options |= SearchItemOptions.Compacted;
                     var labelContent = SearchContent.FormatDescription(item, context, maxWidth);
-                    GUI.Label(labelRect, labelContent, labelStyle);
+                    labelStyle.Draw(labelRect, labelContent, hovered, false, false, false);
                     item.options &= ~SearchItemOptions.Compacted;
                 }
             }
         }
 
-        private Rect DrawFavoriteButton(in SearchItem item, in bool markedAsFavorite, in float buttonWidth, Rect buttonRect)
-        {
-            if (markedAsFavorite)
-            {
-                if (GUI.Button(buttonRect, Styles.searchFavoriteOnButtonContent, Styles.actionButton))
-                    SearchSettings.RemoveItemFavorite(item);
-                EditorGUIUtility.AddCursorRect(buttonRect, MouseCursor.Link);
-            }
-            else
-            {
-                using (new Utils.ColorScope(new Color(0.9f, 0.9f, 0.9f, 0.4f)))
-                    if (GUI.Button(buttonRect, Styles.searchFavoriteButtonContent, Styles.actionButton))
-                        SearchSettings.AddItemFavorite(item);
-                EditorGUIUtility.AddCursorRect(buttonRect, MouseCursor.Link);
-            }
-
-            buttonRect.x -= buttonWidth;
-            return buttonRect;
-        }
-
         private Rect DrawListThumbnail(SearchItem item, Rect itemRect)
         {
             Texture2D thumbnail = null;
diff --git a/Modules/QuickSearch/Editor/UI/ObjectField.cs b/Modules/QuickSearch/Editor/UI/ObjectField.cs
index 155f245d62..736fddc4e6 100644
--- a/Modules/QuickSearch/Editor/UI/ObjectField.cs
+++ b/Modules/QuickSearch/Editor/UI/ObjectField.cs
@@ -16,11 +16,21 @@ namespace UnityEditor.Search
     /// <summary>
     /// Makes a field to receive any object type.
     /// </summary>
-    class ObjectField : BaseField<Object>
+    public class ObjectField : BaseField<Object>
     {
-        public new class UxmlFactory : UxmlFactory<ObjectField, UxmlTraits> {}
+        [Obsolete("Use singleLineHeight instead. (UnityUpgradable) -> singleLineHeight", error: false)]
+        public static float kSingleLineHeight => singleLineHeight;
+        public static float singleLineHeight
+        {
+            get
+            {
+                return EditorGUI.kSingleLineHeight;
+            }
+        }
+
+        internal new class UxmlFactory : UxmlFactory<ObjectField, UxmlTraits> {}
 
-        public new class UxmlTraits : BaseField<Object>.UxmlTraits
+        internal new class UxmlTraits : BaseField<Object>.UxmlTraits
         {
             UxmlTypeAttributeDescription<Object> m_ObjectType = new UxmlTypeAttributeDescription<Object> { name = "type" };
 
@@ -249,24 +259,24 @@ protected override void ExecuteDefaultAction(EventBase evt)
         /// <summary>
         /// USS class name of elements of this type.
         /// </summary>
-        public new static readonly string ussClassName = "unity-object-field";
+        internal new static readonly string ussClassName = "unity-object-field";
         /// <summary>
         /// USS class name of labels in elements of this type.
         /// </summary>
-        public new static readonly string labelUssClassName = ussClassName + "__label";
+        internal new static readonly string labelUssClassName = ussClassName + "__label";
         /// <summary>
         /// USS class name of input elements in elements of this type.
         /// </summary>
-        public new static readonly string inputUssClassName = ussClassName + "__input";
+        internal new static readonly string inputUssClassName = ussClassName + "__input";
 
         /// <summary>
         /// USS class name of object elements in elements of this type.
         /// </summary>
-        public static readonly string objectUssClassName = ussClassName + "__object";
+        internal static readonly string objectUssClassName = ussClassName + "__object";
         /// <summary>
         /// USS class name of selector elements in elements of this type.
         /// </summary>
-        public static readonly string selectorUssClassName = ussClassName + "__selector";
+        internal static readonly string selectorUssClassName = ussClassName + "__selector";
 
         /// <summary>
         /// Constructor.
diff --git a/Modules/QuickSearch/Editor/UI/QuickSearch.cs b/Modules/QuickSearch/Editor/UI/QuickSearch.cs
index 7b40472751..2838d3ab56 100644
--- a/Modules/QuickSearch/Editor/UI/QuickSearch.cs
+++ b/Modules/QuickSearch/Editor/UI/QuickSearch.cs
@@ -61,7 +61,7 @@ internal enum SearchEventStatus
         private Action m_DebounceOff = null;
         private bool m_SyncSearch;
         private SearchQueryTreeView m_QueryTreeView;
-        private SearchField m_SearchField;
+        private UI.SearchField m_SearchField;
         private bool m_ShowSideBar;
         private bool m_ShowDetails;
         private Action m_WaitAsyncResults;
@@ -102,7 +102,7 @@ private QueryHelperWidget queryHelper
 
         public Action<SearchItem, bool> selectCallback { get => (item, canceled) => m_ViewState.selectHandler?.Invoke(item, canceled); set => m_ViewState.selectHandler = value; }
         public Func<SearchItem, bool> filterCallback { get => (item) => m_ViewState.filterHandler?.Invoke(item) ?? true; set => m_ViewState.filterHandler = value; }
-        public Action<SearchItem> trackingCallback { get => (item) => m_ViewState.trackingHandler?.Invoke(item); set => m_ViewState.trackingHandler = value; }
+        public Action<SearchItem> trackingCallback { get => m_ViewState.trackingHandler; set => m_ViewState.trackingHandler = value; }
 
         internal bool searchInProgress => (context?.searchInProgress ?? false) || nextFrame != null || m_DebounceOff != null || m_WaitAsyncResults != null;
         internal string currentGroup => m_FilteredItems.currentGroup;
@@ -260,8 +260,15 @@ public static QuickSearch Create<T>(SearchViewState viewArgs) where T : QuickSea
             QuickSearch qsWindow;
             if (flags.HasAny(SearchFlags.ReuseExistingWindow) && HasOpenInstances<T>())
             {
-                qsWindow = GetWindow<T>(false, null, false);
-                if (context != null)
+                qsWindow = Resources.FindObjectsOfTypeAll<QuickSearch>()
+                    .Where(w => w.viewState.searchFlags.HasAny(SearchFlags.ReuseExistingWindow)
+                        || (w.context?.options.HasAny(SearchFlags.ReuseExistingWindow) ?? false))
+                    .FirstOrDefault();
+                if (!qsWindow)
+                {
+                    qsWindow = CreateInstance<T>();
+                }
+                else if (context != null)
                 {
                     if (context.empty)
                         context.searchText = qsWindow.context?.searchText ?? string.Empty;
@@ -338,7 +345,7 @@ internal static QuickSearch OpenWithContextualProvider(string searchQuery, strin
         public QuickSearch ShowWindow(float defaultWidth = 950, float defaultHeight = 538, SearchFlags flags = SearchFlags.OpenDefault)
         {
             var windowSize = new Vector2(defaultWidth, defaultHeight);
-            if (flags.HasAny(SearchFlags.Dockable))
+            if (flags.HasAny(SearchFlags.Dockable) && viewState.flags.HasNone(SearchViewFlags.Borderless))
             {
                 bool firstOpen = !EditorPrefs.HasKey(k_CheckWindowKeyName);
                 Show(true);
@@ -372,6 +379,14 @@ public void SetSelection(params int[] selection)
             SetSelection(true, selection);
         }
 
+        public void SetColumns(IEnumerable<SearchColumn> columns)
+        {
+            if (viewState.tableConfig == null)
+                throw new NotSupportedException("This result view cannot set columns");
+
+            viewState.tableConfig.columns = columns.ToArray();
+        }
+
         internal static IEnumerable<SearchProvider> GetCurrentSearchWindowProviders()
         {
             if (HasOpenInstances<QuickSearch>())
@@ -453,7 +468,7 @@ public void ExecuteSearchQuery(ISearchQuery query)
 
             var queryContext = CreateQueryContext(query);
             SetContext(queryContext);
-            var viewState = query.GetResultViewState();
+            var viewState = query.GetViewState();
             SetViewState(viewState);
 
             RefreshSearch();
@@ -480,7 +495,7 @@ internal void SetViewState(SearchViewState viewState)
         {
             itemIconSize = viewState.itemSize;
             m_ResultView.SetViewState(viewState);
-            if (!string.IsNullOrEmpty(viewState.group))
+            if (!viewState.hideTabs && !string.IsNullOrEmpty(viewState.group))
                 SelectGroup(viewState.group);
             if (viewState.queryBuilderEnabled)
                 m_ViewState.queryBuilderEnabled = viewState.queryBuilderEnabled;
@@ -554,7 +569,7 @@ public void ShowItemContextualMenu(SearchItem item, Rect position)
                 menu.DropDown(position);
         }
 
-        internal void OnEnable()
+        internal virtual void OnEnable()
         {
             hideFlags |= HideFlags.DontSaveInEditor;
             m_LastFocusedWindow = m_LastFocusedWindow ?? s_FocusedWindow;
@@ -572,7 +587,7 @@ internal void OnEnable()
             LoadSessionSettings(m_ViewState);
 
             SearchSettings.SortActionsPriority();
-            m_SearchField = new SearchField();
+            m_SearchField = new UI.SearchField();
             m_DetailView = new DetailView(this);
             m_UndoManager = new UndoManager(context.searchText);
 
@@ -701,8 +716,10 @@ internal void OnGUI()
                 nextFrame = null;
             }
 
-            if (evt.type == EventType.Repaint && !context.options.HasAny(SearchFlags.Dockable))
+            if (evt.type == EventType.Repaint && (m_Parent?.window?.isPopup ?? false))
+            {
                 Styles.panelBorder.Draw(new Rect(0, 0, position.width, position.height), GUIContent.none, 0);
+            }
         }
 
         private void NotifySyncSearch(string groupId, UnityEditor.SearchService.SearchService.SyncSearchEvent evt)
@@ -801,6 +818,7 @@ private void DrawSideBar(Event evt, Rect areaRect)
                     }
                     filterMenu.ShowAsContext();
                 }
+                GUILayout.Space(2);
             }
             GUILayout.EndHorizontal();
 
@@ -998,11 +1016,19 @@ public void AddItemsToMenu(GenericMenu menu, string optionPrefix)
 
             if (!IsPicker())
                 menu.AddItem(new GUIContent($"{optionPrefix}Keep Open"), SearchSettings.keepOpen, () => ToggleKeepOpen());
+            menu.AddItem(new GUIContent($"{optionPrefix}Show Tabs"), !viewState.hideTabs, () => ToggleShowTabs());
             menu.AddItem(new GUIContent($"{optionPrefix}Show Status"), SearchSettings.showStatusBar, () => ToggleShowStatusBar());
             menu.AddItem(new GUIContent($"{optionPrefix}Show Packages results"), context.options.HasAny(SearchFlags.Packages), () => TogglePackages());
             menu.AddItem(wantsMoreContent, context?.wantsMore ?? false, () => ToggleWantsMore());
         }
 
+        private void ToggleShowTabs()
+        {
+            viewState.hideTabs = !viewState.hideTabs;
+            SelectGroup(null);
+            Refresh();
+        }
+
         private void ToggleQueryBuilder()
         {
             if (viewState.flags.HasAny(SearchViewFlags.DisableBuilderModeToggle))
@@ -1109,7 +1135,7 @@ protected virtual void UpdateWindowTitle()
                 if (m_FilteredItems.Count == 0)
                     titleContent.text = L10n.Tr("Search");
                 else
-                    titleContent.text = $"Search ({m_FilteredItems.Count - (selectCallback != null ? 1 : 0)})";
+                    titleContent.text = $"Search ({m_FilteredItems.Count})";
             }
         }
 
@@ -1424,7 +1450,7 @@ private void HandleKeyboardNavigation(Event evt)
                     ToggleWantsMore();
                     evt.Use();
                 }
-                else if (evt.modifiers.HasAny(EventModifiers.Alt) && evt.keyCode == KeyCode.LeftArrow)
+                else if (!viewState.hideTabs && evt.modifiers.HasAny(EventModifiers.Alt) && evt.keyCode == KeyCode.LeftArrow)
                 {
                     string previousGroupId = null;
                     foreach (var group in EnumerateGroups())
@@ -1438,7 +1464,7 @@ private void HandleKeyboardNavigation(Event evt)
                     }
                     evt.Use();
                 }
-                else if (evt.modifiers.HasAny(EventModifiers.Alt) && evt.keyCode == KeyCode.RightArrow)
+                else if (!viewState.hideTabs && evt.modifiers.HasAny(EventModifiers.Alt) && evt.keyCode == KeyCode.RightArrow)
                 {
                     bool selectNext = false;
                     foreach (var group in EnumerateGroups())
@@ -1473,6 +1499,7 @@ private void UpdateSearchText(string undoText, int cursorPos)
             {
                 context.searchText = undoText;
                 RefreshBuilder();
+                RefreshSearch();
             }
             else
             {
@@ -1531,7 +1558,7 @@ void OnQueryHelperExecute(ISearchQuery query)
 
         private void DrawQueryHelper(float availableSpace)
         {
-            var offset = GUILayoutUtility.GetLastRect().yMax;
+            var offset = viewState.hideTabs ? 0 : GUILayoutUtility.GetLastRect().yMax;
             GUILayout.BeginVertical(GUILayout.ExpandHeight(true));
             var resultViewSize = 0f;
             if (m_ShowSideBar)
@@ -1541,34 +1568,6 @@ private void DrawQueryHelper(float availableSpace)
             GUILayout.EndVertical();
         }
 
-        private void DrawTips(float availableSpace)
-        {
-            using (new GUILayout.VerticalScope(Styles.noResult))
-            {
-                GUILayout.FlexibleSpace();
-                using (new GUILayout.HorizontalScope(Styles.noResult, GUILayout.ExpandHeight(true)))
-                {
-                    GUILayout.FlexibleSpace();
-                    using (new GUILayout.VerticalScope(Styles.tipsSection, GUILayout.Height(160)))
-                    {
-                        GUILayout.Label(L10n.Tr("<b>Search Tips</b>"), Styles.tipText);
-                        GUILayout.Space(15);
-                        for (var i = 0; i < Styles.searchTipIcons.Length; ++i)
-                        {
-                            using (new GUILayout.HorizontalScope(Styles.noResult))
-                            {
-                                GUILayout.Label(Styles.searchTipIcons[i], Styles.tipIcon);
-                                GUILayout.Label(Styles.searchTipLabels[i], Styles.tipText, GUILayout.Width(Mathf.Min(Styles.tipMaxSize, availableSpace - Styles.tipSizeOffset)));
-                            }
-                        }
-                        GUILayout.FlexibleSpace();
-                    }
-                    GUILayout.FlexibleSpace();
-                }
-                GUILayout.FlexibleSpace();
-            }
-        }
-
         private string GetNoResultsHelpString()
         {
             var provider = SearchService.GetProvider(m_FilteredItems.currentGroup);
@@ -1582,10 +1581,15 @@ private void DrawItems(Event evt, float availableSpace)
         {
             using (new EditorGUILayout.VerticalScope(Styles.panelBackground, GUILayout.Width(availableSpace)))
             {
-                DrawTabs(evt, availableSpace);
+                if (!viewState.hideTabs)
+                    DrawTabs(evt, availableSpace);
                 if (m_ResultView != null && (!m_ResultView.showNoResultMessage || m_FilteredItems.Count > 0))
                 {
-                    m_ResultView.Draw(m_Selection, availableSpace);
+                    var rect = m_ResultView.Draw(m_Selection, availableSpace);
+                    if (viewState.hideTabs && evt.type == EventType.Repaint)
+                    {
+                        Styles.topBorder.Draw(rect, GUIContent.none, 0);
+                    }
                     ClearQueryHelper();
                 }
                 else
@@ -1607,7 +1611,10 @@ static ComputedValues()
 
         public IEnumerable<IGroup> EnumerateGroups()
         {
-            return m_FilteredItems.EnumerateGroups(!viewState.hideAllGroup);
+            var groups = m_FilteredItems.EnumerateGroups(!viewState.hideAllGroup);
+            if (!viewState.hideAllGroup)
+                groups = groups.Where(g => !string.Equals(g.id, "default", StringComparison.Ordinal));
+            return groups;
         }
 
         private void DrawTabs(Event evt, float availableSpace)
@@ -1846,10 +1853,12 @@ internal void SelectGroup(string groupId)
             evt.intPayload1 = m_FilteredItems.GetGroupById(groupId)?.count ?? 0;
             SearchAnalytics.SendEvent(evt);
 
-            viewState.groupChanged?.Invoke(context, groupId, m_FilteredItems.currentGroup);
-            m_ResultView?.OnGroupChanged(m_FilteredItems.currentGroup, groupId);
-
+            var oldGroupId = m_FilteredItems.currentGroup;
             m_FilteredItems.currentGroup = groupId;
+
+            viewState.groupChanged?.Invoke(context, groupId, oldGroupId);
+            m_ResultView?.OnGroupChanged(oldGroupId, groupId);
+
             if (syncSearch && groupId != null)
                 NotifySyncSearch(m_FilteredItems.currentGroup, UnityEditor.SearchService.SearchService.SyncSearchEvent.SyncSearch);
 
@@ -1899,7 +1908,7 @@ private void DrawToolbar(Event evt)
                 buttonRect.xMax + Styles.searchField.margin.left,
                 toolbarRect.y + Styles.searchField.margin.top,
                 position.width - buttonRect.xMax - Styles.searchField.margin.horizontal,
-                SearchField.searchFieldSingleLineHeight);
+                UI.SearchField.searchFieldSingleLineHeight);
 
             // Draw right side buttons (rendered right to left)
             buttonRect = new Rect(toolbarRect.xMax, buttonRect.y - 1f, buttonStyle.fixedWidth, buttonStyle.fixedHeight);
@@ -1937,13 +1946,13 @@ private Rect DrawSaveQueryDropdown(Rect buttonRect, in GUIStyle buttonStyle)
 
         private void DrawSearchField(in Event evt, in Rect toolbarRect, Rect searchTextRect)
         {
-            var showClearButton = IsPicker() ? context.searchText != viewState.searchText : !string.IsNullOrEmpty(context.searchText);
+            var showClearButton = IsPicker() ? context.searchText != viewState.initialQuery : !string.IsNullOrEmpty(context.searchText);
             var searchClearButtonRect = new Rect(0, 0, 1, 1);
 
             if (showClearButton)
             {
                 searchClearButtonRect = Styles.searchFieldBtn.margin.Remove(searchTextRect);
-                searchClearButtonRect.xMin = searchClearButtonRect.xMax - SearchField.cancelButtonWidth;
+                searchClearButtonRect.xMin = searchClearButtonRect.xMax - UI.SearchField.cancelButtonWidth;
                 searchClearButtonRect.y -= 1f;
             }
 
@@ -1980,7 +1989,13 @@ private void DrawSearchField(in Event evt, in Rect toolbarRect, Rect searchTextR
             {
                 if (m_QueryBuilder == null)
                 {
-                    GUI.Label(searchTextRect, searchTopicPlaceHolder, Styles.placeholderTextStyle);
+                    if (context.empty)
+                    {
+                        var oc = GUI.color;
+                        GUI.color = new Color(oc.r, oc.g, oc.b, oc.a * 0.5f);
+                        GUI.Label(searchTextRect, searchTopicPlaceHolder, Styles.placeholderTextStyle);
+                        GUI.color = oc;
+                    }
                 }
             }
             else
@@ -2099,7 +2114,7 @@ private void ClearSearch()
             m_QueryTreeView.SetSelection(new int[0]);
             SendEvent(SearchAnalytics.GenericEventType.QuickSearchClearSearch);
             AutoComplete.Clear();
-            context.searchText = IsPicker() ? m_ViewState.searchText : string.Empty;
+            context.searchText = IsPicker() ? m_ViewState.initialQuery : string.Empty;
             GUI.changed = true;
             SetSelection();
             DebounceRefresh();
@@ -2284,8 +2299,6 @@ protected virtual void LoadSessionSettings(SearchViewState args)
             else
                 RefreshSearch();
 
-            UpdateViewState(args);
-
             if (m_ViewState.flags.HasNone(SearchViewFlags.OpenInspectorPreview | SearchViewFlags.OpenLeftSidePanel | SearchViewFlags.HideSearchBar))
             {
                 if (SearchSettings.GetScopeValue(nameof(SearchViewFlags.OpenInspectorPreview), m_ContextHash, 0) != 0)
@@ -2297,7 +2310,7 @@ protected virtual void LoadSessionSettings(SearchViewState args)
 
             if (m_FilteredItems != null)
             {
-                var loadGroup = SearchSettings.GetScopeValue(nameof(m_FilteredItems.currentGroup), m_ContextHash, ((IGroup)m_FilteredItems).id);
+                var loadGroup = string.IsNullOrEmpty(args.group) ? SearchSettings.GetScopeValue(nameof(m_FilteredItems.currentGroup), m_ContextHash, ((IGroup)m_FilteredItems).id) : args.group;
                 if (context.options.HasAny(SearchFlags.FocusContext))
                 {
                     var contextualProvider = GetContextualProvider();
@@ -2305,8 +2318,10 @@ protected virtual void LoadSessionSettings(SearchViewState args)
                         loadGroup = contextualProvider.id;
                 }
 
-                SelectGroup(loadGroup);
+                SelectGroup(viewState.hideTabs ? null : loadGroup);
             }
+
+            UpdateViewState(args);
         }
 
         protected virtual void SaveSessionSettings()
@@ -2543,11 +2558,11 @@ private static void OpenSearchHelp(EditorWindow window, WindowAction action)
         {
             var windowId = (window as QuickSearch)?.windowId ?? null;
             SearchAnalytics.SendEvent(windowId, SearchAnalytics.GenericEventType.QuickSearchOpenDocLink);
-            EditorUtility.OpenWithDefaultApp("https://docs.unity3d.com/2021.1/Documentation/Manual/search-overview.html");
+            EditorUtility.OpenWithDefaultApp("https://docs.unity3d.com/2022.1/Documentation/Manual/search-overview.html");
         }
 
 
-        private QueryBuilder CreateBuilder(SearchContext context, SearchField textField)
+        private QueryBuilder CreateBuilder(SearchContext context, UI.SearchField textField)
         {
             var builder = new QueryBuilder(context, textField);
             ProcessNewBuilder(builder);
diff --git a/Modules/QuickSearch/Editor/UI/ResultView.cs b/Modules/QuickSearch/Editor/UI/ResultView.cs
index bda5ec94cd..5d3fd89755 100644
--- a/Modules/QuickSearch/Editor/UI/ResultView.cs
+++ b/Modules/QuickSearch/Editor/UI/ResultView.cs
@@ -25,7 +25,7 @@ interface IResultView : IDisposable
         bool showNoResultMessage { get; }
 
         void Draw(Rect rect, ICollection<int> selection);
-        void Draw(ICollection<int> selection, float viewWidth);
+        Rect Draw(ICollection<int> selection, float viewWidth);
         int GetDisplayItemCount();
         void HandleInputEvent(Event evt, List<int> selection);
         void DrawControlLayout(float viewWidth);
@@ -71,13 +71,14 @@ public virtual int GetDisplayItemCount()
             return items?.Count ?? 0;
         }
 
-        public void Draw(ICollection<int> selection, float viewWidth)
+        public Rect Draw(ICollection<int> selection, float viewWidth)
         {
             GUILayout.Box(string.Empty, Styles.resultview, GUILayout.ExpandHeight(true), GUILayout.Width(viewWidth));
             if (Event.current.type == EventType.Repaint)
                 m_DrawItemsRect = GUILayoutUtility.GetLastRect();
 
             Draw(m_DrawItemsRect, selection);
+            return m_DrawItemsRect;
         }
 
         public virtual void DrawControlLayout(float viewWidth)
diff --git a/Modules/QuickSearch/Editor/UI/SearchContent.cs b/Modules/QuickSearch/Editor/UI/SearchContent.cs
index 0691084889..67e1ec183d 100644
--- a/Modules/QuickSearch/Editor/UI/SearchContent.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchContent.cs
@@ -76,7 +76,7 @@ public static GUIContent FormatDescription(SearchItem item, SearchContext contex
                     {
                         long score = 1;
                         var matches = new List<int>();
-                        var sq = Utils.CleanString(context.searchQuery.ToLowerInvariant());
+                        var sq = Utils.CleanString(context.searchQuery);
                         if (FuzzySearch.FuzzyMatch(sq, Utils.CleanString(truncatedDesc), ref score, matches))
                             truncatedDesc = RichTextFormatter.FormatSuggestionTitle(truncatedDesc, matches);
                     }
diff --git a/Modules/QuickSearch/Editor/UI/SearchField.cs b/Modules/QuickSearch/Editor/UI/SearchField.cs
index 3ea48c8cc0..ac8669e62d 100644
--- a/Modules/QuickSearch/Editor/UI/SearchField.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchField.cs
@@ -5,7 +5,7 @@
 using System;
 using UnityEngine;
 
-namespace UnityEditor.Search
+namespace UnityEditor.Search.UI
 {
     class SearchField
     {
diff --git a/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs b/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs
index f4fe071b9a..c447192228 100644
--- a/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchPickerWindow.cs
@@ -17,6 +17,14 @@ protected override bool IsPicker()
             return true;
         }
 
+        internal override void OnEnable()
+        {
+            base.OnEnable();
+
+            // If we get opened from an object field, the caller will still our focus, so lets put it back in the picker.
+            Utils.CallDelayed(() => { if (this) SelectSearch(); }, 0.1d);
+        }
+
         public override void ExecuteSelection()
         {
             if (selectCallback == null || selection.Count == 0)
@@ -30,6 +38,11 @@ protected override void LoadSessionSettings(SearchViewState args)
         {
             RefreshSearch();
             UpdateViewState(args);
+
+            if (!string.IsNullOrEmpty(args.group))
+                SelectGroup(args.group);
+            else if (args.hideAllGroup && context.providers.FirstOrDefault() is SearchProvider firstProvider)
+                SelectGroup(firstProvider.type);
         }
 
         protected override void SaveSessionSettings()
@@ -39,8 +52,8 @@ protected override void SaveSessionSettings()
 
         protected override IEnumerable<SearchItem> FetchItems()
         {
-            if (!viewState.excludeNoneItem)
-                yield return SearchItem.none;
+            if (!viewState.excludeClearItem)
+                yield return SearchItem.clear;
             foreach (var item in SearchService.GetItems(context))
             {
                 if (filterCallback != null && !filterCallback(item))
@@ -89,20 +102,6 @@ protected override bool IsSavedSearchQueryEnabled()
             return m_ViewState.HasFlag(SearchViewFlags.EnableSearchQuery);
         }
 
-        static bool HasMarker(QueryBlock block)
-        {
-            if (block is QueryListMarkerBlock)
-            {
-                return true;
-            }
-            if (block is QueryFilterBlock fb)
-            {
-                return fb.marker.valid;
-            }
-            return false;
-        }
-
-
         public static QuickSearch ShowPicker(SearchViewState args)
         {
             var qs = Create<SearchPickerWindow>(args.LoadDefaults(SearchFlags.OpenPicker));
diff --git a/Modules/QuickSearch/Editor/UI/SearchProposition.cs b/Modules/QuickSearch/Editor/UI/SearchProposition.cs
index 35da808937..e9a0d3186c 100644
--- a/Modules/QuickSearch/Editor/UI/SearchProposition.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchProposition.cs
@@ -59,7 +59,7 @@ internal static void FetchPropositions(in SearchContext context, in SearchPropos
     }
 
     [Flags]
-    enum SearchPropositionFlags
+    public enum SearchPropositionFlags
     {
         None = 0,
         FilterOnly    = 1 << 0,
@@ -69,7 +69,7 @@ enum SearchPropositionFlags
         ForceAllProviders = 1 << 4
     }
 
-    static class SearchPropositionFlagsExtensions
+    public static class SearchPropositionFlagsExtensions
     {
         public static bool HasAny(this SearchPropositionFlags flags, SearchPropositionFlags f) => (flags & f) != 0;
         public static bool HasAll(this SearchPropositionFlags flags, SearchPropositionFlags all) => (flags & all) == all;
@@ -86,7 +86,7 @@ static class SearchPropositionFlagsExtensions
         internal readonly string category;
         internal readonly Color color;
         internal readonly Type type;
-        internal readonly object data;
+        public readonly object data;
 
         internal string path => string.IsNullOrEmpty(category) ? label : $"{category}/{label}";
 
@@ -101,13 +101,13 @@ public SearchProposition(string label, string replacement = null, string help =
         {
         }
 
-        internal SearchProposition(string label, string replacement, string help,
+        public SearchProposition(string label, string replacement, string help,
                                    int priority, Texture2D icon, object data, Color color = new Color())
             : this(null, label, replacement, help, priority, TextCursorPlacement.MoveAutoComplete, icon, null, data, color)
         {
         }
 
-        internal SearchProposition(string category = null, string label = null, string replacement = null, string help = null,
+        public SearchProposition(string category = null, string label = null, string replacement = null, string help = null,
                                    int priority = 0, TextCursorPlacement moveCursor = TextCursorPlacement.MoveAutoComplete,
                                    Texture2D icon = null, Type type = null, object data = null, Color color = new Color())
         {
@@ -245,7 +245,7 @@ public class SearchPropositionOptions
 
         internal readonly string query;
         internal readonly int cursor;
-        internal readonly SearchPropositionFlags flags;
+        public SearchPropositionFlags flags { get; private set; }
 
         private string m_Word;
         private string[] m_Tokens;
diff --git a/Modules/QuickSearch/Editor/UI/SearchResultView.cs b/Modules/QuickSearch/Editor/UI/SearchResultView.cs
index d873901ce1..570bb3f0bd 100644
--- a/Modules/QuickSearch/Editor/UI/SearchResultView.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchResultView.cs
@@ -171,6 +171,11 @@ public void FocusSearch()
         {
             // Do nothing
         }
+
+        public void SetColumns(IEnumerable<SearchColumn> columns)
+        {
+            throw new NotSupportedException("This result view cannot set columns");
+        }
     }
 
     class SearchResultViewContainer : IMGUIContainer
diff --git a/Modules/QuickSearch/Editor/UI/SearchViewState.cs b/Modules/QuickSearch/Editor/UI/SearchViewState.cs
index 8818f30f49..20abf2c5cb 100644
--- a/Modules/QuickSearch/Editor/UI/SearchViewState.cs
+++ b/Modules/QuickSearch/Editor/UI/SearchViewState.cs
@@ -20,58 +20,77 @@ static class SearchViewFlagsExtensions
     [Serializable]
     public class SearchViewState : ISerializationCallbackReceiver
     {
-        static readonly Vector2 defaultSize = new Vector2(850f, 539f);
+        public static readonly Vector2 defaultSize = new Vector2(850f, 539f);
         static readonly string[] emptyProviders = new string[0];
 
-        internal SearchContext context
-        {
-            get
-            {
-                if (m_Context == null && m_WasDeserialized)
-                    BuildContext();
-                return m_Context;
-            }
-
-            set
-            {
-                m_Context = value ?? throw new ArgumentNullException(nameof(value));
-            }
-        }
-
         [NonSerialized] private SearchContext m_Context;
         [NonSerialized] private bool m_WasDeserialized;
         [SerializeField] internal string[] providerIds;
-        [SerializeField] private SearchFlags searchFlags;
+        [SerializeField] internal SearchFlags searchFlags;
         [SerializeField] internal string searchText; // Also used as the initial query when the view was created
         [SerializeField] internal bool forceViewMode;
-        [SerializeField] internal string sessionId;
-        [SerializeField] internal string sessionName;
-        [SerializeField] internal bool excludeNoneItem;
-        [SerializeField] internal SearchTable tableConfig;
-        [SerializeField] internal bool ignoreSaveSearches;
-        [SerializeField] internal bool hideAllGroup;
-        [SerializeField] internal GUIContent windowTitle;
-
-        [SerializeField] internal bool queryBuilderEnabled;
+        [SerializeField] private SearchFunctor<Action<SearchItem, bool>> m_SelectHandler;
+        [SerializeField] private SearchFunctor<Action<SearchItem>> m_TrackingHandler;
+        [SerializeField] private SearchFunctor<Func<SearchItem, bool>> m_FilterHandler;
+        [SerializeField] private SearchFunctor<Action<SearchContext, string, string>> m_GroupChanged;
 
+        [SerializeField] public bool hideTabs;
+        public string sessionId;
+        public string sessionName;
+        public bool excludeClearItem;
+        public SearchTable tableConfig;
+        public bool ignoreSaveSearches;
+        public bool hideAllGroup;
+        public GUIContent windowTitle;
         public string title;
         public float itemSize;
         public Rect position;
         public SearchViewFlags flags;
         public string group;
 
-        [SerializeField] private SearchFunctor<Action<SearchItem, bool>> m_SelectHandler;
-        [SerializeField] private SearchFunctor<Action<SearchItem>> m_TrackingHandler;
-        [SerializeField] private SearchFunctor<Func<SearchItem, bool>> m_FilterHandler;
-        [SerializeField] private SearchFunctor<Action<SearchContext, string, string>> m_GroupChanged;
+        [SerializeField] public bool queryBuilderEnabled;
 
-        internal Action<SearchItem, bool> selectHandler { get => m_SelectHandler?.handler; set => m_SelectHandler = new SearchFunctor<Action<SearchItem, bool>>(value); }
-        internal Action<SearchItem> trackingHandler { get => m_TrackingHandler?.handler; set => m_TrackingHandler = new SearchFunctor<Action<SearchItem>>(value); }
+        public Action<SearchItem, bool> selectHandler { get => m_SelectHandler?.handler; set => m_SelectHandler = new SearchFunctor<Action<SearchItem, bool>>(value); }
+        public Action<SearchItem> trackingHandler { get => m_TrackingHandler?.handler; set => m_TrackingHandler = new SearchFunctor<Action<SearchItem>>(value); }
         internal Func<SearchItem, bool> filterHandler { get => m_FilterHandler?.handler; set => m_FilterHandler = new SearchFunctor<Func<SearchItem, bool>>(value); }
-        internal Action<SearchContext, string, string> groupChanged { get => m_GroupChanged?.handler; set => m_GroupChanged = new SearchFunctor<Action<SearchContext, string, string>>(value); }
+        public Action<SearchContext, string, string> groupChanged { get => m_GroupChanged?.handler; set => m_GroupChanged = new SearchFunctor<Action<SearchContext, string, string>>(value); }
+
+        public bool hasWindowSize => position.width > 0f && position.height > 0;
+        public Vector2 windowSize => hasWindowSize ? position.size : defaultSize;
+
+        public SearchContext context
+        {
+            get
+            {
+                if (m_Context == null && m_WasDeserialized)
+                    BuildContext();
+                return m_Context;
+            }
 
-        internal bool hasWindowSize => position.width > 0f && position.height > 0;
-        internal Vector2 windowSize => hasWindowSize ? position.size : defaultSize;
+            internal set
+            {
+                m_Context = value ?? throw new ArgumentNullException(nameof(value));
+            }
+        }
+
+        public string text
+        {
+            get
+            {
+                if (m_Context != null)
+                    return m_Context.searchText;
+                return searchText;
+            }
+
+            set
+            {
+                searchText = value;
+                if (m_Context != null)
+                    m_Context.searchText = value;
+            }
+        }
+
+        internal string initialQuery => searchText;
 
         internal SearchViewState() : this(null, null) {}
         public SearchViewState(SearchContext context) : this(context, null) {}
@@ -82,7 +101,7 @@ public SearchViewState(SearchContext context, SearchViewFlags flags)
             SetSearchViewFlags(flags);
         }
 
-        internal SearchViewState(SearchContext context, Action<SearchItem, bool> selectHandler)
+        public SearchViewState(SearchContext context, Action<SearchItem, bool> selectHandler)
         {
             m_Context = context;
             sessionId = Guid.NewGuid().ToString("N");
@@ -97,7 +116,7 @@ internal SearchViewState(SearchContext context, Action<SearchItem, bool> selectH
             providerIds = emptyProviders;
         }
 
-        internal SearchViewState(SearchContext context,
+        public SearchViewState(SearchContext context,
                                  Action<UnityEngine.Object, bool> selectObjectHandler,
                                  Action<UnityEngine.Object> trackingObjectHandler,
                                  string typeName, Type filterType)
@@ -112,12 +131,12 @@ internal SearchViewState(SearchContext context,
             context.filterType = filterType;
 
             selectHandler = (item, canceled) => selectObjectHandler?.Invoke(Utils.ToObject(item, filterType), canceled);
-            filterHandler = (item) => item == SearchItem.none || (IsObjectMatchingType(item ?? SearchItem.none, filterType ?? typeof(UnityEngine.Object)));
+            filterHandler = (item) => item == SearchItem.clear || (IsObjectMatchingType(item ?? SearchItem.clear, filterType ?? typeof(UnityEngine.Object)));
             trackingHandler = (item) => trackingObjectHandler?.Invoke(Utils.ToObject(item, filterType));
             title = filterType?.Name ?? typeName;
         }
 
-        internal SearchViewState(SearchContext context, SearchTable tableConfig, SearchViewFlags flags = SearchViewFlags.None)
+        public SearchViewState(SearchContext context, SearchTable tableConfig, SearchViewFlags flags = SearchViewFlags.None)
             : this(context, flags | SearchViewFlags.TableView)
         {
             group = null;
@@ -164,7 +183,7 @@ internal void Assign(SearchViewState state)
             searchText = state.context.searchText;
             sessionId = state.sessionId;
             sessionName = state.sessionName;
-            excludeNoneItem = state.excludeNoneItem;
+            excludeClearItem = state.excludeClearItem;
             ignoreSaveSearches = state.ignoreSaveSearches;
 
             title = state.title;
@@ -175,11 +194,9 @@ internal void Assign(SearchViewState state)
             group = state.group;
 
             queryBuilderEnabled = state.queryBuilderEnabled;
-
-            BuildContext();
         }
 
-        private void BuildContext()
+        internal void BuildContext()
         {
             if (providerIds != null && providerIds.Length > 0)
                 m_Context = SearchService.CreateContext(providerIds, searchText ?? string.Empty, searchFlags);
@@ -199,7 +216,7 @@ internal static SearchFlags ToSearchFlags(SearchViewFlags flags)
 
         static bool IsObjectMatchingType(in SearchItem item, in Type filterType)
         {
-            if (item == SearchItem.none)
+            if (item == SearchItem.clear)
                 return true;
             var objType = item.ToType(filterType);
             if (objType == null)
@@ -207,7 +224,7 @@ static bool IsObjectMatchingType(in SearchItem item, in Type filterType)
             return filterType.IsAssignableFrom(objType);
         }
 
-        internal static SearchViewState LoadDefaults()
+        public static SearchViewState LoadDefaults()
         {
             var viewState = new SearchViewState();
             return viewState.LoadDefaults();
@@ -249,19 +266,19 @@ public void OnAfterDeserialize()
                 tableConfig = null;
         }
 
-        internal IEnumerable<string> GetProviderIds()
+        public IEnumerable<string> GetProviderIds()
         {
-            if (context != null)
-                return context.GetProviders().Select(p => p.id);
+            if (m_Context != null)
+                return m_Context.GetProviders().Select(p => p.id);
             return providerIds;
         }
 
-        internal IEnumerable<string> GetProviderTypes()
+        public IEnumerable<string> GetProviderTypes()
         {
-            var providers = context != null ? context.GetProviders() : SearchService.GetProviders(providerIds);
+            var providers = m_Context != null ? m_Context.GetProviders() : SearchService.GetProviders(providerIds);
             return providers.Select(p => p.type).Distinct();
         }
 
-        internal bool HasFlag(SearchViewFlags f) => (flags & f) != 0;
+        public bool HasFlag(SearchViewFlags flags) => (this.flags & flags) != 0;
     }
 }
diff --git a/Modules/QuickSearch/Editor/UI/SplitterInfo.cs b/Modules/QuickSearch/Editor/UI/SplitterInfo.cs
index fe52d03295..9a10e8f235 100644
--- a/Modules/QuickSearch/Editor/UI/SplitterInfo.cs
+++ b/Modules/QuickSearch/Editor/UI/SplitterInfo.cs
@@ -7,7 +7,6 @@
 
 namespace UnityEditor.Search
 {
-    [Serializable]
     class SplitterInfo
     {
         public enum Side
diff --git a/Modules/QuickSearch/Editor/UI/Styles.cs b/Modules/QuickSearch/Editor/UI/Styles.cs
index 580c56e490..7a6e71e24d 100644
--- a/Modules/QuickSearch/Editor/UI/Styles.cs
+++ b/Modules/QuickSearch/Editor/UI/Styles.cs
@@ -51,6 +51,13 @@ static Styles()
             margin = new RectOffset(0, 0, 0, 0)
         };
 
+        public static readonly GUIStyle topBorder = new GUIStyle("grey_border")
+        {
+            name = "quick-search-top-border",
+            padding = new RectOffset(0, 0, 0, 0),
+            margin = new RectOffset(0, 0, 0, 0)
+        };
+
         public static readonly GUIStyle autoCompleteBackground = new GUIStyle("grey_border")
         {
             name = "quick-search-auto-complete-background",
@@ -94,7 +101,7 @@ static Styles()
             padding = new RectOffset(2, 1, 1, 1)
         };
 
-        public static readonly GUIStyle itemGridBackground1 = new GUIStyle(itemBackground1) { fixedHeight = 0, };
+        public static readonly GUIStyle itemGridBackground1 = new GUIStyle(itemBackground1) { fixedHeight = 0 };
         public static readonly GUIStyle itemGridBackground2 = new GUIStyle(itemBackground2) { fixedHeight = 0 };
 
         public static readonly GUIStyle preview = new GUIStyle
@@ -336,8 +343,9 @@ static Styles()
         {
             name = "quick-search-search-field-placeholder",
             fontSize = k_SearchFieldFontSize,
-            padding = new RectOffset(0, 0, 0, 0),
-            alignment = TextAnchor.MiddleCenter,
+            fontStyle = FontStyle.Italic,
+            padding = new RectOffset(14, 0, 0, 0),
+            alignment = TextAnchor.MiddleLeft,
             normal = clear,
             focused = clear,
             hover = clear,
@@ -408,7 +416,7 @@ static Styles()
         public static readonly GUIContent searchTipsSync = EditorGUIUtility.TrTextContentWithIcon("Enable sync to keep other Editor search fields populated ", EditorGUIUtility.LoadIcon("QuickSearch/SyncSearch On"));
         public static readonly GUIContent saveSearchesIconContent = EditorGUIUtility.TrTextContentWithIcon(string.Empty, Utils.LoadIcon("UnityEditor/Search/SearchQueryAsset Icon"));
         public static readonly GUIContent openSaveSearchesIconContent = EditorGUIUtility.TrTextContentWithIcon(string.Empty, "Open Saved Searches Panel (F3)", Utils.LoadIcon("UnityEditor/Search/SearchQueryAsset Icon"));
-        public static readonly GUIContent queryBuilderIconContent = EditorGUIUtility.TrTextContentWithIcon(string.Empty, "Toggle Query Builder Mode (F1)", Utils.LoadIcon("Assembly Icon"));
+        public static readonly GUIContent queryBuilderIconContent = EditorGUIUtility.TrTextContentWithIcon(string.Empty, "Toggle Query Builder Mode (F1)", Utils.LoadIcon("VisualQueryBuilder"));
 
         public static readonly GUIContent[] searchTipIcons =
         {
@@ -448,7 +456,7 @@ static Styles()
 
         public static readonly GUIStyle toolbarButton = new GUIStyle("IconButton")
         {
-            margin = new RectOffset(4, 4, (int)SearchField.textTopBottomPadding, (int)SearchField.textTopBottomPadding),
+            margin = new RectOffset(4, 4, (int)UI.SearchField.textTopBottomPadding, (int)UI.SearchField.textTopBottomPadding),
             padding = new RectOffset(0, 0, 0, 0),
             fixedWidth = 24f,
             fixedHeight = 24f,
@@ -737,6 +745,7 @@ static class QueryColors
         public static readonly Color type;
         public static readonly Color typeIcon;
         public static readonly Color word;
+        public static readonly Color toggle;
         public static readonly Color combine;
         public static readonly Color expression;
         public static readonly Color textureBackgroundColor = new Color(0.2f, 0.2f, 0.25f, 0.95f);
@@ -750,6 +759,7 @@ static QueryColors()
             ColorUtility.TryParseHtmlString("#74CBEE", out area);
             ColorUtility.TryParseHtmlString("#78CAB6", out filter);
             ColorUtility.TryParseHtmlString("#A38CD0", out property);
+            ColorUtility.TryParseHtmlString("#FF6A00", out toggle);
             ColorUtility.TryParseHtmlString("#EBD05F", out type);
             ColorUtility.TryParseHtmlString("#EBD05F", out typeIcon);
             ColorUtility.TryParseHtmlString("#739CEB", out word);
diff --git a/Modules/QuickSearch/Editor/Utilities/IStringView.cs b/Modules/QuickSearch/Editor/Utilities/IStringView.cs
index b02c580380..3ac5812dc4 100644
--- a/Modules/QuickSearch/Editor/Utilities/IStringView.cs
+++ b/Modules/QuickSearch/Editor/Utilities/IStringView.cs
@@ -11,7 +11,7 @@ interface IStringView : IEnumerable<char>
     {
         bool valid { get; }
         string baseString { get; }
-        int Length { get; }
+        int length { get; }
         char this[int index] { get; }
         string ToString();
 
@@ -44,14 +44,14 @@ public static bool IsNullOrEmpty(this IStringView sv)
         {
             if (sv == null || !sv.valid)
                 return true;
-            return sv.Length == 0;
+            return sv.length == 0;
         }
 
         public static bool IsNullOrWhiteSpace(this IStringView sv)
         {
             if (sv.IsNullOrEmpty())
                 return true;
-            for (var i = 0; i < sv.Length; ++i)
+            for (var i = 0; i < sv.length; ++i)
             {
                 if (!char.IsWhiteSpace(sv[i]))
                     return false;
diff --git a/Modules/QuickSearch/Editor/Utilities/StringView.cs b/Modules/QuickSearch/Editor/Utilities/StringView.cs
index 2e79c395b2..40d960508d 100644
--- a/Modules/QuickSearch/Editor/Utilities/StringView.cs
+++ b/Modules/QuickSearch/Editor/Utilities/StringView.cs
@@ -11,20 +11,20 @@ namespace UnityEditor.Search
     /// <summary>
     /// Structure that holds a view on a string, with a specified range of [startIndex, endIndex[.
     /// </summary>
-    readonly struct StringView : IStringView
+    public readonly struct StringView : IStringView, IEquatable<StringView>
     {
         readonly string m_BaseString;
         readonly int m_StartIndex;
         readonly int m_EndIndex;
 
-        public static readonly StringView Null = default;
-        public static readonly StringView Empty = new StringView(string.Empty);
+        public static readonly StringView nil = default;
+        public static readonly StringView empty = new StringView(string.Empty);
 
         public bool valid => m_BaseString != null;
         public int startIndex => m_StartIndex;
         public int endIndex => m_EndIndex;
         public string baseString => m_BaseString;
-        public int Length => m_EndIndex - m_StartIndex;
+        public int length => m_EndIndex - m_StartIndex;
 
         public char this[int index] => m_BaseString[m_StartIndex + index];
 
@@ -51,6 +51,11 @@ public StringView(string baseString, int startIndex, int endIndex)
             m_EndIndex = endIndex;
         }
 
+        public bool Equals(StringView other)
+        {
+            return Equals(other, StringComparison.OrdinalIgnoreCase);
+        }
+
         public override bool Equals(object other)
         {
             if (other is string o)
@@ -62,15 +67,15 @@ public override bool Equals(object other)
             return false;
         }
 
-        public bool Equals(IStringView other, StringComparison comparisonOptions = StringComparison.OrdinalIgnoreCase)
+        internal bool Equals(IStringView other, StringComparison comparisonOptions = StringComparison.OrdinalIgnoreCase)
         {
             if (other is StringView sv)
                 return Equals(sv, comparisonOptions);
 
-            if (other?.Length != Length)
+            if (other?.length != length)
                 return false;
 
-            for (var i = 0; i < Length; ++i)
+            for (var i = 0; i < length; ++i)
             {
                 if (!Compare(this[i], other[i], comparisonOptions))
                     return false;
@@ -79,26 +84,31 @@ public bool Equals(IStringView other, StringComparison comparisonOptions = Strin
             return true;
         }
 
+        bool IStringView.Equals(IStringView other, StringComparison comparisonOptions)
+        {
+            return Equals(other, comparisonOptions);
+        }
+
         public bool Equals(string other, StringComparison comparisonOptions = StringComparison.OrdinalIgnoreCase)
         {
-            if (other?.Length != Length)
+            if (other?.Length != length)
                 return false;
 
-            return string.Compare(m_BaseString, m_StartIndex, other, 0, Length, comparisonOptions) == 0;
+            return string.Compare(m_BaseString, m_StartIndex, other, 0, length, comparisonOptions) == 0;
         }
 
-        public bool Equals(StringView other, StringComparison comparisonOptions = StringComparison.OrdinalIgnoreCase)
+        public bool Equals(StringView other, StringComparison comparisonOptions)
         {
-            if (other.Length != Length)
+            if (other.length != length)
                 return false;
 
-            return string.Compare(m_BaseString, m_StartIndex, other.m_BaseString, other.m_StartIndex, Length, comparisonOptions) == 0;
+            return string.Compare(m_BaseString, m_StartIndex, other.m_BaseString, other.m_StartIndex, length, comparisonOptions) == 0;
         }
 
         public StringView Substring(int start)
         {
-            if (start >= Length)
-                return Empty;
+            if (start >= length)
+                return empty;
 
             return new StringView(m_BaseString, m_StartIndex + start, m_EndIndex);
         }
@@ -110,7 +120,7 @@ IStringView IStringView.Substring(int start)
 
         public StringView Substring(int start, int length)
         {
-            if (start < 0 || start >= Length)
+            if (start < 0 || start >= this.length)
                 throw new ArgumentException("Index out of string range", nameof(start));
 
             var innerStartIndex = m_StartIndex + start;
@@ -161,16 +171,16 @@ static void FindTrimStartEnd(int localStart, int localEnd, string baseString, ch
             }
         }
 
-        public int IndexOf(IStringView other, StringComparison sc = StringComparison.Ordinal)
+        internal int IndexOf(IStringView other, StringComparison sc = StringComparison.Ordinal)
         {
             if (!valid || !other.valid)
                 return -1;
-            if (Length < other.Length)
+            if (length < other.length)
                 return -1;
 
             int foundStartIndex = -1;
             int otherIndex = 0;
-            for (var i = 0; i < Length && otherIndex < other.Length; ++i)
+            for (var i = 0; i < length && otherIndex < other.length; ++i)
             {
                 if (!Compare(this[i], other[otherIndex], sc))
                 {
@@ -188,11 +198,16 @@ public int IndexOf(IStringView other, StringComparison sc = StringComparison.Ord
                 }
             }
 
-            if (otherIndex != other.Length)
+            if (otherIndex != other.length)
                 return -1;
             return foundStartIndex;
         }
 
+        int IStringView.IndexOf(IStringView other, StringComparison sc)
+        {
+            return IndexOf(other, sc);
+        }
+
         public int IndexOf(StringView other, StringComparison sc = StringComparison.Ordinal)
         {
             return IndexOf(this, other, sc);
@@ -212,12 +227,12 @@ static int IndexOf(StringView source, StringView other, StringComparison sc)
         {
             if (!source.valid || !other.valid)
                 return -1;
-            if (source.Length < other.Length)
+            if (source.length < other.length)
                 return -1;
 
             int foundStartIndex = -1;
             int otherIndex = 0;
-            for (var i = 0; i < source.Length && otherIndex < other.Length; ++i)
+            for (var i = 0; i < source.length && otherIndex < other.length; ++i)
             {
                 if (!Compare(source[i], other[otherIndex], sc))
                 {
@@ -235,7 +250,7 @@ static int IndexOf(StringView source, StringView other, StringComparison sc)
                 }
             }
 
-            if (otherIndex != other.Length)
+            if (otherIndex != other.length)
                 return -1;
             return foundStartIndex;
         }
@@ -245,7 +260,7 @@ static int IndexOf(StringView source, char other, StringComparison sc)
             if (!source.valid)
                 return -1;
 
-            for (var i = 0; i < source.Length; ++i)
+            for (var i = 0; i < source.length; ++i)
             {
                 if (Compare(source[i], other, sc))
                     return i;
@@ -254,17 +269,17 @@ static int IndexOf(StringView source, char other, StringComparison sc)
             return -1;
         }
 
-        public int LastIndexOf(IStringView other, StringComparison sc = StringComparison.Ordinal)
+        internal int LastIndexOf(IStringView other, StringComparison sc = StringComparison.Ordinal)
         {
-            if (Length < other.Length)
+            if (length < other.length)
                 return -1;
 
-            int otherIndex = other.Length - 1;
-            for (var i = Length - 1; i >= 0 && otherIndex >= 0; --i)
+            int otherIndex = other.length - 1;
+            for (var i = length - 1; i >= 0 && otherIndex >= 0; --i)
             {
                 if (!Compare(this[i], other[otherIndex], sc))
                 {
-                    otherIndex = other.Length - 1;
+                    otherIndex = other.length - 1;
                 }
                 else
                 {
@@ -277,6 +292,11 @@ public int LastIndexOf(IStringView other, StringComparison sc = StringComparison
             return -1;
         }
 
+        int IStringView.LastIndexOf(IStringView other, StringComparison sc)
+        {
+            return LastIndexOf(other, sc);
+        }
+
         public int LastIndexOf(StringView other, StringComparison sc = StringComparison.Ordinal)
         {
             return LastIndexOf(this, other, sc);
@@ -294,15 +314,15 @@ public int LastIndexOf(char other, StringComparison sc = StringComparison.Ordina
 
         static int LastIndexOf(StringView source, StringView other, StringComparison sc)
         {
-            if (source.Length < other.Length)
+            if (source.length < other.length)
                 return -1;
 
-            int otherIndex = other.Length - 1;
-            for (var i = source.Length - 1; i >= 0 && otherIndex >= 0; --i)
+            int otherIndex = other.length - 1;
+            for (var i = source.length - 1; i >= 0 && otherIndex >= 0; --i)
             {
                 if (!Compare(source[i], other[otherIndex], sc))
                 {
-                    otherIndex = other.Length - 1;
+                    otherIndex = other.length - 1;
                 }
                 else
                 {
@@ -320,7 +340,7 @@ static int LastIndexOf(StringView source, char other, StringComparison sc)
             if (!source.valid)
                 return -1;
 
-            for (var i = source.Length - 1; i >= 0; --i)
+            for (var i = source.length - 1; i >= 0; --i)
             {
                 if (Compare(source[i], other, sc))
                     return i;
@@ -331,7 +351,7 @@ static int LastIndexOf(StringView source, char other, StringComparison sc)
 
         public bool StartsWith(char c, StringComparison stringComparison = StringComparison.Ordinal)
         {
-            if (Length == 0)
+            if (length == 0)
                 return false;
             return Compare(this[0], c, stringComparison);
         }
@@ -341,24 +361,29 @@ public bool StartsWith(string v, StringComparison sc = StringComparison.Ordinal)
             return StartsWith(this, new StringView(v), sc);
         }
 
-        public bool StartsWith(IStringView v, StringComparison sc = StringComparison.Ordinal)
+        internal bool StartsWith(IStringView v, StringComparison sc = StringComparison.Ordinal)
         {
-            if (v.Length > Length)
+            if (v.length > length)
                 return false;
 
-            for (var i = 0; i < v.Length; ++i)
+            for (var i = 0; i < v.length; ++i)
                 if (!Compare(this[i], v[i], sc))
                     return false;
 
             return true;
         }
 
+        bool IStringView.StartsWith(IStringView v, StringComparison sc)
+        {
+            return StartsWith(v, sc);
+        }
+
         static bool StartsWith(StringView source, StringView other, StringComparison sc)
         {
-            if (other.Length > source.Length)
+            if (other.length > source.length)
                 return false;
 
-            for (var i = 0; i < other.Length; ++i)
+            for (var i = 0; i < other.length; ++i)
                 if (!Compare(source[i], other[i], sc))
                     return false;
 
@@ -367,9 +392,9 @@ static bool StartsWith(StringView source, StringView other, StringComparison sc)
 
         public bool EndsWith(char c, StringComparison sc = StringComparison.Ordinal)
         {
-            if (Length == 0)
+            if (length == 0)
                 return false;
-            return Compare(this[Length - 1], c, sc);
+            return Compare(this[length - 1], c, sc);
         }
 
         public bool EndsWith(string v, StringComparison sc = StringComparison.Ordinal)
@@ -377,25 +402,30 @@ public bool EndsWith(string v, StringComparison sc = StringComparison.Ordinal)
             return EndsWith(this, new StringView(v), sc);
         }
 
-        public bool EndsWith(IStringView v, StringComparison sc = StringComparison.Ordinal)
+        internal bool EndsWith(IStringView v, StringComparison sc = StringComparison.Ordinal)
         {
-            if (v.Length > Length)
+            if (v.length > length)
                 return false;
 
-            for (var i = 0; i < v.Length; ++i)
-                if (!Compare(this[Length - v.Length + i], v[i], sc))
+            for (var i = 0; i < v.length; ++i)
+                if (!Compare(this[length - v.length + i], v[i], sc))
                     return false;
 
             return true;
         }
 
+        bool IStringView.EndsWith(IStringView v, StringComparison sc)
+        {
+            return EndsWith(v, sc);
+        }
+
         static bool EndsWith(StringView source, StringView other, StringComparison sc)
         {
-            if (other.Length > source.Length)
+            if (other.length > source.length)
                 return false;
 
-            for (var i = 0; i < other.Length; ++i)
-                if (!Compare(source[source.Length - other.Length + i], other[i], sc))
+            for (var i = 0; i < other.length; ++i)
+                if (!Compare(source[source.length - other.length + i], other[i], sc))
                     return false;
 
             return true;
@@ -403,7 +433,7 @@ static bool EndsWith(StringView source, StringView other, StringComparison sc)
 
         public bool Contains(char c, StringComparison ordinal = StringComparison.Ordinal)
         {
-            for (var i = 0; i < Length; ++i)
+            for (var i = 0; i < length; ++i)
                 if (Compare(this[i], c, ordinal))
                     return true;
             return false;
@@ -414,11 +444,16 @@ public bool Contains(StringView s, StringComparison ordinal = StringComparison.O
             return IndexOf(s) != -1;
         }
 
-        public bool Contains(IStringView s, StringComparison ordinal = StringComparison.Ordinal)
+        internal bool Contains(IStringView s, StringComparison ordinal = StringComparison.Ordinal)
         {
             return IndexOf(s) != -1;
         }
 
+        bool IStringView.Contains(IStringView s, StringComparison ordinal)
+        {
+            return Contains(s, ordinal);
+        }
+
         public bool Contains(string s, StringComparison ordinal = StringComparison.Ordinal)
         {
             return IndexOf(s) != -1;
@@ -454,26 +489,6 @@ public bool Contains(string s, StringComparison ordinal = StringComparison.Ordin
             return !rhs.Equals(lhs);
         }
 
-        public static bool operator==(StringView lhs, IStringView rhs)
-        {
-            return lhs.Equals(rhs);
-        }
-
-        public static bool operator!=(StringView lhs, IStringView rhs)
-        {
-            return !lhs.Equals(rhs);
-        }
-
-        public static bool operator==(IStringView lhs, StringView rhs)
-        {
-            return rhs.Equals(lhs);
-        }
-
-        public static bool operator!=(IStringView lhs, StringView rhs)
-        {
-            return !rhs.Equals(lhs);
-        }
-
         public static implicit operator bool(StringView sv)
         {
             return !sv.IsNullOrEmpty();
@@ -491,9 +506,9 @@ public override string ToString()
         {
             if (!valid)
                 return string.Empty;
-            if (m_StartIndex == 0 && Length == m_BaseString.Length)
+            if (m_StartIndex == 0 && length == m_BaseString.Length)
                 return m_BaseString;
-            return m_BaseString.Substring(m_StartIndex, Length);
+            return m_BaseString.Substring(m_StartIndex, length);
         }
 
         public IEnumerator<char> GetEnumerator()
@@ -551,14 +566,14 @@ public static bool IsNullOrEmpty(this StringView sv)
         {
             if (!sv.valid)
                 return true;
-            return sv.Length == 0;
+            return sv.length == 0;
         }
 
         public static bool IsNullOrWhiteSpace(this StringView sv)
         {
             if (sv.IsNullOrEmpty())
                 return true;
-            for (var i = 0; i < sv.Length; ++i)
+            for (var i = 0; i < sv.length; ++i)
             {
                 if (!char.IsWhiteSpace(sv[i]))
                     return false;
@@ -591,7 +606,7 @@ public static StringView GetWordView(this string baseString, int startIndex)
 
         public static bool HasQuotes(this StringView sv, in char quoteChar = '"')
         {
-            return sv.Length >= 2 && sv.StartsWith(quoteChar) && sv.EndsWith(quoteChar);
+            return sv.length >= 2 && sv.StartsWith(quoteChar) && sv.EndsWith(quoteChar);
         }
     }
 }
diff --git a/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs b/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs
index 0b026e6216..e1aa4a8597 100644
--- a/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs
+++ b/Modules/QuickSearch/Editor/Utilities/SubsetStringView.cs
@@ -27,7 +27,7 @@ struct SubsetStringView : IStringView
 
         public bool valid => m_BaseString != null;
         public string baseString => m_BaseString;
-        public int Length => m_Indexes?.Count ?? 0;
+        public int length => m_Indexes?.Count ?? 0;
 
         public char this[int index] => m_BaseString[m_Indexes[index]];
 
@@ -100,7 +100,7 @@ public void ReplaceWithSubset(int startIndex, int endIndex, int newStartIndex, i
                 return;
 
             var removeRangeStartIndex = -1;
-            for (var i = 0; i < Length; ++i)
+            for (var i = 0; i < length; ++i)
             {
                 var currentIndex = m_Indexes[i];
                 if (currentIndex < startIndex)
@@ -135,11 +135,11 @@ public void ReplaceWithSubset(int startIndex, int endIndex, int newStartIndex, i
                 }
             }
 
-            // If endIndex and newEndIndex are = Length, the loop will breakout before
+            // If endIndex and newEndIndex are = length, the loop will breakout before
             // we can remove anything.
             if (removeRangeStartIndex != -1)
             {
-                var count = Length - removeRangeStartIndex;
+                var count = length - removeRangeStartIndex;
                 m_Indexes.RemoveRange(removeRangeStartIndex, count);
             }
         }
@@ -152,10 +152,10 @@ public int LengthToEndOfBlock(int index)
 
         public SubsetStringView Substring(int start)
         {
-            if (start >= Length)
+            if (start >= length)
                 return Empty;
 
-            return Substring(start, Length - start);
+            return Substring(start, length - start);
         }
 
         IStringView IStringView.Substring(int start)
@@ -165,11 +165,11 @@ IStringView IStringView.Substring(int start)
 
         public SubsetStringView Substring(int start, int length)
         {
-            if (start < 0 || start >= Length)
+            if (start < 0 || start >= this.length)
                 throw new ArgumentException("Index out of string range", nameof(start));
 
             var end = start + length;
-            if (end > Length)
+            if (end > this.length)
                 throw new ArgumentException("Index out of string range", nameof(length));
 
             var indexes = new List<int>(length);
@@ -187,7 +187,7 @@ IStringView IStringView.Substring(int start, int length)
 
         public SubsetStringView Trim(params char[] chrs)
         {
-            FindTrimStartEnd(0, Length, chrs, out var start, out var end);
+            FindTrimStartEnd(0, length, chrs, out var start, out var end);
 
             var indexes = new List<int>(end - start);
             for (var i = start; i < end; ++i)
@@ -231,12 +231,12 @@ public int IndexOf(IStringView other, StringComparison sc = StringComparison.Ord
         {
             if (!valid || !other.valid)
                 return -1;
-            if (Length < other.Length)
+            if (length < other.length)
                 return -1;
 
             int foundStartIndex = -1;
             int otherIndex = 0;
-            for (var i = 0; i < Length && otherIndex < other.Length; ++i)
+            for (var i = 0; i < length && otherIndex < other.length; ++i)
             {
                 if (!StringView.Compare(this[i], other[otherIndex], sc))
                 {
@@ -254,7 +254,7 @@ public int IndexOf(IStringView other, StringComparison sc = StringComparison.Ord
                 }
             }
 
-            if (otherIndex != other.Length)
+            if (otherIndex != other.length)
                 return -1;
             return foundStartIndex;
         }
@@ -279,12 +279,12 @@ static int IndexOf(SubsetStringView source, SubsetStringView other, StringCompar
         {
             if (!source.valid || !other.valid)
                 return -1;
-            if (source.Length < other.Length)
+            if (source.length < other.length)
                 return -1;
 
             int foundStartIndex = -1;
             int otherIndex = 0;
-            for (var i = 0; i < source.Length && otherIndex < other.Length; ++i)
+            for (var i = 0; i < source.length && otherIndex < other.length; ++i)
             {
                 if (!StringView.Compare(source[i], other[otherIndex], sc))
                 {
@@ -302,7 +302,7 @@ static int IndexOf(SubsetStringView source, SubsetStringView other, StringCompar
                 }
             }
 
-            if (otherIndex != other.Length)
+            if (otherIndex != other.length)
                 return -1;
             return foundStartIndex;
         }
@@ -311,12 +311,12 @@ static int IndexOf(SubsetStringView source, StringView other, StringComparison s
         {
             if (!source.valid || !other.valid)
                 return -1;
-            if (source.Length < other.Length)
+            if (source.length < other.length)
                 return -1;
 
             int foundStartIndex = -1;
             int otherIndex = 0;
-            for (var i = 0; i < source.Length && otherIndex < other.Length; ++i)
+            for (var i = 0; i < source.length && otherIndex < other.length; ++i)
             {
                 if (!StringView.Compare(source[i], other[otherIndex], sc))
                 {
@@ -334,7 +334,7 @@ static int IndexOf(SubsetStringView source, StringView other, StringComparison s
                 }
             }
 
-            if (otherIndex != other.Length)
+            if (otherIndex != other.length)
                 return -1;
             return foundStartIndex;
         }
@@ -344,7 +344,7 @@ static int IndexOf(SubsetStringView source, char other, StringComparison sc)
             if (!source.valid)
                 return -1;
 
-            for (var i = 0; i < source.Length; ++i)
+            for (var i = 0; i < source.length; ++i)
             {
                 if (StringView.Compare(source[i], other, sc))
                     return i;
@@ -355,15 +355,15 @@ static int IndexOf(SubsetStringView source, char other, StringComparison sc)
 
         public int LastIndexOf(IStringView other, StringComparison sc = StringComparison.Ordinal)
         {
-            if (Length < other.Length)
+            if (length < other.length)
                 return -1;
 
-            int otherIndex = other.Length - 1;
-            for (var i = Length - 1; i >= 0 && otherIndex >= 0; --i)
+            int otherIndex = other.length - 1;
+            for (var i = length - 1; i >= 0 && otherIndex >= 0; --i)
             {
                 if (!StringView.Compare(this[i], other[otherIndex], sc))
                 {
-                    otherIndex = other.Length - 1;
+                    otherIndex = other.length - 1;
                 }
                 else
                 {
@@ -394,15 +394,15 @@ public int LastIndexOf(char other, StringComparison sc = StringComparison.Ordina
 
         static int LastIndexOf(SubsetStringView source, SubsetStringView other, StringComparison sc)
         {
-            if (source.Length < other.Length)
+            if (source.length < other.length)
                 return -1;
 
-            int otherIndex = other.Length - 1;
-            for (var i = source.Length - 1; i >= 0 && otherIndex >= 0; --i)
+            int otherIndex = other.length - 1;
+            for (var i = source.length - 1; i >= 0 && otherIndex >= 0; --i)
             {
                 if (!StringView.Compare(source[i], other[otherIndex], sc))
                 {
-                    otherIndex = other.Length - 1;
+                    otherIndex = other.length - 1;
                 }
                 else
                 {
@@ -417,15 +417,15 @@ static int LastIndexOf(SubsetStringView source, SubsetStringView other, StringCo
 
         static int LastIndexOf(SubsetStringView source, StringView other, StringComparison sc)
         {
-            if (source.Length < other.Length)
+            if (source.length < other.length)
                 return -1;
 
-            int otherIndex = other.Length - 1;
-            for (var i = source.Length - 1; i >= 0 && otherIndex >= 0; --i)
+            int otherIndex = other.length - 1;
+            for (var i = source.length - 1; i >= 0 && otherIndex >= 0; --i)
             {
                 if (!StringView.Compare(source[i], other[otherIndex], sc))
                 {
-                    otherIndex = other.Length - 1;
+                    otherIndex = other.length - 1;
                 }
                 else
                 {
@@ -443,7 +443,7 @@ static int LastIndexOf(SubsetStringView source, char other, StringComparison sc)
             if (!source.valid)
                 return -1;
 
-            for (var i = source.Length - 1; i >= 0; --i)
+            for (var i = source.length - 1; i >= 0; --i)
             {
                 if (StringView.Compare(source[i], other, sc))
                     return i;
@@ -454,14 +454,14 @@ static int LastIndexOf(SubsetStringView source, char other, StringComparison sc)
 
         public bool StartsWith(char c, StringComparison stringComparison = StringComparison.Ordinal)
         {
-            if (Length == 0)
+            if (length == 0)
                 return false;
             return StringView.Compare(this[0], c, stringComparison);
         }
 
         public bool StartsWith(string v, StringComparison sc = StringComparison.Ordinal)
         {
-            if (v.Length > Length)
+            if (v.Length > length)
                 return false;
 
             for (var i = 0; i < v.Length; ++i)
@@ -473,10 +473,10 @@ public bool StartsWith(string v, StringComparison sc = StringComparison.Ordinal)
 
         public bool StartsWith(IStringView v, StringComparison sc = StringComparison.Ordinal)
         {
-            if (v.Length > Length)
+            if (v.length > length)
                 return false;
 
-            for (var i = 0; i < v.Length; ++i)
+            for (var i = 0; i < v.length; ++i)
                 if (!StringView.Compare(this[i], v[i], sc))
                     return false;
 
@@ -485,18 +485,18 @@ public bool StartsWith(IStringView v, StringComparison sc = StringComparison.Ord
 
         public bool EndsWith(char c, StringComparison sc = StringComparison.Ordinal)
         {
-            if (Length == 0)
+            if (length == 0)
                 return false;
-            return StringView.Compare(this[Length - 1], c, sc);
+            return StringView.Compare(this[length - 1], c, sc);
         }
 
         public bool EndsWith(string v, StringComparison sc = StringComparison.Ordinal)
         {
-            if (v.Length > Length)
+            if (v.Length > length)
                 return false;
 
             for (var i = 0; i < v.Length; ++i)
-                if (!StringView.Compare(this[Length - v.Length + i], v[i], sc))
+                if (!StringView.Compare(this[length - v.Length + i], v[i], sc))
                     return false;
 
             return true;
@@ -504,11 +504,11 @@ public bool EndsWith(string v, StringComparison sc = StringComparison.Ordinal)
 
         public bool EndsWith(IStringView v, StringComparison sc = StringComparison.Ordinal)
         {
-            if (v.Length > Length)
+            if (v.length > length)
                 return false;
 
-            for (var i = 0; i < v.Length; ++i)
-                if (!StringView.Compare(this[Length - v.Length + i], v[i], sc))
+            for (var i = 0; i < v.length; ++i)
+                if (!StringView.Compare(this[length - v.length + i], v[i], sc))
                     return false;
 
             return true;
@@ -516,7 +516,7 @@ public bool EndsWith(IStringView v, StringComparison sc = StringComparison.Ordin
 
         public bool Contains(char c, StringComparison ordinal = StringComparison.Ordinal)
         {
-            for (var i = 0; i < Length; ++i)
+            for (var i = 0; i < length; ++i)
                 if (StringView.Compare(this[i], c, ordinal))
                     return true;
             return false;
@@ -553,10 +553,10 @@ public bool Equals(IStringView other, StringComparison comparisonOptions = Strin
             if (other is SubsetStringView sv)
                 return Equals(sv, comparisonOptions);
 
-            if (other?.Length != Length)
+            if (other?.length != length)
                 return false;
 
-            for (var i = 0; i < Length; ++i)
+            for (var i = 0; i < length; ++i)
             {
                 if (!StringView.Compare(this[i], other[i], comparisonOptions))
                     return false;
@@ -567,10 +567,10 @@ public bool Equals(IStringView other, StringComparison comparisonOptions = Strin
 
         public bool Equals(string other, StringComparison comparisonOptions = StringComparison.OrdinalIgnoreCase)
         {
-            if (other?.Length != Length)
+            if (other?.Length != length)
                 return false;
 
-            for (var i = 0; i < Length; ++i)
+            for (var i = 0; i < length; ++i)
             {
                 if (!StringView.Compare(this[i], other[i], comparisonOptions))
                     return false;
@@ -581,10 +581,10 @@ public bool Equals(string other, StringComparison comparisonOptions = StringComp
 
         public bool Equals(SubsetStringView other, StringComparison comparisonOptions = StringComparison.OrdinalIgnoreCase)
         {
-            if (other.Length != Length)
+            if (other.length != length)
                 return false;
 
-            for (var i = 0; i < Length; ++i)
+            for (var i = 0; i < length; ++i)
             {
                 if (!StringView.Compare(this[i], other[i], comparisonOptions))
                     return false;
@@ -597,9 +597,9 @@ public override string ToString()
         {
             if (!valid)
                 return string.Empty;
-            if (Length == 0)
+            if (length == 0)
                 return string.Empty;
-            if (Length == m_BaseStringLength)
+            if (length == m_BaseStringLength)
                 return m_BaseString;
             var sb = new StringBuilder(m_Indexes.Count);
             foreach (var index in m_Indexes)
@@ -705,14 +705,14 @@ public static bool IsNullOrEmpty(this SubsetStringView sv)
         {
             if (!sv.valid)
                 return true;
-            return sv.Length == 0;
+            return sv.length == 0;
         }
 
         public static bool IsNullOrWhiteSpace(this SubsetStringView sv)
         {
             if (sv.IsNullOrEmpty())
                 return true;
-            for (var i = 0; i < sv.Length; ++i)
+            for (var i = 0; i < sv.length; ++i)
             {
                 if (!char.IsWhiteSpace(sv[i]))
                     return false;
diff --git a/Modules/QuickSearch/Editor/Utilities/Utils.cs b/Modules/QuickSearch/Editor/Utilities/Utils.cs
index 085f4a26e3..760e5b26df 100644
--- a/Modules/QuickSearch/Editor/Utilities/Utils.cs
+++ b/Modules/QuickSearch/Editor/Utilities/Utils.cs
@@ -145,7 +145,7 @@ internal static Hash128 GetSourceAssetFileHash(string guid)
             return AssetDatabase.GetSourceAssetFileHash(guid);
         }
 
-        internal static Texture2D GetAssetThumbnailFromPath(string path)
+        public static Texture2D GetAssetThumbnailFromPath(string path)
         {
             var thumbnail = GetAssetPreviewFromGUID(AssetDatabase.AssetPathToGUID(path));
             if (thumbnail)
@@ -159,12 +159,12 @@ private static Texture2D GetAssetPreviewFromGUID(string guid)
             return AssetPreview.GetAssetPreviewFromGUID(guid);
         }
 
-        internal static Texture2D GetAssetPreviewFromPath(string path, FetchPreviewOptions previewOptions)
+        public static Texture2D GetAssetPreviewFromPath(string path, FetchPreviewOptions previewOptions)
         {
             return GetAssetPreviewFromPath(path, new Vector2(128, 128), previewOptions);
         }
 
-        internal static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize, FetchPreviewOptions previewOptions)
+        public static Texture2D GetAssetPreviewFromPath(string path, Vector2 previewSize, FetchPreviewOptions previewOptions)
         {
             var assetType = AssetDatabase.GetMainAssetTypeAtPath(path);
             if (assetType == typeof(SceneAsset))
@@ -215,7 +215,7 @@ internal static bool HasInvalidComponent(UnityEngine.Object obj)
             return PrefabUtility.HasInvalidComponent(obj);
         }
 
-        internal static int GetMainAssetInstanceID(string assetPath)
+        public static int GetMainAssetInstanceID(string assetPath)
         {
             return AssetDatabase.GetMainAssetInstanceID(assetPath);
         }
@@ -294,7 +294,7 @@ internal static void SetTextEditorHasFocus(TextEditor editor, bool hasFocus)
             editor.m_HasFocus = hasFocus;
         }
 
-        internal static void FrameAssetFromPath(string path)
+        public static void FrameAssetFromPath(string path)
         {
             var asset = SelectAssetFromPath(path);
             if (asset != null)
@@ -343,7 +343,7 @@ internal static string FormatProviderList(IEnumerable<SearchProvider> providers,
             }));
         }
 
-        internal static string FormatBytes(long byteCount)
+        public static string FormatBytes(long byteCount)
         {
             string[] suf = { "B", "KB", "MB", "GB", "TB", "PB", "EB" };
             if (byteCount == 0)
@@ -406,7 +406,7 @@ internal static Type GetProjectBrowserWindowType()
             return typeof(ProjectBrowser);
         }
 
-        internal static Rect GetMainWindowCenteredPosition(Vector2 size)
+        public static Rect GetMainWindowCenteredPosition(Vector2 size)
         {
             var mainWindowRect = GetEditorMainWindowPos();
             return GetCenteredWindowPosition(mainWindowRect, size);
@@ -537,7 +537,7 @@ internal static Texture2D GetIconForObject(UnityEngine.Object obj)
             return EditorGUIUtility.GetIconForObject(obj);
         }
 
-        internal static void PingAsset(string assetPath)
+        public static void PingAsset(string assetPath)
         {
             EditorGUIUtility.PingObject(AssetDatabase.GetMainAssetInstanceID(assetPath));
         }
@@ -571,7 +571,7 @@ internal static bool TryConvertValue<T>(string value, out T convertedValue)
             }
         }
 
-        internal static void StartDrag(UnityEngine.Object[] objects, string label = null)
+        public static void StartDrag(UnityEngine.Object[] objects, string label = null)
         {
             s_LastDraggedObjects = objects;
             if (s_LastDraggedObjects == null)
@@ -581,7 +581,7 @@ internal static void StartDrag(UnityEngine.Object[] objects, string label = null
             DragAndDrop.StartDrag(label);
         }
 
-        internal static void StartDrag(UnityEngine.Object[] objects, string[] paths, string label = null)
+        public static void StartDrag(UnityEngine.Object[] objects, string[] paths, string label = null)
         {
             s_LastDraggedObjects = objects;
             if (paths == null || paths.Length == 0)
@@ -741,7 +741,7 @@ internal static event EditorApplication.CallbackFunction tick
             }
         }
 
-        internal static Action CallDelayed(EditorApplication.CallbackFunction callback, double seconds = 0)
+        public static Action CallDelayed(EditorApplication.CallbackFunction callback, double seconds = 0)
         {
             return EditorApplication.CallDelayed(callback, seconds);
         }
@@ -751,12 +751,12 @@ internal static void SetFirstInspectedEditor(Editor editor)
             editor.firstInspectedEditor = true;
         }
 
-        internal static GUIStyle FromUSS(string name)
+        public static GUIStyle FromUSS(string name)
         {
             return GUIStyleExtensions.FromUSS(GUIStyle.none, name);
         }
 
-        internal static GUIStyle FromUSS(GUIStyle @base, string name)
+        public static GUIStyle FromUSS(GUIStyle @base, string name)
         {
             return GUIStyleExtensions.FromUSS(@base, name);
         }
@@ -824,7 +824,7 @@ internal static string FastToLower(string str)
             return new string(chars);
         }
 
-        internal static string FormatCount(ulong count)
+        public static string FormatCount(ulong count)
         {
             if (count < 1000U)
                 return count.ToString(CultureInfo.InvariantCulture.NumberFormat);
@@ -1114,6 +1114,26 @@ public static Texture2D LoadIcon(string name)
             return EditorGUIUtility.LoadIcon(name);
         }
 
+        public static string GetIconSkinAgnosticName(Texture2D icon)
+        {
+            if (icon == null)
+                return null;
+            return GetIconSkinAgnosticName(icon.name);
+        }
+
+        public static string GetIconSkinAgnosticName(string name)
+        {
+            if (string.IsNullOrEmpty(name))
+                return name;
+
+            var oldName = Path.GetFileName(name);
+            var dirName = Path.GetDirectoryName(name);
+            var newName = oldName.StartsWith("d_") ? oldName.Substring(2) : oldName;
+            if (!string.IsNullOrEmpty(dirName))
+                newName = $"{dirName}/{newName}";
+            return newName;
+        }
+
         public static ulong GetFileIDHint(in UnityEngine.Object obj)
         {
             return Unsupported.GetFileIDHint(obj);
diff --git a/Modules/UIServiceEditor/SafeMode/SafeModeToolbarWindow.cs b/Modules/SafeMode/SafeModeToolbarWindow.cs
similarity index 100%
rename from Modules/UIServiceEditor/SafeMode/SafeModeToolbarWindow.cs
rename to Modules/SafeMode/SafeModeToolbarWindow.cs
diff --git a/Modules/SceneTemplateEditor/DependencyListView.cs b/Modules/SceneTemplateEditor/DependencyListView.cs
index 32dba42889..91c875ebdd 100644
--- a/Modules/SceneTemplateEditor/DependencyListView.cs
+++ b/Modules/SceneTemplateEditor/DependencyListView.cs
@@ -123,6 +123,7 @@ public void UpdateSortingDirection(DependencySortMode mode, DependencyComparer c
             }
         }
 
+        const string k_ListInternalView = "dependency-list-internal-view";
         const string k_ListView = "dependency-list-view";
         const string k_HeaderItem = "dependency-list-view-header";
         const string k_SearchFieldItem = "dependency-list-view-search-field";
@@ -133,6 +134,9 @@ public void UpdateSortingDirection(DependencySortMode mode, DependencyComparer c
         public ListView listView { get; }
         public VisualElement header { get; }
 
+        bool m_SearchFieldReady;
+        internal bool viewReady => m_SearchFieldReady;
+
         Toggle m_CloneHeaderToggle;
 
         SerializedObject m_SerializedObject;
@@ -159,18 +163,28 @@ public DependencyListView(List<SerializedProperty> itemsSource, int itemHeight,
             listViewContainer.style.flexGrow = 1;
 
             listView = new ListView(m_FilteredItems, itemHeight, MakeItem, BindItem);
+            listView.name = k_ListInternalView;
             listView.showAlternatingRowBackgrounds = AlternatingRowBackground.ContentOnly;
             listView.style.flexGrow = 1;
             listView.RegisterCallback<KeyUpEvent>(OnKeyUpEvent);
             listView.selectionType = SelectionType.Multiple;
-            listView.onItemsChosen += OnDoubleClick;
+            listView.itemsChosen += OnDoubleClick;
+            listView.style.maxHeight = Mathf.Max(m_OriginalItems.Count * m_ItemSize + 100, listView.style.maxHeight.value.value);
 
             var searchField = new ToolbarSearchField();
+            searchField.name = "dependency-listview-toolbar-searchfield";
             searchField.RegisterValueChangedCallback(evt =>
             {
                 m_CurrentSearchString = evt.newValue;
                 FilterItems(evt.newValue);
             });
+            var textField = searchField.Q<TextField>();
+            if (textField != null)
+            {
+                textField.maxLength = 1024;
+                m_SearchFieldReady = true;
+            }
+
             searchField.AddToClassList(k_SearchFieldItem);
             Add(searchField);
 
@@ -376,7 +390,7 @@ void FilterItems(string searchText)
         {
             m_FilteredItems.Clear();
 
-            var query = m_QueryEngine.Parse(searchText);
+            var query = m_QueryEngine.ParseQuery(searchText);
             query.returnPayloadIfEmpty = true;
             foreach (var item in query.Apply(m_OriginalItems))
             {
diff --git a/Modules/SceneTemplateEditor/ReferenceUtils.cs b/Modules/SceneTemplateEditor/ReferenceUtils.cs
index 8bdb12c3d7..35c762cd79 100644
--- a/Modules/SceneTemplateEditor/ReferenceUtils.cs
+++ b/Modules/SceneTemplateEditor/ReferenceUtils.cs
@@ -51,6 +51,8 @@ public static void RemapAssetReferences(Dictionary<string, string> pathMap, Dict
                 var assetsInDstPath = AssetDatabase.LoadAllAssetsAtPath(dstPath);
                 foreach (var o in assetsInDstPath)
                 {
+                    if (o == null)
+                        continue;
                     objects.Add(o);
                 }
             }
diff --git a/Modules/SceneTemplateEditor/ScenePicker.cs b/Modules/SceneTemplateEditor/ScenePicker.cs
index 3fa4164f2f..b14404aae7 100644
--- a/Modules/SceneTemplateEditor/ScenePicker.cs
+++ b/Modules/SceneTemplateEditor/ScenePicker.cs
@@ -26,7 +26,7 @@ internal static void OpenScenePicker()
                         SearchViewFlags.DisableSavedSearchQuery |
                         SearchViewFlags.GridView,
                 title = L10n.Tr("Scenes"),
-                excludeNoneItem = true
+                excludeClearItem = true
             });
         }
 
diff --git a/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs b/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs
index 15f4878b40..46d8244532 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateAssetInspectorWindow.cs
@@ -44,6 +44,10 @@ internal class SceneTemplateAssetInspectorWindow : Editor
         private DependencyListView m_DependencyListView;
         internal VisualElement Root { get; set; }
 
+        bool m_TitleTextFieldReady;
+        bool m_DescriptionTextFieldReady;
+        internal bool ViewReady => m_TitleTextFieldReady && m_DescriptionTextFieldReady && (m_DependencyListView?.viewReady ?? false);
+
         private class SnapshotTargetInfo
         {
             public string Name { get; set; }
@@ -104,6 +108,19 @@ public override VisualElement CreateInspectorGUI()
             var titlePropertyField = new PropertyField(templateTitleProperty, L10n.Tr("Title"));
             titlePropertyField.tooltip = L10n.Tr("Scene template display name. Shown in New Scene Dialog.");
             titlePropertyField.RegisterCallback<ChangeEvent<string>>(e => TriggerSceneTemplateModified());
+            titlePropertyField.RegisterCallback<SerializedPropertyBindEvent>(e =>
+            {
+                EditorApplication.delayCall += () =>
+                {
+                    if (!titlePropertyField.Children().Any())
+                        return;
+                    if (titlePropertyField.Children().First() is TextField titlePropertyFieldTextField)
+                    {
+                        titlePropertyFieldTextField.maxLength = 1024;
+                        m_TitleTextFieldReady = true;
+                    }
+                };
+            });
             detailElement.Add(titlePropertyField);
 
             // Scene description
@@ -123,6 +140,7 @@ public override VisualElement CreateInspectorGUI()
                         descriptionTextField.AddToClassList(Styles.classWrappingText);
                         descriptionTextField.multiline = true;
                         descriptionTextField.maxLength = 1024;
+                        m_DescriptionTextFieldReady = true;
                     }
                 };
             });
@@ -178,6 +196,11 @@ public override VisualElement CreateInspectorGUI()
             return root;
         }
 
+        protected override bool ShouldHideOpenButton()
+        {
+            return true;
+        }
+
         void OnCreateSceneTemplatePipeline()
         {
             var assetPath = AssetDatabase.GetAssetPath(serializedObject.targetObject.GetInstanceID());
diff --git a/Modules/SceneTemplateEditor/SceneTemplateService.cs b/Modules/SceneTemplateEditor/SceneTemplateService.cs
index 0cfb14af56..86bd667cdc 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateService.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateService.cs
@@ -137,79 +137,51 @@ internal static InstantiationResult Instantiate(SceneTemplateAsset sceneTemplate
 
             var templatePipeline = sceneTemplate.CreatePipeline();
 
-            if (hasAnyCloneableDependencies || loadAdditively)
+            if (!InstantiateInMemoryScene(sceneTemplate, sourceScenePath, ref newSceneOutputPath, out var rootFolder, out var isTempMemory))
             {
-                if (!InstantiateInMemoryScene(sceneTemplate, sourceScenePath, ref newSceneOutputPath, out var rootFolder, out var isTempMemory))
-                {
-                    instantiateEvent.isCancelled = true;
-                    SceneTemplateAnalytics.SendSceneInstantiationEvent(instantiateEvent);
-                    return null;
-                }
-
-                templatePipeline?.BeforeTemplateInstantiation(sceneTemplate, loadAdditively, isTempMemory ? null : newSceneOutputPath);
-                newSceneTemplateInstantiating?.Invoke(sceneTemplate, isTempMemory ? null : newSceneOutputPath, loadAdditively);
+                instantiateEvent.isCancelled = true;
+                SceneTemplateAnalytics.SendSceneInstantiationEvent(instantiateEvent);
+                return null;
+            }
 
-                newSceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(newSceneOutputPath);
+            templatePipeline?.BeforeTemplateInstantiation(sceneTemplate, loadAdditively, isTempMemory ? null : newSceneOutputPath);
+            newSceneTemplateInstantiating?.Invoke(sceneTemplate, isTempMemory ? null : newSceneOutputPath, loadAdditively);
 
-                var refPathMap = new Dictionary<string, string>();
-                var idMap = new Dictionary<int, int>();
-                if (hasAnyCloneableDependencies)
-                {
-                    var refMap = CopyCloneableDependencies(sceneTemplate, newSceneOutputPath, ref refPathMap);
-                    idMap.Add(sceneTemplate.templateScene.GetInstanceID(), newSceneAsset.GetInstanceID());
-                    ReferenceUtils.RemapAssetReferences(refPathMap, idMap);
+            newSceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(newSceneOutputPath);
 
-                    foreach (var clone in refMap.Values)
-                    {
-                        if (clone)
-                            EditorUtility.SetDirty(clone);
-                    }
-                    AssetDatabase.SaveAssets();
-                }
-
-                newScene = EditorSceneManager.OpenScene(newSceneOutputPath, loadAdditively ? OpenSceneMode.Additive : OpenSceneMode.Single);
+            var refPathMap = new Dictionary<string, string>();
+            var idMap = new Dictionary<int, int>();
+            if (hasAnyCloneableDependencies)
+            {
+                var clonedAssets = CopyCloneableDependencies(sceneTemplate, newSceneOutputPath, ref refPathMap);
+                idMap.Add(sceneTemplate.templateScene.GetInstanceID(), newSceneAsset.GetInstanceID());
+                ReferenceUtils.RemapAssetReferences(refPathMap, idMap);
 
-                if (hasAnyCloneableDependencies)
+                foreach (var clone in clonedAssets)
                 {
-                    EditorSceneManager.RemapAssetReferencesInScene(newScene, refPathMap, idMap);
+                    if (clone)
+                        EditorUtility.SetDirty(clone);
                 }
+                AssetDatabase.SaveAssets();
+            }
 
-                EditorSceneManager.SaveScene(newScene, newSceneOutputPath);
+            newScene = EditorSceneManager.OpenScene(newSceneOutputPath, loadAdditively ? OpenSceneMode.Additive : OpenSceneMode.Single);
 
-                if (isTempMemory)
-                {
-                    newSceneAsset = null;
-                    newScene.SetPathAndGuid("", newScene.guid);
-                    s_CurrentInMemorySceneState.guid = newScene.guid;
-                    s_CurrentInMemorySceneState.rootFolder = rootFolder;
-                    s_CurrentInMemorySceneState.hasCloneableDependencies = hasAnyCloneableDependencies;
-                    s_CurrentInMemorySceneState.dependencyFolderName = Path.GetFileNameWithoutExtension(newSceneOutputPath);
-                }
-            }
-            else
+            if (hasAnyCloneableDependencies)
             {
-                var needTempSceneCleanup = false;
-                if (SceneTemplateUtils.IsAssetReadOnly(sourceScenePath))
-                {
-                    sourceScenePath = CopyToTemporaryScene(sourceScenePath);
-                    needTempSceneCleanup = true;
-                }
-
-                templatePipeline?.BeforeTemplateInstantiation(sceneTemplate, loadAdditively, newSceneOutputPath);
-                newSceneTemplateInstantiating?.Invoke(sceneTemplate, newSceneOutputPath, loadAdditively);
-                newScene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
-                var sourceScene = EditorSceneManager.OpenScene(sourceScenePath, OpenSceneMode.Additive);
-                SceneManager.MergeScenes(sourceScene, newScene);
+                EditorSceneManager.RemapAssetReferencesInScene(newScene, refPathMap, idMap);
+            }
 
-                if (!string.IsNullOrEmpty(newSceneOutputPath))
-                {
-                    EditorSceneManager.SaveScene(newScene, newSceneOutputPath);
-                }
+            EditorSceneManager.SaveScene(newScene, newSceneOutputPath);
 
-                if (needTempSceneCleanup)
-                {
-                    SceneTemplateUtils.DeleteAsset(sourceScenePath);
-                }
+            if (isTempMemory)
+            {
+                newSceneAsset = null;
+                newScene.SetPathAndGuid("", newScene.guid);
+                s_CurrentInMemorySceneState.guid = newScene.guid;
+                s_CurrentInMemorySceneState.rootFolder = rootFolder;
+                s_CurrentInMemorySceneState.hasCloneableDependencies = hasAnyCloneableDependencies;
+                s_CurrentInMemorySceneState.dependencyFolderName = Path.GetFileNameWithoutExtension(newSceneOutputPath);
             }
 
             SceneTemplateAnalytics.SendSceneInstantiationEvent(instantiateEvent);
@@ -324,7 +296,6 @@ private static void Init()
 
         static void RegisterApplicationEvent()
         {
-            EditorApplication.quitting += EditorApplicationQuitting;
             AssemblyReloadEvents.beforeAssemblyReload += BeforeAssemblyReload;
             AssemblyReloadEvents.afterAssemblyReload += AfterAssemblyReload;
         }
@@ -342,21 +313,6 @@ static void AfterAssemblyReload()
                 RegisterInMemoryTempFolder(s_TempFolderBase);
         }
 
-        static void EditorApplicationQuitting()
-        {
-            if (registeredTempFolder)
-            {
-                try
-                {
-                    AssetDatabase.UnregisterRedirectedAssetFolder(k_MountPoint, k_InMemoryTempFolder);
-                    if (Directory.Exists(s_TempFolderBase))
-                        Directory.Delete(s_TempFolderBase, true);
-                }
-                catch { }
-            }
-        }
-
-
         static void UpdateSceneTemplatesOnSceneSave(Scene scene)
         {
             var infos = SceneTemplateUtils.GetSceneTemplateInfos();
@@ -468,9 +424,9 @@ private static void AddSceneTemplateModuleDefine(BuildTarget target, HashSet<str
             defines.Add("SCENE_TEMPLATE_MODULE");
         }
 
-        private static Dictionary<Object, Object> CopyCloneableDependencies(SceneTemplateAsset sceneTemplate, string newSceneOutputPath, ref Dictionary<string, string> refPathMap)
+        private static List<Object> CopyCloneableDependencies(SceneTemplateAsset sceneTemplate, string newSceneOutputPath, ref Dictionary<string, string> refPathMap)
         {
-            var refMap = new Dictionary<Object, Object>();
+            var clonedAssets = new List<Object>();
             var outputSceneFileName = Path.GetFileNameWithoutExtension(newSceneOutputPath);
             var outputSceneDirectory = Path.GetDirectoryName(newSceneOutputPath);
             var dependencyFolder = Path.Combine(outputSceneDirectory, outputSceneFileName);
@@ -479,43 +435,46 @@ private static Dictionary<Object, Object> CopyCloneableDependencies(SceneTemplat
                 Directory.CreateDirectory(dependencyFolder);
             }
 
-            foreach (var dependency in sceneTemplate.dependencies)
+            try
             {
-                if (dependency.instantiationMode != TemplateInstantiationMode.Clone)
-                    continue;
-
-                var dependencyPath = AssetDatabase.GetAssetPath(dependency.dependency);
-                if (String.IsNullOrEmpty(dependencyPath))
+                AssetDatabase.StartAssetEditing();
+                foreach (var dependency in sceneTemplate.dependencies)
                 {
-                    Debug.LogError("Cannot find dependency path for: " + dependency.dependency, dependency.dependency);
-                    continue;
+                    if (dependency.instantiationMode != TemplateInstantiationMode.Clone)
+                        continue;
+
+                    var dependencyPath = AssetDatabase.GetAssetPath(dependency.dependency);
+                    if (String.IsNullOrEmpty(dependencyPath))
+                    {
+                        Debug.LogError("Cannot find dependency path for: " + dependency.dependency, dependency.dependency);
+                        continue;
+                    }
+
+                    var clonedDepName = Path.GetFileName(dependencyPath);
+                    var clonedDepPath = Path.Combine(dependencyFolder, clonedDepName).Replace("\\", "/");
+                    // FYI: CopyAsset already does Import and Refresh
+                    AssetDatabase.CopyAsset(dependencyPath, clonedDepPath);
+                    refPathMap.Add(dependencyPath, clonedDepPath);
                 }
+            }
+            finally
+            {
+                AssetDatabase.StopAssetEditing();
+                AssetDatabase.Refresh();
+            }
 
-                var clonedDepName = Path.GetFileName(dependencyPath);
-                var clonedDepPath = Path.Combine(dependencyFolder, clonedDepName).Replace("\\", "/");
-                // FYI: CopyAsset already does Import and Refresh
-                AssetDatabase.CopyAsset(dependencyPath, clonedDepPath);
+            foreach (var clonedDepPath in refPathMap.Values)
+            {
                 var clonedDependency = AssetDatabase.LoadMainAssetAtPath(clonedDepPath);
                 if (clonedDependency == null || !clonedDependency)
                 {
                     Debug.LogError("Cannot load cloned dependency path at: " + clonedDepPath);
                     continue;
                 }
-
-                refPathMap.Add(dependencyPath, clonedDepPath);
-                refMap.Add(dependency.dependency, clonedDependency);
+                clonedAssets.Add(clonedDependency);
             }
 
-            return refMap;
-        }
-
-        private static string CopyToTemporaryScene(string sourceScenePath)
-        {
-            var tempScenePath = $"Assets/{Guid.NewGuid():N}.unity";
-            tempScenePath = AssetDatabase.GenerateUniqueAssetPath(tempScenePath);
-            if (!AssetDatabase.CopyAsset(sourceScenePath, tempScenePath))
-                throw new Exception($"Cannot copy read-only sceneTemplate \"{sourceScenePath}\"");
-            return tempScenePath;
+            return clonedAssets;
         }
 
         static void RegisterInMemoryTempFolder()
@@ -590,7 +549,7 @@ private static void SaveTemplateFromCurrentScene()
                 return;
 
             var sourceSceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(currentScene.path);
-            CreateTemplateFromScene(sourceSceneAsset, FileUtil.GetProjectRelativePath(sceneTemplateFile), SceneTemplateAnalytics.TemplateCreationType.SaveCurrentSceneAsTemplateMenu);
+            CreateTemplateFromScene(sourceSceneAsset, sceneTemplateFile, SceneTemplateAnalytics.TemplateCreationType.SaveCurrentSceneAsTemplateMenu);
         }
 
         [CommandHandler("Menu/File/NewSceneTemplate")]
diff --git a/Modules/SceneTemplateEditor/SceneTemplateUtils.cs b/Modules/SceneTemplateEditor/SceneTemplateUtils.cs
index 789518eff2..fc38a1f074 100644
--- a/Modules/SceneTemplateEditor/SceneTemplateUtils.cs
+++ b/Modules/SceneTemplateEditor/SceneTemplateUtils.cs
@@ -245,7 +245,7 @@ internal static bool CreateBuiltinScene(BuiltinTemplateType type, bool loadAddit
                 return false;
             }
 
-            if (!EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
+            if (!loadAdditively && !EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
             {
                 return false;
             }
diff --git a/Modules/UIServiceEditor/SceneView/DropdownToggle.cs b/Modules/SceneView/DropdownToggle.cs
similarity index 100%
rename from Modules/UIServiceEditor/SceneView/DropdownToggle.cs
rename to Modules/SceneView/DropdownToggle.cs
diff --git a/Modules/UIServiceEditor/SceneView/SceneViewLightingOverlays.cs b/Modules/SceneView/SceneViewLightingOverlays.cs
similarity index 99%
rename from Modules/UIServiceEditor/SceneView/SceneViewLightingOverlays.cs
rename to Modules/SceneView/SceneViewLightingOverlays.cs
index d04663dddd..250e4d1a5a 100644
--- a/Modules/UIServiceEditor/SceneView/SceneViewLightingOverlays.cs
+++ b/Modules/SceneView/SceneViewLightingOverlays.cs
@@ -14,6 +14,7 @@
 namespace UnityEditor
 {
     [Overlay(typeof(SceneView), k_OverlayID, "Light Settings")]
+    [Icon("Icons/Exposure.png")]
     class SceneViewLighting : Overlay, ITransientOverlay
     {
         const string k_OverlayID = "Scene View/Light Settings";
diff --git a/Modules/UIServiceEditor/SceneView/SceneViewToolbarElements.cs b/Modules/SceneView/SceneViewToolbarElements.cs
similarity index 97%
rename from Modules/UIServiceEditor/SceneView/SceneViewToolbarElements.cs
rename to Modules/SceneView/SceneViewToolbarElements.cs
index b3c787794a..ef2e05dd45 100644
--- a/Modules/UIServiceEditor/SceneView/SceneViewToolbarElements.cs
+++ b/Modules/SceneView/SceneViewToolbarElements.cs
@@ -56,10 +56,10 @@ public CameraModeElement()
 
             clicked += () => PopupWindow.Show(worldBound, new SceneRenderModeWindow(sceneView));
 
-            m_ShadedIcon = EditorGUIUtility.FindTexture("Toolbars/Shaded");
-            m_ShadedWireframeIcon = EditorGUIUtility.FindTexture("Toolbars/ShadedWireframe");
-            m_WireframeIcon = EditorGUIUtility.FindTexture("Toolbars/Wireframe");
-            m_DebugIcon = EditorGUIUtility.FindTexture("Toolbars/debug");
+            m_ShadedIcon = EditorGUIUtility.IconContent("Toolbars/Shaded").image as Texture2D;
+            m_ShadedWireframeIcon = EditorGUIUtility.IconContent("Toolbars/ShadedWireframe").image as Texture2D;;
+            m_WireframeIcon = EditorGUIUtility.IconContent("Toolbars/Wireframe").image as Texture2D;;
+            m_DebugIcon = EditorGUIUtility.IconContent("Toolbars/debug").image as Texture2D;;
 
             RegisterCallback<AttachToPanelEvent>(OnAttachedToPanel);
             RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
@@ -240,6 +240,7 @@ public SceneFxElement()
         void OnAttachedToPanel(AttachToPanelEvent evt)
         {
             sceneView.sceneViewState.fxEnableChanged += OnSceneFxChanged;
+            OnSceneFxChanged(sceneView.sceneViewState.fxEnabled);
         }
 
         void OnDetachFromPanel(DetachFromPanelEvent evt)
diff --git a/Modules/ShaderFoundry/ScriptBindings/AssemblyInfo.cs b/Modules/ShaderFoundry/ScriptBindings/AssemblyInfo.cs
new file mode 100644
index 0000000000..23902121bd
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/AssemblyInfo.cs
@@ -0,0 +1,16 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Unity.ShaderFoundry.Editor")]
+[assembly: InternalsVisibleTo("Unity.ShaderFoundry.BlockSS")]
+[assembly: InternalsVisibleTo("Unity.ShaderFoundry.Editor.GraphicsTests")]
+
+[assembly: InternalsVisibleTo("Unity.ShaderGraph.GraphDeltaRegistry")]
+
+[assembly: InternalsVisibleTo("UnityEditor.ShaderFoundry.Tests")]
+[assembly: InternalsVisibleTo("Unity.ShaderFoundry.Tests")]
+[assembly: InternalsVisibleTo("Unity.ContextLayeredDataStorage.Tests")]
+[assembly: InternalsVisibleTo("Unity.ShaderGraph.GraphDelta.Tests")]
diff --git a/Modules/ShaderFoundry/ScriptBindings/Block.binding.cs b/Modules/ShaderFoundry/ScriptBindings/Block.binding.cs
new file mode 100644
index 0000000000..b4a2dcd7b8
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/Block.binding.cs
@@ -0,0 +1,297 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+using BlockInput = UnityEditor.ShaderFoundry.BlockVariable;
+using BlockOutput = UnityEditor.ShaderFoundry.BlockVariable;
+using BlockProperty = UnityEditor.ShaderFoundry.BlockVariable;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/Block.h")]
+    internal struct BlockInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_DeclaredTypeListHandle;
+        internal FoundryHandle m_ReferencedTypeListHandle;
+        internal FoundryHandle m_DeclaredFunctionListHandle;
+        internal FoundryHandle m_ReferencedFunctionListHandle;
+        internal FoundryHandle m_EntryPointFunctionHandle;
+        internal FoundryHandle m_InputVariableListHandle;
+        internal FoundryHandle m_OutputVariableListHandle;
+        internal FoundryHandle m_PropertyVariableListHandle;
+        internal FoundryHandle m_CommandListHandle;
+        internal FoundryHandle m_DefineListHandle;
+        internal FoundryHandle m_IncludeListHandle;
+        internal FoundryHandle m_KeywordListHandle;
+        internal FoundryHandle m_PragmaListHandle;
+        internal FoundryHandle m_PassParentHandle;
+        internal FoundryHandle m_TemplateParentHandle;
+
+        internal extern static BlockInternal Invalid();
+        internal extern bool IsValid { [NativeMethod("IsValid")] get; }
+
+        internal extern FoundryHandle GetPassParentHandle();
+        internal extern FoundryHandle GetTemplateParentHandle();
+        internal extern bool HasParent();
+    }
+
+    [FoundryAPI]
+    internal readonly struct Block : IEquatable<Block>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly BlockInternal block;
+
+        // public API
+        public ShaderContainer Container => container;
+
+        // exists if it has been allocated
+        public bool Exists => (container != null && handle.IsValid);
+
+        // must have a name assigned to be considered valid
+        public bool IsValid => Exists && block.IsValid;
+
+        public string Name => container?.GetString(block.m_NameHandle) ?? string.Empty;
+        public IEnumerable<ShaderType> Types
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_DeclaredTypeListHandle);
+                return list.Select<ShaderType>(localContainer, (handle) => (new ShaderType(localContainer, handle)));
+            }
+        }
+        public ShaderType GetType(string typeName) => Container.GetType(typeName, this);
+        public IEnumerable<ShaderType> ReferencedTypes
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_ReferencedTypeListHandle);
+                return list.Select<ShaderType>(localContainer, (handle) => (new ShaderType(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<ShaderFunction> Functions
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_DeclaredFunctionListHandle);
+                return list.Select<ShaderFunction>(localContainer, (handle) => (new ShaderFunction(localContainer, handle)));
+            }
+        }
+        public IEnumerable<ShaderFunction> ReferencedFunctions
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_ReferencedFunctionListHandle);
+                return list.Select<ShaderFunction>(localContainer, (handle) => (new ShaderFunction(localContainer, handle)));
+            }
+        }
+
+        public ShaderFunction EntryPointFunction => new ShaderFunction(container, block.m_EntryPointFunctionHandle);
+
+        public IEnumerable<BlockInput> Inputs => GetVariableEnumerable(block.m_InputVariableListHandle);
+
+        public IEnumerable<BlockOutput> Outputs => GetVariableEnumerable(block.m_OutputVariableListHandle);
+
+        public IEnumerable<CommandDescriptor> Commands
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_CommandListHandle);
+                return list.Select<CommandDescriptor>(localContainer, (handle) => (new CommandDescriptor(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<DefineDescriptor> Defines
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_DefineListHandle);
+                return list.Select<DefineDescriptor>(localContainer, (handle) => (new DefineDescriptor(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<IncludeDescriptor> Includes
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_IncludeListHandle);
+                return list.Select<IncludeDescriptor>(localContainer, (handle) => (new IncludeDescriptor(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<KeywordDescriptor> Keywords
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_KeywordListHandle);
+                return list.Select<KeywordDescriptor>(localContainer, (handle) => (new KeywordDescriptor(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<PragmaDescriptor> Pragmas
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(block.m_PragmaListHandle);
+                return list.Select<PragmaDescriptor>(localContainer, (handle) => (new PragmaDescriptor(localContainer, handle)));
+            }
+        }
+
+        IEnumerable<BlockVariable> GetVariableEnumerable(FoundryHandle listHandle)
+        {
+            var localContainer = Container;
+            var list = new FixedHandleListInternal(listHandle);
+            return list.Select<BlockVariable>(localContainer, (handle) => (new BlockVariable(localContainer, handle)));
+        }
+
+        public TemplatePass ParentPass => new TemplatePass(container, block.GetPassParentHandle());
+        public Template ParentTemplate => new Template(container, block.GetTemplateParentHandle());
+
+        // private
+        internal Block(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.block = container?.GetBlock(handle) ?? BlockInternal.Invalid();
+        }
+
+        public static Block Invalid => new Block(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is Block other && this.Equals(other);
+        public bool Equals(Block other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(Block lhs, Block rhs) => lhs.Equals(rhs);
+        public static bool operator!=(Block lhs, Block rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            internal readonly FoundryHandle blockHandle;
+            internal FoundryHandle passParentHandle;
+            internal FoundryHandle templateParentHandle;
+            internal string name;
+            List<ShaderType> types = new List<ShaderType>();
+            List<ShaderType> referencedTypes = new List<ShaderType>();
+            List<ShaderFunction> functions = new List<ShaderFunction>();
+            List<ShaderFunction> referencedFunctions = new List<ShaderFunction>();
+            ShaderFunction entryPointFunction = ShaderFunction.Invalid;
+
+            List<CommandDescriptor> m_Commands = new List<CommandDescriptor>();
+            List<DefineDescriptor> m_Defines = new List<DefineDescriptor>();
+            List<IncludeDescriptor> m_Includes = new List<IncludeDescriptor>();
+            List<KeywordDescriptor> m_Keywords = new List<KeywordDescriptor>();
+            List<PragmaDescriptor> m_Pragmas = new List<PragmaDescriptor>();
+            bool finalized = false;
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name)
+                : this(container, name, FoundryHandle.Invalid(), FoundryHandle.Invalid())
+            {
+            }
+
+            internal Builder(ShaderContainer container, string name, FoundryHandle passParentHandle, FoundryHandle templateParentHandle)
+            {
+                this.container = container;
+                this.name = name;
+                this.passParentHandle = passParentHandle;
+                this.templateParentHandle = templateParentHandle;
+                blockHandle = container.CreateBlockInternal();
+            }
+
+            internal void AddType(ShaderType type) { types.Add(type); }
+
+            public void AddReferencedType(ShaderType type) { referencedTypes.Add(type); }
+            public void AddFunction(ShaderFunction function) { functions.Add(function); }
+            public void AddReferencedFunction(ShaderFunction function) { referencedFunctions.Add(function); }
+            public void SetEntryPointFunction(ShaderFunction function) { entryPointFunction = function; AddFunction(entryPointFunction); }
+
+            public void AddCommand(CommandDescriptor descriptor) { m_Commands.Add(descriptor); }
+            public void AddDefine(DefineDescriptor descriptor) { m_Defines.Add(descriptor); }
+            public void AddInclude(IncludeDescriptor descriptor) { m_Includes.Add(descriptor); }
+            public void AddKeyword(KeywordDescriptor descriptor) { m_Keywords.Add(descriptor); }
+            public void AddPragma(PragmaDescriptor descriptor) { m_Pragmas.Add(descriptor); }
+
+            // Get the input and output types for this function (assumed to be an entry point)
+            static void GetInOutTypes(ShaderFunction function, out ShaderType inputType, out ShaderType outputType)
+            {
+                inputType = outputType = ShaderType.Invalid;
+                if (function.IsValid)
+                {
+                    outputType = function.ReturnType;
+                    var parameters = function.Parameters.GetEnumerator();
+                    if (parameters.MoveNext())
+                        inputType = parameters.Current.Type;
+                }
+            }
+
+            static List<BlockVariable> BuildVariablesFromTypeFields(ShaderContainer container, ShaderType type)
+            {
+                var results = new List<BlockVariable>();
+                foreach (var field in type.StructFields)
+                {
+                    var builder = new BlockVariable.Builder(container);
+                    builder.Name = field.Name;
+                    builder.Type = field.Type;
+                    foreach (var attribute in field.Attributes)
+                        builder.AddAttribute(attribute);
+                    results.Add(builder.Build());
+                }
+                return results;
+            }
+
+            public Block Build()
+            {
+                if (finalized)
+                    return new Block(Container, blockHandle);
+                finalized = true;
+
+                var blockInternal = new BlockInternal();
+                blockInternal.m_NameHandle = container.AddString(name);
+
+                blockInternal.m_DeclaredTypeListHandle = FixedHandleListInternal.Build(container, types, (t) => (t.handle));
+                blockInternal.m_ReferencedTypeListHandle = FixedHandleListInternal.Build(container, referencedTypes, (t) => (t.handle));
+                blockInternal.m_DeclaredFunctionListHandle = FixedHandleListInternal.Build(container, functions, (f) => (f.handle));
+                blockInternal.m_ReferencedFunctionListHandle = FixedHandleListInternal.Build(container, referencedFunctions, (f) => (f.handle));
+                blockInternal.m_EntryPointFunctionHandle = entryPointFunction.handle;
+
+                // Build up the input/output variable list from the entry point function
+                GetInOutTypes(entryPointFunction, out var inputType, out var outputType);
+                var inputs = BuildVariablesFromTypeFields(Container, inputType);
+                var outputs = BuildVariablesFromTypeFields(Container, outputType);
+
+                blockInternal.m_InputVariableListHandle = FixedHandleListInternal.Build(container, inputs, (v) => (v.handle));
+                blockInternal.m_OutputVariableListHandle = FixedHandleListInternal.Build(container, outputs, (v) => (v.handle));
+
+                blockInternal.m_CommandListHandle = FixedHandleListInternal.Build(container, m_Commands, (c) => (c.handle));
+                blockInternal.m_DefineListHandle = FixedHandleListInternal.Build(container, m_Defines, (d) => (d.handle));
+                blockInternal.m_IncludeListHandle = FixedHandleListInternal.Build(container, m_Includes, (i) => (i.handle));
+                blockInternal.m_KeywordListHandle = FixedHandleListInternal.Build(container, m_Keywords, (k) => (k.handle));
+                blockInternal.m_PragmaListHandle = FixedHandleListInternal.Build(container, m_Pragmas, (p) => (p.handle));
+                blockInternal.m_PassParentHandle = passParentHandle;
+                blockInternal.m_TemplateParentHandle = templateParentHandle;
+
+                container.SetBlockInternal(blockHandle, blockInternal);
+                return new Block(container, blockHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/BlockInstance.binding.cs b/Modules/ShaderFoundry/ScriptBindings/BlockInstance.binding.cs
new file mode 100644
index 0000000000..6656037ad2
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/BlockInstance.binding.cs
@@ -0,0 +1,73 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/BlockInstance.h")]
+    internal struct BlockInstanceInternal
+    {
+        internal FoundryHandle m_BlockHandle;
+
+        internal extern static BlockInstanceInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct BlockInstance : IEquatable<BlockInstance>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly BlockInstanceInternal blockInstance;
+
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+        public Block Block { get { return new Block(container, blockInstance.m_BlockHandle); } }
+
+        // private
+        internal BlockInstance(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.blockInstance = container?.GetBlockInstance(handle) ?? BlockInstanceInternal.Invalid();
+        }
+
+        public static BlockInstance Invalid => new BlockInstance(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is BlockInstance other && this.Equals(other);
+        public bool Equals(BlockInstance other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(BlockInstance lhs, BlockInstance rhs) => lhs.Equals(rhs);
+        public static bool operator!=(BlockInstance lhs, BlockInstance rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            Block block;
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, Block block)
+            {
+                this.container = container;
+                this.block = block;
+            }
+
+            public BlockInstance Build()
+            {
+                var blockInstanceInternal = new BlockInstanceInternal();
+                blockInstanceInternal.m_BlockHandle = block.handle;
+                var returnTypeHandle = container.AddBlockInstanceInternal(blockInstanceInternal);
+                return new BlockInstance(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/BlockVariable.binding.cs b/Modules/ShaderFoundry/ScriptBindings/BlockVariable.binding.cs
new file mode 100644
index 0000000000..bc7035e0b6
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/BlockVariable.binding.cs
@@ -0,0 +1,101 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/BlockVariable.h")]
+    internal struct BlockVariableInternal
+    {
+        internal FoundryHandle m_TypeHandle;
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_AttributeListHandle;
+
+        internal static extern BlockVariableInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct BlockVariable : IEquatable<BlockVariable>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly BlockVariableInternal variable;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null);
+        public ShaderType Type => new ShaderType(container, variable.m_TypeHandle);
+        public string Name => container?.GetString(variable.m_NameHandle) ?? string.Empty;
+        public IEnumerable<ShaderAttribute> Attributes
+        {
+            get
+            {
+                var count = container?.GetHandleBlobSize(variable.m_AttributeListHandle) ?? 0;
+                for (uint i = 0; i < count; ++i)
+                {
+                    var attributeHandle = container.GetHandleBlobElement(variable.m_AttributeListHandle, i);
+                    yield return new ShaderAttribute(Container, attributeHandle);
+                }
+            }
+        }
+
+        // private
+        internal BlockVariable(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.variable = container?.GetBlockVariable(handle) ?? BlockVariableInternal.Invalid();
+        }
+
+        public static BlockVariable Invalid => new BlockVariable(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is BlockVariable other && this.Equals(other);
+        public bool Equals(BlockVariable other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(BlockVariable lhs, BlockVariable rhs) => lhs.Equals(rhs);
+        public static bool operator!=(BlockVariable lhs, BlockVariable rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            public ShaderType Type { get; set; } = ShaderType.Invalid;
+            public string Name { get; set; }
+            public List<ShaderAttribute> Attributes { get; set; } = new List<ShaderAttribute>();
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container)
+            {
+                this.container = container;
+            }
+
+            public void AddAttribute(ShaderAttribute attribute)
+            {
+                Attributes.Add(attribute);
+            }
+
+            public BlockVariable Build()
+            {
+                var blockVariableInternal = new BlockVariableInternal()
+                {
+                    m_TypeHandle = Type.handle,
+                    m_NameHandle = container.AddString(Name),
+                };
+                blockVariableInternal.m_AttributeListHandle = container.AddHandleBlob((uint)Attributes.Count);
+                for (int i = 0; i < Attributes.Count; ++i)
+                    container.SetHandleBlobElement(blockVariableInternal.m_AttributeListHandle, (uint)i, Attributes[i].handle);
+
+                var returnTypeHandle = container.AddBlockVariableInternal(blockVariableInternal);
+                return new BlockVariable(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/CommandDescriptor.binding.cs b/Modules/ShaderFoundry/ScriptBindings/CommandDescriptor.binding.cs
new file mode 100644
index 0000000000..c59b58e6d3
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/CommandDescriptor.binding.cs
@@ -0,0 +1,92 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+using System.Linq;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/CommandDescriptor.h")]
+    internal struct CommandDescriptorInternal
+    {
+        internal FoundryHandle m_ListHandle;
+
+        internal extern static CommandDescriptorInternal Invalid();
+        internal extern void Setup(ShaderContainer container, string name, string[] ops);
+        internal extern bool IsValid();
+        internal extern string GetName(ShaderContainer container);
+        internal extern int GetOpCount(ShaderContainer container);
+        internal extern string GetOp(ShaderContainer container, int index);
+    }
+
+    [FoundryAPI]
+    internal readonly struct CommandDescriptor : IEquatable<CommandDescriptor>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly CommandDescriptorInternal descriptor;
+        internal readonly FoundryHandle handle;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && descriptor.IsValid());
+
+        public string Name => descriptor.GetName(container);
+
+        public IEnumerable<string> Ops
+        {
+            get
+            {
+                var opCount = descriptor.GetOpCount(container);
+                for (var i = 0; i < opCount; ++i)
+                    yield return descriptor.GetOp(container, i);
+            }
+        }
+
+        // private
+        internal CommandDescriptor(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.descriptor = container?.GetCommandDescriptor(handle) ?? CommandDescriptorInternal.Invalid();
+        }
+
+        public static CommandDescriptor Invalid => new CommandDescriptor(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is CommandDescriptor other && this.Equals(other);
+        public bool Equals(CommandDescriptor other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(CommandDescriptor lhs, CommandDescriptor rhs) => lhs.Equals(rhs);
+        public static bool operator!=(CommandDescriptor lhs, CommandDescriptor rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            string name;
+            List<string> ops = new List<string>();
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, IEnumerable<string> ops)
+            {
+                this.container = container;
+                this.name = name;
+                this.ops = ops.ToList();
+            }
+
+            public CommandDescriptor Build()
+            {
+                var descriptor = new CommandDescriptorInternal();
+                descriptor.Setup(container, name, ops.ToArray());
+                var resultHandle = container.AddCommandDescriptorInternal(descriptor);
+                return new CommandDescriptor(container, resultHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/CustomizationPoint.cs b/Modules/ShaderFoundry/ScriptBindings/CustomizationPoint.cs
new file mode 100644
index 0000000000..d927c8f800
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/CustomizationPoint.cs
@@ -0,0 +1,113 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/CustomizationPoint.h")]
+    internal struct CustomizationPointInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_InputListHandle;
+        internal FoundryHandle m_OutputListHandle;
+        internal FoundryHandle m_PropertyListHandle;
+        internal FoundryHandle m_DefaultBlockInstanceList;
+
+        internal extern static CustomizationPointInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct CustomizationPoint : IEquatable<CustomizationPoint>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly CustomizationPointInternal customizationPoint;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+        public string Name => container?.GetString(customizationPoint.m_NameHandle) ?? string.Empty;
+        public IEnumerable<BlockVariable> Inputs => GetVariableEnumerable(customizationPoint.m_InputListHandle);
+        public IEnumerable<BlockVariable> Outputs => GetVariableEnumerable(customizationPoint.m_OutputListHandle);
+        public IEnumerable<BlockVariable> Properties => GetVariableEnumerable(customizationPoint.m_PropertyListHandle);
+        public IEnumerable<BlockInstance> DefaultBlockInstances
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(customizationPoint.m_DefaultBlockInstanceList);
+                return list.Select<BlockInstance>(localContainer, (handle) => (new BlockInstance(localContainer, handle)));
+            }
+        }
+
+        IEnumerable<BlockVariable> GetVariableEnumerable(FoundryHandle listHandle)
+        {
+            var localContainer = Container;
+            var list = new FixedHandleListInternal(listHandle);
+            return list.Select<BlockVariable>(localContainer, (handle) => (new BlockVariable(localContainer, handle)));
+        }
+
+        // private
+        internal CustomizationPoint(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.customizationPoint = container?.GetCustomizationPoint(handle) ?? CustomizationPointInternal.Invalid();
+        }
+
+        public static CustomizationPoint Invalid => new CustomizationPoint(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is CustomizationPoint other && this.Equals(other);
+        public bool Equals(CustomizationPoint other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(CustomizationPoint lhs, CustomizationPoint rhs) => lhs.Equals(rhs);
+        public static bool operator!=(CustomizationPoint lhs, CustomizationPoint rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            internal string name;
+            public List<BlockVariable> inputs { get; set; } = new List<BlockVariable>();
+            public List<BlockVariable> outputs { get; set; } = new List<BlockVariable>();
+            public List<BlockVariable> properties { get; set; } = new List<BlockVariable>();
+            public List<BlockInstance> defaultBlockInstances { get; set; } = new List<BlockInstance>();
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name)
+            {
+                this.container = container;
+                this.name = name;
+            }
+
+            public void AddInput(BlockVariable input) { inputs.Add(input); }
+            public void AddOutput(BlockVariable output) { outputs.Add(output); }
+            public void AddProperty(BlockVariable prop) { properties.Add(prop); }
+            public void AddDefaultBlockInstance(BlockInstance blockInstance) { defaultBlockInstances.Add(blockInstance); }
+
+            public CustomizationPoint Build()
+            {
+                var customizationPointInternal = new CustomizationPointInternal
+                {
+                    m_NameHandle = container.AddString(name),
+                };
+
+                customizationPointInternal.m_InputListHandle = FixedHandleListInternal.Build(container, inputs, (v) => (v.handle));
+                customizationPointInternal.m_OutputListHandle = FixedHandleListInternal.Build(container, outputs, (v) => (v.handle));
+                customizationPointInternal.m_PropertyListHandle = FixedHandleListInternal.Build(container, properties, (v) => (v.handle));
+                customizationPointInternal.m_DefaultBlockInstanceList = FixedHandleListInternal.Build(container, defaultBlockInstances, (v) => (v.handle));
+
+                var returnTypeHandle = container.AddCustomizationPointInternal(customizationPointInternal);
+                return new CustomizationPoint(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/CustomizationPointInstance.cs b/Modules/ShaderFoundry/ScriptBindings/CustomizationPointInstance.cs
new file mode 100644
index 0000000000..951adce3cb
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/CustomizationPointInstance.cs
@@ -0,0 +1,111 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine.Bindings;
+using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/CustomizationPointInstance.h")]
+    internal struct CustomizationPointInstanceInternal
+    {
+        internal FoundryHandle m_CustomizationPointHandle;
+        internal FoundryHandle m_BlockInstanceListHandle;
+        internal FoundryHandle m_PassIdentifierListHandle;
+
+        internal extern static CustomizationPointInstanceInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct CustomizationPointInstance : IEquatable<CustomizationPointInstance>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly CustomizationPointInstanceInternal customizationPointInstance;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null);
+        public CustomizationPoint CustomizationPoint => new CustomizationPoint(container, customizationPointInstance.m_CustomizationPointHandle);
+
+        public IEnumerable<BlockInstance> BlockInstances
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(customizationPointInstance.m_BlockInstanceListHandle);
+                return list.Select<BlockInstance>(localContainer, (handle) => (new BlockInstance(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<PassIdentifier> PassIdentifiers
+        {
+            get
+            {
+                if (Container == null)
+                    return Enumerable.Empty<PassIdentifier>();
+
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(customizationPointInstance.m_PassIdentifierListHandle);
+                return list.Select<PassIdentifier>(localContainer, (handle) => (localContainer.GetPassIdentifier(handle)));
+            }
+        }
+
+        // private
+        internal CustomizationPointInstance(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.customizationPointInstance = container?.GetCustomizationPointInstance(handle) ?? CustomizationPointInstanceInternal.Invalid();
+        }
+
+        public static CustomizationPointInstance Invalid => new CustomizationPointInstance(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is CustomizationPointInstance other && this.Equals(other);
+        public bool Equals(CustomizationPointInstance other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(CustomizationPointInstance lhs, CustomizationPointInstance rhs) => lhs.Equals(rhs);
+        public static bool operator!=(CustomizationPointInstance lhs, CustomizationPointInstance rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            CustomizationPoint customizationPoint = CustomizationPoint.Invalid;
+            public List<BlockInstance> BlockInstances { get; set; } = new List<BlockInstance>();
+            List<PassIdentifierInternal> PassIdentifiers { get; set; } = new List<PassIdentifierInternal>();
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, CustomizationPoint customizationPoint)
+            {
+                this.container = container;
+                this.customizationPoint = customizationPoint;
+            }
+
+            public void AddPassIdentifier(uint subShaderIndex, uint passIndex)
+            {
+                PassIdentifiers.Add(new PassIdentifierInternal(subShaderIndex, passIndex));
+            }
+
+            public CustomizationPointInstance Build()
+            {
+                var customizationPointInstanceInternal = new CustomizationPointInstanceInternal()
+                {
+                    m_CustomizationPointHandle = customizationPoint.handle,
+                };
+
+                customizationPointInstanceInternal.m_BlockInstanceListHandle = FixedHandleListInternal.Build(container, BlockInstances, (v) => (v.handle));
+                customizationPointInstanceInternal.m_PassIdentifierListHandle = FixedHandleListInternal.Build(container, PassIdentifiers, (p) => (container.AddPassIdentifier(p.SubShaderIndex, p.PassIndex)));
+
+                var returnTypeHandle = container.AddCustomizationPointInstanceInternal(customizationPointInstanceInternal);
+                return new CustomizationPointInstance(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/DefaultContainer.cs b/Modules/ShaderFoundry/ScriptBindings/DefaultContainer.cs
new file mode 100644
index 0000000000..0e89ca4d69
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/DefaultContainer.cs
@@ -0,0 +1,63 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+
+
+namespace UnityEditor.ShaderFoundry
+{
+    internal sealed partial class ShaderContainer
+    {
+        static void AddDefaultTypes(ShaderContainer container)
+        {
+            ShaderType.Void(container);
+
+            string[] scalarTypes =
+            {
+                "bool", "int", "uint", "half", "float", "double"
+            };
+
+            foreach (var s in scalarTypes)
+            {
+                var scalarType = ShaderType.Scalar(container, s);
+
+                for (int dim = 1; dim <= 4; dim++)
+                    ShaderType.Vector(container, scalarType, dim);
+
+                for (int rows = 1; rows <= 4; rows++)
+                    for (int cols = 1; cols <= 4; cols++)
+                        ShaderType.Matrix(container, scalarType, rows, cols);
+            }
+
+            ShaderType.Texture(container, "Texture1D");
+            ShaderType.Texture(container, "Texture1DArray");
+            ShaderType.Texture(container, "Texture2D");
+            ShaderType.Texture(container, "Texture2DArray");
+            ShaderType.Texture(container, "Texture3D");
+            ShaderType.Texture(container, "TextureCube");
+            ShaderType.Texture(container, "TextureCubeArray");
+            ShaderType.Texture(container, "Texture2DMS");
+            ShaderType.Texture(container, "Texture2DMSArray");
+            ShaderType.SamplerState(container, "SamplerState");
+
+
+            // Unity wrapped resource types
+            ShaderType BuildExternallyDeclaredType(ShaderContainer container, string typeName)
+            {
+                var builder = new ShaderType.StructBuilder(container, typeName);
+                builder.DeclaredExternally();
+                return builder.Build();
+            }
+
+            container._UnityTexture2D = BuildExternallyDeclaredType(container, "UnityTexture2D");
+            container._UnityTexture2DArray = BuildExternallyDeclaredType(container, "UnityTexture2DArray");
+            container._UnityTextureCube = BuildExternallyDeclaredType(container, "UnityTextureCube");
+            container._UnityTexture3D = BuildExternallyDeclaredType(container, "UnityTexture3D");
+            container._UnitySamplerState = BuildExternallyDeclaredType(container, "UnitySamplerState");
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/DefineDescriptor.binding.cs b/Modules/ShaderFoundry/ScriptBindings/DefineDescriptor.binding.cs
new file mode 100644
index 0000000000..629d012f58
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/DefineDescriptor.binding.cs
@@ -0,0 +1,83 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/DefineDescriptor.h")]
+    internal struct DefineDescriptorInternal
+    {
+        internal FoundryHandle m_ListHandle;
+
+        internal extern static DefineDescriptorInternal Invalid();
+
+        internal extern void Setup(ShaderContainer container, string name, string value);
+
+        internal extern bool IsValid();
+        internal extern string GetName(ShaderContainer container);
+        internal extern string GetValue(ShaderContainer container);
+    }
+
+    [FoundryAPI]
+    internal readonly struct DefineDescriptor : IEquatable<DefineDescriptor>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly DefineDescriptorInternal descriptor;
+        internal readonly FoundryHandle handle;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && descriptor.IsValid());
+
+        public string Name => descriptor.GetName(Container);
+        public string Value => descriptor.GetValue(Container);
+
+        // private
+        internal DefineDescriptor(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.descriptor = container?.GetDefineDescriptor(handle) ?? DefineDescriptorInternal.Invalid();
+        }
+
+        public static DefineDescriptor Invalid => new DefineDescriptor(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is DefineDescriptor other && this.Equals(other);
+        public bool Equals(DefineDescriptor other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(DefineDescriptor lhs, DefineDescriptor rhs) => lhs.Equals(rhs);
+        public static bool operator!=(DefineDescriptor lhs, DefineDescriptor rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            string name;
+            string value;
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, string value)
+            {
+                this.container = container;
+                this.name = name;
+                this.value = value;
+            }
+
+            public DefineDescriptor Build()
+            {
+                var descriptor = new DefineDescriptorInternal();
+                descriptor.Setup(container, name, value);
+                var resultHandle = container.AddDefineDescriptorInternal(descriptor);
+                return new DefineDescriptor(container, resultHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/EqualityChecks.cs b/Modules/ShaderFoundry/ScriptBindings/EqualityChecks.cs
new file mode 100644
index 0000000000..1024efdb3e
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/EqualityChecks.cs
@@ -0,0 +1,21 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+namespace UnityEditor.ShaderFoundry
+{
+    internal struct EqualityChecks
+    {
+        internal static bool ReferenceEquals(int index0, ShaderContainer container0, int index1, ShaderContainer container1)
+        {
+            // Even if the containers are different, invalid objects are always equal
+            return (index0 == index1) && ((index0 == -1) || (container0 == container1));
+        }
+
+        internal static bool ReferenceEquals(FoundryHandle handle0, ShaderContainer container0, FoundryHandle handle1, ShaderContainer container1)
+        {
+            // Even if the containers are different, invalid objects are always equal
+            return (handle0 == handle1) && ((!handle0.IsValid) || (container0 == container1));
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/FixedHandleList.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/FixedHandleList.bindings.cs
new file mode 100644
index 0000000000..b528464ea3
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/FixedHandleList.bindings.cs
@@ -0,0 +1,63 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/FixedHandleList.h")]
+    internal struct FixedHandleListInternal
+    {
+        FoundryHandle m_ListHandle;
+
+        public FoundryHandle ListHandle => m_ListHandle;
+
+        public FixedHandleListInternal(FoundryHandle listHandle)
+        {
+            m_ListHandle = listHandle;
+        }
+
+        public extern static FixedHandleListInternal Invalid();
+        public extern bool IsValid();
+        public extern uint GetSize(ShaderContainer container);
+        public extern FoundryHandle GetElement(ShaderContainer container, uint elementIndex);
+        public extern void SetElement(ShaderContainer container, uint elementIndex, FoundryHandle handle);
+
+        public static FixedHandleListInternal Empty => Invalid();
+
+        public static FoundryHandle Build(ShaderContainer container, List<FoundryHandle> values)
+        {
+            if ((values == null) || (values.Count <= 0))
+                return FoundryHandle.Invalid();
+            var listHandle = container.AddHandleBlob((uint)values.Count);
+            for (var i = 0; i < values.Count; ++i)
+                container.SetHandleBlobElement(listHandle, (uint)i, values[i]);
+            return listHandle;
+        }
+
+        public static FoundryHandle Build<T>(ShaderContainer container, List<T> items, Func<T, FoundryHandle> indexFunc)
+        {
+            if ((items == null) || (items.Count <= 0))
+                return FoundryHandle.Invalid();
+            var listHandle = container.AddHandleBlob((uint)items.Count);
+            for (var i = 0; i < items.Count; ++i)
+                container.SetHandleBlobElement(listHandle, (uint)i, indexFunc(items[i]));
+            return listHandle;
+        }
+
+        public IEnumerable<T> Select<T>(ShaderContainer container, Func<FoundryHandle, T> func)
+        {
+            var size = GetSize(container);
+            for (uint i = 0; i < size; i++)
+            {
+                var handle = GetElement(container, i);
+                yield return func(handle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/FixedIntList.cs b/Modules/ShaderFoundry/ScriptBindings/FixedIntList.cs
new file mode 100644
index 0000000000..d3586070e9
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/FixedIntList.cs
@@ -0,0 +1,63 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/FixedIntList.h")]
+    internal struct FixedIntListInternal
+    {
+        FoundryHandle m_ListHandle;
+
+        public FoundryHandle ListHandle => m_ListHandle;
+
+        public FixedIntListInternal(FoundryHandle listHandle)
+        {
+            m_ListHandle = listHandle;
+        }
+
+        public extern static FixedIntListInternal Invalid();
+        public extern bool IsValid();
+        public extern uint GetSize(ShaderContainer container);
+        public extern int GetElement(ShaderContainer container, uint elementIndex);
+        public extern void SetElement(ShaderContainer container, uint elementIndex, int id);
+
+        public static FixedIntListInternal Empty => Invalid();
+
+        public static FoundryHandle Build(ShaderContainer container, List<int> values)
+        {
+            if ((values == null) || (values.Count <= 0))
+                return FoundryHandle.Invalid();
+            var listHandle = container.AddIntBlob((uint)values.Count);
+            for (var i = 0; i < values.Count; ++i)
+                container.SetIntBlobElement(listHandle, (uint)i, values[i]);
+            return listHandle;
+        }
+
+        public static FoundryHandle Build<T>(ShaderContainer container, List<T> items, Func<T, int> indexFunc)
+        {
+            if ((items == null) || (items.Count <= 0))
+                return FoundryHandle.Invalid();
+            var listHandle = container.AddIntBlob((uint)items.Count);
+            for (var i = 0; i < items.Count; ++i)
+                container.SetIntBlobElement(listHandle, (uint)i, indexFunc(items[i]));
+            return listHandle;
+        }
+
+        public IEnumerable<T> Select<T>(ShaderContainer container, Func<int, T> func)
+        {
+            var size = GetSize(container);
+            for (uint i = 0; i < size; i++)
+            {
+                var id = GetElement(container, i);
+                yield return func(id);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/FoundryAPIAttribute.cs b/Modules/ShaderFoundry/ScriptBindings/FoundryAPIAttribute.cs
new file mode 100644
index 0000000000..116191d94d
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/FoundryAPIAttribute.cs
@@ -0,0 +1,17 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    // This is a temporary attribute to flag the parts of the API that should be public
+    // but are currently flagged internal while under development
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Enum | AttributeTargets.Interface, Inherited = true, AllowMultiple = false)]
+    internal class FoundryAPIAttribute : Attribute
+    {
+        public FoundryAPIAttribute() {}
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/FoundryHandle.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/FoundryHandle.bindings.cs
new file mode 100644
index 0000000000..a069bd4615
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/FoundryHandle.bindings.cs
@@ -0,0 +1,34 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine.Bindings;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/FoundryHandle.h")]
+    [FoundryAPI]
+    internal struct FoundryHandle
+    {
+        private UInt32 m_Handle;
+
+        internal extern bool IsValid { [NativeMethod("IsValid")] get; }
+        internal extern static FoundryHandle Invalid();
+        internal bool ReferenceEquals(FoundryHandle other)
+        {
+            return m_Handle == other.m_Handle;
+        }
+
+        public override bool Equals(object obj) => obj is FoundryHandle other && this.Equals(other);
+        public bool Equals(FoundryHandle other) => this.ReferenceEquals(other);
+        public override int GetHashCode() => (m_Handle).GetHashCode();
+        public static bool operator==(FoundryHandle lhs, FoundryHandle rhs) => lhs.ReferenceEquals(rhs);
+        public static bool operator!=(FoundryHandle lhs, FoundryHandle rhs) => !lhs.ReferenceEquals(rhs);
+
+        public override string ToString() { return $"{m_Handle}"; }
+
+        // This is extremely temporary!!  Use at your own risk as it will go away soon.
+        internal UInt32 Handle { get { return m_Handle; } set { m_Handle = value; }}
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/FunctionParameter.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/FunctionParameter.bindings.cs
new file mode 100644
index 0000000000..3d11abe52b
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/FunctionParameter.bindings.cs
@@ -0,0 +1,105 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/FunctionParameter.h")]
+    internal struct FunctionParameterInternal
+    {
+        // these enums must match the declarations in FunctionParameter.h
+        internal enum Flags
+        {
+            kFlagsInput = 1 << 0,
+            kFlagsOutput = 1 << 1,
+        };
+
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_TypeHandle;
+        internal UInt32 m_Flags;
+
+        // TODO no need to make this extern, can duplicate it here
+        internal static extern FunctionParameterInternal Invalid();
+
+        internal bool IsValid => (m_NameHandle.IsValid && (m_Flags != 0));
+
+        internal extern static bool ValueEquals(ShaderContainer aContainer, FoundryHandle aHandle, ShaderContainer bContainer, FoundryHandle bHandle);
+    }
+
+    [FoundryAPI]
+    internal readonly struct FunctionParameter : IEquatable<FunctionParameter>
+    {
+        // data members
+        readonly ShaderContainer container;
+        internal readonly FoundryHandle handle;
+        readonly FunctionParameterInternal param;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null) && handle.IsValid && (param.IsValid);
+        public string Name => container?.GetString(param.m_NameHandle) ?? string.Empty;
+        public ShaderType Type => new ShaderType(container, param.m_TypeHandle);
+        public bool IsInput => ((param.m_Flags & (UInt32)FunctionParameterInternal.Flags.kFlagsInput) != 0);
+        public bool IsOutput => ((param.m_Flags & (UInt32)FunctionParameterInternal.Flags.kFlagsOutput) != 0);
+        internal UInt32 Flags => param.m_Flags;
+
+        // private
+        internal FunctionParameter(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.param = container?.GetFunctionParameter(handle) ?? FunctionParameterInternal.Invalid();
+        }
+
+        public static FunctionParameter Invalid => new FunctionParameter(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is FunctionParameter other && this.Equals(other);
+        public bool Equals(FunctionParameter other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(FunctionParameter lhs, FunctionParameter rhs) => lhs.Equals(rhs);
+        public static bool operator!=(FunctionParameter lhs, FunctionParameter rhs) => !lhs.Equals(rhs);
+
+        public bool ValueEquals(in FunctionParameter other)
+        {
+            return FunctionParameterInternal.ValueEquals(container, handle, other.container, other.handle);
+        }
+
+        public struct Builder
+        {
+            ShaderContainer container;
+            internal string name;
+            internal ShaderType type;
+            internal UInt32 flags;
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, ShaderType type, bool input, bool output)
+            {
+                this.container = container;
+                this.name = name;
+                this.type = type;
+                this.flags = (input ? (UInt32)FunctionParameterInternal.Flags.kFlagsInput : 0) | (output ? (UInt32)FunctionParameterInternal.Flags.kFlagsOutput : 0);
+            }
+
+            internal Builder(ShaderContainer container, string name, ShaderType type, UInt32 flags)
+            {
+                this.container = container;
+                this.name = name;
+                this.type = type;
+                this.flags = flags;
+            }
+
+            public FunctionParameter Build()
+            {
+                FoundryHandle returnHandle = container.AddFunctionParameter(name, type.handle, flags);
+                return new FunctionParameter(Container, returnHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ITemplateLinker.cs b/Modules/ShaderFoundry/ScriptBindings/ITemplateLinker.cs
new file mode 100644
index 0000000000..eddd8c0941
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/ITemplateLinker.cs
@@ -0,0 +1,15 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [FoundryAPI]
+    internal interface ITemplateLinker
+    {
+        public abstract void Link(ShaderBuilder builder, ShaderContainer shaderContainer, TemplateInstance templateInstance);
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ITemplateProvider.cs b/Modules/ShaderFoundry/ScriptBindings/ITemplateProvider.cs
new file mode 100644
index 0000000000..932fd2e460
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/ITemplateProvider.cs
@@ -0,0 +1,59 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [FoundryAPI]
+    internal class TemplateProviderSettings
+    {
+        const string SharedScopeName = "_Shared";
+        Dictionary<string, Dictionary<string, string>> settingScopes = new Dictionary<string, Dictionary<string, string>>();
+
+        public void Add(string name, string value, string scope = null)
+        {
+            // If no scope is specified, use the shared scope key
+            string scopeName = scope ?? SharedScopeName;
+            // Create the scopes map if needed
+            if (!settingScopes.ContainsKey(scopeName))
+                settingScopes.Add(scopeName, new Dictionary<string, string>());
+            // Last setting wins, always override
+            settingScopes[scopeName].Add(name, value);
+        }
+
+        public string Find(string name, string scope = null)
+        {
+            // Check the provided scope. If we fail to find the name there
+            // or there was no provided scope then check the shared scope.
+            string result = FindSetting(name, scope);
+            if (result == null)
+                result = FindSetting(name, SharedScopeName);
+            return result;
+        }
+
+        string FindSetting(string name, string scope)
+        {
+            if (scope != null)
+            {
+                if (settingScopes.TryGetValue(scope, out var scopedSettings))
+                {
+                    scopedSettings.TryGetValue(name, out var value);
+                    return value;
+                }
+            }
+            return null;
+        }
+    }
+
+    [FoundryAPI]
+    internal interface ITemplateProvider
+    {
+        public abstract string Name { get; }
+        public abstract IEnumerable<CustomizationPoint> GetCustomizationPoints();
+        public abstract void ConfigureSettings(TemplateProviderSettings settings);
+        public abstract IEnumerable<Template> GetTemplates(ShaderContainer container);
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/IncludeDescriptor.binding.cs b/Modules/ShaderFoundry/ScriptBindings/IncludeDescriptor.binding.cs
new file mode 100644
index 0000000000..0f11757ccb
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/IncludeDescriptor.binding.cs
@@ -0,0 +1,70 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/IncludeDescriptor.h")]
+    internal struct IncludeDescriptorInternal
+    {
+        internal FoundryHandle m_StringHandle;
+
+        internal extern void Setup(ShaderContainer container, String value);
+        internal extern bool IsValid();
+        internal extern string GetValue(ShaderContainer container);
+        internal extern static IncludeDescriptorInternal Invalid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct IncludeDescriptor
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly IncludeDescriptorInternal descriptor;
+        internal readonly FoundryHandle handle;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && descriptor.IsValid());
+
+        public string Value => descriptor.GetValue(Container);
+
+        // private
+        internal IncludeDescriptor(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.descriptor = container?.GetIncludeDescriptor(handle) ?? IncludeDescriptorInternal.Invalid();
+        }
+
+        public static IncludeDescriptor Invalid => new IncludeDescriptor(null, FoundryHandle.Invalid());
+
+        public struct Builder
+        {
+            ShaderContainer container;
+            string value;
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string value)
+            {
+                this.container = container;
+                this.value = value;
+            }
+
+            public IncludeDescriptor Build()
+            {
+                var descriptor = new IncludeDescriptorInternal();
+                descriptor.Setup(container, value);
+                var resultHandle = container.AddIncludeDescriptorInternal(descriptor);
+                return new IncludeDescriptor(container, resultHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/KeywordDescriptor.binding.cs b/Modules/ShaderFoundry/ScriptBindings/KeywordDescriptor.binding.cs
new file mode 100644
index 0000000000..633b6a64fd
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/KeywordDescriptor.binding.cs
@@ -0,0 +1,104 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+using System.Linq;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/KeywordDescriptor.h")]
+    internal struct KeywordDescriptorInternal
+    {
+        internal FoundryHandle m_ListHandle;
+
+        internal extern static KeywordDescriptorInternal Invalid();
+        internal extern void Setup(ShaderContainer container, string definition, string scope, string stage, string name, string[] ops);
+
+        internal extern string GetDefinition(ShaderContainer container);
+        internal extern string GetScope(ShaderContainer container);
+        internal extern string GetStage(ShaderContainer container);
+        internal extern string GetName(ShaderContainer container);
+        internal extern int GetOpCount(ShaderContainer container);
+        internal extern string GetOp(ShaderContainer container, int index);
+    }
+
+    [FoundryAPI]
+    internal readonly struct KeywordDescriptor : IEquatable<KeywordDescriptor>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly KeywordDescriptorInternal descriptor;
+        internal readonly FoundryHandle handle;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && descriptor.m_ListHandle.IsValid);
+
+        public string Definition => descriptor.GetDefinition(container);
+        public string Scope => descriptor.GetScope(container);
+        public string Stage => descriptor.GetStage(container);
+        public string Name => descriptor.GetName(container);
+
+        public IEnumerable<string> Ops
+        {
+            get
+            {
+                var opCount = descriptor.GetOpCount(container);
+                for (var i = 0; i < opCount; ++i)
+                    yield return descriptor.GetOp(container, i);
+            }
+        }
+
+        // private
+        internal KeywordDescriptor(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.descriptor = container?.GetKeywordDescriptor(handle) ?? KeywordDescriptorInternal.Invalid();
+        }
+
+        public static KeywordDescriptor Invalid => new KeywordDescriptor(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is KeywordDescriptor other && this.Equals(other);
+        public bool Equals(KeywordDescriptor other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(KeywordDescriptor lhs, KeywordDescriptor rhs) => lhs.Equals(rhs);
+        public static bool operator!=(KeywordDescriptor lhs, KeywordDescriptor rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            string definition;
+            string scope;
+            string stage;
+            string name;
+            List<string> ops = new List<string>();
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, string definition, string scope, string stage, IEnumerable<string> ops)
+            {
+                this.container = container;
+                this.name = name;
+                this.definition = definition;
+                this.scope = scope;
+                this.stage = stage;
+                this.ops = ops.ToList();
+            }
+
+            public KeywordDescriptor Build()
+            {
+                var descriptor = new KeywordDescriptorInternal();
+                descriptor.Setup(container, definition, scope, stage, name, ops.ToArray());
+                var resultHandle = container.AddKeywordDescriptorInternal(descriptor);
+                return new KeywordDescriptor(container, resultHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/PassIdentifier.cs b/Modules/ShaderFoundry/ScriptBindings/PassIdentifier.cs
new file mode 100644
index 0000000000..0d4ce08ec5
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/PassIdentifier.cs
@@ -0,0 +1,21 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace UnityEditor.ShaderFoundry
+{
+    // This should be deleted once it's possible to construct this in managed
+    internal struct PassIdentifierInternal
+    {
+        public readonly uint SubShaderIndex;
+        public readonly uint PassIndex;
+
+        public PassIdentifierInternal(uint subShaderIndex, uint passIndex)
+        {
+            SubShaderIndex = subShaderIndex;
+            PassIndex = passIndex;
+        }
+    };
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/PragmaDescriptor.binding.cs b/Modules/ShaderFoundry/ScriptBindings/PragmaDescriptor.binding.cs
new file mode 100644
index 0000000000..fd8feabcbe
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/PragmaDescriptor.binding.cs
@@ -0,0 +1,93 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+using System.Linq;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/PragmaDescriptor.h")]
+    internal struct PragmaDescriptorInternal
+    {
+        internal FoundryHandle m_ListHandle;
+
+        internal extern static PragmaDescriptorInternal Invalid();
+        internal extern void Setup(ShaderContainer container, string name, string[] ops);
+
+        internal extern bool IsValid();
+        internal extern string GetName(ShaderContainer container);
+        internal extern int GetOpCount(ShaderContainer container);
+        internal extern string GetOp(ShaderContainer container, int index);
+    }
+
+    [FoundryAPI]
+    internal readonly struct PragmaDescriptor : IEquatable<PragmaDescriptor>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly PragmaDescriptorInternal descriptor;
+        internal readonly FoundryHandle handle;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && descriptor.IsValid());
+
+        public string Name => descriptor.GetName(Container);
+
+        public IEnumerable<string> Ops
+        {
+            get
+            {
+                var opCount = descriptor.GetOpCount(Container);
+                for (var i = 0; i < opCount; ++i)
+                    yield return descriptor.GetOp(Container, i);
+            }
+        }
+
+        // private
+        internal PragmaDescriptor(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.descriptor = container?.GetPragmaDescriptor(handle) ?? PragmaDescriptorInternal.Invalid();
+        }
+
+        public static PragmaDescriptor Invalid => new PragmaDescriptor(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is PragmaDescriptor other && this.Equals(other);
+        public bool Equals(PragmaDescriptor other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(PragmaDescriptor lhs, PragmaDescriptor rhs) => lhs.Equals(rhs);
+        public static bool operator!=(PragmaDescriptor lhs, PragmaDescriptor rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            string name;
+            List<string> ops = new List<string>();
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, IEnumerable<string> ops)
+            {
+                this.container = container;
+                this.name = name;
+                this.ops = ops.ToList();
+            }
+
+            public PragmaDescriptor Build()
+            {
+                var descriptor = new PragmaDescriptorInternal();
+                descriptor.Setup(container, name, ops.ToArray());
+                var resultHandle = container.AddPragmaDescriptorInternal(descriptor);
+                return new PragmaDescriptor(container, resultHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ShaderAttribute.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/ShaderAttribute.bindings.cs
new file mode 100644
index 0000000000..895e6e6b3a
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/ShaderAttribute.bindings.cs
@@ -0,0 +1,205 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/ShaderAttributeParam.h")]
+    internal struct ShaderAttributeParamInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_ValueHandle;
+
+        internal extern static ShaderAttributeParamInternal Invalid();
+
+        internal extern void Setup(ShaderContainer container, string name, string value);
+
+        internal extern bool IsValid();
+        internal extern string GetName(ShaderContainer container);
+        internal extern string GetValue(ShaderContainer container);
+
+        internal extern static bool ValueEquals(ShaderContainer aContainer, FoundryHandle aHandle, ShaderContainer bContainer, FoundryHandle bHandle);
+    }
+
+    [FoundryAPI]
+    internal readonly struct ShaderAttributeParam : IEquatable<ShaderAttributeParam>
+    {
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly ShaderAttributeParamInternal param;
+
+        internal ShaderAttributeParam(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.param = container?.GetShaderAttributeParam(handle) ?? ShaderAttributeParamInternal.Invalid();
+        }
+
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null) && (param.IsValid());
+        public string Name => param.GetName(container);
+        public string Value => param.GetValue(container);
+        public static ShaderAttributeParam Invalid => new ShaderAttributeParam(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is ShaderAttributeParam other && this.Equals(other);
+        public bool Equals(ShaderAttributeParam other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(ShaderAttributeParam lhs, ShaderAttributeParam rhs) => lhs.Equals(rhs);
+        public static bool operator!=(ShaderAttributeParam lhs, ShaderAttributeParam rhs) => !lhs.Equals(rhs);
+
+        public bool ValueEquals(in ShaderAttributeParam other)
+        {
+            return ShaderAttributeParamInternal.ValueEquals(container, handle, other.container, other.handle);
+        }
+
+        public struct Builder
+        {
+            ShaderContainer container;
+            internal string m_Name;
+            internal string m_Value;
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, string value)
+            {
+                this.container = container;
+                m_Name = name;
+                m_Value = value;
+            }
+
+            public ShaderAttributeParam Build()
+            {
+                var paramInternal = new ShaderAttributeParamInternal();
+                paramInternal.Setup(container, m_Name, m_Value);
+
+                var returnHandle = container.AddShaderAttributeParamInternal(paramInternal);
+                return new ShaderAttributeParam(container, returnHandle);
+            }
+        }
+    }
+
+    [NativeHeader("Modules/ShaderFoundry/Public/ShaderAttribute.h")]
+    internal struct ShaderAttributeInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_ParameterListHandle;
+
+        internal extern static ShaderAttributeInternal Invalid();
+
+        internal extern void Setup(ShaderContainer container, string name, FoundryHandle parameterListHandle);
+
+        internal extern bool IsValid();
+        internal extern string GetName(ShaderContainer container);
+
+        internal extern static bool ValueEquals(ShaderContainer aContainer, FoundryHandle aHandle, ShaderContainer bContainer, FoundryHandle bHandle);
+    }
+
+    [FoundryAPI]
+    internal readonly struct ShaderAttribute : IEquatable<ShaderAttribute>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly ShaderAttributeInternal attr;
+
+        // public API
+        public ShaderContainer Container => container;
+        public static ShaderAttribute Invalid => new ShaderAttribute(null, FoundryHandle.Invalid());
+        public bool IsValid => (container != null) && handle.IsValid && (attr.IsValid());
+        public string Name => attr.GetName(container);
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is ShaderAttribute other && this.Equals(other);
+        public bool Equals(ShaderAttribute other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(ShaderAttribute lhs, ShaderAttribute rhs) => lhs.Equals(rhs);
+        public static bool operator!=(ShaderAttribute lhs, ShaderAttribute rhs) => !lhs.Equals(rhs);
+
+        public bool ValueEquals(in ShaderAttribute other)
+        {
+            return ShaderAttributeInternal.ValueEquals(container, handle, other.container, other.handle);
+        }
+
+        public IEnumerable<ShaderAttributeParam> Parameters
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(attr.m_ParameterListHandle);
+                return list.Select<ShaderAttributeParam>(localContainer, (handle) => (new ShaderAttributeParam(localContainer, handle)));
+            }
+        }
+
+        internal ShaderAttribute(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = (container ? handle : FoundryHandle.Invalid());
+            this.attr = container?.GetShaderAttribute(handle) ?? ShaderAttributeInternal.Invalid();
+        }
+
+        public struct Builder
+        {
+            // TODO : hmm..  this is a little weird because the struct is by-value, but it contains a list that is by-reference
+            // so...  it may not work the way you think if you copy Builders..
+
+            //   Builder A = new Builder().Param("ParamA");
+            //   A.Param("ParamA");
+            //
+            //   Builder B = A;
+            //   B.Param("ParamB");
+            //
+            //   A.Param("ParamA2");
+            //
+            // Now Both A and B have all three parameters... :P
+
+            ShaderContainer container;
+            internal string name;
+            internal List<ShaderAttributeParam> parameters;
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name)
+            {
+                this.container = container;
+                this.name = name;
+                this.parameters = null;
+            }
+
+            public Builder Param(ShaderAttributeParam attribute)
+            {
+                if (parameters == null)
+                    parameters = new List<ShaderAttributeParam>();
+                parameters.Add(attribute);
+                return this;
+            }
+
+            public Builder Param(string value)
+            {
+                return Param(null, value);
+            }
+
+            public Builder Param(string name, string value)
+            {
+                var paramBuilder = new ShaderAttributeParam.Builder(container, name, value);
+                return Param(paramBuilder.Build());
+            }
+
+            public ShaderAttribute Build()
+            {
+                var paramListHandle = FixedHandleListInternal.Build(container, parameters, (p) => (p.handle));
+                var attributeInternal = new ShaderAttributeInternal();
+                attributeInternal.Setup(container, name, paramListHandle);
+
+                var returnHandle = container.AddShaderAttributeInternal(attributeInternal);
+                return new ShaderAttribute(container, returnHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ShaderBuilder.cs b/Modules/ShaderFoundry/ScriptBindings/ShaderBuilder.cs
new file mode 100644
index 0000000000..d7af0c96c9
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/ShaderBuilder.cs
@@ -0,0 +1,564 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [FoundryAPI]
+    internal class ShaderBuilder
+    {
+        List<String> strs;
+        int charLength;
+
+        // builder-only state
+        int currentIndent;
+        int tabSize;
+
+        public ShaderBuilder(int initialSize = 100, int indent = 0, int tabSize = 4)
+        {
+            strs = new List<string>(initialSize);
+            charLength = 0;
+            currentIndent = indent;
+            this.tabSize = tabSize;
+        }
+
+        public void Space()
+        {
+            Add(_space);
+        }
+
+        public void Indent()
+        {
+            currentIndent += tabSize;
+        }
+
+        public void Deindent()
+        {
+            currentIndent -= tabSize;
+        }
+
+        public void Indentation()
+        {
+            // TODO: cached space strings would be faster... or just do a formatting pass later on
+            for (int x = 0; x < currentIndent; x++)
+                Space();
+        }
+
+        public void NewLine()
+        {
+            Add(_newline);
+        }
+
+        public void Add(string l0)
+        {
+            strs.Add(l0);
+            charLength += l0.Length;
+        }
+
+        public void Add(string l0, string l1) { Add(l0); Add(l1); }
+        public void Add(string l0, string l1, string l2) { Add(l0); Add(l1); Add(l2); }
+        public void Add(string l0, string l1, string l2, string l3) { Add(l0); Add(l1); Add(l2); Add(l3); }
+        public void Add(string l0, string l1, string l2, string l3, string l4) { Add(l0); Add(l1); Add(l2); Add(l3); Add(l4); }
+        public void Add(string l0, string l1, string l2, string l3, string l4, string l5) { Add(l0); Add(l1); Add(l2); Add(l3); Add(l4); Add(l5); }
+        public void Add(params string[] lArray)
+        {
+            foreach (var l in lArray)
+                Add(l);
+        }
+
+        public void AddLine(string l0) { Indentation(); Add(l0); NewLine(); }
+        public void AddLine(string l0, string l1) { Indentation(); Add(l0); Add(l1); NewLine(); }
+        public void AddLine(string l0, string l1, string l2) { Indentation(); Add(l0); Add(l1); Add(l2); NewLine(); }
+        public void AddLine(string l0, string l1, string l2, string l3) { Indentation(); Add(l0); Add(l1); Add(l2); Add(l3); NewLine(); }
+        public void AddLine(string l0, string l1, string l2, string l3, string l4) { Indentation(); Add(l0); Add(l1); Add(l2); Add(l3); Add(l4); NewLine(); }
+        public void AddLine(string l0, string l1, string l2, string l3, string l4, string l5) { Indentation(); Add(l0); Add(l1); Add(l2); Add(l3); Add(l4); Add(l5); NewLine(); }
+        public void AddLine(params string[] lArray)
+        {
+            Indentation();
+            foreach (var l in lArray)
+                Add(l);
+            NewLine();
+        }
+
+        static readonly string _newline = "\n";
+        static readonly string _space = " ";
+        static readonly string _blockNamespaceSuffix = "Block::";
+        static readonly string _comma = ", "; // Space always follows a comma in current usage
+        static readonly string _semicolon = ";";
+        static readonly string _equal = " = ";
+        static readonly string _openParen = "(";
+        static readonly string _closeParen = ")";
+        static readonly string _openSquare = "[";
+        static readonly string _closeSquare = "]";
+        static readonly string _openCurly = "{";
+        static readonly string _closeCurly = "}";
+        static readonly string _inout = "inout ";
+        static readonly string _out = "out ";
+        const char _tokenMarker = '$';
+        static readonly string _tokenFunctionName = "$F:";
+        static readonly string _tokenTypeName = "$T:";
+        static readonly string _tokenDeclareVariable = "$V:";
+        static readonly string _tokenEnd = "$";
+        static readonly string _struct = "struct ";
+
+        internal enum DeclarationMode { NoSemicolon, Semicolon }
+
+        internal void AddFunctionNameInternal(ShaderFunction function)
+        {
+            if (!function.Exists)
+            {
+                Add("/* ERROR: non-existent function specified for function name */");
+                return;
+            }
+
+            bool useDeferredDeclaration =
+                (function.ParentBlock.Exists && !function.ParentBlock.IsValid) ||
+                (!function.IsValid);
+
+            if (useDeferredDeclaration)
+            {
+                Add(_tokenFunctionName, function.handle.ToString(), _tokenEnd);
+            }
+            else
+            {
+                // if there's a parent block, the type is in the block namespace
+                if (function.ParentBlock.IsValid)
+                    Add(function.ParentBlock.Name, _blockNamespaceSuffix);
+                Add(function.Name);
+            }
+        }
+
+        internal void AddNonArrayTypeNameInternal(ShaderType type)
+        {
+            if (!type.Exists)
+            {
+                Add("/* ERROR: cannot get name of non-existent type */");
+                return;
+            }
+
+            bool useDeferredDeclaration =
+                (type.ParentBlock.Exists && !type.ParentBlock.IsValid) ||
+                (!type.IsValid);
+
+            if (useDeferredDeclaration)
+            {
+                Add(_tokenTypeName, type.handle.ToString(), _tokenEnd);
+            }
+            else
+            {
+                if (type.IsArray)
+                {
+                    Add("/* ERROR: cannot use an array type here */");
+                    return;
+                }
+
+                // if there's a parent block, the type is in the block namespace
+                if (type.ParentBlock.IsValid)
+                    Add(type.ParentBlock.Name, _blockNamespaceSuffix);
+                Add(type.Name);
+            }
+        }
+
+        internal void VariableDeclarationInternal(ShaderType type, string name, DeclarationMode mode, string defaultValue = null)
+        {
+            if (!type.Exists)
+            {
+                Add("/* ERROR: non-existent type specified for variable ", name, " */");
+                return;
+            }
+
+            bool useDeferredDeclaration =
+                (type.ParentBlock.Exists && !type.ParentBlock.IsValid) ||
+                (!type.IsValid) ||
+                (type.IsArray && !type.ArrayElementType.IsValid);
+            // we must catch unfinished array element types in the var decl to correctly handle arrays of arrays of unfinished types
+            // this is because the array count must be appended in reverse order, so we must use the $V: token
+
+            if (useDeferredDeclaration)
+            {
+                Add(_tokenDeclareVariable, type.handle.ToString(), ",", name, _tokenEnd);
+            }
+            else
+            {
+                if (type.IsVoid)
+                {
+                    Add("/* ERROR: cannot declare a variable of type void ", name, " */");
+                    return;
+                }
+                else if (type.IsArray)
+                {
+                    // have to declare arrays in reverse order (standard HLSL/C syntax)
+                    // this is not ideal in terms of string allocations, but I think any approach requires some form of allocation..
+                    var nameSuffix = _openSquare + (type.ArrayElements > 0 ? type.ArrayElements.ToString() : "") + _closeSquare;
+                    var modifiedName = name + nameSuffix;
+                    VariableDeclarationInternal(type.ArrayElementType, modifiedName, DeclarationMode.NoSemicolon);
+                }
+                else
+                {
+                    AddNonArrayTypeNameInternal(type);
+                    Add(_space, name);
+                }
+            }
+
+            if (defaultValue != null)
+                Add(_equal, defaultValue);
+
+            if (mode == DeclarationMode.Semicolon)
+                Add(_semicolon);
+        }
+
+        internal void FunctionCallInternal(ShaderFunction function, DeclarationMode mode, params string[] arguments)
+        {
+            if (!function.Exists)
+            {
+                Add("/* ERROR: non-existent function specified for function call */");
+                return;
+            }
+
+            AddFunctionNameInternal(function);
+
+            Add(_openParen);
+
+            // Iterate across the list of parameters (if any) and emit each one
+            for (int a = 0; a < arguments.Length; a++)
+            {
+                if (a > 0)
+                    Add(_comma);
+                Add(arguments[a]);
+            }
+
+            Add(_closeParen);
+
+            if (mode == DeclarationMode.Semicolon)
+                Add(_semicolon);
+        }
+
+        // This will emit a simple variable declaration with optional default value
+        public void DeclareVariable(ShaderType type, string name, string defaultValue = null)
+        {
+            Indentation();
+            VariableDeclarationInternal(type, name, DeclarationMode.Semicolon, defaultValue);
+            NewLine();
+        }
+
+        // These will emit a call to 'function' using the supplied arguments
+        public void CallFunction(ShaderFunction function, params string[] arguments)
+        {
+            Indentation();
+            FunctionCallInternal(function, DeclarationMode.Semicolon, arguments);
+            NewLine();
+        }
+
+        public void CallFunctionWithReturn(ShaderFunction function, string returnVariable, params string[] arguments)
+        {
+            Indentation();
+            Add(returnVariable);
+            Add(_equal);
+            FunctionCallInternal(function, DeclarationMode.Semicolon, arguments);
+            NewLine();
+        }
+
+        public void CallFunctionWithDeclaredReturn(ShaderFunction function, ShaderType returnType, string returnVariable, params string[] arguments)
+        {
+            Indentation();
+            VariableDeclarationInternal(returnType, returnVariable, DeclarationMode.NoSemicolon);
+            Add(_equal);
+            FunctionCallInternal(function, DeclarationMode.Semicolon, arguments);
+            NewLine();
+        }
+
+        public void DeclareFunction(ShaderFunction function)
+        {
+            if (!function.IsValid)
+            {
+                AddLine("/* ERROR: cannot declare invalid function */");
+                return;
+            }
+
+            var returnType = function.ReturnType;
+            if (!returnType.IsValid)
+            {
+                AddLine("/* ERROR: cannot declare function with invalid return type */");
+                return;
+            }
+
+            if (returnType.IsArray)
+            {
+                AddLine("/* ERROR: cannot declare a function with an array return type */");
+                return;
+            }
+
+            Indentation();
+
+            AddNonArrayTypeNameInternal(returnType);
+            Add(_space, function.Name, _openParen);
+
+            var paramIndex = 0;
+            foreach (var param in function.Parameters)
+            {
+                if (paramIndex != 0)
+                    Add(_comma);
+
+                if (param.IsOutput)
+                {
+                    if (param.IsInput)
+                        Add(_inout);
+                    else
+                        Add(_out);
+                }
+
+                VariableDeclarationInternal(param.Type, param.Name, DeclarationMode.NoSemicolon);
+                ++paramIndex;
+            }
+            Add(_closeParen);
+            NewLine();
+
+            using (BlockScope())
+            {
+                AddWithTokenTranslation(function.Body, function.Container);
+            }
+        }
+
+        public void DeclareStruct(ShaderType type)
+        {
+            if (type.IsStruct)
+            {
+                AddLine(_struct, type.Name);
+                using (BlockScope(true))
+                {
+                    foreach (var field in type.StructFields)
+                        DeclareVariable(field.Type, field.Name);
+                }
+            }
+        }
+
+        void AddSubString(string str, int startOffsetInclusive, int endOffsetExclusive)
+        {
+            int length = endOffsetExclusive - startOffsetInclusive;
+            if (length > 0)
+            {
+                // don't GC alloc the substring if we can help it
+                // possible this is not necessary if str.SubString(0, str.Length) just returns str already... needs test
+                if ((startOffsetInclusive == 0) && (length == str.Length))
+                    Add(str);
+                else
+                    Add(str.Substring(startOffsetInclusive, length));
+            }
+        }
+
+        static bool IsDigit(char c)
+        {
+            return (c >= '0') && (c <= '9');
+        }
+
+        static bool TryParseInt(string str, int startOffsetInclusive, int endOffsetExclusive, out int value, out int end)
+        {
+            // search for the end of the int
+            int offset;
+            for (offset = startOffsetInclusive; offset < endOffsetExclusive; offset++)
+            {
+                if (!IsDigit(str[offset]))
+                {
+                    break;
+                }
+            }
+            end = offset;
+            var intString = str.Substring(startOffsetInclusive, end - startOffsetInclusive);
+            return Int32.TryParse(intString, out value);
+        }
+
+        int ParseSimpleToken(string str, int startOffsetInclusive, int endOffsetExclusive, char token)
+        {
+            // Expected Format: "{Token}:{id}"
+            if (str[startOffsetInclusive + 1] != ':')
+            {
+                var tokenSubStr = str.Substring(startOffsetInclusive, endOffsetExclusive - startOffsetInclusive);
+                throw new Exception($"Malformed token found when parsing '{tokenSubStr}'. Expected ':' after '${token}'");
+            }
+
+            if (!TryParseInt(str, startOffsetInclusive + 2, endOffsetExclusive, out int tokenId, out int end))
+            {
+                var tokenSubStr = str.Substring(startOffsetInclusive, endOffsetExclusive - startOffsetInclusive);
+                throw new Exception($"Token '{tokenSubStr}' is malformed. The identifier number is not a valid integer.");
+            }
+            return tokenId;
+        }
+
+        void ParseTokenWithName(string str, int startOffsetInclusive, int endOffsetExclusive, char token, out int tokenId, out string outName)
+        {
+            // Expected Format: "{Token}:{id},{name}"
+            tokenId = -1;
+            outName = null;
+            int offset = startOffsetInclusive + 1;
+            if (str[offset] != ':')
+            {
+                var tokenSubStr = str.Substring(startOffsetInclusive, endOffsetExclusive - startOffsetInclusive);
+                throw new Exception($"Malformed token found when parsing '{tokenSubStr}'. Expected ':' after '${token}'");
+            }
+
+            ++offset;
+            if (!TryParseInt(str, offset, endOffsetExclusive, out tokenId, out int end))
+            {
+                var tokenSubStr = str.Substring(startOffsetInclusive, endOffsetExclusive - startOffsetInclusive);
+                throw new Exception($"Token '{tokenSubStr}' is malformed. The identifier number is not a valid integer.");
+            }
+
+            offset = end;
+            if (str[offset] != ',')
+            {
+                var tokenSubStr = str.Substring(startOffsetInclusive, endOffsetExclusive - startOffsetInclusive);
+                throw new Exception($"Malformed token found when parsing $V: '{tokenSubStr}'. Expected ',' after the identifier.");
+            }
+
+            offset++;
+            outName = str.Substring(offset, endOffsetExclusive - offset);
+        }
+
+        void ProcessToken(string str, int startOffsetInclusive, int endOffsetExclusive, ShaderContainer container)
+        {
+            int length = endOffsetExclusive - startOffsetInclusive;
+            if (length <= 2)
+                return; // can't possibly be a valid token
+
+            // Special tokens are used to done ids that are to be replaced with actual identifiers later:
+            // - "$T:{id}$": Replaces the string with the type name with the given id.
+            // - "$F:{id}$": Replaces the string with the function name with the given id.
+            // - "$V:{id},{varName}$": Replaces the string with the variable declaration with the given id.
+            // Variable declarations also need the variable name due to how arrays have to be declared: "type name[size]".
+            // This may go away if we ever add a variable instance object.
+            int offset = startOffsetInclusive;
+            switch (str[offset])
+            {
+                case 'V': // variable declaration
+                {
+                    ParseTokenWithName(str, startOffsetInclusive, endOffsetExclusive, 'V', out int shaderTypeIndex, out string varName);
+                    // declare it!
+                    FoundryHandle shaderTypeHandle = new FoundryHandle();
+                    shaderTypeHandle.Handle = (uint)shaderTypeIndex;
+                    var shaderType = new ShaderType(container, shaderTypeHandle);
+                    VariableDeclarationInternal(shaderType, varName, DeclarationMode.NoSemicolon);
+                    break;
+                }
+                case 'F': // function call - function name
+                {
+                    int tokenId = ParseSimpleToken(str, startOffsetInclusive, endOffsetExclusive, 'F');
+                    FoundryHandle shaderFunctionHandle = new FoundryHandle();
+                    shaderFunctionHandle.Handle = (uint)tokenId;
+                    var shaderFunction = new ShaderFunction(container, shaderFunctionHandle);
+                    AddFunctionNameInternal(shaderFunction);
+                    break;
+                }
+                case 'T': // type name
+                {
+                    int typeId = ParseSimpleToken(str, startOffsetInclusive, endOffsetExclusive, 'T');
+                    FoundryHandle shaderTypeHandle = new FoundryHandle();
+                    shaderTypeHandle.Handle = (uint)typeId;
+                    var shaderType = new ShaderType(container, shaderTypeHandle);
+                    AddNonArrayTypeNameInternal(shaderType);
+                    break;
+                }
+                default:
+                {
+                    var tokenSubStr = str.Substring(startOffsetInclusive, endOffsetExclusive - startOffsetInclusive);
+                    throw new Exception($"Malformed token found when parsing '{tokenSubStr}'. Identifier {str[offset]} was unexpected.");
+                }
+            }
+        }
+
+        internal void AddWithTokenTranslation(string str, ShaderContainer container)
+        {
+            int startRun = 0;
+            int length = str.Length;
+            int offset = 0;
+
+            while (offset < length)
+            {
+                if (str[offset] != _tokenMarker)
+                    offset++;
+                else
+                {
+                    // found a token
+                    // first complete the plain text run up to this point
+                    AddSubString(str, startRun, offset);
+
+                    // find the end of the token
+                    var tokenStart = offset + 1;
+                    var tokenEnd = tokenStart;
+                    while (tokenEnd < length && str[tokenEnd] != _tokenMarker)
+                        tokenEnd++;
+
+                    // process the token
+                    ProcessToken(str, tokenStart, tokenEnd, container);
+
+                    // start a new plain text run after the token marker
+                    startRun = offset = tokenEnd + 1;
+                }
+            }
+            // we hit the end of the string, complete the current plain text run
+            // (if offset is greater than length, then string was terminated inside a token)
+            if (offset == length)
+                AddSubString(str, startRun, offset);
+        }
+
+        // MUST BE DISPOSED, example:   using(var block = BlockScope()) { block.foo(); }
+        public Block BlockScope(bool semicolon = false)
+        {
+            AddLine(_openCurly);
+            Indent();
+            return new Block(this, semicolon);
+        }
+
+        public readonly ref struct Block
+        {
+            readonly ShaderBuilder parent;
+            readonly bool semicolon;
+
+            public Block(ShaderBuilder parent, bool semicolon = false)
+            {
+                this.parent = parent;
+                this.semicolon = semicolon;
+            }
+
+            public void Dispose()
+            {
+                parent.Deindent();
+                if (semicolon)
+                    parent.AddLine(_closeCurly, _semicolon);
+                else
+                    parent.AddLine(_closeCurly);
+            }
+        }
+
+        public string ConvertToString()
+        {
+            //         var result = string.Create(charLength, this, (span, builder) =>
+            //         {
+            //             // TODO: once we have spans (.NEt 5) this is a better way to do it, fewer allocations
+            //             foreach (var s in builder.strs)
+            //             {
+            //                 s.AsSpan().CopyTo(chars.Slice(position));
+            //             }
+            //         });
+
+            char[] buf = new char[charLength];
+            int len = 0;
+            foreach (var s in strs)
+            {
+                int slen = s.Length;
+                s.CopyTo(0, buf, len, slen);
+                len += slen;
+            }
+            var result = new string(buf, 0, len);
+            return result;
+        }
+
+        public override string ToString()
+        {
+            return ConvertToString();
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ShaderContainer.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/ShaderContainer.bindings.cs
new file mode 100644
index 0000000000..9c28527cbe
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/ShaderContainer.bindings.cs
@@ -0,0 +1,250 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Bindings;
+using Object = UnityEngine.Object;
+
+using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/ShaderContainer.h")]
+    // This is needed for registration to work with the container being in a namespace!
+    [NativeClass("ShaderFoundry::ShaderContainer")]
+    [FoundryAPI]
+    internal sealed partial class ShaderContainer : Object
+    {
+        // call native function to implement "constructor"
+        public ShaderContainer(ShaderContainer parent = null)
+        {
+            Internal_Create(this);
+            if (parent != null)
+                AddDeclarationsFrom(parent);
+            else
+                AddDefaultTypes(this);
+        }
+
+        private extern static void Internal_Create([Writable] ShaderContainer self);
+        private extern void AddDeclarationsFrom(ShaderContainer other);
+
+        // native member functions
+        internal extern FoundryHandle AddString(string s);
+        internal extern string GetString(FoundryHandle stringHandle);
+
+        internal extern FoundryHandle AddShaderAttributeParamInternal(ShaderAttributeParamInternal shaderAttributeParamInternal);
+        internal extern ShaderAttributeParamInternal GetShaderAttributeParam(FoundryHandle shaderAttributeParamHandle);
+
+        internal extern FoundryHandle AddShaderAttributeInternal(ShaderAttributeInternal shaderAttributeInternal);
+        internal extern ShaderAttributeInternal GetShaderAttribute(FoundryHandle shaderAttributeHandle);
+
+        internal extern FoundryHandle AddCommandDescriptorInternal(CommandDescriptorInternal commandDescriptorInternal);
+        internal extern CommandDescriptorInternal GetCommandDescriptor(FoundryHandle commandDescriptorHandle);
+
+        internal extern FoundryHandle AddDefineDescriptorInternal(DefineDescriptorInternal defineDescriptorInternal);
+        internal extern DefineDescriptorInternal GetDefineDescriptor(FoundryHandle defineDescriptorHandle);
+
+        internal extern FoundryHandle AddIncludeDescriptorInternal(IncludeDescriptorInternal includeDescriptorInternal);
+        internal extern IncludeDescriptorInternal GetIncludeDescriptor(FoundryHandle includeDescriptorHandle);
+
+        internal extern FoundryHandle AddKeywordDescriptorInternal(KeywordDescriptorInternal keywordDescriptorInternal);
+        internal extern KeywordDescriptorInternal GetKeywordDescriptor(FoundryHandle keywordDescriptorHandle);
+
+        internal extern FoundryHandle AddPragmaDescriptorInternal(PragmaDescriptorInternal pragmaDescriptorInternal);
+        internal extern PragmaDescriptorInternal GetPragmaDescriptor(FoundryHandle pragmaDescriptorHandle);
+
+        internal extern FoundryHandle AddTagDescriptorInternal(TagDescriptorInternal tagDescriptorInternal);
+        internal extern TagDescriptorInternal GetTagDescriptor(FoundryHandle tagDescriptorHandle);
+
+        internal extern FoundryHandle CreateFunctionInternal();
+        internal extern bool SetFunction(FoundryHandle functionHandle, string name, string body, FoundryHandle returnTypeHandle, FoundryHandle parameterListHandle, FoundryHandle parentBlockHandle);
+        internal extern ShaderFunctionInternal GetFunction(FoundryHandle functionHandle);
+
+        internal extern FoundryHandle AddFunctionParameter(string name, FoundryHandle typeHandle, UInt32 flags);
+        internal extern FunctionParameterInternal GetFunctionParameter(FoundryHandle functionParameterHandle);
+
+        // most types should be added via the ShaderType.* functions.
+        // this function is used to ensure the shader type belongs to this container
+        internal FoundryHandle AddShaderType(ShaderType shaderType, bool convertNonexistantToVoid)
+        {
+            if (shaderType.Exists)
+            {
+                if (shaderType.Container == this)
+                    return shaderType.handle;
+                else
+                {
+                    // TODO: have to deep copy the definition from another container
+                    return FoundryHandle.Invalid();
+                }
+            }
+            else
+            {
+                // invalid shader type...
+                if (convertNonexistantToVoid)
+                    return ShaderTypeInternal.Void(this);
+                else
+                    return FoundryHandle.Invalid();
+            }
+        }
+
+        internal extern FoundryHandle AddIntBlob(uint size);
+        internal extern uint GetIntBlobSize(FoundryHandle blobHandle);
+        internal extern int GetIntBlobElement(FoundryHandle blobHandle, uint elementIndex);
+        internal extern void SetIntBlobElement(FoundryHandle blobHandle, uint elementIndex, int elementValue);
+
+        internal extern FoundryHandle AddHandleBlob(uint size);
+        internal extern uint GetHandleBlobSize(FoundryHandle blobHandle);
+        internal extern FoundryHandle GetHandleBlobElement(FoundryHandle blobHandle, uint elementIndex);
+        internal extern void SetHandleBlobElement(FoundryHandle blobHandle, uint elementIndex, FoundryHandle handle);
+
+        internal extern FoundryHandle CreateTypeInternal();
+        internal extern bool SetTypeInternal(FoundryHandle typeHandle, ShaderTypeInternal type);
+        internal extern ShaderTypeInternal GetType(FoundryHandle typeHandle);
+        internal extern FoundryHandle GetTypeByName(string typeName, FoundryHandle blockHandle);
+
+        public ShaderType GetType(string name)
+        {
+            return new ShaderType(this, GetTypeByName(name, FoundryHandle.Invalid()));
+        }
+
+        public ShaderType GetType(string name, Block block)
+        {
+            return new ShaderType(this, GetTypeByName(name, block.handle));
+        }
+
+        public ShaderType GetType(string name, Block.Builder builder)
+        {
+            return new ShaderType(this, GetTypeByName(name, builder.blockHandle));
+        }
+
+        internal extern FoundryHandle AddStructFieldInternal(StructFieldInternal structField);
+        internal extern StructFieldInternal GetStructField(FoundryHandle structFieldHandle);
+
+        internal extern FoundryHandle AddBlockVariableInternal(BlockVariableInternal block);
+        internal extern BlockVariableInternal GetBlockVariable(FoundryHandle blockVariableHandle);
+
+        internal extern FoundryHandle CreateBlockInternal();
+        internal extern bool SetBlockInternal(FoundryHandle blockHandle, BlockInternal block);
+        internal extern BlockInternal GetBlock(FoundryHandle blockHandle);
+
+        internal extern FoundryHandle AddBlockInstanceInternal(BlockInstanceInternal blockInstance);
+        internal extern BlockInstanceInternal GetBlockInstance(FoundryHandle blockInstanceHandle);
+
+        internal extern FoundryHandle AddPassIdentifier(uint subShaderIndex, uint passIndex);
+        internal extern PassIdentifier GetPassIdentifier(FoundryHandle passIdentifierHandle);
+
+        internal extern FoundryHandle AddCustomizationPointInternal(CustomizationPointInternal customizationPoint);
+        internal extern CustomizationPointInternal GetCustomizationPoint(FoundryHandle customizationPointHandle);
+
+        internal extern FoundryHandle AddCustomizationPointInstanceInternal(CustomizationPointInstanceInternal customizationPointInstance);
+        internal extern CustomizationPointInstanceInternal GetCustomizationPointInstance(FoundryHandle customizationPointInstanceHandle);
+
+        internal extern FoundryHandle AddTemplatePassStageElementInternal(TemplatePassStageElementInternal templatePassStageElement);
+        internal extern TemplatePassStageElementInternal GetTemplatePassStageElement(FoundryHandle templatePassStageElementHandle);
+
+        internal extern FoundryHandle AddTemplatePassInternal(TemplatePassInternal templatePass);
+        internal extern TemplatePassInternal GetTemplatePass(FoundryHandle templatePassHandle);
+
+        internal extern FoundryHandle AddTemplateInstanceInternal(TemplateInstanceInternal templateInstance);
+        internal extern TemplateInstanceInternal GetTemplateInstance(FoundryHandle templateInstanceHandle);
+
+        internal extern FoundryHandle AddTemplateInternal(TemplateInternal templateInternal);
+        internal extern TemplateInternal GetTemplate(FoundryHandle templateHandle);
+
+        internal FoundryHandle AddTemplateLinker(ITemplateLinker linker)
+        {
+            // If the linker is either null, or has already been added, we return an invalid handle
+            if (linker == null)
+                throw new Exception("Registering a null template linker is not valid.");
+
+            var existingLinkerIndex = m_TemplateLinkers.FindIndex((l) => (l == linker));
+            if (existingLinkerIndex != -1)
+                throw new Exception($"Template linker '{linker}' has already been registered.");
+
+            FoundryHandle handle = new FoundryHandle();
+            handle.Handle = (uint)m_TemplateLinkers.Count;
+            m_TemplateLinkers.Add(linker);
+
+            return handle;
+        }
+
+        internal ITemplateLinker GetTemplateLinker(FoundryHandle linkerHandle)
+        {
+            if (linkerHandle.IsValid && (linkerHandle.Handle < m_TemplateLinkers.Count))
+                return m_TemplateLinkers[(int)linkerHandle.Handle];
+
+            return null;
+        }
+
+        List<ITemplateLinker> m_TemplateLinkers = new List<ITemplateLinker>();
+
+        // cached common types
+        ShaderType m_void;
+        ShaderType m_bool, m_bool2, m_bool3, m_bool4;
+        ShaderType m_int, m_int2, m_int3, m_int4;
+        ShaderType m_uint, m_uint2, m_uint3, m_uint4;
+        ShaderType m_half, m_half2, m_half3, m_half4;
+        ShaderType m_float, m_float2, m_float3, m_float4;
+        ShaderType m_double, m_double2, m_double3, m_double4;
+        ShaderType m_float2x2, m_float3x3, m_float4x4;
+        ShaderType m_Texture1D, m_Texture1DArray, m_Texture2D, m_Texture2DArray, m_Texture3D, m_TextureCube, m_TextureCubeArray, m_Texture2DMS, m_Texture2DMSArray;
+        ShaderType m_SamplerState;
+
+        public ShaderType _void =>      m_void.IsValid ?    m_void :    (m_void =       GetType("void"));
+
+        public ShaderType _bool =>      m_bool.IsValid ?    m_bool :    (m_bool =       GetType("bool"));
+        public ShaderType _bool2 =>     m_bool2.IsValid ?   m_bool2 :   (m_bool2 =      GetType("bool2"));
+        public ShaderType _bool3 =>     m_bool3.IsValid ?   m_bool3 :   (m_bool3 =      GetType("bool3"));
+        public ShaderType _bool4 =>     m_bool4.IsValid ?   m_bool4 :   (m_bool4 =      GetType("bool4"));
+
+        public ShaderType _int =>       m_int.IsValid ?     m_int :     (m_int =        GetType("int"));
+        public ShaderType _int2 =>      m_int2.IsValid ?    m_int2 :    (m_int2 =       GetType("int2"));
+        public ShaderType _int3 =>      m_int3.IsValid ?    m_int3 :    (m_int3 =       GetType("int3"));
+        public ShaderType _int4 =>      m_int4.IsValid ?    m_int4 :    (m_int4 =       GetType("int4"));
+
+        public ShaderType _uint =>      m_uint.IsValid ?    m_uint :    (m_uint =       GetType("uint"));
+        public ShaderType _uint2 =>     m_uint2.IsValid ?   m_uint2 :   (m_uint2 =      GetType("uint2"));
+        public ShaderType _uint3 =>     m_uint3.IsValid ?   m_uint3 :   (m_uint3 =      GetType("uint3"));
+        public ShaderType _uint4 =>     m_uint4.IsValid ?   m_uint4 :   (m_uint4 =      GetType("uint4"));
+
+        public ShaderType _half =>      m_half.IsValid ?    m_half :    (m_half =       GetType("half"));
+        public ShaderType _half2 =>     m_half2.IsValid ?   m_half2 :   (m_half2 =      GetType("half2"));
+        public ShaderType _half3 =>     m_half3.IsValid ?   m_half3 :   (m_half3 =      GetType("half3"));
+        public ShaderType _half4 =>     m_half4.IsValid ?   m_half4 :   (m_half4 =      GetType("half4"));
+
+        public ShaderType _float =>     m_float.IsValid ?   m_float :   (m_float =      GetType("float"));
+        public ShaderType _float2 =>    m_float2.IsValid ?  m_float2 :  (m_float2 =     GetType("float2"));
+        public ShaderType _float3 =>    m_float3.IsValid ?  m_float3 :  (m_float3 =     GetType("float3"));
+        public ShaderType _float4 =>    m_float4.IsValid ?  m_float4 :  (m_float4 =     GetType("float4"));
+
+        public ShaderType _float2x2 =>  m_float2x2.IsValid ? m_float2x2 : (m_float2x2 = GetType("float2x2"));
+        public ShaderType _float3x3 =>  m_float3x3.IsValid ? m_float3x3 : (m_float3x3 = GetType("float3x3"));
+        public ShaderType _float4x4 =>  m_float4x4.IsValid ? m_float4x4 : (m_float4x4 = GetType("float4x4"));
+
+        public ShaderType _double =>    m_double.IsValid ?  m_double :  (m_double =     GetType("double"));
+        public ShaderType _double2 =>   m_double2.IsValid ? m_double2 : (m_double2 =    GetType("double2"));
+        public ShaderType _double3 =>   m_double3.IsValid ? m_double3 : (m_double3 =    GetType("double3"));
+        public ShaderType _double4 =>   m_double4.IsValid ? m_double4 : (m_double4 =    GetType("double4"));
+
+        public ShaderType _Texture1D =>         m_Texture1D.IsValid ?       m_Texture1D :       (m_Texture1D =          GetType("Texture1D"));
+        public ShaderType _Texture2D =>         m_Texture2D.IsValid ?       m_Texture2D :       (m_Texture2D =          GetType("Texture2D"));
+        public ShaderType _Texture3D =>         m_Texture3D.IsValid ?       m_Texture3D :       (m_Texture3D =          GetType("Texture3D"));
+        public ShaderType _Texture1DArray =>    m_Texture1DArray.IsValid ?  m_Texture1DArray :  (m_Texture1DArray =     GetType("Texture1DArray"));
+        public ShaderType _Texture2DArray =>    m_Texture2DArray.IsValid ?  m_Texture2DArray :  (m_Texture2DArray =     GetType("Texture2DArray"));
+        public ShaderType _TextureCube =>       m_TextureCube.IsValid ?     m_TextureCube :     (m_TextureCube =        GetType("TextureCube"));
+        public ShaderType _TextureCubeArray =>  m_TextureCubeArray.IsValid ? m_TextureCubeArray : (m_TextureCubeArray =   GetType("TextureCubeArray"));
+        public ShaderType _Texture2DMS =>       m_Texture2DMS.IsValid ?     m_Texture2DMS :     (m_Texture2DMS =        GetType("Texture2DMS"));
+        public ShaderType _Texture2DMSArray =>  m_Texture2DMSArray.IsValid ? m_Texture2DMSArray : (m_Texture2DMSArray =   GetType("Texture2DMSArray"));
+
+        public ShaderType _SamplerState =>      m_SamplerState.IsValid ?    m_SamplerState :    (m_SamplerState =       GetType("SamplerState"));
+
+        public ShaderType _UnitySamplerState;
+        public ShaderType _UnityTexture2D;
+        public ShaderType _UnityTexture2DArray;
+        public ShaderType _UnityTextureCube;
+        public ShaderType _UnityTexture3D;
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ShaderFunction.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/ShaderFunction.bindings.cs
new file mode 100644
index 0000000000..86fad888d5
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/ShaderFunction.bindings.cs
@@ -0,0 +1,180 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/ShaderFunction.h")]
+    internal struct ShaderFunctionInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_BodyHandle;
+        internal FoundryHandle m_ReturnTypeHandle;
+        internal FoundryHandle m_ParameterListHandle;
+        internal FoundryHandle m_ParentBlockHandle;
+
+        internal extern static ShaderFunctionInternal Invalid();
+        internal extern bool IsValid { [NativeMethod("IsValid")] get; }
+        internal extern FoundryHandle GetParentBlockHandle();
+
+        internal extern static bool ValueEquals(ShaderContainer aContainer, FoundryHandle aHandle, ShaderContainer bContainer, FoundryHandle bHandle);
+    }
+
+    [FoundryAPI]
+    internal readonly struct ShaderFunction : IEquatable<ShaderFunction>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly ShaderFunctionInternal function;
+
+        // public API
+        public ShaderContainer Container => container;
+        public static ShaderFunction Invalid => new ShaderFunction(null, FoundryHandle.Invalid());
+
+        public bool Exists => (container != null) && handle.IsValid;
+        public bool IsValid => Exists && function.IsValid;
+
+        public string Name => container?.GetString(function.m_NameHandle) ?? String.Empty;
+        public string Body => container?.GetString(function.m_BodyHandle) ?? String.Empty;
+        public ShaderType ReturnType => new ShaderType(container, function.m_ReturnTypeHandle);
+        public IEnumerable<FunctionParameter> Parameters
+        {
+            get
+            {
+                var localContainer = container;
+                var blockHandles = new FixedHandleListInternal(function.m_ParameterListHandle);
+                return blockHandles.Select(localContainer, (handle) => (new FunctionParameter(localContainer, handle)));
+            }
+        }
+
+        // Not valid until the parent block is finished being built.
+        public Block ParentBlock => new Block(Container, function.GetParentBlockHandle());
+
+        internal ShaderFunction(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.function = container?.GetFunction(handle) ?? ShaderFunctionInternal.Invalid();
+        }
+
+        // only for use by the Builder
+        ShaderFunction(ShaderContainer container, FoundryHandle functionHandle, string name, string body, FoundryHandle returnTypeHandle, List<FunctionParameter> parameters, FoundryHandle parentBlockHandle)
+        {
+            this.container = container;
+            if (container != null)
+            {
+                FoundryHandle parametersList = FixedHandleListInternal.Build(container, parameters, (p) => (p.handle));
+                handle = functionHandle;
+                container.SetFunction(functionHandle, name, body, returnTypeHandle, parametersList, parentBlockHandle);
+                function = container.GetFunction(handle);
+                return;
+            }
+
+            // failure
+            this = Invalid;
+        }
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is ShaderFunction other && this.Equals(other);
+        public bool Equals(ShaderFunction other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(ShaderFunction lhs, ShaderFunction rhs) => lhs.Equals(rhs);
+        public static bool operator!=(ShaderFunction lhs, ShaderFunction rhs) => !lhs.Equals(rhs);
+
+        public bool ValueEquals(in ShaderFunction other)
+        {
+            return ShaderFunctionInternal.ValueEquals(container, handle, other.container, other.handle);
+        }
+
+        public class Builder : ShaderBuilder
+        {
+            ShaderContainer container;
+            readonly internal FoundryHandle functionHandle = FoundryHandle.Invalid();
+            ShaderFoundry.Block.Builder parentBlockBuilder;
+            protected string name;
+            ShaderType returnType = ShaderType.Invalid;
+            List<FunctionParameter> parameters;
+            bool finalized = false;
+
+            public ShaderContainer Container => container;
+
+            // Construct a function with void return type in the global scope
+            public Builder(ShaderContainer container, string name)
+                : this(container, name, container._void, null)
+            {
+            }
+
+            // Construct a function with specified return type in the global scope
+            public Builder(ShaderContainer container, string name, ShaderType returnType)
+                : this(container, name, returnType, null)
+            {
+            }
+
+            // Construct a function with void return type in the specified block scope
+            public Builder(ShaderFoundry.Block.Builder blockBuilder, string name)
+                : this(blockBuilder.Container, name, blockBuilder.Container._void, blockBuilder)
+            {
+            }
+
+            // Construct a function with specified return type in the specified block scope
+            public Builder(ShaderFoundry.Block.Builder blockBuilder, string name, ShaderType returnType)
+                : this(blockBuilder.Container, name, returnType, blockBuilder)
+            {
+            }
+
+            internal Builder(ShaderContainer container, string name, ShaderType returnType, ShaderFoundry.Block.Builder parentBlockBuilder)
+            {
+                this.container = container;
+                this.name = name;
+                this.returnType = returnType;
+                functionHandle = container.CreateFunctionInternal();
+                this.parentBlockBuilder = parentBlockBuilder;
+            }
+
+            public void AddParameter(FunctionParameter parameter)
+            {
+                if (parameters == null)
+                    parameters = new List<FunctionParameter>();
+                parameters.Add(parameter);
+            }
+
+            public void AddInput(ShaderType type, string name)
+            {
+                var paramBuilder = new FunctionParameter.Builder(container, name, type, true, false);
+                AddParameter(paramBuilder.Build());
+            }
+
+            public void AddOutput(ShaderType type, string name)
+            {
+                var paramBuilder = new FunctionParameter.Builder(container, name, type, false, true);
+                AddParameter(paramBuilder.Build());
+            }
+
+            public ShaderFunction Build()
+            {
+                if (finalized)
+                    return new ShaderFunction(Container, functionHandle);
+                finalized = true;
+
+                FoundryHandle parentBlockHandle = parentBlockBuilder?.blockHandle ?? FoundryHandle.Invalid();
+                var returnTypeHandle = container.AddShaderType(returnType, true);
+                var builtFunction = new ShaderFunction(container, functionHandle, name, ConvertToString(), returnTypeHandle, parameters, parentBlockHandle);
+
+                if (parentBlockBuilder != null)
+                {
+                    // Register the new function with the parent block
+                    parentBlockBuilder.AddFunction(builtFunction);
+                }
+
+                return builtFunction;
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/ShaderType.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/ShaderType.bindings.cs
new file mode 100644
index 0000000000..ef683b5166
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/ShaderType.bindings.cs
@@ -0,0 +1,342 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+using System.Linq;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/ShaderType.h")]
+    internal struct ShaderTypeInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal UInt32 m_Kind; // Enum declaration in ShaderType.h
+        internal UInt32 m_Flags; // Enum declaration in ShaderType.h
+        internal FoundryHandle m_AttributeListHandle;
+        internal FoundryHandle m_IncludeListHandle;
+        internal FoundryHandle m_v0;
+        internal UInt32 m_v1;
+        internal UInt32 m_v2;
+        internal FoundryHandle m_ParentBlockHandle;
+
+        internal static extern ShaderTypeInternal Invalid();
+
+        internal extern bool IsValid { [NativeMethod("IsValid")] get; }
+        internal extern bool IsVoid { [NativeMethod("IsVoid")] get; }
+        internal extern bool IsScalar { [NativeMethod("IsScalar")] get; }
+        internal extern bool IsVector { [NativeMethod("IsVector")] get; }
+        internal extern bool IsMatrix { [NativeMethod("IsMatrix")] get; }
+        internal extern bool IsStruct { [NativeMethod("IsStruct")] get; }
+        internal extern bool IsTexture { [NativeMethod("IsTexture")] get; }
+        internal extern bool IsSamplerState { [NativeMethod("IsSamplerState")] get; }
+        internal extern bool IsArray { [NativeMethod("IsArray")] get; }
+        internal extern bool IsVectorOrScalar { [NativeMethod("IsVectorOrScalar")] get; }
+        internal extern bool IsPlaceholder { [NativeMethod("IsPlaceholder")] get; }
+        internal extern bool IsDeclaredExternally();
+
+        internal extern int VectorDimension { get; }
+        internal extern int MatrixColumns { get; }
+        internal extern int MatrixRows { get; }
+        internal extern int ArrayElements { get; }
+        internal extern FoundryHandle GetArrayElementTypeHandle();
+        internal extern FoundryHandle GetParentBlockHandle();
+
+        internal IEnumerable<StructField> StructFields(ShaderContainer container)
+        {
+            if (IsStruct)
+            {
+                var list = new FixedHandleListInternal(m_v0);
+                return list.Select<StructField>(container, (handle) => (new StructField(container, handle)));
+            }
+            return Enumerable.Empty<StructField>();
+        }
+
+        internal IEnumerable<ShaderAttribute> Attributes(ShaderContainer container)
+        {
+            var list = new FixedHandleListInternal(m_AttributeListHandle);
+            return list.Select<ShaderAttribute>(container, (handle) => (new ShaderAttribute(container, handle)));
+        }
+
+        internal IEnumerable<IncludeDescriptor> Includes(ShaderContainer container)
+        {
+            var list = new FixedHandleListInternal(m_IncludeListHandle);
+            return list.Select<IncludeDescriptor>(container, (handle) => (new IncludeDescriptor(container, handle)));
+        }
+
+        internal extern static FoundryHandle Void(ShaderContainer container);
+        internal extern static FoundryHandle Scalar(ShaderContainer container, string name, FoundryHandle includeListHandle);
+        internal extern static FoundryHandle Vector(ShaderContainer container, FoundryHandle scalarTypeHandle, int dimension);
+        internal extern static FoundryHandle Matrix(ShaderContainer container, FoundryHandle scalarTypeHandle, int rows, int cols);
+        internal extern static FoundryHandle Texture(ShaderContainer container, string name);
+        internal extern static FoundryHandle SamplerState(ShaderContainer container, string name);
+        internal extern static FoundryHandle Array(ShaderContainer container, FoundryHandle elementTypeHandle, int elementCount);
+        internal extern static FoundryHandle Struct(ShaderContainer container, FoundryHandle typeHandle, string name, FoundryHandle fieldListHandle, FoundryHandle attributeListHandle, FoundryHandle includeListHandle,  FoundryHandle parentBlockHandle, bool declaredExternally);
+
+        internal extern static bool ValueEquals(ShaderContainer aContainer, FoundryHandle aHandle, ShaderContainer bContainer, FoundryHandle bHandle);
+    }
+
+    [FoundryAPI]
+    internal readonly struct ShaderType : IEquatable<ShaderType>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly ShaderTypeInternal type;
+
+        // public API
+        public ShaderContainer Container => container;
+        public static ShaderType Invalid => new ShaderType(null, FoundryHandle.Invalid());
+
+        // Exists means it has been allocated (it can be referenced, even if not valid yet)
+        public bool Exists => (container != null) && handle.IsValid;
+
+        // Valid means the value is fully built (description is complete) and it is inspectable
+        public bool IsValid => Exists && type.IsValid;
+
+        public string Name => container?.GetString(type.m_NameHandle) ?? string.Empty;
+
+        public bool IsVoid => type.IsVoid;
+        public bool IsScalar => type.IsScalar;
+        public bool IsVector => type.IsVector;
+        public bool IsMatrix => type.IsMatrix;
+        public bool IsStruct => type.IsStruct;
+        public bool IsTexture => type.IsTexture;
+        public bool IsSamplerState => type.IsSamplerState;
+        public bool IsArray => type.IsArray;
+        public bool IsVectorOrScalar => type.IsVectorOrScalar;
+        public bool IsPlaceholder => type.IsPlaceholder;
+        public bool IsDeclaredExternally => type.IsDeclaredExternally();
+
+        public int VectorDimension => type.IsVector ? type.VectorDimension : (type.IsScalar ? 1 : 0);
+        public int MatrixColumns => type.IsMatrix ? type.MatrixColumns : 0;
+        public int MatrixRows => type.IsMatrix ? type.MatrixRows : 0;
+        public int ArrayElements => type.IsArray ? type.ArrayElements : 0;
+        public ShaderType ArrayElementType => (container != null && IsArray) ? new ShaderType(container, type.GetArrayElementTypeHandle()) : ShaderType.Invalid;
+        public IEnumerable<StructField> StructFields => type.StructFields(container);
+        public IEnumerable<ShaderAttribute> Attributes => type.Attributes(container);
+        public IEnumerable<IncludeDescriptor> Includes => type.Includes(container);
+        // Not valid until the parent block is finished being built.
+        public Block ParentBlock => new Block(container, type.GetParentBlockHandle());
+
+        public override int GetHashCode() => (container, handle).GetHashCode();
+
+        // Equals and operator == check reference equality - an indication that the two objects are literally the same.
+        // ValueEquals does a deep compare of the internal details of both objects, and determines if the two objects
+        // are equivalent.  Reference equality implies value equality, but not vice versa.
+        public override bool Equals(object obj) => obj is ShaderType other && this.Equals(other);
+        public bool Equals(ShaderType other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public static bool operator==(ShaderType lhs, ShaderType rhs) => lhs.Equals(rhs);
+        public static bool operator!=(ShaderType lhs, ShaderType rhs) => !lhs.Equals(rhs);
+
+        public bool ValueEquals(in ShaderType other)
+        {
+            return ShaderTypeInternal.ValueEquals(container, handle, other.container, other.handle);
+        }
+
+        internal ShaderType(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = (container ? handle : FoundryHandle.Invalid());
+            this.type = container?.GetType(handle) ?? ShaderTypeInternal.Invalid();
+        }
+
+        public static ShaderType Void(ShaderContainer container)
+        {
+            if (container != null)
+            {
+                var handle = ShaderTypeInternal.Void(container);
+                if (handle.IsValid)
+                    return new ShaderType(container, handle);
+            }
+            return ShaderType.Invalid;
+        }
+
+        public static ShaderType Scalar(ShaderContainer container, string name, List<ShaderAttribute> attributes = null)
+        {
+            if ((container != null) && (name != null))
+            {
+                var handle = ShaderTypeInternal.Scalar(container, name, FoundryHandle.Invalid());
+                if (handle.IsValid)
+                    return new ShaderType(container, handle);
+            }
+            return ShaderType.Invalid;
+        }
+
+        public static ShaderType Vector(ShaderContainer container, ShaderType scalarType, int dimension)
+        {
+            if ((container != null) && (container == scalarType.container) && scalarType.IsScalar)
+            {
+                if ((dimension >= 1) && (dimension <= 4))
+                {
+                    var handle = ShaderTypeInternal.Vector(container, scalarType.handle, dimension);
+                    if (handle.IsValid)
+                        return new ShaderType(container, handle);
+                }
+            }
+            return ShaderType.Invalid;
+        }
+
+        public static ShaderType Matrix(ShaderContainer container, ShaderType scalarType, int rows, int cols)
+        {
+            if ((container != null) && (container == scalarType.container) && scalarType.IsScalar)
+            {
+                if ((rows >= 1) && (rows <= 4) && (cols >= 1) && (cols <= 4))
+                {
+                    var handle = ShaderTypeInternal.Matrix(container, scalarType.handle, rows, cols);
+                    if (handle.IsValid)
+                        return new ShaderType(container, handle);
+                }
+            }
+            return ShaderType.Invalid;
+        }
+
+        public static ShaderType Texture(ShaderContainer container, string name)
+        {
+            if ((container != null) && (name != null))
+            {
+                var handle = ShaderTypeInternal.Texture(container, name);
+                if (handle.IsValid)
+                    return new ShaderType(container, handle);
+            }
+            return ShaderType.Invalid;
+        }
+
+        public static ShaderType SamplerState(ShaderContainer container, string name)
+        {
+            if ((container != null) && (name != null))
+            {
+                var handle = ShaderTypeInternal.SamplerState(container, name);
+                if (handle.IsValid)
+                    return new ShaderType(container, handle);
+            }
+            return ShaderType.Invalid;
+        }
+
+        public static ShaderType Array(ShaderContainer container, ShaderType elementType, int elementCount)
+        {
+            if ((container != null) && elementType.IsValid && elementCount >= 0)
+            {
+                var handle = ShaderTypeInternal.Array(container, elementType.handle, elementCount);
+                if (handle.IsValid)
+                    return new ShaderType(container, handle);
+            }
+            return ShaderType.Invalid;
+        }
+
+        // use Builder ?
+        internal static ShaderType Struct(ShaderContainer container, FoundryHandle typeHandle, string name, FoundryHandle parentBlockHandle, List<StructField> fields, List<ShaderAttribute> attributes = null, List<string> includes = null, bool declaredExternally = false)
+        {
+            if ((container != null) && !string.IsNullOrEmpty(name))
+            {
+                bool success = true;
+                FoundryHandle fieldListHandle = FixedHandleListInternal.Build(container, fields, (f) => (f.handle));
+
+                var attributeList = FixedHandleListInternal.Build(container, attributes, (a) => (a.handle));
+                FoundryHandle includeList = FoundryHandle.Invalid();
+                if ((includes != null) && (includes.Count > 0))
+                {
+                    var includeHandles = new List<FoundryHandle>();
+                    foreach (string path in includes)
+                    {
+                        var builder = new IncludeDescriptor.Builder(container, path);
+                        FoundryHandle includeHandle = builder.Build().handle;
+                        if (includeHandle.IsValid)
+                            includeHandles.Add(includeHandle);
+                    }
+                    includeList = FixedHandleListInternal.Build(container, includeHandles);
+                }
+                if (success)
+                {
+                    var handle = ShaderTypeInternal.Struct(container, typeHandle, name, fieldListHandle, attributeList, includeList, parentBlockHandle, declaredExternally);
+                    if (handle.IsValid)
+                        return new ShaderType(container, handle);
+                }
+            }
+            return ShaderType.Invalid;
+        }
+
+        public class StructBuilder
+        {
+            ShaderContainer container;
+            readonly internal FoundryHandle typeHandle;
+
+            Block.Builder parentBlock;
+
+            string name;
+            List<StructField> fields;
+            List<ShaderAttribute> attributes;
+            List<string> includes;
+            bool declaredExternally;
+            bool finalized = false;
+
+            // create struct in global namespace
+            public StructBuilder(ShaderContainer container, string name) : this(container, name, null) {}
+
+            // create struct in block
+            public StructBuilder(Block.Builder blockBuilder, string name) : this(blockBuilder.Container, name, blockBuilder) {}
+
+            internal StructBuilder(ShaderContainer container, string name, Block.Builder blockBuilder)
+            {
+                this.container = container;
+                this.name = name;
+                this.typeHandle = container.CreateTypeInternal();
+                this.parentBlock = blockBuilder;
+            }
+
+            public void AddField(ShaderType type, string name)
+            {
+                var fieldBuilder = new StructField.Builder(container, name, type);
+                AddField(fieldBuilder.Build());
+            }
+
+            public void AddField(StructField field)
+            {
+                if (fields == null)
+                    fields = new List<StructField>();
+                fields.Add(field);
+            }
+
+            public void AddAttribute(ShaderAttribute attribute)
+            {
+                if (attributes == null)
+                    attributes = new List<ShaderAttribute>();
+                attributes.Add(attribute);
+            }
+
+            public void AddInclude(string path)
+            {
+                if (includes == null)
+                    includes = new List<string>();
+                includes.Add(path);
+            }
+
+            public void DeclaredExternally()
+            {
+                declaredExternally = true;
+            }
+
+            public ShaderType Build()
+            {
+                if (finalized)
+                    return new ShaderType(container, typeHandle);
+                finalized = true;
+
+                FoundryHandle parentBlockHandle = parentBlock?.blockHandle ?? FoundryHandle.Invalid();
+                var structType = ShaderType.Struct(container, typeHandle, name, parentBlockHandle, fields, attributes, includes, declaredExternally);
+
+                if (parentBlock != null)
+                {
+                    // register with parent block
+                    parentBlock.AddType(structType);
+                }
+
+                return structType;
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/StructField.bindings.cs b/Modules/ShaderFoundry/ScriptBindings/StructField.bindings.cs
new file mode 100644
index 0000000000..28d064a476
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/StructField.bindings.cs
@@ -0,0 +1,103 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/StructField.h")]
+    internal struct StructFieldInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_TypeHandle;
+        internal FoundryHandle m_AttributeListHandle;
+
+        // TODO no need to make this extern, can duplicate it here
+        internal static extern StructFieldInternal Invalid();
+
+        internal bool IsValid => m_NameHandle.IsValid;
+
+        internal IEnumerable<ShaderAttribute> Attributes(ShaderContainer container)
+        {
+            var list = new FixedHandleListInternal(m_AttributeListHandle);
+            return list.Select<ShaderAttribute>(container, (handle) => (new ShaderAttribute(container, handle)));
+        }
+
+        internal extern static bool ValueEquals(ShaderContainer aContainer, FoundryHandle aHandle, ShaderContainer bContainer, FoundryHandle bHandle);
+    }
+
+    [FoundryAPI]
+    internal readonly struct StructField : IEquatable<StructField>
+    {
+        // data members
+        readonly ShaderContainer container;
+        internal readonly FoundryHandle handle;
+        readonly StructFieldInternal field;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null) && handle.IsValid && (field.IsValid);
+        public string Name => container?.GetString(field.m_NameHandle) ?? string.Empty;
+        public ShaderType Type => new ShaderType(container, field.m_TypeHandle);
+        public IEnumerable<ShaderAttribute> Attributes => field.Attributes(container);
+
+        // private
+        internal StructField(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.field = container?.GetStructField(handle) ?? StructFieldInternal.Invalid();
+        }
+
+        public static StructField Invalid => new StructField(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is StructField other && this.Equals(other);
+        public bool Equals(StructField other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(StructField lhs, StructField rhs) => lhs.Equals(rhs);
+        public static bool operator!=(StructField lhs, StructField rhs) => !lhs.Equals(rhs);
+
+        public bool ValueEquals(in StructField other)
+        {
+            return StructFieldInternal.ValueEquals(container, handle, other.container, other.handle);
+        }
+
+        public class Builder
+        {
+            internal ShaderContainer container;
+            internal string name;
+            internal ShaderType type = ShaderType.Invalid;
+            internal List<ShaderAttribute> attributes;
+
+            public Builder(ShaderContainer container, string name, ShaderType type)
+            {
+                this.container = container;
+                this.name = name;
+                this.type = type;
+            }
+
+            public void AddAttribute(ShaderAttribute attribute)
+            {
+                if (attributes == null)
+                    attributes = new List<ShaderAttribute>();
+                attributes.Add(attribute);
+            }
+
+            public StructField Build()
+            {
+                var structFieldInternal = new StructFieldInternal();
+                structFieldInternal.m_NameHandle = container.AddString(name);
+                structFieldInternal.m_TypeHandle = type.handle;
+                structFieldInternal.m_AttributeListHandle = FixedHandleListInternal.Build(container, attributes, (a) => (a.handle));
+                var returnHandle = container.AddStructFieldInternal(structFieldInternal);
+                return new StructField(container, returnHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/TagDescriptor.binding.cs b/Modules/ShaderFoundry/ScriptBindings/TagDescriptor.binding.cs
new file mode 100644
index 0000000000..6b30d4d203
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/TagDescriptor.binding.cs
@@ -0,0 +1,84 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/TagDescriptor.h")]
+    internal struct TagDescriptorInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_ValueHandle;
+
+        internal extern static TagDescriptorInternal Invalid();
+
+        internal extern bool IsValid();
+
+        internal extern FoundryHandle GetNameHandle();
+        internal extern FoundryHandle GetValueHandle();
+    }
+
+    [FoundryAPI]
+    internal readonly struct TagDescriptor : IEquatable<TagDescriptor>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly TagDescriptorInternal descriptor;
+        internal readonly FoundryHandle handle;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && descriptor.IsValid());
+
+        public string Name => Container?.GetString(descriptor.GetNameHandle()) ?? string.Empty;
+        public string Value => Container?.GetString(descriptor.GetValueHandle()) ?? string.Empty;
+
+        // private
+        internal TagDescriptor(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.descriptor = container?.GetTagDescriptor(handle) ?? TagDescriptorInternal.Invalid();
+        }
+
+        public static TagDescriptor Invalid => new TagDescriptor(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is TagDescriptor other && this.Equals(other);
+        public bool Equals(TagDescriptor other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(TagDescriptor lhs, TagDescriptor rhs) => lhs.Equals(rhs);
+        public static bool operator!=(TagDescriptor lhs, TagDescriptor rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            string name;
+            string value;
+
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, string value)
+            {
+                this.container = container;
+                this.name = name;
+                this.value = value;
+            }
+
+            public TagDescriptor Build()
+            {
+                var descriptor = new TagDescriptorInternal();
+                descriptor.m_NameHandle = container.AddString(name);
+                descriptor.m_ValueHandle = container.AddString(value);
+                var resultHandle = container.AddTagDescriptorInternal(descriptor);
+                return new TagDescriptor(container, resultHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/Template.binding.cs b/Modules/ShaderFoundry/ScriptBindings/Template.binding.cs
new file mode 100644
index 0000000000..c7dab0e437
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/Template.binding.cs
@@ -0,0 +1,125 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/Template.h")]
+    internal struct TemplateInternal
+    {
+        internal FoundryHandle m_NameHandle;
+        internal FoundryHandle m_PassListHandle;
+        internal FoundryHandle m_TagDescriptorListHandle;
+        internal FoundryHandle m_AdditionalShaderIDStringHandle;
+        internal FoundryHandle m_LinkerHandle;
+
+        internal extern static TemplateInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct Template : IEquatable<Template>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly TemplateInternal template;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+        public string Name => container?.GetString(template.m_NameHandle) ?? string.Empty;
+        public string AdditionalShaderID => container?.GetString(template.m_AdditionalShaderIDStringHandle) ?? string.Empty;
+        public IEnumerable<TemplatePass> Passes
+        {
+            get
+            {
+                var localContainer = Container;
+                var passList = new FixedHandleListInternal(template.m_PassListHandle);
+                return passList.Select<TemplatePass>(localContainer, (handle) => (new TemplatePass(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<TagDescriptor> TagDescriptors
+        {
+            get
+            {
+                var localContainer = Container;
+                var tagDescriptorList = new FixedHandleListInternal(template.m_TagDescriptorListHandle);
+                return tagDescriptorList.Select<TagDescriptor>(localContainer, (handle) => (new TagDescriptor(localContainer, handle)));
+            }
+        }
+
+        public ITemplateLinker Linker => Container?.GetTemplateLinker(template.m_LinkerHandle) ?? null;
+
+        // private
+        internal Template(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.template = container?.GetTemplate(handle) ?? TemplateInternal.Invalid();
+        }
+
+        public static Template Invalid => new Template(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is Template other && this.Equals(other);
+        public bool Equals(Template other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(Template lhs, Template rhs) => lhs.Equals(rhs);
+        public static bool operator!=(Template lhs, Template rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            public string Name { get; set; }
+            public string AdditionalShaderID { get; set; }
+            List<TemplatePass> passes { get; set; } = new List<TemplatePass>();
+            ITemplateLinker linker;
+            List<TagDescriptor> tagDescriptors = new List<TagDescriptor>();
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, string name, ITemplateLinker linker)
+            {
+                if (container == null || linker == null)
+                    throw new Exception("A valid ShaderContainer and ITemplateLinker must be provided to create a Template Builder.");
+
+                this.container = container;
+                this.Name = name;
+                this.linker = linker;
+            }
+
+            public void AddPass(TemplatePass pass)
+            {
+                passes.Add(pass);
+            }
+
+            public void AddTagDescriptor(TagDescriptor tagDescriptor)
+            {
+                tagDescriptors.Add(tagDescriptor);
+            }
+
+            public Template Build()
+            {
+                var templateInternal = new TemplateInternal()
+                {
+                    m_NameHandle = container.AddString(Name),
+                    m_AdditionalShaderIDStringHandle = container.AddString(AdditionalShaderID),
+                    m_LinkerHandle = container.AddTemplateLinker(linker)
+                };
+
+                templateInternal.m_PassListHandle = FixedHandleListInternal.Build(container, passes, (p) => (p.handle));
+                templateInternal.m_TagDescriptorListHandle = FixedHandleListInternal.Build(container, tagDescriptors, (t) => (t.handle));
+
+                var returnTypeHandle = container.AddTemplateInternal(templateInternal);
+                return new Template(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/TemplateInstance.cs b/Modules/ShaderFoundry/ScriptBindings/TemplateInstance.cs
new file mode 100644
index 0000000000..9c7aec4d00
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/TemplateInstance.cs
@@ -0,0 +1,118 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine.Bindings;
+using System.Runtime.InteropServices;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/TemplateInstance.h")]
+    internal struct TemplateInstanceInternal
+    {
+        internal FoundryHandle m_TemplateHandle;
+        internal FoundryHandle m_CustomizationPointListHandle;
+        internal FoundryHandle m_TagDescriptorListHandle;
+
+        internal extern static TemplateInstanceInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct TemplateInstance : IEquatable<TemplateInstance>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly TemplateInstanceInternal templateInstance;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+
+        public Template Template
+        {
+            get
+            {
+                var localContainer = container;
+                return new Template(localContainer, templateInstance.m_TemplateHandle);
+            }
+        }
+
+        public IEnumerable<CustomizationPointInstance> CustomizationPointInstances
+        {
+            get
+            {
+                var localContainer = Container;
+                var blockHandles = new FixedHandleListInternal(templateInstance.m_CustomizationPointListHandle);
+                return blockHandles.Select(localContainer, (handle) => (new CustomizationPointInstance(localContainer, handle)));
+            }
+        }
+
+        public IEnumerable<TagDescriptor> TagDescriptors
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(templateInstance.m_TagDescriptorListHandle);
+                return list.Select(localContainer, (handle) => (new TagDescriptor(localContainer, handle)));
+            }
+        }
+
+        // private
+        internal TemplateInstance(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.templateInstance = container?.GetTemplateInstance(handle) ?? TemplateInstanceInternal.Invalid();
+        }
+
+        public static TemplateInstance Invalid => new TemplateInstance(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is TemplateInstance other && this.Equals(other);
+        public bool Equals(TemplateInstance other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(TemplateInstance lhs, TemplateInstance rhs) => lhs.Equals(rhs);
+        public static bool operator!=(TemplateInstance lhs, TemplateInstance rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            ShaderContainer container;
+            Template template = Template.Invalid;
+            public List<CustomizationPointInstance> customizationPointInstances = new List<CustomizationPointInstance>();
+            List<TagDescriptor> tagDescriptors = new List<TagDescriptor>();
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container, Template template)
+            {
+                this.container = container;
+                this.template = template;
+            }
+
+            public void AddCustomizationPointInstance(CustomizationPointInstance customizationPointInstance)
+            {
+                customizationPointInstances.Add(customizationPointInstance);
+            }
+
+            public void AddTagDescriptor(TagDescriptor tagDescriptor)
+            {
+                tagDescriptors.Add(tagDescriptor);
+            }
+
+            public TemplateInstance Build()
+            {
+                var templateInstanceInternal = new TemplateInstanceInternal();
+                templateInstanceInternal.m_TemplateHandle = template.handle;
+                templateInstanceInternal.m_CustomizationPointListHandle = FixedHandleListInternal.Build(container, customizationPointInstances, (o) => (o.handle));
+                templateInstanceInternal.m_TagDescriptorListHandle = FixedHandleListInternal.Build(container, tagDescriptors, (o) => (o.handle));
+
+                var returnTypeHandle = container.AddTemplateInstanceInternal(templateInstanceInternal);
+                return new TemplateInstance(container, returnTypeHandle);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/TemplatePass.binding.cs b/Modules/ShaderFoundry/ScriptBindings/TemplatePass.binding.cs
new file mode 100644
index 0000000000..0459d4cee7
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/TemplatePass.binding.cs
@@ -0,0 +1,176 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using UnityEngine.Bindings;
+using PassIdentifier = UnityEngine.Rendering.PassIdentifier;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/TemplatePass.h")]
+    internal struct TemplatePassInternal
+    {
+        internal FoundryHandle m_DisplayNameHandle;
+        internal FoundryHandle m_ReferenceNameHandle;
+        internal FoundryHandle m_PassIdentifierHandle;
+        internal FoundryHandle m_VertexStageElementListHandle;
+        internal FoundryHandle m_FragmentStageElementListHandle;
+        internal FoundryHandle m_TagDescriptorListHandle;
+
+        internal extern static TemplatePassInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct TemplatePass : IEquatable<TemplatePass>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly TemplatePassInternal templatePass;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+        public string DisplayName => container?.GetString(templatePass.m_DisplayNameHandle) ?? string.Empty;
+        public string ReferenceName => container?.GetString(templatePass.m_ReferenceNameHandle) ?? string.Empty;
+        // TODO SHADER: The else case should return invalid pass identifier once it's possible to construct this in managed.
+        public PassIdentifier PassIdentifier => container?.GetPassIdentifier(templatePass.m_PassIdentifierHandle) ?? new PassIdentifier();
+
+        public IEnumerable<TemplatePassStageElement> VertexStageElements => GetStageElements(templatePass.m_VertexStageElementListHandle);
+        public IEnumerable<TemplatePassStageElement> FragmentStageElements => GetStageElements(templatePass.m_FragmentStageElementListHandle);
+
+        IEnumerable<TemplatePassStageElement> GetStageElements(FoundryHandle stageElementListHandle)
+        {
+            var localContainer = Container;
+            var list = new FixedHandleListInternal(stageElementListHandle);
+            return list.Select(localContainer, (handle) => (new TemplatePassStageElement(localContainer, handle)));
+        }
+
+        public IEnumerable<TagDescriptor> TagDescriptors
+        {
+            get
+            {
+                var localContainer = Container;
+                var list = new FixedHandleListInternal(templatePass.m_TagDescriptorListHandle);
+                return list.Select(localContainer, (handle) => (new TagDescriptor(localContainer, handle)));
+            }
+        }
+
+        // private
+        internal TemplatePass(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.templatePass = container?.GetTemplatePass(handle) ?? TemplatePassInternal.Invalid();
+        }
+
+        public static TemplatePass Invalid => new TemplatePass(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is TemplatePass other && this.Equals(other);
+        public bool Equals(TemplatePass other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(TemplatePass lhs, TemplatePass rhs) => lhs.Equals(rhs);
+        public static bool operator!=(TemplatePass lhs, TemplatePass rhs) => !lhs.Equals(rhs);
+
+        public class Builder
+        {
+            internal class StageElement
+            {
+                internal BlockInstance BlockInstance = BlockInstance.Invalid;
+                internal CustomizationPoint CustomizationPoint = CustomizationPoint.Invalid;
+            }
+
+            ShaderContainer container;
+            string displayName;
+            string referenceName;
+            PassIdentifierInternal passIdentifier = new PassIdentifierInternal(uint.MaxValue, uint.MaxValue);
+            List<StageElement> vertexStageElements = new List<StageElement>();
+            List<StageElement> fragmentStageElements = new List<StageElement>();
+            List<TagDescriptor> tagDescriptors = new List<TagDescriptor>();
+
+            public string DisplayName { get { return displayName; } set { displayName = value; }}
+            public string ReferenceName { get { return referenceName; } set { referenceName = value; }}
+            public ShaderContainer Container => container;
+
+            public Builder(ShaderContainer container)
+            {
+                this.container = container;
+            }
+
+            public void SetPassIdentifier(uint subShaderIndex, uint passIndex)
+            {
+                passIdentifier = new PassIdentifierInternal(subShaderIndex, passIndex);
+            }
+
+            public void AddTagDescriptor(TagDescriptor tagDescriptor)
+            {
+                tagDescriptors.Add(tagDescriptor);
+            }
+
+            public void AppendBlockInstance(BlockInstance blockInstance, Rendering.ShaderType stageType)
+            {
+                List<StageElement> stageElements = GetElementsForStage(stageType);
+                if (stageElements == null)
+                    throw new Exception($"Stage {stageType} is not valid.");
+
+                stageElements.Add(new StageElement { BlockInstance = blockInstance });
+            }
+
+            public void AppendCustomizationPoint(CustomizationPoint customizationPoint, Rendering.ShaderType stageType)
+            {
+                List<StageElement> stageElements = GetElementsForStage(stageType);
+                if (stageElements == null)
+                    throw new Exception($"Stage {stageType} is not valid.");
+
+                // Make sure the customization point hasn't been added multiple times.
+                var element = stageElements.Find((e) => (e.CustomizationPoint == customizationPoint));
+                if (element != null)
+                    throw new Exception($"Customization point {customizationPoint.Name} cannot be added to a stage multiple times.");
+
+                stageElements.Add(new StageElement { CustomizationPoint = customizationPoint });
+            }
+
+            List<StageElement> GetElementsForStage(Rendering.ShaderType stageType)
+            {
+                if (stageType == Rendering.ShaderType.Vertex)
+                    return vertexStageElements;
+                else if (stageType == Rendering.ShaderType.Fragment)
+                    return fragmentStageElements;
+                return null;
+            }
+
+            public TemplatePass Build()
+            {
+                var templatePassInternal = new TemplatePassInternal()
+                {
+                    m_DisplayNameHandle = container.AddString(displayName),
+                    m_ReferenceNameHandle = container.AddString(referenceName),
+                };
+
+                templatePassInternal.m_PassIdentifierHandle = container.AddPassIdentifier(passIdentifier.SubShaderIndex, passIdentifier.PassIndex);
+                templatePassInternal.m_VertexStageElementListHandle = FixedHandleListInternal.Build(container, vertexStageElements, (e) => BuildStageElement(e));
+                templatePassInternal.m_FragmentStageElementListHandle = FixedHandleListInternal.Build(container, fragmentStageElements, (e) => BuildStageElement(e));
+                templatePassInternal.m_TagDescriptorListHandle = FixedHandleListInternal.Build(container, tagDescriptors, (o) => (o.handle));
+
+                var returnTypeHandle = container.AddTemplatePassInternal(templatePassInternal);
+                return new TemplatePass(container, returnTypeHandle);
+            }
+
+            FoundryHandle BuildStageElement(StageElement stageElement)
+            {
+                var blockInstanceHandle = stageElement.BlockInstance;
+                var customizationPointHandle = stageElement.CustomizationPoint;
+                var stageElementInternal = new TemplatePassStageElementInternal()
+                {
+                    m_BlockInstanceHandle = blockInstanceHandle.handle,
+                    m_CustomizationPointHandle = customizationPointHandle.handle,
+                };
+                return container.AddTemplatePassStageElementInternal(stageElementInternal);
+            }
+        }
+    }
+}
diff --git a/Modules/ShaderFoundry/ScriptBindings/TemplatePassStageElement.binding.cs b/Modules/ShaderFoundry/ScriptBindings/TemplatePassStageElement.binding.cs
new file mode 100644
index 0000000000..f8a36d217e
--- /dev/null
+++ b/Modules/ShaderFoundry/ScriptBindings/TemplatePassStageElement.binding.cs
@@ -0,0 +1,52 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Collections.Generic;
+using UnityEngine.Bindings;
+
+namespace UnityEditor.ShaderFoundry
+{
+    [NativeHeader("Modules/ShaderFoundry/Public/TemplatePassStageElement.h")]
+    internal struct TemplatePassStageElementInternal
+    {
+        internal FoundryHandle m_BlockInstanceHandle;
+        internal FoundryHandle m_CustomizationPointHandle;
+
+        internal extern static TemplatePassStageElementInternal Invalid();
+        internal extern bool IsValid();
+    }
+
+    [FoundryAPI]
+    internal readonly struct TemplatePassStageElement : IEquatable<TemplatePassStageElement>
+    {
+        // data members
+        readonly ShaderContainer container;
+        readonly internal FoundryHandle handle;
+        readonly TemplatePassStageElementInternal templatePassStageElement;
+
+        // public API
+        public ShaderContainer Container => container;
+        public bool IsValid => (container != null && handle.IsValid);
+        public BlockInstance BlockInstance => new BlockInstance(container, templatePassStageElement.m_BlockInstanceHandle);
+        public CustomizationPoint CustomizationPoint => new CustomizationPoint(container, templatePassStageElement.m_CustomizationPointHandle);
+
+        // private
+        internal TemplatePassStageElement(ShaderContainer container, FoundryHandle handle)
+        {
+            this.container = container;
+            this.handle = handle;
+            this.templatePassStageElement = container?.GetTemplatePassStageElement(handle) ?? TemplatePassStageElementInternal.Invalid();
+        }
+
+        public static TemplatePassStageElement Invalid => new TemplatePassStageElement(null, FoundryHandle.Invalid());
+
+        // Equals and operator == implement Reference Equality.  ValueEquals does a deep compare if you need that instead.
+        public override bool Equals(object obj) => obj is TemplatePassStageElement other && this.Equals(other);
+        public bool Equals(TemplatePassStageElement other) => EqualityChecks.ReferenceEquals(this.handle, this.container, other.handle, other.container);
+        public override int GetHashCode() => (container, handle).GetHashCode();
+        public static bool operator==(TemplatePassStageElement lhs, TemplatePassStageElement rhs) => lhs.Equals(rhs);
+        public static bool operator!=(TemplatePassStageElement lhs, TemplatePassStageElement rhs) => !lhs.Equals(rhs);
+    }
+}
diff --git a/Modules/SharedInternals/BindingsAttributes.cs b/Modules/SharedInternals/BindingsAttributes.cs
index 09def9dc1c..9437f78458 100644
--- a/Modules/SharedInternals/BindingsAttributes.cs
+++ b/Modules/SharedInternals/BindingsAttributes.cs
@@ -466,4 +466,26 @@ public PreventReadOnlyInstanceModificationAttribute()
         {
         }
     }
+
+
+    [VisibleToOtherModules]
+    interface IBindingsMarshalAsSpan
+    {
+        bool IsReadOnly { get; }
+        string SizeParameter { get; }
+    }
+
+    [VisibleToOtherModules]
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple =false, Inherited = false)]
+    class SpanAttribute : Attribute, IBindingsMarshalAsSpan
+    {
+        public bool IsReadOnly { get; }
+        public string SizeParameter { get; }
+
+        public SpanAttribute(string sizeParameter, bool isReadOnly = false)
+        {
+            SizeParameter = sizeParameter;
+            IsReadOnly = isReadOnly;
+        }
+    }
 }
diff --git a/Modules/UIServiceEditor/ShortcutManager/ShortcutManagerWindowView.cs b/Modules/ShortcutManager/ShortcutManagerWindowView.cs
similarity index 99%
rename from Modules/UIServiceEditor/ShortcutManager/ShortcutManagerWindowView.cs
rename to Modules/ShortcutManager/ShortcutManagerWindowView.cs
index 079654af1e..5204763fcc 100644
--- a/Modules/UIServiceEditor/ShortcutManager/ShortcutManagerWindowView.cs
+++ b/Modules/ShortcutManager/ShortcutManagerWindowView.cs
@@ -464,11 +464,11 @@ void BuildVisualElementHierarchyRoot()
             m_ShortcutsTable = new ListView((IList)m_ViewController.GetShortcutList(), k_ListItemHeight,  MakeItemForShortcutTable, BindShortcutEntryItem) {name = "shortcutsTable"};
 
             m_CategoryTreeView.selectedIndex = m_ViewController.selectedCategoryIndex;
-            m_CategoryTreeView.onSelectionChange += CategorySelectionChanged;
+            m_CategoryTreeView.selectionChanged += CategorySelectionChanged;
 
             m_ShortcutsTable.Q<ScrollView>().verticalScrollerVisibility = ScrollerVisibility.AlwaysVisible;
-            m_ShortcutsTable.onSelectionChange += ShortcutSelectionChanged;
-            m_ShortcutsTable.onItemsChosen += ShortcutTableEntryChosen;
+            m_ShortcutsTable.selectionChanged += ShortcutSelectionChanged;
+            m_ShortcutsTable.itemsChosen += ShortcutTableEntryChosen;
             m_ShortcutsTable.RegisterCallback<MouseDownEvent>(ShortcutTableRightClickDown);
             m_ShortcutsTable.RegisterCallback<MouseUpEvent>(ShortcutTableRightClickUp);
             m_ShortcutsTable.RegisterCallback<GeometryChangedEvent>(ShortcutTableGeometryChanged);
@@ -1385,6 +1385,11 @@ protected override List<KeyCombination> StringToValue(string str)
         {
             return default;
         }
+
+        internal override void UpdateValueFromText()
+        {
+            // Do nothing. There's no text-to-value conversion here.
+        }
     }
 
     internal class ShortcutSearchField : SearchFieldBase<ShortcutTextField, List<KeyCombination>>
diff --git a/Modules/ShortcutManagerEditor/ShortcutController.cs b/Modules/ShortcutManagerEditor/ShortcutController.cs
index 3702ee7e83..6c2c17ca5f 100644
--- a/Modules/ShortcutManagerEditor/ShortcutController.cs
+++ b/Modules/ShortcutManagerEditor/ShortcutController.cs
@@ -25,6 +25,8 @@ interface IAvailableShortcutsChangedNotifier
     [InitializeOnLoad]
     static class ShortcutIntegration
     {
+        static string kIgnoreWhenPlayModeFocused = "GameView.IgnoreWhenPlayModeFocused";
+
         class LastUsedProfileIdProvider : ILastUsedProfileIdProvider
         {
             static string lastUsedProfileIdEditorPrefKey => $"ShortcutManagement_LastUsedShortcutProfileId_{ModeService.currentId}";
@@ -78,6 +80,22 @@ internal static bool enabled
             }
         }
 
+        public static bool ignoreWhenPlayModeFocused
+        {
+            get
+            {
+                return s_IgnoreWhenPlayModeFocused;
+            }
+            set
+            {
+                if (s_IgnoreWhenPlayModeFocused == value) return;
+                EditorPrefs.SetBool(kIgnoreWhenPlayModeFocused, value);
+                s_IgnoreWhenPlayModeFocused = value;
+            }
+
+        }
+        internal static bool s_IgnoreWhenPlayModeFocused;
+
         [RequiredByNativeCode]
         internal static void SetShortcutIntegrationEnabled(bool enable)
         {
@@ -104,6 +122,7 @@ static bool HasAnyEntriesHandler()
 
         static void EventHandler()
         {
+            if (s_IgnoreWhenPlayModeFocused && EditorWindow.focusedWindow is GameView && Application.isPlaying) return;
             instance.contextManager.SetFocusedWindow(EditorWindow.focusedWindow);
             instance.HandleKeyEvent(Event.current);
         }
@@ -135,6 +154,7 @@ static void InitializeController()
             s_Instance.trigger.invokingAction += OnInvokingAction;
 
             enabled = true;
+            ignoreWhenPlayModeFocused = EditorPrefs.GetBool(kIgnoreWhenPlayModeFocused, false);
             EditorApplication.doPressedKeysTriggerAnyShortcut += HasAnyEntriesHandler;
             EditorApplication.focusChanged += OnFocusChanged;
         }
diff --git a/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs b/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs
index a30c833172..abb9e04547 100644
--- a/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs
+++ b/Modules/ShortcutManagerEditor/ShortcutManagerWindow.cs
@@ -184,7 +184,7 @@ void OnEnable()
             var profileManager = ShortcutIntegration.instance.profileManager;
             var bindingValidator = ShortcutIntegration.instance.bindingValidator;
             m_ViewController = new ShortcutManagerWindowViewController(m_State, directory, bindingValidator, profileManager, contextManager, ShortcutIntegration.instance);
-            var view = EditorUIService.instance.CreateShortcutManagerWindowView(m_ViewController, m_ViewController);
+            var view = new ShortcutManagerWindowView(m_ViewController, m_ViewController);
             m_ViewController.SetView(view);
 
             var root = view.GetVisualElementHierarchyRoot();
diff --git a/Modules/StyleSheetsEditor/Converters/ConverterUtils.cs b/Modules/StyleSheetsEditor/Converters/ConverterUtils.cs
index 5bf15c244a..6c87fb3a4d 100644
--- a/Modules/StyleSheetsEditor/Converters/ConverterUtils.cs
+++ b/Modules/StyleSheetsEditor/Converters/ConverterUtils.cs
@@ -9,6 +9,7 @@
 using System.Reflection;
 using System.Text;
 using UnityEditor.Experimental;
+using UnityEditor.UIElements.StyleSheets;
 using UnityEngine;
 using UnityEngine.UIElements;
 using UnityEngine.UIElements.StyleSheets;
@@ -827,7 +828,16 @@ internal static StyleSheetResolver ResolveFromSheetsFolder(IEnumerable<string> f
 
         internal static StyleSheet CompileStyleSheetContent(string styleSheetContent, bool disableValidation = true, bool reportErrors = false)
         {
-            return EditorUIService.instance.CompileStyleSheetContent(styleSheetContent, disableValidation, reportErrors);
+            var importer = new StyleSheetImporterImpl();
+            var styleSheet = ScriptableObject.CreateInstance<StyleSheet>();
+            importer.disableValidation = disableValidation;
+            importer.Import(styleSheet, styleSheetContent);
+            if (reportErrors)
+            {
+                foreach (var err in importer.importErrors)
+                    Debug.LogFormat(LogType.Warning, LogOption.NoStacktrace, styleSheet, err.ToString());
+            }
+            return styleSheet;
         }
     }
 }
diff --git a/Modules/Terrain/Public/TerrainData.bindings.cs b/Modules/Terrain/Public/TerrainData.bindings.cs
index 7c2d7816c3..f23b7ffc54 100644
--- a/Modules/Terrain/Public/TerrainData.bindings.cs
+++ b/Modules/Terrain/Public/TerrainData.bindings.cs
@@ -75,6 +75,12 @@ public enum DetailRenderMode
         Grass = 2
     }
 
+    public enum DetailScatterMode
+    {
+        CoverageMode = 0,
+        InstanceCountMode = 1
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     [NativeHeader("TerrainScriptingClasses.h")]
     [NativeHeader("Modules/Terrain/Public/TerrainDataScriptingInterface.h")]
@@ -94,10 +100,13 @@ public sealed partial class DetailPrototype
         internal float m_MaxHeight = 2F;
         internal int m_NoiseSeed = 0;
         internal float m_NoiseSpread = 0.1F;
+        internal float m_Density = 1.0F;
         internal float m_HoleEdgePadding = 0.0F;
         internal int m_RenderMode = 2;
         internal int m_UsePrototypeMesh = 0;
         internal int m_UseInstancing = 0;
+        internal float m_AlignToGround = 0;
+        internal float m_PositionOrderliness = 0;
 
         public GameObject prototype { get { return m_Prototype; } set { m_Prototype = value; } }
 
@@ -115,6 +124,8 @@ public sealed partial class DetailPrototype
 
         public float noiseSpread { get { return m_NoiseSpread; } set { m_NoiseSpread = value; } }
 
+        public float density { get { return m_Density; } set { m_Density = value; } }
+
         [Obsolete("bendFactor has no effect and is deprecated.", false)]
         public float bendFactor { get { return 0.0f; } set {} }
 
@@ -130,6 +141,10 @@ public sealed partial class DetailPrototype
 
         public bool useInstancing { get { return m_UseInstancing != 0; } set { m_UseInstancing = value ? 1 : 0; } }
 
+        public float alignToGround { get { return m_AlignToGround; } set { m_AlignToGround = value; } }
+
+        public float positionOrderliness { get { return m_PositionOrderliness; } set { m_PositionOrderliness = value; } }
+
         public DetailPrototype() {}
 
         public DetailPrototype(DetailPrototype other)
@@ -144,10 +159,13 @@ public DetailPrototype(DetailPrototype other)
             m_MaxHeight = other.m_MaxHeight;
             m_NoiseSeed = other.m_NoiseSeed;
             m_NoiseSpread = other.m_NoiseSpread;
+            m_Density = other.m_Density;
             m_HoleEdgePadding = other.m_HoleEdgePadding;
             m_RenderMode = other.m_RenderMode;
             m_UsePrototypeMesh = other.m_UsePrototypeMesh;
             m_UseInstancing = other.m_UseInstancing;
+            m_AlignToGround = other.m_AlignToGround;
+            m_PositionOrderliness = other.m_PositionOrderliness;
         }
 
         public override bool Equals(object obj)
@@ -181,6 +199,7 @@ private bool Equals(DetailPrototype other)
                 && m_MaxHeight == other.m_MaxHeight
                 && m_NoiseSeed == other.m_NoiseSeed
                 && m_NoiseSpread == other.m_NoiseSpread
+                && m_Density == other.m_Density
                 && m_HoleEdgePadding == other.m_HoleEdgePadding
                 && m_RenderMode == other.m_RenderMode
                 && m_UsePrototypeMesh == other.m_UsePrototypeMesh
@@ -318,7 +337,7 @@ private enum BoundaryValueType
             MinDetailResPerPatch = 1,
             MaxDetailResPerPatch = 2,
             MaxDetailPatchCount = 3,
-            MaxDetailsPerRes = 4,
+            MaxCoveragePerRes = 4,
             MinAlphamapRes = 5,
             MaxAlphamapRes = 6,
             MinBaseMapRes = 7,
@@ -333,7 +352,6 @@ private enum BoundaryValueType
         internal static readonly int k_MinimumDetailResolutionPerPatch = GetBoundaryValue(BoundaryValueType.MinDetailResPerPatch);
         internal static readonly int k_MaximumDetailResolutionPerPatch = GetBoundaryValue(BoundaryValueType.MaxDetailResPerPatch);
         internal static readonly int k_MaximumDetailPatchCount = GetBoundaryValue(BoundaryValueType.MaxDetailPatchCount);
-        internal static readonly int k_MaximumDetailsPerRes = GetBoundaryValue(BoundaryValueType.MaxDetailsPerRes);
         internal static readonly int k_MinimumAlphamapResolution = GetBoundaryValue(BoundaryValueType.MinAlphamapRes);
         internal static readonly int k_MaximumAlphamapResolution = GetBoundaryValue(BoundaryValueType.MaxAlphamapRes);
         internal static readonly int k_MinimumBaseMapResolution = GetBoundaryValue(BoundaryValueType.MinBaseMapRes);
@@ -680,9 +698,10 @@ extern public int detailHeight
             get;
         }
 
-        internal static int maxDetailsPerRes
+        extern public int maxDetailScatterPerRes
         {
-            get { return k_MaximumDetailsPerRes; }
+            [NativeName(k_DetailDatabasePrefix + "GetMaximumScatterPerRes")]
+            get;
         }
 
         public void SetDetailResolution(int detailResolution, int resolutionPerPatch)
@@ -712,6 +731,14 @@ public void SetDetailResolution(int detailResolution, int resolutionPerPatch)
         [NativeName(k_DetailDatabasePrefix + "SetDetailResolution")]
         extern private void Internal_SetDetailResolution(int patchCount, int resolutionPerPatch);
 
+        public void SetDetailScatterMode(DetailScatterMode scatterMode)
+        {
+            Internal_SetDetailScatterMode(scatterMode);
+        }
+
+        [NativeName(k_DetailDatabasePrefix + "SetDetailScatterMode")]
+        extern private void Internal_SetDetailScatterMode(DetailScatterMode scatterMode);
+
         extern public int detailPatchCount
         {
             [NativeName(k_DetailDatabasePrefix + "GetPatchCount")]
@@ -730,6 +757,12 @@ extern public int detailResolutionPerPatch
             get;
         }
 
+        extern public DetailScatterMode detailScatterMode
+        {
+            [NativeName(k_DetailDatabasePrefix + "GetDetailScatterMode")]
+            get;
+        }
+
         [NativeName(k_DetailDatabasePrefix + "ResetDirtyDetails")]
         extern internal void ResetDirtyDetails();
 
diff --git a/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs b/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs
index 184d8e5d75..bbce85f955 100644
--- a/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs
+++ b/Modules/TerrainEditor/PaintTools/CreateTerrainTool.cs
@@ -120,6 +120,7 @@ Terrain CreateNeighbor(Terrain parent, Vector3 position)
                 terrainData.terrainLayers = newarray;
             }
             terrainData.SetDetailResolution(parent.terrainData.detailResolution, parent.terrainData.detailResolutionPerPatch);
+            terrainData.SetDetailScatterMode(parent.terrainData.detailScatterMode);
             terrainData.wavingGrassSpeed = parent.terrainData.wavingGrassSpeed;
             terrainData.wavingGrassAmount = parent.terrainData.wavingGrassAmount;
             terrainData.wavingGrassStrength = parent.terrainData.wavingGrassStrength;
diff --git a/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs b/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs
index 44215719ca..4a9b100421 100644
--- a/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs
+++ b/Modules/TerrainEditor/PaintTools/PaintDetailsTool.cs
@@ -119,7 +119,7 @@ public static int CopyDetailPrototype(Terrain terrain, Terrain sourceTerrain, in
 
         public static int GetMaxDetailInstances(TerrainData terrainData)
         {
-            return terrainData.detailResolutionPerPatch * terrainData.detailResolutionPerPatch * TerrainData.maxDetailsPerRes;
+            return terrainData.detailResolutionPerPatch * terrainData.detailResolutionPerPatch * terrainData.maxDetailScatterPerRes;
         }
     }
 
@@ -156,7 +156,10 @@ public float detailStrength
             }
             set
             {
-                m_DetailsStrength = Mathf.Clamp01(Mathf.Round(value * TerrainData.maxDetailsPerRes) / TerrainData.maxDetailsPerRes);
+                m_DetailsStrength = m_TargetTerrain == null || m_TargetTerrain.terrainData == null ?
+                    value :
+                    Mathf.Clamp01(Mathf.Round(value * m_TargetTerrain.terrainData.maxDetailScatterPerRes) / m_TargetTerrain.terrainData.maxDetailScatterPerRes);
+
             }
         }
 
@@ -259,8 +262,8 @@ public override bool OnPaint(Terrain terrain, IOnPaint editContext)
                                 int yBrushOffset = (ymin + y) - (yCenter - intRadius + intFraction);
                                 float opa = detailOpacity * m_BrushRep.GetStrengthInt(xBrushOffset, yBrushOffset);
 
-                                float targetValue = Mathf.Lerp(alphamap[y, x], targetStrength * TerrainData.maxDetailsPerRes, opa);
-                                alphamap[y, x] = Mathf.Min(Mathf.RoundToInt(targetValue - .5f + Random.value), TerrainData.maxDetailsPerRes);
+                                float targetValue = Mathf.Lerp(alphamap[y, x], targetStrength * terrainData.maxDetailScatterPerRes, opa);
+                                alphamap[y, x] = Mathf.Min(Mathf.RoundToInt(targetValue - .5f + Random.value), terrainData.maxDetailScatterPerRes);
                             }
                         }
 
diff --git a/Modules/TerrainEditor/TerrainInspector.cs b/Modules/TerrainEditor/TerrainInspector.cs
index c729c8c077..d511b0df69 100644
--- a/Modules/TerrainEditor/TerrainInspector.cs
+++ b/Modules/TerrainEditor/TerrainInspector.cs
@@ -11,6 +11,7 @@ GUILayout.TextureGrid number of horiz elements doesn't work
 using UnityEngine.Rendering;
 using UnityEditor.AnimatedValues;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using UnityEditor.ShortcutManagement;
 using UnityEngine.TerrainTools;
@@ -187,6 +188,7 @@ class Styles
             public readonly GUIContent drawTrees = EditorGUIUtility.TrTextContent("Draw", "Should trees, grass and details be drawn?");
             public readonly GUIContent detailObjectDistance = EditorGUIUtility.TrTextContent("Detail Distance", "The distance (from camera) beyond which details will be culled.");
             public readonly GUIContent detailObjectDensity = EditorGUIUtility.TrTextContent("Detail Density", "The number of detail/grass objects in a given unit of area. The value can be set lower to reduce rendering overhead.");
+            public readonly GUIContent detailScatterMode = EditorGUIUtility.TrTextContent("Detail Scatter Mode", "The scatter mode type to be used while painting details. Coverage paints areas detail should be populated in based on their density setting, Instance Count paints the amount per sample.");
             public readonly GUIContent treeDistance = EditorGUIUtility.TrTextContent("Tree Distance", "The distance (from camera) beyond which trees will be culled. For SpeedTree trees this parameter is controlled by the LOD group settings.");
             public readonly GUIContent treeBillboardDistance = EditorGUIUtility.TrTextContent("Billboard Start", "The distance (from camera) at which 3D tree objects will be replaced by billboard images. For SpeedTree trees this parameter is controlled by the LOD group settings.");
             public readonly GUIContent treeCrossFadeLength = EditorGUIUtility.TrTextContent("Fade Length", "Distance over which trees will transition between 3D objects and billboards. For SpeedTree trees this parameter is controlled by the LOD group settings.");
@@ -976,6 +978,12 @@ private void CheckToolActivation()
                 {
                     SetCurrentPaintToolActive();
                 }
+
+                if (m_Terrain != null)
+                {
+                    // When switching tool reactivate all renderflags
+                    m_Terrain.editorRenderFlags = TerrainRenderFlags.All;
+                }
             }
         }
 
@@ -991,9 +999,11 @@ public static void MenuButton(GUIContent title, string menuName, Terrain terrain
             }
         }
 
-        static Rect GetAspectRect(int elementCount, int approxSize, int extraLineHeight, out int itemsPerRow)
+        private static Rect GetAspectRect(int elementCount, int approxSize, int extraLineHeight, out int itemsPerRow)
         {
-            itemsPerRow = (int)Mathf.Ceil((EditorGUIUtility.currentViewWidth - 20) / approxSize);
+            // account for when currentViewWidth = 0
+            float editorWidth = EditorGUIUtility.currentViewWidth > 0f ? EditorGUIUtility.currentViewWidth : 240f;
+            itemsPerRow = Mathf.CeilToInt((editorWidth - 20) / approxSize);
             int yCount = (elementCount + itemsPerRow - 1) / itemsPerRow;
             Rect r1 = GUILayoutUtility.GetAspectRect(itemsPerRow / (float)yCount);
             Rect r2 = GUILayoutUtility.GetRect(10, extraLineHeight * yCount);
@@ -1395,6 +1405,7 @@ public void ShowSettings()
                 var treeBillboardDistance = EditorGUILayout.Slider(styles.treeBillboardDistance, m_Terrain.treeBillboardDistance, 5, 2000); // former string formatting: ""
                 var treeCrossFadeLength = EditorGUILayout.Slider(styles.treeCrossFadeLength, m_Terrain.treeCrossFadeLength, 0, 200); // former string formatting: ""
                 var treeMaximumFullLODCount = EditorGUILayout.IntSlider(styles.treeMaximumFullLODCount, m_Terrain.treeMaximumFullLODCount, 0, 10000);
+                var detailScatterMode = (DetailScatterMode)EditorGUILayout.EnumPopup(styles.detailScatterMode, m_Terrain.terrainData.detailScatterMode);
 
                 // Only do this check once per frame.
                 if (Event.current.type == EventType.Layout)
@@ -1428,6 +1439,23 @@ public void ShowSettings()
                     m_Terrain.treeCrossFadeLength = treeCrossFadeLength;
                     m_Terrain.treeMaximumFullLODCount = treeMaximumFullLODCount;
 
+                    if (m_Terrain.terrainData.detailScatterMode != detailScatterMode)
+                    {
+                        if (detailScatterMode == DetailScatterMode.CoverageMode)
+                        {
+                            ResampleDetailResolution(terrainData, terrainData.detailResolution, terrainData.detailResolutionPerPatch, detailScatterMode);
+                        }
+                        else if (EditorUtility.DisplayDialog(
+                            L10n.Tr("Change Detail Scatter Mode"),
+                            L10n.Tr("Changing detail scatter mode to \"Instance count\" will erase existing detail placements. This action is undoable. Do you wish to continue?"),
+                            L10n.Tr("Yes"),
+                            L10n.Tr("No"))
+                            )
+                        {
+                            m_Terrain.terrainData.SetDetailScatterMode(detailScatterMode);
+                        }
+                    }
+
                     MarkDirty(m_Terrain);
                 }
                 --EditorGUI.indentLevel;
@@ -1824,7 +1852,7 @@ public void ShowResolution(TerrainData terrainData)
                 }
 
                 if (resolutionChanged || resolutionPerPatchChanged)
-                    ResizeDetailResolution(terrainData, detailResolution, detailResolutionPerPatch);
+                    ResampleDetailResolution(terrainData, detailResolution, detailResolutionPerPatch);
 
                 MarkTerrainDataDirty();
                 m_Terrain.Flush();
@@ -1866,22 +1894,71 @@ public void ShowHolesSettings(TerrainData terrainData)
             EditorGUILayout.EndFoldoutHeaderGroup();
         }
 
-        void ResizeDetailResolution(TerrainData terrainData, int resolution, int resolutionPerPatch)
-        {
-            if (resolution == terrainData.detailResolution)
-            {
-                var layers = new List<int[, ]>();
-                for (int i = 0; i < terrainData.detailPrototypes.Length; i++)
-                    layers.Add(terrainData.GetDetailLayer(0, 0, terrainData.detailWidth, terrainData.detailHeight, i));
+        void ResampleDetailResolution(TerrainData terrainData, int resolution, int resolutionPerPatch, DetailScatterMode? scatterMode = null)
+        {
+            var layers = new List<byte[]>();
+            int originalResolution = terrainData.detailResolution;
+            int oldWidth = terrainData.detailWidth;
+            int oldHeight = terrainData.detailHeight;
+            // Store texture versions of outdated detail map
+            for (int i = 0; i < terrainData.detailPrototypes.Length; i++)
+            {
+                byte[] detailArray = terrainData
+                    .GetDetailLayer(0, 0, oldWidth, oldHeight, i)
+                    .Cast<int>().Select<int, byte>(v =>
+                        terrainData.detailScatterMode == DetailScatterMode.InstanceCountMode
+                        ? (byte)(Math.Min(v * 16, 255))
+                        : (byte)v)
+                    .ToArray();
+                layers.Add(detailArray);
+            }
+
+            // resize (and clear) detail maps
+            terrainData.SetDetailResolution(resolution, resolutionPerPatch);
+            if (scatterMode.HasValue)
+                terrainData.SetDetailScatterMode(scatterMode.Value);
+
+            for (int i = 0; i < layers.Count; i++)
+            {
+                Texture2D detailTexture = new Texture2D(oldWidth, oldHeight, TextureFormat.R8, false);
+                detailTexture.filterMode = FilterMode.Bilinear;
+                detailTexture.SetPixelData(layers[i], 0);
+                detailTexture.Apply(false);
+
+                int width = terrainData.detailWidth;
+                int height = terrainData.detailHeight;
+
+                // blit old detail map textures to target sized RT
+                RenderTexture rt = RenderTexture.GetTemporary(width, height);
+                rt.filterMode = FilterMode.Bilinear;
+                RenderTexture.active = rt;
+                Graphics.Blit(detailTexture, rt);
+                Texture2D resizedTex = new Texture2D(width, height);
+                resizedTex.ReadPixels(new Rect(0, 0, width, height), 0,0);
+                resizedTex.Apply();
+                RenderTexture.active = null;
+                RenderTexture.ReleaseTemporary(rt);
+
+                float resampleRatio = terrainData.detailScatterMode == DetailScatterMode.CoverageMode
+                ? 1.0f
+                : (float)originalResolution / resolution;
+                resampleRatio *= resampleRatio;
+
+                // Get pixel data from resulting blit and copy to detail maps
+                int[] values = resizedTex.GetPixels()
+                    .Select<Color, int>(c =>
+                    {
+                        int detailAmt = Mathf.CeilToInt(terrainData.maxDetailScatterPerRes * c.r);
+                        return Mathf.CeilToInt(detailAmt * resampleRatio);
+                    })
+                    .ToArray<int>();
 
-                terrainData.SetDetailResolution(resolution, resolutionPerPatch);
+                var detailArray = new int[width, height];
+                Buffer.BlockCopy(values, 0, detailArray, 0, width * height * sizeof(int));
+                terrainData.SetDetailLayer(0, 0, i, detailArray);
 
-                for (int i = 0; i < layers.Count; i++)
-                    terrainData.SetDetailLayer(0, 0, i, layers[i]);
-            }
-            else
-            {
-                terrainData.SetDetailResolution(resolution, resolutionPerPatch);
+                DestroyImmediate(detailTexture);
+                DestroyImmediate(resizedTex);
             }
         }
 
@@ -2275,6 +2352,12 @@ private bool RaycastAllTerrains(out Terrain hitTerrain, out RaycastHit raycastHi
 
         public void OnSceneGUICallback(SceneView sceneView)
         {
+            if (selectedTool == TerrainTool.None && m_PreviousSelectedTool != TerrainTool.None)
+            {
+                // if we switch the active scene tool while painting we still need to update the terrains. ( case 1394295 )
+                PaintContext.ApplyDelayedActions();
+            }
+
             Initialize();
 
             if (selectedTool == TerrainTool.None)
diff --git a/Modules/TerrainEditor/TerrainWizards.cs b/Modules/TerrainEditor/TerrainWizards.cs
index 6554d9ace4..5c3c4df024 100644
--- a/Modules/TerrainEditor/TerrainWizards.cs
+++ b/Modules/TerrainEditor/TerrainWizards.cs
@@ -504,7 +504,10 @@ internal class DetailWizardSharedStyles
         public readonly GUIStyle helpBoxBig;
         public readonly GUIContent noiseSeed = EditorGUIUtility.TrTextContent("Noise Seed", "Specifies the random seed value for detail object placement.");
         public readonly GUIContent noiseSpread = EditorGUIUtility.TrTextContent("Noise Spread", "Controls the spatial frequency of the noise pattern used to vary the scale and color of the detail objects.");
+        public readonly GUIContent detailDensity = EditorGUIUtility.TrTextContent("Detail density", "Controls detail density for this detail prototype, relative to it's size. Only enabled in \"Coverage\" detail scatter mode.");
         public readonly GUIContent holeEdgePadding = EditorGUIUtility.TrTextContent("Hole Edge Padding (%)", "Controls how far away detail objects are from the edge of the hole area.\n\nSpecify this value as a percentage of the detail width, which determines the radius of the circular area around the detail object used for hole testing.");
+        public readonly GUIContent alignToGround = EditorGUIUtility.TrTextContent("Align To Ground (%)", "Rotate detail axis to ground normal direction.");
+        public readonly GUIContent positionOrderliness = EditorGUIUtility.TrTextContent("Position Orderliness (%)", "Controls how to generate position between random and quasirandom. \n\nquasirandom prevents instances from overlapping each other.");
 
         public DetailWizardSharedStyles()
         {
@@ -542,11 +545,14 @@ class DetailMeshWizard : TerrainWizard
         public float        m_MaxHeight;
         public int          m_NoiseSeed;
         public float        m_NoiseSpread;
+        public float        m_detailDensity;
         public float        m_HoleEdgePadding;
         public Color        m_HealthyColor;
         public Color        m_DryColor;
         public DetailMeshRenderMode m_RenderMode;
         public bool         m_UseInstancing;
+        public float        m_AlignToGround;
+        public float        m_PositionOrderliness;
 
         private int     m_PrototypeIndex = -1;
 
@@ -580,6 +586,7 @@ internal void InitializeDefaults(Terrain terrain, int index)
             m_MaxHeight = prototype.maxHeight;
             m_NoiseSeed = prototype.noiseSeed;
             m_NoiseSpread = prototype.noiseSpread;
+            m_detailDensity = prototype.density;
             m_HoleEdgePadding = Mathf.Clamp01(prototype.holeEdgePadding) * 100.0f;
             m_HealthyColor = prototype.healthyColor;
             m_DryColor = prototype.dryColor;
@@ -597,6 +604,8 @@ internal void InitializeDefaults(Terrain terrain, int index)
                     break;
             }
             m_UseInstancing = prototype.useInstancing;
+            m_AlignToGround = Mathf.Clamp01(prototype.alignToGround) * 100.0f;
+            m_PositionOrderliness = Mathf.Clamp01(prototype.positionOrderliness) * 100.0f;
 
             OnWizardUpdate();
         }
@@ -617,11 +626,14 @@ DetailPrototype MakePrototype()
                 noiseSeed = m_NoiseSeed,
                 noiseSpread = m_NoiseSpread,
                 holeEdgePadding = m_HoleEdgePadding / 100.0f,
+                density = m_detailDensity,
                 healthyColor = m_HealthyColor,
                 dryColor = m_DryColor,
                 renderMode = ComputeRenderMode(),
                 usePrototypeMesh = true,
                 useInstancing = m_UseInstancing,
+                alignToGround = m_AlignToGround / 100.0f,
+                positionOrderliness = m_PositionOrderliness / 100.0f
             };
         }
 
@@ -678,6 +690,8 @@ protected override bool DrawWizardGUI()
             EditorGUI.BeginChangeCheck();
 
             m_DetailPrefab = EditorGUILayout.ObjectField("Detail Prefab", m_DetailPrefab, typeof(GameObject), !TerrainDataIsPersistent) as GameObject;
+            m_AlignToGround = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.alignToGround, m_AlignToGround, 0, 100);
+            m_PositionOrderliness = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.positionOrderliness, m_PositionOrderliness, 0, 100);
             m_MinWidth = EditorGUILayout.FloatField("Min Width", m_MinWidth);
             m_MaxWidth = EditorGUILayout.FloatField("Max Width", m_MaxWidth);
             m_MinHeight = EditorGUILayout.FloatField("Min Height", m_MinHeight);
@@ -686,6 +700,10 @@ protected override bool DrawWizardGUI()
             m_NoiseSpread = EditorGUILayout.FloatField(DetailWizardSharedStyles.Instance.noiseSpread, m_NoiseSpread);
             m_HoleEdgePadding = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.holeEdgePadding, m_HoleEdgePadding, 0, 100);
 
+            GUI.enabled = terrainData.detailScatterMode == DetailScatterMode.CoverageMode;
+            m_detailDensity = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.detailDensity, m_detailDensity, 0, 3);
+            GUI.enabled = true;
+
             if (!m_UseInstancing)
             {
                 m_HealthyColor = EditorGUILayout.ColorField("Healthy Color", m_HealthyColor);
@@ -721,10 +739,13 @@ class DetailTextureWizard : TerrainWizard
         public float        m_MaxHeight;
         public int          m_NoiseSeed;
         public float        m_NoiseSpread;
+        public float        m_detailDensity;
         public float        m_HoleEdgePadding;
         public Color        m_HealthyColor;
         public Color        m_DryColor;
         public bool         m_Billboard;
+        public float        m_AlignToGround;
+        public float        m_PositionOrderliness;
 
         private int      m_PrototypeIndex = -1;
 
@@ -757,10 +778,13 @@ internal void InitializeDefaults(Terrain terrain, int index)
             m_MaxHeight = prototype.maxHeight;
             m_NoiseSeed = prototype.noiseSeed;
             m_NoiseSpread = prototype.noiseSpread;
+            m_detailDensity = prototype.density;
             m_HoleEdgePadding = Mathf.Clamp01(prototype.holeEdgePadding) * 100.0f;
             m_HealthyColor = prototype.healthyColor;
             m_DryColor = prototype.dryColor;
             m_Billboard = prototype.renderMode == DetailRenderMode.GrassBillboard;
+            m_AlignToGround = Mathf.Clamp01(prototype.alignToGround) * 100.0f;
+            m_PositionOrderliness = Mathf.Clamp01(prototype.positionOrderliness) * 100.0f;
 
             OnWizardUpdate();
         }
@@ -780,12 +804,15 @@ DetailPrototype MakePrototype()
                 maxHeight = m_MaxHeight,
                 noiseSeed = m_NoiseSeed,
                 noiseSpread = m_NoiseSpread,
+                density = m_detailDensity,
                 holeEdgePadding = m_HoleEdgePadding / 100.0f,
                 healthyColor = m_HealthyColor,
                 dryColor = m_DryColor,
                 renderMode = ComputeRenderMode(),
                 usePrototypeMesh = false,
                 useInstancing = false,
+                alignToGround = m_AlignToGround / 100.0f,
+                positionOrderliness = m_PositionOrderliness / 100.0f
             };
         }
 
@@ -848,12 +875,18 @@ protected override bool DrawWizardGUI()
 
             Rect r = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight);
             m_DetailTexture = EditorGUI.ObjectField(r, "Detail Texture", m_DetailTexture, typeof(Texture2D), !TerrainDataIsPersistent) as Texture2D;
+
+            m_AlignToGround = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.alignToGround, m_AlignToGround, 0, 100);
+            m_PositionOrderliness = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.positionOrderliness, m_PositionOrderliness, 0, 100);
             m_MinWidth = EditorGUILayout.FloatField("Min Width", m_MinWidth);
             m_MaxWidth = EditorGUILayout.FloatField("Max Width", m_MaxWidth);
             m_MinHeight = EditorGUILayout.FloatField("Min Height", m_MinHeight);
             m_MaxHeight = EditorGUILayout.FloatField("Max Height", m_MaxHeight);
             m_NoiseSeed = EditorGUILayout.IntField(DetailWizardSharedStyles.Instance.noiseSeed, m_NoiseSeed);
             m_NoiseSpread = EditorGUILayout.FloatField(DetailWizardSharedStyles.Instance.noiseSpread, m_NoiseSpread);
+            GUI.enabled = terrainData.detailScatterMode == DetailScatterMode.CoverageMode;
+            m_detailDensity = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.detailDensity, m_detailDensity, 0, 3);
+            GUI.enabled = true;
             m_HoleEdgePadding = EditorGUILayout.Slider(DetailWizardSharedStyles.Instance.holeEdgePadding, m_HoleEdgePadding, 0, 100);
 
             m_HealthyColor = EditorGUILayout.ColorField("Healthy Color", m_HealthyColor);
diff --git a/Modules/TextCoreTextEngine/Managed/FontAsset.cs b/Modules/TextCoreTextEngine/Managed/FontAsset.cs
index cc657b391b..c25f6060a6 100644
--- a/Modules/TextCoreTextEngine/Managed/FontAsset.cs
+++ b/Modules/TextCoreTextEngine/Managed/FontAsset.cs
@@ -142,6 +142,8 @@ public Font sourceFontFile
         [SerializeField]
         private Font m_SourceFontFile;
 
+        [SerializeField] private string m_SourceFontFilePath;
+
         public AtlasPopulationMode atlasPopulationMode
         {
             get { return m_AtlasPopulationMode; }
@@ -517,23 +519,44 @@ public FontWeightPair[] fontWeightTable
         public static FontAsset CreateFontAsset(string familyName, string styleName, int pointSize = 90)
         {
             if (FontEngine.TryGetSystemFontReference(familyName, styleName, out FontReference fontRef))
-                return CreateFontAsset(fontRef.filePath, fontRef.faceIndex, pointSize, 9, GlyphRenderMode.SDFAA, 1024, 1024);
+                return CreateFontAsset(fontRef.filePath, fontRef.faceIndex, pointSize, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.DynamicOS, true);
 
             Debug.Log("Unable to find a font file with the specified Family Name [" + familyName + "] and Style [" + styleName + "].");
 
             return null;
         }
 
+        /// <summary>
+        /// Creates a new font asset instance from the font file at the given file path.
+        /// </summary>
+        /// <param name="fontFilePath">The file path of the font file.</param>
+        /// <param name="faceIndex">The index of font face.</param>
+        /// <param name="samplingPointSize">The sampling point size.</param>
+        /// <param name="atlasPadding">The padding between individual glyphs in the font atlas texture.</param>
+        /// <param name="renderMode">The atlas render mode.</param>
+        /// <param name="atlasWidth">The atlas texture width.</param>
+        /// <param name="atlasHeight">The atlas texture height.</param>
+        /// <returns>An instance of the newly created font asset.</returns>
+        public static FontAsset CreateFontAsset(string fontFilePath, int faceIndex, int samplingPointSize, int atlasPadding, GlyphRenderMode renderMode, int atlasWidth, int atlasHeight)
+        {
+            return CreateFontAsset(fontFilePath, faceIndex, samplingPointSize, atlasPadding, renderMode, atlasWidth, atlasHeight, AtlasPopulationMode.Dynamic, true);
+        }
+
         static FontAsset CreateFontAsset(string fontFilePath, int faceIndex, int samplingPointSize, int atlasPadding, GlyphRenderMode renderMode, int atlasWidth, int atlasHeight, AtlasPopulationMode atlasPopulationMode = AtlasPopulationMode.DynamicOS, bool enableMultiAtlasSupport = true)
         {
             // Load Font Face
             if (FontEngine.LoadFontFace(fontFilePath, samplingPointSize, faceIndex) != FontEngineError.Success)
             {
-                Debug.Log("Unable to load font face for [" + fontFilePath + "].");
+                Debug.Log("Unable to load font face from [" + fontFilePath + "].");
                 return null;
             }
 
-            return CreateFontAssetInstance(null, atlasPadding, renderMode, atlasWidth, atlasHeight, atlasPopulationMode, enableMultiAtlasSupport);
+            FontAsset fontAsset = CreateFontAssetInstance(null, atlasPadding, renderMode, atlasWidth, atlasHeight, atlasPopulationMode, enableMultiAtlasSupport);
+
+            // Set font file path
+            fontAsset.m_SourceFontFilePath = fontFilePath;
+
+            return fontAsset;
         }
 
         /// <summary>
@@ -587,7 +610,7 @@ static FontAsset CreateFontAssetInstance(Font font, int atlasPadding, GlyphRende
             fontAsset.m_Version = "1.1.0";
             fontAsset.faceInfo = FontEngine.GetFaceInfo();
 
-            if (atlasPopulationMode == AtlasPopulationMode.Dynamic)
+            if (atlasPopulationMode == AtlasPopulationMode.Dynamic && font != null)
             {
                 fontAsset.sourceFontFile = font;
 
@@ -681,8 +704,10 @@ static FontAsset CreateFontAssetInstance(Font font, int atlasPadding, GlyphRende
         private static ProfilerMarker k_TryAddCharacterMarker = new ProfilerMarker("FontAsset.TryAddCharacter");
         private static ProfilerMarker k_TryAddCharactersMarker = new ProfilerMarker("FontAsset.TryAddCharacters");
         private static ProfilerMarker k_UpdateGlyphAdjustmentRecordsMarker = new ProfilerMarker("FontAsset.UpdateGlyphAdjustmentRecords");
+        private static ProfilerMarker k_UpdateDiacriticalMarkAdjustmentRecordsMarker = new ProfilerMarker("FontAsset.UpdateDiacriticalAdjustmentRecords");
         private static ProfilerMarker k_ClearFontAssetDataMarker = new ProfilerMarker("FontAsset.ClearFontAssetData");
         private static ProfilerMarker k_UpdateFontAssetDataMarker = new ProfilerMarker("FontAsset.UpdateFontAssetData");
+        private static ProfilerMarker k_TryAddGlyphMarker = new ProfilerMarker("FontAsset.TryAddGlyphMarker");
 
         // ================================================================================
         //
@@ -699,6 +724,10 @@ private void OnDestroy()
 
         private void OnValidate()
         {
+            // Skip validation until the Editor has been fully loaded.
+            if (Time.frameCount == 0)
+                return;
+
             // Make sure our lookup dictionary have been initialized.
             if (m_CharacterLookupDictionary == null || m_GlyphLookupDictionary == null)
                 ReadFontAssetDefinition();
@@ -753,6 +782,7 @@ public void ReadFontAssetDefinition()
                     m_AtlasPadding = (int)material.GetFloat(TextShaderUtilities.ID_GradientScale) - 1;
             }
 
+
             // Special handling to replace shaders referencing the InternalErrorShader by the appropriate TextCore internal shaders.
             // This is necessary to make sure font assets and materials created in a project that includes the TextCore package
             // continue to work as expected when the package is removed and using the TextCore module.
@@ -891,6 +921,10 @@ internal void InitializeLigatureSubstitutionLookupDictionary()
                 {
                     LigatureSubstitutionRecord record = substitutionRecords[i];
 
+                    // Skip newly added records
+                    if (record.componentGlyphIDs == null || record.componentGlyphIDs.Length == 0)
+                        continue;
+
                     uint keyGlyphIndex = record.componentGlyphIDs[0];
 
                     if (!m_FontFeatureTable.m_LigatureSubstitutionRecordLookup.ContainsKey(keyGlyphIndex))
@@ -1084,7 +1118,15 @@ FontEngineError LoadFontFace()
                 if (m_SourceFontFile == null)
                     m_SourceFontFile = SourceFont_EditorRef;
 
-                return FontEngine.LoadFontFace(m_SourceFontFile, m_FaceInfo.pointSize, m_FaceInfo.faceIndex);
+                // Try loading the font face from source font object
+                if (FontEngine.LoadFontFace(m_SourceFontFile, m_FaceInfo.pointSize, m_FaceInfo.faceIndex) == FontEngineError.Success)
+                    return FontEngineError.Success;
+
+                // Try loading the font face from file path
+                if (string.IsNullOrEmpty(m_SourceFontFilePath) == false)
+                    return  FontEngine.LoadFontFace(m_SourceFontFilePath, m_FaceInfo.pointSize, m_FaceInfo.faceIndex);
+
+                return FontEngineError.Invalid_Face;
             }
 
             // Font Asset is Dynamic OS
@@ -1549,7 +1591,7 @@ internal static void UpdateFontFeaturesForFontAssetsInQueue()
             int count = k_FontAssets_FontFeaturesUpdateQueue.Count;
 
             for (int i = 0; i < count; i++)
-                k_FontAssets_FontFeaturesUpdateQueue[i].UpdateGlyphAdjustmentRecords();
+                k_FontAssets_FontFeaturesUpdateQueue[i].UpdateAllFontFeatures();
 
             if (count > 0)
             {
@@ -1838,7 +1880,7 @@ public bool TryAddCharacters(uint[] unicodes, out uint[] missingUnicodes, bool i
 
             // Get Font Features for the given characters
             if (includeFontFeatures)
-                UpdateGlyphAdjustmentRecords();
+                UpdateAllFontFeatures();
 
             // Makes the changes to the font asset persistent.
             RegisterResourceForUpdate?.Invoke(this);
@@ -2053,7 +2095,7 @@ public bool TryAddCharacters(string characters, out string missingCharacters, bo
 
             // Get Font Features for the given characters
             if (includeFontFeatures)
-                UpdateGlyphAdjustmentRecords();
+                UpdateAllFontFeatures();
 
             // Makes the changes to the font asset persistent.
             RegisterResourceForUpdate?.Invoke(this);
@@ -2214,6 +2256,91 @@ internal TMP_Character AddCharacter_Internal(uint unicode, Glyph glyph)
         }
         */
 
+        internal bool TryAddGlyphInternal(uint glyphIndex, out Glyph glyph)
+        {
+            using (k_TryAddGlyphMarker.Auto()) {
+                glyph = null;
+
+                // Check if glyph is already present in the font asset.
+                if (m_GlyphLookupDictionary.ContainsKey(glyphIndex))
+                {
+                    glyph = m_GlyphLookupDictionary[glyphIndex];
+                    return true;
+                }
+
+                // Load font face.
+                if (LoadFontFace() != FontEngineError.Success)
+                    return false;
+
+                if (m_AtlasTextures[m_AtlasTextureIndex].isReadable == false)
+                {
+                    Debug.LogWarning($"Unable to add the requested glyph to font asset [{this.name}]'s atlas texture. Please make the texture [{m_AtlasTextures[m_AtlasTextureIndex].name}] readable.", m_AtlasTextures[m_AtlasTextureIndex]);
+                    return false;
+                }
+
+                // Resize the Atlas Texture to the appropriate size
+                if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
+                {
+                    m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
+                    FontEngine.ResetAtlasTexture(m_AtlasTextures[m_AtlasTextureIndex]);
+                }
+
+                // Set texture upload mode to batching texture.Apply()
+                FontEngine.SetTextureUploadMode(false);
+
+                // Try adding glyph to local atlas texture
+                if (FontEngine.TryAddGlyphToTexture(glyphIndex, m_AtlasPadding, GlyphPackingMode.BestShortSideFit, m_FreeGlyphRects, m_UsedGlyphRects, m_AtlasRenderMode, m_AtlasTextures[m_AtlasTextureIndex], out glyph))
+                {
+                    // Update glyph atlas index
+                    glyph.atlasIndex = m_AtlasTextureIndex;
+
+                    // Add new glyph to glyph table.
+                    m_GlyphTable.Add(glyph);
+                    m_GlyphLookupDictionary.Add(glyphIndex, glyph);
+
+                    m_GlyphIndexList.Add(glyphIndex);
+                    m_GlyphIndexListNewlyAdded.Add(glyphIndex);
+
+                    //if (TextSettings.getFontFeaturesAtRuntime)
+                    //    RegisterFontAssetForFontFeatureUpdate(this);
+
+                    // Makes the changes to the font asset persistent.
+                    RegisterResourceForUpdate?.Invoke(this);
+
+                    return true;
+                }
+
+                // Add glyph which did not fit in current atlas texture to new atlas texture.
+                if (m_IsMultiAtlasTexturesEnabled)
+                {
+                    // Create new atlas texture
+                    SetupNewAtlasTexture();
+
+                    // Try adding glyph to newly created atlas texture
+                    if (FontEngine.TryAddGlyphToTexture(glyphIndex, m_AtlasPadding, GlyphPackingMode.BestShortSideFit, m_FreeGlyphRects, m_UsedGlyphRects, m_AtlasRenderMode, m_AtlasTextures[m_AtlasTextureIndex], out glyph))
+                    {
+                        // Update glyph atlas index
+                        glyph.atlasIndex = m_AtlasTextureIndex;
+
+                        // Add new glyph to glyph table.
+                        m_GlyphTable.Add(glyph);
+                        m_GlyphLookupDictionary.Add(glyphIndex, glyph);
+
+                        m_GlyphIndexList.Add(glyphIndex);
+                        m_GlyphIndexListNewlyAdded.Add(glyphIndex);
+
+                        //if (TextSettings.getFontFeaturesAtRuntime)
+                        //    RegisterFontAssetForFontFeatureUpdate(this);
+
+                        // Make changes to font asset persistent.
+                        RegisterResourceForUpdate?.Invoke(this);
+
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
 
         /// <summary>
         /// Try adding character using Unicode value to font asset.
@@ -2644,70 +2771,14 @@ void SetupNewAtlasTexture()
             OnFontAssetTextureChanged?.Invoke(tex, this);
         }
 
-        /// <summary>
-        /// Not used currently
-        /// </summary>
-        internal void UpdateAtlasTexture()
+        void UpdateAllFontFeatures()
         {
-            // Return if we don't have any glyphs to add to atlas texture.
-            if (m_GlyphsToRender.Count == 0)
-                return;
-
-            //Debug.Log("Updating [" + this.name + "]'s atlas texture.");
-
-            // Pack glyphs in the given atlas texture size.
-            // TODO: Packing and glyph render modes should be defined in the font asset.
-            //FontEngine.PackGlyphsInAtlas(m_GlyphsToPack, m_GlyphsPacked, m_AtlasPadding, GlyphPackingMode.ContactPointRule, GlyphRenderMode.SDFAA, m_AtlasWidth, m_AtlasHeight, m_FreeGlyphRects, m_UsedGlyphRects);
-            //FontEngine.RenderGlyphsToTexture(m_GlyphsPacked, m_AtlasPadding, GlyphRenderMode.SDFAA, m_AtlasTextures[m_AtlasTextureIndex]);
-
-            // Resize the Atlas Texture to the appropriate size
-            if (m_AtlasTextures[m_AtlasTextureIndex].width == 0 || m_AtlasTextures[m_AtlasTextureIndex].height == 0)
-            {
-                m_AtlasTextures[m_AtlasTextureIndex].Reinitialize(m_AtlasWidth, m_AtlasHeight);
-                FontEngine.ResetAtlasTexture(m_AtlasTextures[m_AtlasTextureIndex]);
-            }
-
-            //FontEngine.RenderGlyphsToTexture(m_GlyphsToRender, m_AtlasPadding, m_AtlasRenderMode, m_AtlasTextures[m_AtlasTextureIndex]);
-
-            // Apply changes to atlas texture
-            m_AtlasTextures[m_AtlasTextureIndex].Apply(false, false);
 
-            // Add glyphs that were successfully packed to the glyph table.
-            //for (int i = 0; i < m_GlyphsToRender.Count /* m_GlyphsPacked.Count */; i++)
-            //{
-            //    Glyph glyph = m_GlyphsToRender[i]; // m_GlyphsPacked[i];
-
-            //    // Update atlas texture index
-            //    glyph.atlasIndex = m_AtlasTextureIndex;
-
-            //    m_GlyphTable.Add(glyph);
-            //    m_GlyphLookupDictionary.Add(glyph.index, glyph);
-            //}
-
-            // Clear list of glyphs
-            //m_GlyphsPacked.Clear();
-            //m_GlyphsToRender.Clear();
-
-            // Add any remaining glyphs into new atlas texture if multi texture support if enabled.
-            //if (m_GlyphsToPack.Count > 0)
-            //{
-            /*
-            // Create new atlas texture
-            Texture2D tex = new Texture2D(m_AtlasWidth, m_AtlasHeight, TextureFormat.Alpha8, false, true);
-            tex.SetPixels32(new Color32[m_AtlasWidth * m_AtlasHeight]);
-            tex.Apply();
-
-            m_AtlasTextureIndex++;
-
-            if (m_AtlasTextures.Length == m_AtlasTextureIndex)
-                Array.Resize(ref m_AtlasTextures, Mathf.NextPowerOfTwo(m_AtlasTextureIndex + 1));
+            UpdateGlyphAdjustmentRecords();
 
-            m_AtlasTextures[m_AtlasTextureIndex] = tex;
-            */
-            //}
 
-            // Makes the changes to the font asset persistent.
-            RegisterResourceForUpdate?.Invoke(this);
+            // Clear newly added glyph list
+            m_GlyphIndexListNewlyAdded.Clear();
         }
 
         /// <summary>
@@ -2715,37 +2786,32 @@ internal void UpdateAtlasTexture()
         /// </summary>
         internal void UpdateGlyphAdjustmentRecords()
         {
-            k_UpdateGlyphAdjustmentRecordsMarker.Begin();
-
-            GlyphPairAdjustmentRecord[] pairAdjustmentRecords = FontEngine.GetGlyphPairAdjustmentRecords(m_GlyphIndexList, out int recordCount);
+            using (k_UpdateGlyphAdjustmentRecordsMarker.Auto()) {
+                GlyphPairAdjustmentRecord[] pairAdjustmentRecords = FontEngine.GetGlyphPairAdjustmentRecords(m_GlyphIndexList, out int recordCount);
 
-            // Clear newly added glyph list
-            m_GlyphIndexListNewlyAdded.Clear();
+                // Clear newly added glyph list
+                m_GlyphIndexListNewlyAdded.Clear();
 
-            if (pairAdjustmentRecords == null || pairAdjustmentRecords.Length == 0)
-            {
-                k_UpdateGlyphAdjustmentRecordsMarker.End();
-                return;
-            }
+                if (pairAdjustmentRecords == null || pairAdjustmentRecords.Length == 0)
+                    return;
 
-            if (m_FontFeatureTable == null)
-                m_FontFeatureTable = new FontFeatureTable();
+                if (m_FontFeatureTable == null)
+                    m_FontFeatureTable = new FontFeatureTable();
 
-            for (int i = 0; i < pairAdjustmentRecords.Length && pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex != 0; i++)
-            {
-                uint pairKey = pairAdjustmentRecords[i].secondAdjustmentRecord.glyphIndex << 16 | pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex;
+                for (int i = 0; i < pairAdjustmentRecords.Length && pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex != 0; i++)
+                {
+                    uint pairKey = pairAdjustmentRecords[i].secondAdjustmentRecord.glyphIndex << 16 | pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex;
 
-                // Check if table already contains a pair adjustment record for this key.
-                if (m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.ContainsKey(pairKey))
-                    continue;
+                    // Check if table already contains a pair adjustment record for this key.
+                    if (m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.ContainsKey(pairKey))
+                        continue;
 
-                GlyphPairAdjustmentRecord record = pairAdjustmentRecords[i];
+                    GlyphPairAdjustmentRecord record = pairAdjustmentRecords[i];
 
-                m_FontFeatureTable.m_GlyphPairAdjustmentRecords.Add(record);
-                m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.Add(pairKey, record);
+                    m_FontFeatureTable.m_GlyphPairAdjustmentRecords.Add(record);
+                    m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.Add(pairKey, record);
+                }
             }
-
-            k_UpdateGlyphAdjustmentRecordsMarker.End();
         }
 
         /// <summary>
@@ -2754,38 +2820,34 @@ internal void UpdateGlyphAdjustmentRecords()
         /// <param name="glyphIndexes"></param>
         internal void UpdateGlyphAdjustmentRecords(uint[] glyphIndexes)
         {
-            k_UpdateGlyphAdjustmentRecordsMarker.Begin();
+            using (k_UpdateGlyphAdjustmentRecordsMarker.Auto())
+            {
+                // Get glyph pair adjustment records from font file.
+                GlyphPairAdjustmentRecord[] pairAdjustmentRecords = FontEngine.GetGlyphPairAdjustmentTable(glyphIndexes);
 
-            // Get glyph pair adjustment records from font file.
-            GlyphPairAdjustmentRecord[] pairAdjustmentRecords = FontEngine.GetGlyphPairAdjustmentTable(glyphIndexes);
+                // Clear newly added glyph list
+                //m_GlyphIndexListNewlyAdded.Clear();
 
-            // Clear newly added glyph list
-            //m_GlyphIndexListNewlyAdded.Clear();
-
-            if (pairAdjustmentRecords == null || pairAdjustmentRecords.Length == 0)
-            {
-                k_UpdateGlyphAdjustmentRecordsMarker.End();
-                return;
-            }
+                if (pairAdjustmentRecords == null || pairAdjustmentRecords.Length == 0)
+                    return;
 
-            if (m_FontFeatureTable == null)
-                m_FontFeatureTable = new FontFeatureTable();
+                if (m_FontFeatureTable == null)
+                    m_FontFeatureTable = new FontFeatureTable();
 
-            for (int i = 0; i < pairAdjustmentRecords.Length && pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex != 0; i++)
-            {
-                uint pairKey = pairAdjustmentRecords[i].secondAdjustmentRecord.glyphIndex << 16 | pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex;
+                for (int i = 0; i < pairAdjustmentRecords.Length && pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex != 0; i++)
+                {
+                    uint pairKey = pairAdjustmentRecords[i].secondAdjustmentRecord.glyphIndex << 16 | pairAdjustmentRecords[i].firstAdjustmentRecord.glyphIndex;
 
-                // Check if table already contains a pair adjustment record for this key.
-                if (m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.ContainsKey(pairKey))
-                    continue;
+                    // Check if table already contains a pair adjustment record for this key.
+                    if (m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.ContainsKey(pairKey))
+                        continue;
 
-                GlyphPairAdjustmentRecord record = pairAdjustmentRecords[i];
+                    GlyphPairAdjustmentRecord record = pairAdjustmentRecords[i];
 
-                m_FontFeatureTable.m_GlyphPairAdjustmentRecords.Add(record);
-                m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.Add(pairKey, record);
+                    m_FontFeatureTable.m_GlyphPairAdjustmentRecords.Add(record);
+                    m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.Add(pairKey, record);
+                }
             }
-
-            k_UpdateGlyphAdjustmentRecordsMarker.End();
         }
 
         /// <summary>
@@ -2877,6 +2939,7 @@ internal void UpdateGlyphAdjustmentRecords(List<uint> newGlyphIndexes, List<uint
             */
         }
 
+
         /// <summary>
         /// Internal method to copy generic list data to generic array of the same type.
         /// </summary>
@@ -2904,31 +2967,29 @@ void CopyListDataToArray<T>(List<T> srcList, ref T[] dstArray)
         /// <param name="setAtlasSizeToZero">Will set the atlas texture size to zero width and height if true.</param>
         public void ClearFontAssetData(bool setAtlasSizeToZero = false)
         {
-            k_ClearFontAssetDataMarker.Begin();
+            using (k_ClearFontAssetDataMarker.Auto()) {
+                // Record full object undo in the Editor.
+                //UnityEditor.Undo.RecordObjects(new UnityEngine.Object[] { this, this.atlasTexture }, "Resetting Font Asset");
 
-            // Record full object undo in the Editor.
-            //UnityEditor.Undo.RecordObjects(new UnityEngine.Object[] { this, this.atlasTexture }, "Resetting Font Asset");
+                // Clear glyph, character and font feature tables
+                ClearFontAssetTables(true);
 
-            // Clear glyph, character and font feature tables
-            ClearFontAssetTables();
+                // Clear atlas textures
+                ClearAtlasTextures(setAtlasSizeToZero);
 
-            // Clear atlas textures
-            ClearAtlasTextures(setAtlasSizeToZero);
-
-            ReadFontAssetDefinition();
-
-            //TMP_ResourceManager.RebuildFontAssetCache(instanceID);
+                ReadFontAssetDefinition();
 
-            // Makes the changes to the font asset persistent.
-            RegisterResourceForUpdate?.Invoke(this);
+                //TMP_ResourceManager.RebuildFontAssetCache();
 
-            k_ClearFontAssetDataMarker.End();
+                // Makes the changes to the font asset persistent.
+                RegisterResourceForUpdate?.Invoke(this);
+            }
         }
 
-        internal void ClearFontAssetDataInternal()
+        internal void ClearFontAssetDataInternal(bool clearFontFeatures = false)
         {
             // Clear glyph, character and font feature tables
-            ClearFontAssetTables();
+            ClearFontAssetTables(clearFontFeatures);
 
             // Clear atlas textures
             ClearAtlasTextures(true);
@@ -2942,35 +3003,33 @@ internal void ClearFontAssetDataInternal()
         /// </summary>
         internal void UpdateFontAssetData()
         {
-            k_UpdateFontAssetDataMarker.Begin();
+            using (k_UpdateFontAssetDataMarker.Auto()) {
+                // Get list of all characters currently contained in the font asset.
+                uint[] unicodeCharacters = new uint[m_CharacterTable.Count];
 
-            // Get list of all characters currently contained in the font asset.
-            uint[] unicodeCharacters = new uint[m_CharacterTable.Count];
+                for (int i = 0; i < m_CharacterTable.Count; i++)
+                    unicodeCharacters[i] = m_CharacterTable[i].unicode;
 
-            for (int i = 0; i < m_CharacterTable.Count; i++)
-                unicodeCharacters[i] = m_CharacterTable[i].unicode;
+                // Clear glyph, character and font feature tables
+                ClearFontAssetTables(true);
 
-            // Clear glyph, character and font feature tables
-            ClearFontAssetTables();
+                // Clear atlas textures
+                ClearAtlasTextures(true);
 
-            // Clear atlas textures
-            ClearAtlasTextures(true);
-
-            ReadFontAssetDefinition();
-
-            //TMP_ResourceManager.RebuildFontAssetCache(instanceID);
+                ReadFontAssetDefinition();
 
-            // Add existing glyphs and characters back in the font asset (if any)
-            if (unicodeCharacters.Length > 0)
-                TryAddCharacters(unicodeCharacters, true);
+                //TMP_ResourceManager.RebuildFontAssetCache();
 
-            k_UpdateFontAssetDataMarker.End();
+                // Add existing glyphs and characters back in the font asset (if any)
+                if (unicodeCharacters.Length > 0)
+                    TryAddCharacters(unicodeCharacters, true);
+            }
         }
 
         /// <summary>
         ///
         /// </summary>
-        internal void ClearFontAssetTables()
+        internal void ClearFontAssetTables(bool clearFontFeatures)
         {
             // Clear glyph and character tables
             if (m_GlyphTable != null)
@@ -2996,9 +3055,24 @@ internal void ClearFontAssetTables()
             if (m_GlyphsRendered != null)
                 m_GlyphsRendered.Clear();
 
-            // Clear Glyph Adjustment Table
-            if (m_FontFeatureTable != null && m_FontFeatureTable.m_GlyphPairAdjustmentRecords != null)
-                m_FontFeatureTable.glyphPairAdjustmentRecords.Clear();
+            if (clearFontFeatures)
+            {
+                // Clear Ligature Table
+                if (m_FontFeatureTable != null && m_FontFeatureTable.m_LigatureSubstitutionRecords != null)
+                    m_FontFeatureTable.m_LigatureSubstitutionRecords.Clear();
+
+                // Clear Glyph Adjustment Table
+                if (m_FontFeatureTable != null && m_FontFeatureTable.m_GlyphPairAdjustmentRecords != null)
+                    m_FontFeatureTable.m_GlyphPairAdjustmentRecords.Clear();
+
+                // Clear Mark-to-Base Adjustment Table
+                if (m_FontFeatureTable != null && m_FontFeatureTable.m_MarkToBaseAdjustmentRecords != null)
+                    m_FontFeatureTable.m_MarkToBaseAdjustmentRecords.Clear();
+
+                // Clear Mark-to-Mark Adjustment Table
+                if (m_FontFeatureTable != null && m_FontFeatureTable.m_MarkToMarkAdjustmentRecords != null)
+                    m_FontFeatureTable.m_MarkToMarkAdjustmentRecords.Clear();
+            }
         }
 
         /// <summary>
diff --git a/Modules/TextCoreTextEngine/Managed/FontAssetUtilities.cs b/Modules/TextCoreTextEngine/Managed/FontAssetUtilities.cs
index 597cdcdfc9..e8ff1955b0 100644
--- a/Modules/TextCoreTextEngine/Managed/FontAssetUtilities.cs
+++ b/Modules/TextCoreTextEngine/Managed/FontAssetUtilities.cs
@@ -83,9 +83,14 @@ private static Character GetCharacterFromFontAsset_Internal(uint unicode, FontAs
                 {
                     if (temp.characterLookupTable.TryGetValue(unicode, out character))
                     {
-                        isAlternativeTypeface = true;
+                        if (character.textAsset != null)
+                        {
+                            isAlternativeTypeface = true;
+                            return character;
+                        }
 
-                        return character;
+                        // Remove character from lookup table
+                        temp.characterLookupTable.Remove(unicode);
                     }
 
                     if (temp.atlasPopulationMode == AtlasPopulationMode.Dynamic || temp.atlasPopulationMode == AtlasPopulationMode.DynamicOS)
@@ -120,7 +125,12 @@ private static Character GetCharacterFromFontAsset_Internal(uint unicode, FontAs
 
             // Search the source font asset for the requested character.
             if (sourceFontAsset.characterLookupTable.TryGetValue(unicode, out character))
-                return character;
+            {
+                if (character.textAsset != null)
+                    return character;
+
+                sourceFontAsset.characterLookupTable.Remove(unicode);
+            }
 
             if (sourceFontAsset.atlasPopulationMode == AtlasPopulationMode.Dynamic || sourceFontAsset.atlasPopulationMode == AtlasPopulationMode.DynamicOS)
             {
diff --git a/Modules/TextCoreTextEngine/Managed/MeshInfo.cs b/Modules/TextCoreTextEngine/Managed/MeshInfo.cs
index 59d6a8ec24..7f3d869781 100644
--- a/Modules/TextCoreTextEngine/Managed/MeshInfo.cs
+++ b/Modules/TextCoreTextEngine/Managed/MeshInfo.cs
@@ -15,12 +15,24 @@ enum VertexSortingOrder { Normal, Reverse }
     struct MeshInfo
     {
         static readonly Color32 k_DefaultColor = new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue);
+        static readonly Vector3 k_DefaultNormal = new Vector3(0.0f, 0.0f, -1f);
+        static readonly Vector4 k_DefaultTangent = new Vector4(-1f, 0.0f, 0.0f, 1f);
+        static readonly Bounds k_DefaultBounds = new Bounds();
 
+        public Mesh mesh;
         public int vertexCount;
 
         public Vector3[] vertices;
+        public Vector3[] normals;
+        public Vector4[] tangents;
 
-        public Vector2[] uvs0;
+        /// <summary>
+        /// UV0 contains the following information
+        /// X, Y are the UV coordinates of the glyph in the atlas texture.
+        /// Z is the texture index in the texture atlas array
+        /// W is the SDF Scale where a negative value represents bold text
+        /// </summary>
+        public Vector4[] uvs0;
         public Vector2[] uvs2;
         public Color32[] colors32;
         public int[] triangles;
@@ -44,10 +56,13 @@ public MeshInfo(int size)
             vertexCount = 0;
 
             vertices = new Vector3[sizeX4];
-            uvs0 = new Vector2[sizeX4];
+            uvs0 = new Vector4[sizeX4];
             uvs2 = new Vector2[sizeX4];
             colors32 = new Color32[sizeX4];
 
+            mesh = new Mesh();
+            normals = new Vector3[sizeX4];
+            tangents = new Vector4[sizeX4];
             triangles = new int[sizeX6];
 
             int indexX6 = 0;
@@ -60,6 +75,8 @@ public MeshInfo(int size)
                     uvs0[indexX4 + i] = Vector2.zero;
                     uvs2[indexX4 + i] = Vector2.zero;
                     colors32[indexX4 + i] = k_DefaultColor;
+                    normals[indexX4 + i] = k_DefaultNormal;
+                    tangents[indexX4 + i] = k_DefaultTangent;
                 }
 
                 triangles[indexX6 + 0] = indexX4 + 0;
@@ -72,6 +89,81 @@ public MeshInfo(int size)
                 indexX4 += 4;
                 indexX6 += 6;
             }
+
+            mesh.vertices = vertices;
+            mesh.normals = normals;
+            mesh.tangents = tangents;
+            mesh.triangles = triangles;
+            mesh.bounds = k_DefaultBounds;
+            material = null;
+        }
+
+        /// <summary>
+        /// Function to pre-allocate vertex attributes for a mesh of size X.
+        /// </summary>
+        /// <param name="mesh"></param>
+        /// <param name="size"></param>
+        public MeshInfo(Mesh mesh, int size)
+        {
+            // Clear existing mesh data
+            if (mesh == null)
+                mesh = new Mesh();
+            else
+                mesh.Clear();
+
+            this.mesh = mesh;
+
+            // Limit the mesh to less than 65535 vertices which is the limit for Unity's Mesh.
+            size = Mathf.Min(size, 16383);
+
+            int sizeX4 = size * 4;
+            int sizeX6 = size * 6;
+
+            vertexCount = 0;
+
+            vertices = new Vector3[sizeX4];
+            uvs0 = new Vector4[sizeX4];
+            uvs2 = new Vector2[sizeX4];
+            //this.uvs4 = new Vector2[sizeX4]; // SDF scale data
+            colors32 = new Color32[sizeX4];
+
+            normals = new Vector3[sizeX4];
+            tangents = new Vector4[sizeX4];
+            triangles = new int[sizeX6];
+
+            int index_X6 = 0;
+            int index_X4 = 0;
+            while (index_X4 / 4 < size)
+            {
+                for (int i = 0; i < 4; i++)
+                {
+                    vertices[index_X4 + i] = Vector3.zero;
+                    uvs0[index_X4 + i] = Vector2.zero;
+                    uvs2[index_X4 + i] = Vector2.zero;
+                    //this.uvs4[index_X4 + i] = Vector2.zero;
+                    colors32[index_X4 + i] = k_DefaultColor;
+                    normals[index_X4 + i] = k_DefaultNormal;
+                    tangents[index_X4 + i] = k_DefaultTangent;
+                }
+
+                triangles[index_X6 + 0] = index_X4 + 0;
+                triangles[index_X6 + 1] = index_X4 + 1;
+                triangles[index_X6 + 2] = index_X4 + 2;
+                triangles[index_X6 + 3] = index_X4 + 2;
+                triangles[index_X6 + 4] = index_X4 + 3;
+                triangles[index_X6 + 5] = index_X4 + 0;
+
+                index_X4 += 4;
+                index_X6 += 6;
+            }
+
+            // Pre-assign base vertex attributes.
+            mesh.vertices = vertices;
+            mesh.normals = normals;
+            mesh.tangents = tangents;
+            mesh.triangles = triangles;
+            mesh.bounds = k_DefaultBounds;
+            material = null;
         }
 
         /// <summary>
@@ -134,6 +226,21 @@ internal void ClearUnusedVertices()
                 Array.Clear(vertices, vertexCount, length);
         }
 
+        /// <summary>
+        /// Function used to mark unused vertices as degenerate an upload resulting data to the mesh.
+        /// </summary>
+        /// <param name="startIndex"></param>
+        public void ClearUnusedVertices(int startIndex, bool updateMesh)
+        {
+            int length = this.vertices.Length - startIndex;
+
+            if (length > 0)
+                Array.Clear(this.vertices, startIndex, length);
+
+            if (updateMesh && mesh != null)
+                this.mesh.vertices = this.vertices;
+        }
+
         /// <summary>
         /// Function used to mark unused vertices as degenerate.
         /// </summary>
@@ -196,7 +303,7 @@ internal void SwapVertexData(int src, int dst)
             vertices[srcIndex + 3] = vertex;
 
             //Swap UVs0
-            Vector2 uvs;
+            Vector4 uvs;
             uvs = uvs0[dstIndex + 0];
             uvs0[dstIndex + 0] = uvs0[srcIndex + 0];
             uvs0[srcIndex + 0] = uvs;
diff --git a/Modules/TextCoreTextEngine/Managed/TextElementInfo.cs b/Modules/TextCoreTextEngine/Managed/TextElementInfo.cs
index 4224b86259..26bfe79bc7 100644
--- a/Modules/TextCoreTextEngine/Managed/TextElementInfo.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextElementInfo.cs
@@ -9,9 +9,8 @@ namespace UnityEngine.TextCore.Text
     struct TextVertex
     {
         public Vector3 position;
-        public Vector2 uv;
+        public Vector4 uv;
         public Vector2 uv2;
-        public Vector2 uv4;
         public Color32 color;
     }
 
@@ -23,8 +22,10 @@ struct TextElementInfo
         public char character; // Should be changed to an int to handle UTF 32
         public int index; // Index of the character in the input string.
         public TextElementType elementType;
+        public int stringLength;
 
         public TextElement textElement;
+        public Glyph alternativeGlyph;
         public FontAsset fontAsset;
         public SpriteAsset spriteAsset;
         public int spriteIndex;
@@ -51,14 +52,20 @@ struct TextElementInfo
         public float ascender;
         public float baseLine;
         public float descender;
+        internal float adjustedAscender;
+        internal float adjustedDescender;
+        internal float adjustedHorizontalAdvance;
 
         public float xAdvance;
         public float aspectRatio;
         public float scale;
         public Color32 color;
         public Color32 underlineColor;
+        public int underlineVertexIndex;
         public Color32 strikethroughColor;
+        public int strikethroughVertexIndex;
         public Color32 highlightColor;
+        public HighlightState highlightState;
         public FontStyles style;
         public bool isVisible;
     }
diff --git a/Modules/TextCoreTextEngine/Managed/TextGenerator.cs b/Modules/TextCoreTextEngine/Managed/TextGenerator.cs
index e63f6561e5..65d4ef004a 100644
--- a/Modules/TextCoreTextEngine/Managed/TextGenerator.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextGenerator.cs
@@ -7,12 +7,11 @@
 using UnityEngine.Bindings;
 using UnityEngine.Profiling;
 using UnityEngine.TextCore.LowLevel;
+using System;
+using System.Text;
 
 namespace UnityEngine.TextCore.Text
 {
-    internal enum TextOverflowMode { Overflow = 0, Ellipsis = 1, Masking = 2, Truncate = 3, ScrollRect = 4, Page = 5, Linked = 6 }
-    enum TextureMapping { Character = 0, Line = 1, Paragraph = 2, MatchAspect = 3 }
-
     internal class TextGenerationSettings
     {
         public string text;
@@ -36,8 +35,10 @@ internal class TextGenerationSettings
 
         public Color color = Color.white;
         public TextColorGradient fontColorGradient;
+        public TextColorGradient fontColorGradientPreset;
         public bool tintSprites;
         public bool overrideRichTextColors;
+        public bool shouldConvertToLinearSpace = true;
 
         public float fontSize = 18;
         public bool autoSize;
@@ -49,12 +50,14 @@ internal class TextGenerationSettings
         public bool isRightToLeft;
         public bool extraPadding;
         public bool parseControlCharacters = true;
+        public bool isOrthographic = true;
 
         public float characterSpacing;
         public float wordSpacing;
         public float lineSpacing;
         public float paragraphSpacing;
         public float lineSpacingMax;
+        public TextWrappingMode textWrappingMode = TextWrappingMode.Normal;
 
         public int maxVisibleCharacters = 99999;
         public int maxVisibleWords = 99999;
@@ -72,6 +75,7 @@ internal class TextGenerationSettings
         public bool inverseYAxis;
 
         public float charWidthMaxAdj;
+        internal TextInputSource inputSource = TextInputSource.TextString;
 
         protected bool Equals(TextGenerationSettings other)
         {
@@ -82,7 +86,7 @@ protected bool Equals(TextGenerationSettings other)
                 textAlignment == other.textAlignment && overflowMode == other.overflowMode &&
                 wordWrap == other.wordWrap && wordWrappingRatio.Equals(other.wordWrappingRatio) &&
                 color.Equals(other.color) && Equals(fontColorGradient, other.fontColorGradient) &&
-                tintSprites == other.tintSprites &&
+                Equals(fontColorGradientPreset, other.fontColorGradientPreset) && tintSprites == other.tintSprites &&
                 overrideRichTextColors == other.overrideRichTextColors && fontSize.Equals(other.fontSize) &&
                 autoSize == other.autoSize &&
                 fontSizeMin.Equals(other.fontSizeMin) && fontSizeMax.Equals(other.fontSizeMax) &&
@@ -100,7 +104,8 @@ protected bool Equals(TextGenerationSettings other)
                 horizontalMapping == other.horizontalMapping && verticalMapping == other.verticalMapping &&
                 uvLineOffset.Equals(other.uvLineOffset) &&
                 geometrySortingOrder == other.geometrySortingOrder && inverseYAxis == other.inverseYAxis &&
-                charWidthMaxAdj.Equals(other.charWidthMaxAdj);
+                charWidthMaxAdj.Equals(other.charWidthMaxAdj) && textWrappingMode == other.textWrappingMode &&
+                isOrthographic.Equals(other.isOrthographic);
         }
 
         public override bool Equals(object obj)
@@ -129,6 +134,7 @@ public override int GetHashCode()
                 hashCode = (hashCode * 397) ^ wordWrappingRatio.GetHashCode();
                 hashCode = (hashCode * 397) ^ color.GetHashCode();
                 hashCode = (hashCode * 397) ^ (fontColorGradient != null ? fontColorGradient.GetHashCode() : 0);
+                hashCode = (hashCode * 397) ^ (fontColorGradientPreset != null ? fontColorGradientPreset.GetHashCode() : 0);
                 hashCode = (hashCode * 397) ^ tintSprites.GetHashCode();
                 hashCode = (hashCode * 397) ^ overrideRichTextColors.GetHashCode();
                 hashCode = (hashCode * 397) ^ fontSize.GetHashCode();
@@ -158,6 +164,8 @@ public override int GetHashCode()
                 hashCode = (hashCode * 397) ^ (int)geometrySortingOrder;
                 hashCode = (hashCode * 397) ^ inverseYAxis.GetHashCode();
                 hashCode = (hashCode * 397) ^ charWidthMaxAdj.GetHashCode();
+                hashCode = (hashCode * 397) ^ (int)textWrappingMode;
+                hashCode = (hashCode * 397) ^ isOrthographic.GetHashCode();
                 return hashCode;
             }
         }
@@ -195,6 +203,7 @@ public void Copy(TextGenerationSettings other)
 
             color = other.color;
             fontColorGradient = other.fontColorGradient;
+            fontColorGradientPreset = other.fontColorGradientPreset;
             tintSprites = other.tintSprites;
             overrideRichTextColors = other.overrideRichTextColors;
 
@@ -208,12 +217,14 @@ public void Copy(TextGenerationSettings other)
             isRightToLeft = other.isRightToLeft;
             extraPadding = other.extraPadding;
             parseControlCharacters = other.parseControlCharacters;
+            isOrthographic = other.isOrthographic;
 
             characterSpacing = other.characterSpacing;
             wordSpacing = other.wordSpacing;
             lineSpacing = other.lineSpacing;
             paragraphSpacing = other.paragraphSpacing;
             lineSpacingMax = other.lineSpacingMax;
+            textWrappingMode = other.textWrappingMode;
 
             maxVisibleCharacters = other.maxVisibleCharacters;
             maxVisibleWords = other.maxVisibleWords;
@@ -280,11 +291,8 @@ const int
             k_CjkHalfwidthStart = 0xFF00,
             k_CjkHalfwidthEnd = 0xFFEF;
 
-        const int k_VerticesMax = 16383;
-        const int k_SpritesStart = 57344;
 
         const float k_FloatUnset = -32767;
-
         const int k_MaxCharacters = 8; // Determines the initial allocation and size of the character array / buffer.
 
         static TextGenerator s_TextGenerator;
@@ -308,6 +316,7 @@ public static void GenerateText(TextGenerationSettings settings, TextInfo textIn
 
             if (textInfo == null)
             {
+                // TODO: If no textInfo is passed, we want to use an internal one instead of creating a new one everytime.
                 Debug.LogError("Null TextInfo provided to TextGenerator. Cannot update its content.");
                 return;
             }
@@ -408,11 +417,64 @@ public static Vector2 GetPreferredValues(TextGenerationSettings settings, TextIn
             return textGenerator.GetPreferredValuesInternal(settings, textInfo);
         }
 
+        /// <summary>
+        /// Internal array containing the converted source text used in the text parsing process.
+        /// </summary>
+        private TextBackingContainer m_TextBackingArray = new TextBackingContainer(4);
+
+        /// <summary>
+        /// Array containing the Unicode characters to be parsed.
+        /// </summary>
+        internal UnicodeChar[] m_TextProcessingArray = new UnicodeChar[8];
+
+        /// <summary>
+        /// The number of Unicode characters that have been parsed and contained in the m_InternalParsingBuffer
+        /// </summary>
+        internal int m_InternalTextProcessingArraySize;
+
+        /// <summary>
+        /// Determines if the data structures allocated to contain the geometry of the text object will be reduced in size if the number of characters required to display the text is reduced by more than 256 characters.
+        /// This reduction has the benefit of reducing the amount of vertex data being submitted to the graphic device but results in GC when it occurs.
+        /// </summary>
+        bool vertexBufferAutoSizeReduction
+        {
+            get { return m_VertexBufferAutoSizeReduction; }
+            set { m_VertexBufferAutoSizeReduction = value; }
+        }
+        [SerializeField]
+        protected bool m_VertexBufferAutoSizeReduction = false;
+
+        private char[] m_HtmlTag = new char[128]; // Maximum length of rich text tag. This is pre-allocated to avoid GC.
+
+        internal HighlightState m_HighlightState = new HighlightState(Color.white, Offset.zero);
+
+        protected bool m_IsIgnoringAlignment;
+
+        /// <summary>
+        /// Property indicating whether the text is Truncated or using Ellipsis.
+        /// </summary>
+        public static bool isTextTruncated { get { return m_IsTextTruncated; } }
+        static protected bool m_IsTextTruncated;
+
+        /// <summary>
+        /// Delegate for the OnMissingCharacter event called when the requested Unicode character is missing from the font asset.
+        /// </summary>
+        /// <param name="unicode">The Unicode of the missing character.</param>
+        /// <param name="stringIndex">The index of the missing character in the source string.</param>
+        /// <param name="text">The source text that contains the missing character.</param>
+        /// <param name="fontAsset">The font asset that is missing the requested characters.</param>
+        /// <param name="textComponent">The text component where the requested character is missing.</param>
+        public delegate void MissingCharacterEventCallback(int unicode, int stringIndex, TextInfo text, FontAsset fontAsset);
+
+        /// <summary>
+        /// Event delegate to be called when the requested Unicode character is missing from the font asset.
+        /// </summary>
+        public static event MissingCharacterEventCallback OnMissingCharacter;
+
         Vector3[] m_RectTransformCorners = new Vector3[4];
         float m_MarginWidth;
         float m_MarginHeight;
 
-        int[] m_CharBuffer = new int[k_MaxCharacters];
         float m_PreferredWidth;
         float m_PreferredHeight;
         FontAsset m_CurrentFontAsset;
@@ -428,10 +490,13 @@ public static Vector2 GetPreferredValues(TextGenerationSettings settings, TextIn
         float m_CurrentFontSize;
         TextProcessingStack<float> m_SizeStack = new TextProcessingStack<float>(16);
 
+        // STYLE TAGS
+        protected TextProcessingStack<int>[] m_TextStyleStacks = new TextProcessingStack<int>[8];
+        protected int m_TextStyleStackDepth = 0;
+
         FontStyles m_FontStyleInternal = FontStyles.Normal;
         FontStyleStack m_FontStyleStack;
 
-        //FontWeight m_FontWeight = FontWeight.Regular;
         TextFontWeight m_FontWeightInternal = TextFontWeight.Regular;
         TextProcessingStack<TextFontWeight> m_FontWeightStack = new TextProcessingStack<TextFontWeight>(8);
 
@@ -447,12 +512,15 @@ public static Vector2 GetPreferredValues(TextGenerationSettings settings, TextIn
         TextProcessingStack<Color32> m_UnderlineColorStack = new TextProcessingStack<Color32>(new Color32[16]);
         TextProcessingStack<Color32> m_StrikethroughColorStack = new TextProcessingStack<Color32>(new Color32[16]);
         TextProcessingStack<Color32> m_HighlightColorStack = new TextProcessingStack<Color32>(new Color32[16]);
+        TextProcessingStack<HighlightState> m_HighlightStateStack = new TextProcessingStack<HighlightState>(new HighlightState[16]);
+        TextProcessingStack<int> m_ItalicAngleStack = new TextProcessingStack<int>(new int[16]);
         TextColorGradient m_ColorGradientPreset;
         TextProcessingStack<TextColorGradient> m_ColorGradientStack = new TextProcessingStack<TextColorGradient>(new TextColorGradient[16]);
+        bool m_ColorGradientPresetIsTinted;
         TextProcessingStack<int> m_ActionStack = new TextProcessingStack<int>(new int[16]);
-        bool m_IsFxMatrixSet;
         float m_LineOffset;
         float m_LineHeight;
+        bool m_IsDrivenLineSpacing;
         float m_CSpacing;
         float m_MonoSpacing;
         float m_XAdvance;
@@ -469,6 +537,7 @@ public static Vector2 GetPreferredValues(TextGenerationSettings settings, TextIn
         float m_MaxLineDescender;
         int m_LineNumber;
         int m_LineVisibleCharacterCount;
+        int m_LineVisibleSpaceCount;
         int m_FirstOverflowCharacterIndex;
         int m_PageNumber;
         float m_MarginLeft;
@@ -482,7 +551,9 @@ public static Vector2 GetPreferredValues(TextGenerationSettings settings, TextIn
         bool m_IsNonBreakingSpace;
         WordWrapState m_SavedWordWrapState;
         WordWrapState m_SavedLineState;
-        int m_LoopCountA;
+        WordWrapState m_SavedEllipsisState = new WordWrapState();
+        WordWrapState m_SavedLastValidState = new WordWrapState();
+        WordWrapState m_SavedSoftLineBreakState = new WordWrapState();
         TextElementType m_TextElementType;
         bool m_IsParsingText;
         int m_SpriteIndex;
@@ -490,35 +561,34 @@ public static Vector2 GetPreferredValues(TextGenerationSettings settings, TextIn
         TextElement m_CachedTextElement;
         Color32 m_HighlightColor;
         float m_CharWidthAdjDelta;
-        Matrix4x4 m_FxMatrix;
         float m_MaxFontSize;
         float m_MinFontSize;
-        bool m_IsCharacterWrappingEnabled;
+        int m_AutoSizeIterationCount;
+        int m_AutoSizeMaxIterationCount = 100;
+        bool m_IsAutoSizePointSizeSet;
         float m_StartOfLineAscender;
         float m_LineSpacingDelta;
         bool m_IsMaskingEnabled;
         MaterialReference[] m_MaterialReferences = new MaterialReference[8];
         int m_SpriteCount = 0;
         TextProcessingStack<int> m_StyleStack = new TextProcessingStack<int>(new int[16]);
+        TextProcessingStack<WordWrapState> m_EllipsisInsertionCandidateStack = new TextProcessingStack<WordWrapState>(8, 8);
         int m_SpriteAnimationId;
+        int m_ItalicAngle;
+        Vector3 m_FXScale;
+        Quaternion m_FXRotation;
 
-        /// <summary>
-        /// Internal Array used in the parsing and layout of the text.
-        /// </summary>
-        uint[] m_InternalTextParsingBuffer = new uint[256];
+        int m_LastBaseGlyphIndex;
+        float m_PageAscender;
 
-        RichTextTagAttribute[] m_Attributes = new RichTextTagAttribute[8];
+        RichTextTagAttribute[] m_XmlAttribute = new RichTextTagAttribute[8];
+        private float[] m_AttributeParameterValues = new float[16];
 
-        XmlTagAttribute[] m_XmlAttribute = new XmlTagAttribute[8]; // To remove...
-        char[] m_RichTextTag = new char[128];
         Dictionary<int, int> m_MaterialReferenceIndexLookup = new Dictionary<int, int>();
         bool m_IsCalculatingPreferredValues;
         SpriteAsset m_DefaultSpriteAsset;
         bool m_TintSprite;
 
-        //private Character m_CachedEllipsisGlyphInfo = null;
-        //Character m_CachedUnderlineGlyphInfo;
-
         protected SpecialCharacter m_Ellipsis;
         protected SpecialCharacter m_Underline;
 
@@ -526,7 +596,6 @@ public static Vector2 GetPreferredValues(TextGenerationSettings settings, TextIn
         bool m_IsSdfShader;
 
         TextElementInfo[] m_InternalTextElementInfo;
-        int m_RecursiveCount;
 
         void Prepare(TextGenerationSettings generationSettings, TextInfo textInfo)
         {
@@ -543,8 +612,9 @@ void Prepare(TextGenerationSettings generationSettings, TextInfo textInfo)
             ComputeMarginSize(generationSettings.screenRect, generationSettings.margins);
 
             //ParseInputText
-            TextGeneratorUtilities.StringToCharArray(generationSettings.text, ref m_CharBuffer, ref m_StyleStack, generationSettings);
-            SetArraySizes(m_CharBuffer, generationSettings, textInfo);
+            PopulateTextBackingArray(generationSettings.text);
+            PopulateTextProcessingArray(generationSettings);
+            SetArraySizes(m_TextProcessingArray, generationSettings, textInfo);
 
             // Reset Font min / max used with Auto-sizing
             if (generationSettings.autoSize)
@@ -557,7 +627,6 @@ void Prepare(TextGenerationSettings generationSettings, TextInfo textInfo)
             m_LineSpacingDelta = 0;
             m_CharWidthAdjDelta = 0;
 
-            m_IsCharacterWrappingEnabled = false;
             Profiler.EndSample();
         }
 
@@ -566,20 +635,27 @@ void Prepare(TextGenerationSettings generationSettings, TextInfo textInfo)
         /// </summary>
         void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textInfo)
         {
-            // Clear TextInfo
-            if (textInfo == null)
+            // Early exit if no font asset was assigned. This should not be needed since LiberationSans SDF will be assigned by default.
+            if (generationSettings.fontAsset == null || generationSettings.fontAsset.characterLookupTable == null)
+            {
+                Debug.LogWarning("Can't Generate Mesh! No Font Asset has been assigned.");
+                m_IsAutoSizePointSizeSet = true;
                 return;
+            }
 
-            textInfo.Clear();
+            // Clear TextInfo
+            if (textInfo != null)
+                textInfo.Clear();
 
             // Early exit if we don't have any Text to generate.
-            if (m_CharBuffer == null || m_CharBuffer.Length == 0 || m_CharBuffer[0] == (char)0)
+            if (m_TextProcessingArray == null || m_TextProcessingArray.Length == 0 || m_TextProcessingArray[0].unicode == 0)
             {
                 // Clear mesh and upload changes to the mesh.
                 ClearMesh(true, textInfo);
 
                 m_PreferredWidth = 0;
                 m_PreferredHeight = 0;
+                m_IsAutoSizePointSizeSet = true;
 
                 return;
             }
@@ -596,23 +672,27 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
             // Calculate the scale of the font based on selected font size and sampling point size.
             // baseScale is calculated using the font asset assigned to the text object.
-            float baseScale = m_FontScale = (m_FontSize / generationSettings.fontAsset.faceInfo.pointSize * generationSettings.fontAsset.faceInfo.scale);
+            float baseScale = (m_FontSize / generationSettings.fontAsset.m_FaceInfo.pointSize * generationSettings.fontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
             float currentElementScale = baseScale;
+            float currentEmScale = m_FontSize * 0.01f * (generationSettings.isOrthographic ? 1 : 0.1f);
             m_FontScaleMultiplier = 1;
 
             m_CurrentFontSize = m_FontSize;
             m_SizeStack.SetDefault(m_CurrentFontSize);
+            float fontSizeDelta = 0;
+
+            int charCode = 0; // Holds the character code of the currently being processed character.
 
             m_FontStyleInternal = generationSettings.fontStyle; // Set the default style.
             m_FontWeightInternal = (m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold ? TextFontWeight.Bold : generationSettings.fontWeight;
             m_FontWeightStack.SetDefault(m_FontWeightInternal);
             m_FontStyleStack.Clear();
 
-            m_LineJustification = generationSettings.textAlignment; // Sets the line justification mode to match editor alignment.
+            m_LineJustification = generationSettings.textAlignment;// m_textAlignment; // Sets the line justification mode to match editor alignment.
             m_LineJustificationStack.SetDefault(m_LineJustification);
 
             float padding = 0;
-            float boldXAdvanceMultiplier = 1; // Used to increase spacing between character when style is bold.
+            //float boldXAdvanceMultiplier = 1; // Used to increase spacing between character when style is bold.
 
             m_BaselineOffset = 0; // Used by subscript characters.
             m_BaselineOffsetStack.Clear();
@@ -620,12 +700,12 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             // Underline
             bool beginUnderline = false;
             Vector3 underlineStart = Vector3.zero; // Used to track where underline starts & ends.
-            Vector3 underlineEnd;
+            Vector3 underlineEnd = Vector3.zero;
 
             // Strike-through
             bool beginStrikethrough = false;
             Vector3 strikethroughStart = Vector3.zero;
-            Vector3 strikethroughEnd;
+            Vector3 strikethroughEnd = Vector3.zero;
 
             // Text Highlight
             bool beginHighlight = false;
@@ -640,19 +720,23 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             m_ColorStack.SetDefault(m_HtmlColor);
             m_UnderlineColorStack.SetDefault(m_HtmlColor);
             m_StrikethroughColorStack.SetDefault(m_HtmlColor);
-            m_HighlightColorStack.SetDefault(m_HtmlColor);
+            m_HighlightStateStack.SetDefault(new HighlightState(m_HtmlColor, Offset.zero));
 
             m_ColorGradientPreset = null;
             m_ColorGradientStack.SetDefault(null);
 
+            m_ItalicAngle = m_CurrentFontAsset.italicStyleSlant;
+            m_ItalicAngleStack.SetDefault(m_ItalicAngle);
+
             // Clear the Action stack.
             m_ActionStack.Clear();
 
-            m_IsFxMatrixSet = false;
+            m_FXScale = Vector3.one;
+            m_FXRotation = Quaternion.identity;
 
             m_LineOffset = 0; // Amount of space between lines (font line spacing + m_linespacing).
             m_LineHeight = k_FloatUnset;
-            float lineGap = m_CurrentFontAsset.faceInfo.lineHeight - (m_CurrentFontAsset.faceInfo.ascentLine - m_CurrentFontAsset.faceInfo.descentLine);
+            float lineGap = m_CurrentFontAsset.faceInfo.lineHeight - (m_CurrentFontAsset.m_FaceInfo.ascentLine - m_CurrentFontAsset.m_FaceInfo.descentLine);
 
             m_CSpacing = 0; // Amount of space added between characters as a result of the use of the <cspace> tag.
             m_MonoSpacing = 0;
@@ -673,30 +757,30 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
             m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
             m_LineNumber = 0;
+            m_StartOfLineAscender = 0;
             m_LineVisibleCharacterCount = 0;
+            m_LineVisibleSpaceCount = 0;
             bool isStartOfNewLine = true;
+            m_IsDrivenLineSpacing = false;
             m_FirstOverflowCharacterIndex = -1;
+            m_LastBaseGlyphIndex = int.MinValue;
 
             m_PageNumber = 0;
             int pageToDisplay = Mathf.Clamp(generationSettings.pageToDisplay - 1, 0, textInfo.pageInfo.Length - 1);
-            int previousPageOverflowChar = 0;
-
-            int ellipsisIndex = 0;
+            textInfo.ClearPageInfo();
 
             Vector4 margins = generationSettings.margins;
-            float marginWidth = m_MarginWidth;
-            float marginHeight = m_MarginHeight;
+            float marginWidth = m_MarginWidth > 0 ? m_MarginWidth : 0;
+            float marginHeight = m_MarginHeight > 0 ? m_MarginHeight : 0;
             m_MarginLeft = 0;
             m_MarginRight = 0;
             m_Width = -1;
-            float width = marginWidth + 0.0001f - m_MarginLeft - m_MarginRight;
+            float widthOfTextArea = marginWidth + 0.0001f - m_MarginLeft - m_MarginRight;
 
             // Need to initialize these Extents structures
             m_MeshExtents.min = TextGeneratorUtilities.largePositiveVector2;
             m_MeshExtents.max = TextGeneratorUtilities.largeNegativeVector2;
 
-            TextSettings textSettings = generationSettings.textSettings;
-
             // Initialize lineInfo
             textInfo.ClearLineInfo();
 
@@ -704,45 +788,71 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             m_MaxCapHeight = 0;
             m_MaxAscender = 0;
             m_MaxDescender = 0;
-            float pageAscender = 0;
+            m_PageAscender = 0;
             float maxVisibleDescender = 0;
             bool isMaxVisibleDescenderSet = false;
             m_IsNewPage = false;
 
-            // Word Wrapping related
-            bool isFirstWord = true;
+            // Initialize struct to track states of word wrapping
+            bool isFirstWordOfLine = true;
             m_IsNonBreakingSpace = false;
             bool ignoreNonBreakingSpace = false;
-            bool isLastBreakingChar = false;
-            int wrappingIndex = 0;
+            int lastSoftLineBreak = 0;
+
+            CharacterSubstitution characterToSubstitute = new CharacterSubstitution(-1, 0);
+            bool isSoftHyphenIgnored = false;
+            var wordWrap = generationSettings.wordWrap ? TextWrappingMode.Normal : TextWrappingMode.NoWrap;
 
             // Save character and line state before we begin layout.
             SaveWordWrappingState(ref m_SavedWordWrapState, -1, -1, textInfo);
             SaveWordWrappingState(ref m_SavedLineState, -1, -1, textInfo);
+            SaveWordWrappingState(ref m_SavedEllipsisState, -1, -1, textInfo);
+            SaveWordWrappingState(ref m_SavedLastValidState, -1, -1, textInfo);
+            SaveWordWrappingState(ref m_SavedSoftLineBreakState, -1, -1, textInfo);
+
+            m_EllipsisInsertionCandidateStack.Clear();
+            // Clear the previous truncated / ellipsed state
+            m_IsTextTruncated = false;
 
-            m_LoopCountA += 1;
+            TextSettings textSettings = generationSettings.textSettings;
 
-            int endTagIndex;
+            // Safety Tracker
+            int restoreCount = 0;
 
             // Parse through Character buffer to read HTML tags and begin creating mesh.
-            for (int i = 0; i < m_CharBuffer.Length && m_CharBuffer[i] != 0; i++)
+            for (int i = 0; i < m_TextProcessingArray.Length && m_TextProcessingArray[i].unicode != 0; i++)
             {
-                var charCode = m_CharBuffer[i]; // Holds the character code of the currently being processed character.
+                charCode = m_TextProcessingArray[i].unicode;
+
+                if (restoreCount > 5)
+                {
+                    Debug.LogError("Line breaking recursion max threshold hit... Character [" + charCode + "] index: " + i);
+                    characterToSubstitute.index = m_CharacterCount;
+                    characterToSubstitute.unicode = 0x03;
+                }
+
+                // Skip characters that have been substituted.
+                if (charCode == 0x1A)
+                    continue;
 
                 // Parse Rich Text Tag
-                if (generationSettings.richText && charCode == k_LesserThan)
+                #region Parse Rich Text Tag
+                if (generationSettings.richText && charCode == '<')
                 {
                     m_IsParsingText = true;
                     m_TextElementType = TextElementType.Character;
+                    int endTagIndex;
 
                     // Check if Tag is valid. If valid, skip to the end of the validated tag.
-                    if (ValidateHtmlTag(m_CharBuffer, i + 1, out endTagIndex, generationSettings, textInfo))
+                    if (ValidateHtmlTag(m_TextProcessingArray, i + 1, out endTagIndex, generationSettings, textInfo))
                     {
                         i = endTagIndex;
 
                         // Continue to next character or handle the sprite element
                         if (m_TextElementType == TextElementType.Character)
+                        {
                             continue;
+                        }
                     }
                 }
                 else
@@ -751,23 +861,66 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     m_CurrentMaterialIndex = textInfo.textElementInfo[m_CharacterCount].materialReferenceIndex;
                     m_CurrentFontAsset = textInfo.textElementInfo[m_CharacterCount].fontAsset;
                 }
+                #endregion End Parse Rich Text Tag
 
-                int prevMaterialIndex = m_CurrentMaterialIndex;
-
+                int previousMaterialIndex = m_CurrentMaterialIndex;
                 bool isUsingAltTypeface = textInfo.textElementInfo[m_CharacterCount].isUsingAlternateTypeface;
 
                 m_IsParsingText = false;
 
+                // Handle potential character substitutions
+                #region Character Substitutions
+                bool isInjectedCharacter = false;
+
+                if (characterToSubstitute.index == m_CharacterCount)
+                {
+                    charCode = (int)characterToSubstitute.unicode;
+                    m_TextElementType = TextElementType.Character;
+                    isInjectedCharacter = true;
+
+                    switch (charCode)
+                    {
+                        case 0x03:
+                            textInfo.textElementInfo[m_CharacterCount].textElement = m_CurrentFontAsset.characterLookupTable[0x03];
+                            m_IsTextTruncated = true;
+                            break;
+                        case 0x2D:
+                            //
+                            break;
+                        case 0x2026:
+                            textInfo.textElementInfo[m_CharacterCount].textElement = m_Ellipsis.character;
+                            textInfo.textElementInfo[m_CharacterCount].elementType = TextElementType.Character;
+                            textInfo.textElementInfo[m_CharacterCount].fontAsset = m_Ellipsis.fontAsset;
+                            textInfo.textElementInfo[m_CharacterCount].material = m_Ellipsis.material;
+                            textInfo.textElementInfo[m_CharacterCount].materialReferenceIndex = m_Ellipsis.materialIndex;
+
+                            // Indicates the source parsing data has been modified.
+                            m_IsTextTruncated = true;
+
+                            // End Of Text
+                            characterToSubstitute.index = m_CharacterCount + 1;
+                            characterToSubstitute.unicode = 0x03;
+                            break;
+                    }
+                }
+                #endregion
+
+
                 // When using Linked text, mark character as ignored and skip to next character.
-                if (m_CharacterCount < generationSettings.firstVisibleCharacter)
+                #region Linked Text
+                if (m_CharacterCount < generationSettings.firstVisibleCharacter && charCode != 0x03)
                 {
                     textInfo.textElementInfo[m_CharacterCount].isVisible = false;
                     textInfo.textElementInfo[m_CharacterCount].character = (char)k_ZeroWidthSpace;
+                    textInfo.textElementInfo[m_CharacterCount].lineNumber = 0;
                     m_CharacterCount += 1;
                     continue;
                 }
+                #endregion
+
 
                 // Handle Font Styles like LowerCase, UpperCase and SmallCaps.
+                #region Handling of LowerCase, UpperCase and SmallCaps Font Styles
 
                 float smallCapsMultiplier = 1.0f;
 
@@ -778,6 +931,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         // If this character is lowercase, switch to uppercase.
                         if (char.IsLower((char)charCode))
                             charCode = char.ToUpper((char)charCode);
+
                     }
                     else if ((m_FontStyleInternal & FontStyles.LowerCase) == FontStyles.LowerCase)
                     {
@@ -794,38 +948,63 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         }
                     }
                 }
+                #endregion
+
 
                 // Look up Character Data from Dictionary and cache it.
+                #region Look up Character Data
 
+                float baselineOffset = 0;
+                float elementAscentLine = 0;
+                float elementDescentLine = 0;
                 if (m_TextElementType == TextElementType.Sprite)
                 {
                     // If a sprite is used as a fallback then get a reference to it and set the color to white.
-                    m_CurrentSpriteAsset = textInfo.textElementInfo[m_CharacterCount].spriteAsset;
-                    m_SpriteIndex = textInfo.textElementInfo[m_CharacterCount].spriteIndex;
+                    m_CurrentSpriteAsset = textInfo.textElementInfo[m_CharacterCount].textElement.textAsset as SpriteAsset;
+                    m_SpriteIndex = (int)textInfo.textElementInfo[m_CharacterCount].textElement.glyphIndex;
 
                     SpriteCharacter sprite = m_CurrentSpriteAsset.spriteCharacterTable[m_SpriteIndex];
                     if (sprite == null)
+                    {
                         continue;
+                    }
 
                     // Sprites are assigned in the E000 Private Area + sprite Index
-                    if (charCode == k_LesserThan)
-                        charCode = k_SpritesStart + m_SpriteIndex;
+                    if (charCode == '<')
+                        charCode = 57344 + m_SpriteIndex;
                     else
                         m_SpriteColor = Color.white;
 
+                    float fontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
+
                     // The sprite scale calculations are based on the font asset assigned to the text object.
-                    float spriteScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
-                    currentElementScale = m_CurrentFontAsset.faceInfo.ascentLine / sprite.glyph.metrics.height * sprite.scale * sprite.glyph.scale * spriteScale * generationSettings.scale;
+                    if (m_CurrentSpriteAsset.m_FaceInfo.pointSize > 0)
+                    {
+                        float spriteScale = m_CurrentFontSize / m_CurrentSpriteAsset.m_FaceInfo.pointSize * m_CurrentSpriteAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+                        currentElementScale = sprite.m_Scale * sprite.m_Glyph.scale * spriteScale;
+                        elementAscentLine = m_CurrentSpriteAsset.m_FaceInfo.ascentLine;
+                        baselineOffset = m_CurrentSpriteAsset.m_FaceInfo.baseline * fontScale * m_FontScaleMultiplier * m_CurrentSpriteAsset.m_FaceInfo.scale;
+                        elementDescentLine = m_CurrentSpriteAsset.m_FaceInfo.descentLine;
+                    }
+                    else
+                    {
+                        float spriteScale = m_CurrentFontSize / m_CurrentFontAsset.m_FaceInfo.pointSize * m_CurrentFontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+                        currentElementScale = m_CurrentFontAsset.m_FaceInfo.ascentLine / sprite.m_Glyph.metrics.height * sprite.m_Scale * sprite.m_Glyph.scale * spriteScale;
+                        float scaleDelta = spriteScale / currentElementScale;
+                        elementAscentLine = m_CurrentFontAsset.m_FaceInfo.ascentLine * scaleDelta;
+                        baselineOffset = m_CurrentFontAsset.m_FaceInfo.baseline * fontScale * m_FontScaleMultiplier * m_CurrentFontAsset.m_FaceInfo.scale;
+                        elementDescentLine = m_CurrentFontAsset.m_FaceInfo.descentLine * scaleDelta;
+                    }
 
                     m_CachedTextElement = sprite;
 
                     textInfo.textElementInfo[m_CharacterCount].elementType = TextElementType.Sprite;
-                    textInfo.textElementInfo[m_CharacterCount].scale = spriteScale;
+                    textInfo.textElementInfo[m_CharacterCount].scale = currentElementScale;
                     textInfo.textElementInfo[m_CharacterCount].spriteAsset = m_CurrentSpriteAsset;
                     textInfo.textElementInfo[m_CharacterCount].fontAsset = m_CurrentFontAsset;
                     textInfo.textElementInfo[m_CharacterCount].materialReferenceIndex = m_CurrentMaterialIndex;
 
-                    m_CurrentMaterialIndex = prevMaterialIndex;
+                    m_CurrentMaterialIndex = previousMaterialIndex;
 
                     padding = 0;
                 }
@@ -833,29 +1012,51 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 {
                     m_CachedTextElement = textInfo.textElementInfo[m_CharacterCount].textElement;
                     if (m_CachedTextElement == null)
+                    {
                         continue;
+                    }
 
                     m_CurrentFontAsset = textInfo.textElementInfo[m_CharacterCount].fontAsset;
                     m_CurrentMaterial = textInfo.textElementInfo[m_CharacterCount].material;
                     m_CurrentMaterialIndex = textInfo.textElementInfo[m_CharacterCount].materialReferenceIndex;
 
-                    // Re-calculate font scale as the font asset may have changed.
-                    m_FontScale = m_CurrentFontSize * smallCapsMultiplier / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale;
+                    // Special handling if replaced character was a line feed where in this case we have to use the scale of the previous character.
+                    float adjustedScale;
+                    if (isInjectedCharacter && m_TextProcessingArray[i].unicode == 0x0A && m_CharacterCount != m_FirstCharacterOfLine)
+                        adjustedScale = textInfo.textElementInfo[m_CharacterCount - 1].pointSize * smallCapsMultiplier / m_CurrentFontAsset.m_FaceInfo.pointSize * m_CurrentFontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+                    else
+                        adjustedScale = m_CurrentFontSize * smallCapsMultiplier / m_CurrentFontAsset.m_FaceInfo.pointSize * m_CurrentFontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+
+                    // Special handling for injected Ellipsis
+                    if (isInjectedCharacter && charCode == 0x2026)
+                    {
+                        elementAscentLine = 0;
+                        elementDescentLine = 0;
+                    }
+                    else
+                    {
+                        elementAscentLine = m_CurrentFontAsset.m_FaceInfo.ascentLine;
+                        elementDescentLine = m_CurrentFontAsset.m_FaceInfo.descentLine;
+                    }
 
-                    currentElementScale = m_FontScale * m_FontScaleMultiplier * m_CachedTextElement.scale * generationSettings.scale;
+                    currentElementScale = adjustedScale * m_FontScaleMultiplier * m_CachedTextElement.m_Scale * m_CachedTextElement.m_Glyph.scale;
+                    baselineOffset = m_CurrentFontAsset.m_FaceInfo.baseline * adjustedScale * m_FontScaleMultiplier * m_CurrentFontAsset.m_FaceInfo.scale;
 
                     textInfo.textElementInfo[m_CharacterCount].elementType = TextElementType.Character;
                     textInfo.textElementInfo[m_CharacterCount].scale = currentElementScale;
 
                     padding = m_CurrentMaterialIndex == 0 ? m_Padding : GetPaddingForMaterial(m_CurrentMaterial, generationSettings.extraPadding);
                 }
+                #endregion
+
 
                 // Handle Soft Hyphen
-                float oldScale = currentElementScale;
-                if (charCode == k_SoftHyphen)
-                {
+                #region Handle Soft Hyphen
+                float currentElementUnmodifiedScale = currentElementScale;
+                if (charCode == 0xAD || charCode == 0x03)
                     currentElementScale = 0;
-                }
+                #endregion
+
 
                 // Store some of the text object's information
                 textInfo.textElementInfo[m_CharacterCount].character = (char)charCode;
@@ -863,66 +1064,168 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 textInfo.textElementInfo[m_CharacterCount].color = m_HtmlColor;
                 textInfo.textElementInfo[m_CharacterCount].underlineColor = m_UnderlineColor;
                 textInfo.textElementInfo[m_CharacterCount].strikethroughColor = m_StrikethroughColor;
-                textInfo.textElementInfo[m_CharacterCount].highlightColor = m_HighlightColor;
+                textInfo.textElementInfo[m_CharacterCount].highlightState = m_HighlightState;
                 textInfo.textElementInfo[m_CharacterCount].style = m_FontStyleInternal;
-                textInfo.textElementInfo[m_CharacterCount].index = i;
+
+                // Cache glyph metrics
+                Glyph altGlyph = textInfo.textElementInfo[m_CharacterCount].alternativeGlyph;
+                GlyphMetrics currentGlyphMetrics = altGlyph == null ? m_CachedTextElement.m_Glyph.metrics : altGlyph.metrics;
+
+                // Optimization to avoid calling this more than once per character.
+                bool isWhiteSpace = charCode <= 0xFFFF && char.IsWhiteSpace((char)charCode);
 
                 // Handle Kerning if Enabled.
+                #region Handle Kerning
                 GlyphValueRecord glyphAdjustments = new GlyphValueRecord();
                 float characterSpacingAdjustment = generationSettings.characterSpacing;
                 if (generationSettings.enableKerning)
                 {
                     GlyphPairAdjustmentRecord adjustmentPair;
-                    uint baseGlyphIndex = m_CachedTextElement.glyphIndex;
+                    uint baseGlyphIndex = m_CachedTextElement.m_GlyphIndex;
 
                     if (m_CharacterCount < totalCharacterCount - 1)
                     {
-                        uint nextGlyphIndex = textInfo.textElementInfo[m_CharacterCount + 1].textElement.glyphIndex;
+                        uint nextGlyphIndex = textInfo.textElementInfo[m_CharacterCount + 1].textElement.m_GlyphIndex;
                         uint key = nextGlyphIndex << 16 | baseGlyphIndex;
 
                         if (m_CurrentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
                         {
                             glyphAdjustments = adjustmentPair.firstAdjustmentRecord.glyphValueRecord;
-                            //characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
+                            characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
                         }
                     }
 
                     if (m_CharacterCount >= 1)
                     {
-                        uint previousGlyphIndex = textInfo.textElementInfo[m_CharacterCount - 1].textElement.glyphIndex;
+                        uint previousGlyphIndex = textInfo.textElementInfo[m_CharacterCount - 1].textElement.m_GlyphIndex;
                         uint key = baseGlyphIndex << 16 | previousGlyphIndex;
 
                         if (m_CurrentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
                         {
                             glyphAdjustments += adjustmentPair.secondAdjustmentRecord.glyphValueRecord;
-                            //characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
+                            characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
+                        }
+                    }
+                }
+
+                textInfo.textElementInfo[m_CharacterCount].adjustedHorizontalAdvance = glyphAdjustments.xAdvance;
+                #endregion
+
+
+                // Handle Diacritical Marks
+                #region Handle Diacritical Marks
+                bool isBaseGlyph = TextGeneratorUtilities.IsBaseGlyph((uint)charCode);
+
+                if (isBaseGlyph)
+                    m_LastBaseGlyphIndex = m_CharacterCount;
+
+                if (m_CharacterCount > 0 && !isBaseGlyph)
+                {
+                    // Check for potential Mark-to-Base lookup if previous glyph was a base glyph
+                    if (m_LastBaseGlyphIndex != int.MinValue && m_LastBaseGlyphIndex == m_CharacterCount - 1)
+                    {
+                        Glyph baseGlyph = textInfo.textElementInfo[m_LastBaseGlyphIndex].textElement.glyph;
+                        uint baseGlyphIndex = baseGlyph.index;
+                        uint markGlyphIndex = m_CachedTextElement.glyphIndex;
+                        uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+                        if (m_CurrentFontAsset.fontFeatureTable.m_MarkToBaseAdjustmentRecordLookup.TryGetValue(key, out MarkToBaseAdjustmentRecord glyphAdjustmentRecord))
+                        {
+                            float advanceOffset = (textInfo.textElementInfo[m_LastBaseGlyphIndex].origin - m_XAdvance) / currentElementScale;
+
+                            glyphAdjustments.xPlacement = advanceOffset + glyphAdjustmentRecord.baseGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.markPositionAdjustment.xPositionAdjustment;
+                            glyphAdjustments.yPlacement = glyphAdjustmentRecord.baseGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.markPositionAdjustment.yPositionAdjustment;
+
+                            characterSpacingAdjustment = 0;
+                        }
+                    }
+                    else
+                    {
+                        // Iterate from previous glyph to last base glyph checking for any potential Mark-to-Mark lookups to apply. Otherwise check for potential Mark-to-Base lookup between the current glyph and last base glyph
+                        bool wasLookupApplied = false;
+
+                        // Check for any potential Mark-to-Mark lookups
+                        for (int characterLookupIndex = m_CharacterCount - 1; characterLookupIndex >= 0 && characterLookupIndex != m_LastBaseGlyphIndex; characterLookupIndex--)
+                        {
+                            // Handle any potential Mark-to-Mark lookup
+                            Glyph baseMarkGlyph = textInfo.textElementInfo[characterLookupIndex].textElement.glyph;
+                            uint baseGlyphIndex = baseMarkGlyph.index;
+                            uint combiningMarkGlyphIndex = m_CachedTextElement.glyphIndex;
+                            uint key = combiningMarkGlyphIndex << 16 | baseGlyphIndex;
+
+                            if (m_CurrentFontAsset.fontFeatureTable.m_MarkToMarkAdjustmentRecordLookup.TryGetValue(key, out MarkToMarkAdjustmentRecord glyphAdjustmentRecord))
+                            {
+                                float baseMarkOrigin = (textInfo.textElementInfo[characterLookupIndex].origin - m_XAdvance) / currentElementScale;
+                                float currentBaseline = baselineOffset - m_LineOffset + m_BaselineOffset;
+                                float baseMarkBaseline = (textInfo.textElementInfo[characterLookupIndex].baseLine - currentBaseline) / currentElementScale;
+
+                                glyphAdjustments.xPlacement = baseMarkOrigin + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.xPositionAdjustment;
+                                glyphAdjustments.yPlacement = baseMarkBaseline + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.yPositionAdjustment;
+
+                                characterSpacingAdjustment = 0;
+                                wasLookupApplied = true;
+                                break;
+                            }
+                        }
+
+                        // If no Mark-to-Mark lookups were applied, check for potential Mark-to-Base lookup.
+                        if (m_LastBaseGlyphIndex != int.MinValue && !wasLookupApplied)
+                        {
+                            // Handle lookup for Mark-to-Base
+                            Glyph baseGlyph = textInfo.textElementInfo[m_LastBaseGlyphIndex].textElement.glyph;
+                            uint baseGlyphIndex = baseGlyph.index;
+                            uint markGlyphIndex = m_CachedTextElement.glyphIndex;
+                            uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+                            if (m_CurrentFontAsset.fontFeatureTable.m_MarkToBaseAdjustmentRecordLookup.TryGetValue(key, out MarkToBaseAdjustmentRecord glyphAdjustmentRecord))
+                            {
+                                float advanceOffset = (textInfo.textElementInfo[m_LastBaseGlyphIndex].origin - m_XAdvance) / currentElementScale;
+
+                                glyphAdjustments.xPlacement = advanceOffset + glyphAdjustmentRecord.baseGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.markPositionAdjustment.xPositionAdjustment;
+                                glyphAdjustments.yPlacement = glyphAdjustmentRecord.baseGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.markPositionAdjustment.yPositionAdjustment;
+
+                                characterSpacingAdjustment = 0;
+                            }
                         }
                     }
                 }
 
+                // Adjust relevant text metrics
+                elementAscentLine += glyphAdjustments.yPlacement;
+                elementDescentLine += glyphAdjustments.yPlacement;
+                #endregion
+
 
                 // Initial Implementation for RTL support.
+                #region Handle Right-to-Left
                 if (generationSettings.isRightToLeft)
                 {
-                    m_XAdvance -= ((m_CachedTextElement.glyph.metrics.horizontalAdvance * boldXAdvanceMultiplier + generationSettings.characterSpacing + generationSettings.wordSpacing + m_CurrentFontAsset.regularStyleSpacing) * currentElementScale + m_CSpacing) * (1 - m_CharWidthAdjDelta);
+                    m_XAdvance -= currentGlyphMetrics.horizontalAdvance * (1 - m_CharWidthAdjDelta) * currentElementScale;
 
-                    if (char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace)
-                        m_XAdvance -= generationSettings.wordSpacing * currentElementScale;
+                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                        m_XAdvance -= generationSettings.wordSpacing * currentEmScale;
                 }
+                #endregion
+
 
                 // Handle Mono Spacing
+                #region Handle Mono Spacing
                 float monoAdvance = 0;
                 if (m_MonoSpacing != 0)
                 {
-                    monoAdvance = (m_MonoSpacing / 2 - (m_CachedTextElement.glyph.metrics.width / 2 + m_CachedTextElement.glyph.metrics.horizontalBearingX) * currentElementScale) * (1 - m_CharWidthAdjDelta);
+                    monoAdvance = (m_MonoSpacing / 2 - (currentGlyphMetrics.width / 2 + currentGlyphMetrics.horizontalBearingX) * currentElementScale) * (1 - m_CharWidthAdjDelta);
                     m_XAdvance += monoAdvance;
                 }
+                #endregion
+
 
                 // Set Padding based on selected font style
-                float stylePadding; // Extra padding required to accommodate Bold style.
+                #region Handle Style Padding
+                float boldSpacingAdjustment;
+                float stylePadding;
                 if (m_TextElementType == TextElementType.Character && !isUsingAltTypeface && ((m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold)) // Checks for any combination of Bold Style.
                 {
-                    if (m_CurrentMaterial.HasProperty(TextShaderUtilities.ID_GradientScale))
+                    if (m_CurrentMaterial != null && m_CurrentMaterial.HasProperty(TextShaderUtilities.ID_GradientScale))
                     {
                         float gradientScale = m_CurrentMaterial.GetFloat(TextShaderUtilities.ID_GradientScale);
                         stylePadding = m_CurrentFontAsset.boldStyleWeight / 4.0f * gradientScale * m_CurrentMaterial.GetFloat(TextShaderUtilities.ID_ScaleRatio_A);
@@ -934,14 +1237,14 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     else
                         stylePadding = 0;
 
-                    boldXAdvanceMultiplier = 1 + m_CurrentFontAsset.boldStyleSpacing * 0.01f;
+                    boldSpacingAdjustment = m_CurrentFontAsset.boldStyleSpacing;
                 }
                 else
                 {
-                    if (m_CurrentMaterial.HasProperty(TextShaderUtilities.ID_GradientScale))
+                    if (m_CurrentMaterial != null && m_CurrentMaterial.HasProperty(TextShaderUtilities.ID_GradientScale) && m_CurrentMaterial.HasProperty(TextShaderUtilities.ID_ScaleRatio_A))
                     {
                         float gradientScale = m_CurrentMaterial.GetFloat(TextShaderUtilities.ID_GradientScale);
-                        stylePadding = m_CurrentFontAsset.regularStyleWeight / 4.0f * gradientScale * m_CurrentMaterial.GetFloat(TextShaderUtilities.ID_ScaleRatio_A);
+                        stylePadding = m_CurrentFontAsset.m_RegularStyleWeight / 4.0f * gradientScale * m_CurrentMaterial.GetFloat(TextShaderUtilities.ID_ScaleRatio_A);
 
                         // Clamp overall padding to Gradient Scale size.
                         if (stylePadding + padding > gradientScale)
@@ -950,23 +1253,25 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     else
                         stylePadding = 0;
 
-                    boldXAdvanceMultiplier = 1.0f;
+                    boldSpacingAdjustment = 0;
                 }
+                #endregion Handle Style Padding
+
 
                 // Determine the position of the vertices of the Character or Sprite.
-                float fontBaseLineOffset = m_CurrentFontAsset.faceInfo.baseline * m_FontScale * m_FontScaleMultiplier * m_CurrentFontAsset.faceInfo.scale;
+                #region Calculate Vertices Position
                 Vector3 topLeft;
-                topLeft.x = m_XAdvance + ((m_CachedTextElement.glyph.metrics.horizontalBearingX - padding - stylePadding + glyphAdjustments.xPlacement) * currentElementScale * (1 - m_CharWidthAdjDelta));
-                topLeft.y = fontBaseLineOffset + (m_CachedTextElement.glyph.metrics.horizontalBearingY + padding + glyphAdjustments.yPlacement) * currentElementScale - m_LineOffset + m_BaselineOffset;
+                topLeft.x = m_XAdvance + ((currentGlyphMetrics.horizontalBearingX * m_FXScale.x - padding - stylePadding + glyphAdjustments.xPlacement) * currentElementScale * (1 - m_CharWidthAdjDelta));
+                topLeft.y = baselineOffset + (currentGlyphMetrics.horizontalBearingY + padding + glyphAdjustments.yPlacement) * currentElementScale - m_LineOffset + m_BaselineOffset;
                 topLeft.z = 0;
 
                 Vector3 bottomLeft;
                 bottomLeft.x = topLeft.x;
-                bottomLeft.y = topLeft.y - ((m_CachedTextElement.glyph.metrics.height + padding * 2) * currentElementScale);
+                bottomLeft.y = topLeft.y - ((currentGlyphMetrics.height + padding * 2) * currentElementScale);
                 bottomLeft.z = 0;
 
                 Vector3 topRight;
-                topRight.x = bottomLeft.x + ((m_CachedTextElement.glyph.metrics.width + padding * 2 + stylePadding * 2) * currentElementScale * (1 - m_CharWidthAdjDelta));
+                topRight.x = bottomLeft.x + ((currentGlyphMetrics.width * m_FXScale.x + padding * 2 + stylePadding * 2) * currentElementScale * (1 - m_CharWidthAdjDelta));
                 topRight.y = topLeft.y;
                 topRight.z = 0;
 
@@ -974,31 +1279,42 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 bottomRight.x = topRight.x;
                 bottomRight.y = bottomLeft.y;
                 bottomRight.z = 0;
+                #endregion
+
 
                 // Check if we need to Shear the rectangles for Italic styles
+                #region Handle Italic & Shearing
                 if (m_TextElementType == TextElementType.Character && !isUsingAltTypeface && ((m_FontStyleInternal & FontStyles.Italic) == FontStyles.Italic))
                 {
                     // Shift Top vertices forward by half (Shear Value * height of character) and Bottom vertices back by same amount.
-                    float shearValue = m_CurrentFontAsset.italicStyleSlant * 0.01f;
-                    Vector3 topShear = new Vector3(shearValue * ((m_CachedTextElement.glyph.metrics.horizontalBearingY + padding + stylePadding) * currentElementScale), 0, 0);
-                    Vector3 bottomShear = new Vector3(shearValue * (((m_CachedTextElement.glyph.metrics.horizontalBearingY - m_CachedTextElement.glyph.metrics.height - padding - stylePadding)) * currentElementScale), 0, 0);
-
-                    topLeft = topLeft + topShear;
-                    bottomLeft = bottomLeft + bottomShear;
-                    topRight = topRight + topShear;
-                    bottomRight = bottomRight + bottomShear;
+                    float shearValue = m_ItalicAngle * 0.01f;
+                    Vector3 topShear = new Vector3(shearValue * ((currentGlyphMetrics.horizontalBearingY + padding + stylePadding) * currentElementScale), 0, 0);
+                    Vector3 bottomShear = new Vector3(shearValue * (((currentGlyphMetrics.horizontalBearingY - currentGlyphMetrics.height - padding - stylePadding)) * currentElementScale), 0, 0);
+
+                    Vector3 shearAdjustment = new Vector3((topShear.x - bottomShear.x) / 2, 0, 0);
+
+                    topLeft = topLeft + topShear - shearAdjustment;
+                    bottomLeft = bottomLeft + bottomShear - shearAdjustment;
+                    topRight = topRight + topShear - shearAdjustment;
+                    bottomRight = bottomRight + bottomShear - shearAdjustment;
                 }
+                #endregion Handle Italics & Shearing
+
 
-                // Handle Character Rotation
-                if (m_IsFxMatrixSet)
+                // Handle Character FX Rotation
+                #region Handle Character FX Rotation
+                if (m_FXRotation != Quaternion.identity)
                 {
+                    Matrix4x4 rotationMatrix = Matrix4x4.Rotate(m_FXRotation);
                     Vector3 positionOffset = (topRight + bottomLeft) / 2;
 
-                    topLeft = m_FxMatrix.MultiplyPoint3x4(topLeft - positionOffset) + positionOffset;
-                    bottomLeft = m_FxMatrix.MultiplyPoint3x4(bottomLeft - positionOffset) + positionOffset;
-                    topRight = m_FxMatrix.MultiplyPoint3x4(topRight - positionOffset) + positionOffset;
-                    bottomRight = m_FxMatrix.MultiplyPoint3x4(bottomRight - positionOffset) + positionOffset;
+                    topLeft = rotationMatrix.MultiplyPoint3x4(topLeft - positionOffset) + positionOffset;
+                    bottomLeft = rotationMatrix.MultiplyPoint3x4(bottomLeft - positionOffset) + positionOffset;
+                    topRight = rotationMatrix.MultiplyPoint3x4(topRight - positionOffset) + positionOffset;
+                    bottomRight = rotationMatrix.MultiplyPoint3x4(bottomRight - positionOffset) + positionOffset;
                 }
+                #endregion
+
 
                 // Store vertex information for the character or sprite.
                 textInfo.textElementInfo[m_CharacterCount].bottomLeft = bottomLeft;
@@ -1006,291 +1322,633 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 textInfo.textElementInfo[m_CharacterCount].topRight = topRight;
                 textInfo.textElementInfo[m_CharacterCount].bottomRight = bottomRight;
 
-                textInfo.textElementInfo[m_CharacterCount].origin = m_XAdvance;
-                textInfo.textElementInfo[m_CharacterCount].baseLine = fontBaseLineOffset - m_LineOffset + m_BaselineOffset;
+                textInfo.textElementInfo[m_CharacterCount].origin = m_XAdvance + glyphAdjustments.xPlacement * currentElementScale;
+                textInfo.textElementInfo[m_CharacterCount].baseLine = (baselineOffset - m_LineOffset + m_BaselineOffset) + glyphAdjustments.yPlacement * currentElementScale;
                 textInfo.textElementInfo[m_CharacterCount].aspectRatio = (topRight.x - bottomLeft.x) / (topLeft.y - bottomLeft.y);
 
 
-                // Compute and save text element Ascender and maximum line Ascender.
-                float elementAscender = m_CurrentFontAsset.faceInfo.ascentLine * (m_TextElementType == TextElementType.Character ? currentElementScale / smallCapsMultiplier : textInfo.textElementInfo[m_CharacterCount].scale) + m_BaselineOffset;
-                textInfo.textElementInfo[m_CharacterCount].ascender = elementAscender - m_LineOffset;
-                m_MaxLineAscender = elementAscender > m_MaxLineAscender ? elementAscender : m_MaxLineAscender;
+                // Compute text metrics
+                #region Compute Ascender & Descender values
+                // Element Ascender in line space
+                float elementAscender = m_TextElementType == TextElementType.Character
+                    ? elementAscentLine * currentElementScale / smallCapsMultiplier + m_BaselineOffset
+                    : elementAscentLine * currentElementScale + m_BaselineOffset;
+
+                // Element Descender in line space
+                float elementDescender = m_TextElementType == TextElementType.Character
+                    ? elementDescentLine * currentElementScale / smallCapsMultiplier + m_BaselineOffset
+                    : elementDescentLine * currentElementScale + m_BaselineOffset;
 
-                // Compute and save text element Descender and maximum line Descender.
-                float elementDescender = m_CurrentFontAsset.faceInfo.descentLine * (m_TextElementType == TextElementType.Character ? currentElementScale / smallCapsMultiplier : textInfo.textElementInfo[m_CharacterCount].scale) + m_BaselineOffset;
-                float elementDescenderIi = textInfo.textElementInfo[m_CharacterCount].descender = elementDescender - m_LineOffset;
-                m_MaxLineDescender = elementDescender < m_MaxLineDescender ? elementDescender : m_MaxLineDescender;
+                float adjustedAscender = elementAscender;
+                float adjustedDescender = elementDescender;
 
-                // Adjust maxLineAscender and maxLineDescender if style is superscript or subscript
-                if ((m_FontStyleInternal & FontStyles.Subscript) == FontStyles.Subscript || (m_FontStyleInternal & FontStyles.Superscript) == FontStyles.Superscript)
+                // Max line ascender and descender in line space
+                bool isFirstCharacterOfLine = m_CharacterCount == m_FirstCharacterOfLine;
+                if (isFirstCharacterOfLine || isWhiteSpace == false)
                 {
-                    float baseAscender = (elementAscender - m_BaselineOffset) / m_CurrentFontAsset.faceInfo.subscriptSize;
-                    elementAscender = m_MaxLineAscender;
-                    m_MaxLineAscender = baseAscender > m_MaxLineAscender ? baseAscender : m_MaxLineAscender;
+                    // Special handling for Superscript and Subscript where we use the unadjusted line ascender and descender
+                    if (m_BaselineOffset != 0)
+                    {
+                        adjustedAscender = Mathf.Max((elementAscender - m_BaselineOffset) / m_FontScaleMultiplier, adjustedAscender);
+                        adjustedDescender = Mathf.Min((elementDescender - m_BaselineOffset) / m_FontScaleMultiplier, adjustedDescender);
+                    }
+
+                    m_MaxLineAscender = Mathf.Max(adjustedAscender, m_MaxLineAscender);
+                    m_MaxLineDescender = Mathf.Min(adjustedDescender, m_MaxLineDescender);
+                }
+
+                // Element Ascender and Descender in object space
+                if (isFirstCharacterOfLine || isWhiteSpace == false)
+                {
+                    textInfo.textElementInfo[m_CharacterCount].adjustedAscender = adjustedAscender;
+                    textInfo.textElementInfo[m_CharacterCount].adjustedDescender = adjustedDescender;
+
+                    textInfo.textElementInfo[m_CharacterCount].ascender = elementAscender - m_LineOffset;
+                    m_MaxDescender = textInfo.textElementInfo[m_CharacterCount].descender = elementDescender - m_LineOffset;
+                }
+                else
+                {
+                    textInfo.textElementInfo[m_CharacterCount].adjustedAscender = m_MaxLineAscender;
+                    textInfo.textElementInfo[m_CharacterCount].adjustedDescender = m_MaxLineDescender;
 
-                    float baseDescender = (elementDescender - m_BaselineOffset) / m_CurrentFontAsset.faceInfo.subscriptSize;
-                    elementDescender = m_MaxLineDescender;
-                    m_MaxLineDescender = baseDescender < m_MaxLineDescender ? baseDescender : m_MaxLineDescender;
+                    textInfo.textElementInfo[m_CharacterCount].ascender = m_MaxLineAscender - m_LineOffset;
+                    m_MaxDescender = textInfo.textElementInfo[m_CharacterCount].descender = m_MaxLineDescender - m_LineOffset;
                 }
 
+                // Max text object ascender and cap height
                 if (m_LineNumber == 0 || m_IsNewPage)
                 {
-                    m_MaxAscender = m_MaxAscender > elementAscender ? m_MaxAscender : elementAscender;
-                    m_MaxCapHeight = Mathf.Max(m_MaxCapHeight, m_CurrentFontAsset.faceInfo.capLine * currentElementScale / smallCapsMultiplier);
+                    if (isFirstCharacterOfLine || isWhiteSpace == false)
+                    {
+                        m_MaxAscender = m_MaxLineAscender;
+                        m_MaxCapHeight = Mathf.Max(m_MaxCapHeight, m_CurrentFontAsset.m_FaceInfo.capLine * currentElementScale / smallCapsMultiplier);
+                    }
                 }
+
+                // Page ascender
                 if (m_LineOffset == 0)
-                    pageAscender = pageAscender > elementAscender ? pageAscender : elementAscender;
+                {
+                    if (isFirstCharacterOfLine || isWhiteSpace == false)
+                        m_PageAscender = m_PageAscender > elementAscender ? m_PageAscender : elementAscender;
+                }
+                #endregion
 
 
                 // Set Characters to not visible by default.
                 textInfo.textElementInfo[m_CharacterCount].isVisible = false;
 
+                bool isJustifiedOrFlush = ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Flush) == HorizontalAlignment.Flush || ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Justified) == HorizontalAlignment.Justified;
+
                 // Setup Mesh for visible text elements. ie. not a SPACE / LINEFEED / CARRIAGE RETURN.
-                float lineOffsetDelta;
-                if (charCode == k_Tab || charCode == k_NoBreakSpace || charCode == k_FigureSpace || (!char.IsWhiteSpace((char)charCode) && charCode != k_ZeroWidthSpace) || m_TextElementType == TextElementType.Sprite)
+                #region Handle Visible Characters
+                if (charCode == k_Tab || ((wordWrap == TextWrappingMode.PreserveWhitespace || wordWrap == TextWrappingMode.PreserveWhitespaceNoWrap) && (isWhiteSpace || charCode == k_ZeroWidthSpace)) || (isWhiteSpace == false && charCode != k_ZeroWidthSpace && charCode != 0xAD && charCode != 0x03) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_TextElementType == TextElementType.Sprite)
                 {
                     textInfo.textElementInfo[m_CharacterCount].isVisible = true;
 
-                    width = m_Width != -1 ? Mathf.Min(marginWidth + 0.0001f - m_MarginLeft - m_MarginRight, m_Width) : marginWidth + 0.0001f - m_MarginLeft - m_MarginRight;
-                    textInfo.lineInfo[m_LineNumber].marginLeft = m_MarginLeft;
+                    #region Experimental Margin Shaper
+                    //Vector2 shapedMargins;
+                    //if (marginShaper)
+                    //{HorizontalAlignmentOption
+                    //    shapedMargins = m_marginShaper.GetShapedMargins(textInfo.textElementInfo[m_CharacterCount].baseLine);
+                    //    if (shapedMargins.x < margins.x)
+                    //    {
+                    //        shapedMargins.x = m_MarginLeft;
+                    //    }
+                    //    else
+                    //    {
+                    //        shapedMargins.x += m_MarginLeft - margins.x;
+                    //    }
+                    //    if (shapedMargins.y < margins.z)
+                    //    {
+                    //        shapedMargins.y = m_MarginRight;
+                    //    }
+                    //    else
+                    //    {
+                    //        shapedMargins.y += m_MarginRight - margins.z;
+                    //    }
+                    //}
+                    //else
+                    //{
+                    //    shapedMargins.x = m_MarginLeft;
+                    //    shapedMargins.y = m_MarginRight;
+                    //}
+                    //width = marginWidth + 0.0001f - shapedMargins.x - shapedMargins.y;
+                    //if (m_Width != -1 && m_Width < width)
+                    //{
+                    //    width = m_Width;
+                    //}
+                    //textInfo.lineInfo[m_LineNumber].marginLeft = shapedMargins.x;
+                    #endregion
+
+                    float marginLeft = m_MarginLeft;
+                    float marginRight = m_MarginRight;
+
+                    // Injected characters do not override margins
+                    if (isInjectedCharacter)
+                    {
+                        marginLeft = textInfo.lineInfo[m_LineNumber].marginLeft;
+                        marginRight = textInfo.lineInfo[m_LineNumber].marginRight;
+                    }
 
-                    bool isJustifiedOrFlush = ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Flush) == HorizontalAlignment.Flush || ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Justified) == HorizontalAlignment.Justified;
+                    widthOfTextArea = m_Width != -1 ? Mathf.Min(marginWidth + 0.0001f - marginLeft - marginRight, m_Width) : marginWidth + 0.0001f - marginLeft - marginRight;
 
                     // Calculate the line breaking width of the text.
-                    var linebreakingWidth = Mathf.Abs(m_XAdvance) + (!generationSettings.isRightToLeft ? m_CachedTextElement.glyph.metrics.horizontalAdvance : 0) * (1 - m_CharWidthAdjDelta) * (charCode != 0xAD ? currentElementScale : oldScale);
+                    float textWidth = Mathf.Abs(m_XAdvance) + (!generationSettings.isRightToLeft ? currentGlyphMetrics.horizontalAdvance : 0) * (1 - m_CharWidthAdjDelta) * (charCode == 0xAD ? currentElementUnmodifiedScale : currentElementScale);
+                    float textHeight = m_MaxAscender - (m_MaxLineDescender - m_LineOffset) + (m_LineOffset > 0 && m_IsDrivenLineSpacing == false ? m_MaxLineAscender - m_StartOfLineAscender : 0);
 
-                    // Check if Character exceeds the width of the Text Container
-                    if (linebreakingWidth > width * (isJustifiedOrFlush ? 1.05f : 1.0f))
+                    int testedCharacterCount = m_CharacterCount;
+
+                    // Handling of current line Vertical Bounds
+                    #region Current Line Vertical Bounds Check
+                    if (textHeight > marginHeight + 0.0001f)
                     {
-                        ellipsisIndex = m_CharacterCount - 1; // Last safely rendered character
+                        // Set isTextOverflowing and firstOverflowCharacterIndex
+                        if (m_FirstOverflowCharacterIndex == -1)
+                            m_FirstOverflowCharacterIndex = m_CharacterCount;
 
-                        // Word Wrapping
-                        if (generationSettings.wordWrap && m_CharacterCount != m_FirstCharacterOfLine)
+                        // Check if Auto-Size is enabled
+                        if (generationSettings.autoSize)
                         {
-                            // Check if word wrapping is still possible
-                            if (wrappingIndex == m_SavedWordWrapState.previousWordBreak || isFirstWord)
+                            // Handle Line spacing adjustments
+                            #region Line Spacing Adjustments
+                            if (m_LineSpacingDelta > generationSettings.lineSpacingMax && m_LineOffset > 0 && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
                             {
-                                // Word wrapping is no longer possible. Shrink size of text if auto-sizing is enabled.
-                                if (generationSettings.autoSize && m_FontSize > generationSettings.fontSizeMin)
-                                {
-                                    // Handle Character Width Adjustments
-                                    if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100)
-                                    {
-                                        m_LoopCountA = 0;
-                                        m_CharWidthAdjDelta += 0.01f;
-                                        GenerateTextMesh(generationSettings, textInfo);
+                                float adjustmentDelta = (marginHeight - textHeight) / m_LineNumber;
 
-                                        return;
-                                    }
+                                m_LineSpacingDelta = Mathf.Max(m_LineSpacingDelta + adjustmentDelta / baseScale, generationSettings.lineSpacingMax);
 
-                                    // Adjust Point Size
-                                    m_MaxFontSize = m_FontSize;
+                                return;
+                            }
+                            #endregion
 
-                                    m_FontSize -= Mathf.Max((m_FontSize - m_MinFontSize) / 2, 0.05f);
-                                    m_FontSize = (int)(Mathf.Max(m_FontSize, generationSettings.fontSizeMin) * 20 + 0.5f) / 20f;
 
-                                    if (m_LoopCountA > 20)
-                                    {
-                                        return; // Added to debug
-                                    }
-                                    GenerateTextMesh(generationSettings, textInfo);
+                            // Handle Text Auto-sizing resulting from text exceeding vertical bounds.
+                            #region Text Auto-Sizing (Text greater than vertical bounds)
+                            if (m_FontSize > generationSettings.fontSizeMin && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
+                            {
+                                m_MaxFontSize = m_FontSize;
 
-                                    return;
-                                }
+                                float sizeDelta = Mathf.Max((m_FontSize - m_MinFontSize) / 2, 0.05f);
+                                m_FontSize -= sizeDelta;
+                                m_FontSize = Mathf.Max((int)(m_FontSize * 20 + 0.5f) / 20f, generationSettings.fontSizeMin);
 
-                                // Word wrapping is no longer possible, now breaking up individual words.
-                                if (m_IsCharacterWrappingEnabled == false)
-                                {
-                                    if (ignoreNonBreakingSpace == false)
-                                        ignoreNonBreakingSpace = true;
-                                    else
-                                        m_IsCharacterWrappingEnabled = true;
-                                }
-                                else
-                                    isLastBreakingChar = true;
+                                return;
                             }
+                            #endregion Text Auto-Sizing
+                        }
 
+                        // Handle Vertical Overflow on current line
+                        switch (generationSettings.overflowMode)
+                        {
+                            case TextOverflowMode.Overflow:
+                            case TextOverflowMode.ScrollRect:
+                            case TextOverflowMode.Masking:
+                                // Nothing happens as vertical bounds are ignored in this mode.
+                                break;
 
-                            // Restore to previously stored state of last valid (space character or linefeed)
-                            i = RestoreWordWrappingState(ref m_SavedWordWrapState, textInfo);
-                            wrappingIndex = i; // Used to detect when line length can no longer be reduced.
+                            case TextOverflowMode.Truncate:
+                                i = RestoreWordWrappingState(ref m_SavedLastValidState, textInfo);
 
-                            // Handling for Soft Hyphen
-                            if (m_CharBuffer[i] == k_SoftHyphen)
-                            {
-                                m_CharBuffer[i] = k_HyphenMinus;
-                                GenerateTextMesh(generationSettings, textInfo);
-                                return;
-                            }
+                                characterToSubstitute.index = testedCharacterCount;
+                                //characterToSubstitute.unicode = 0x03;
+                                continue;
 
-                            // Check if Line Spacing of previous line needs to be adjusted.
-                            if (m_LineNumber > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_LineHeight == k_FloatUnset && !m_IsNewPage)
-                            {
-                                float offsetDelta = m_MaxLineAscender - m_StartOfLineAscender;
-                                TextGeneratorUtilities.AdjustLineOffset(m_FirstCharacterOfLine, m_CharacterCount, offsetDelta, textInfo);
-                                m_LineOffset += offsetDelta;
-                                m_SavedWordWrapState.lineOffset = m_LineOffset;
-                                m_SavedWordWrapState.previousLineAscender = m_MaxLineAscender;
-                            }
-                            m_IsNewPage = false;
+                            case TextOverflowMode.Ellipsis:
+                                if (m_EllipsisInsertionCandidateStack.Count == 0)
+                                {
+                                    i = -1;
+                                    m_CharacterCount = 0;
+                                    characterToSubstitute.index = 0;
+                                    characterToSubstitute.unicode = 0x03;
+                                    m_FirstCharacterOfLine = 0;
+                                    continue;
+                                }
 
-                            // Calculate lineAscender & make sure if last character is superscript or subscript that we check that as well.
-                            float lineAscender = m_MaxLineAscender - m_LineOffset;
-                            float lineDescender = m_MaxLineDescender - m_LineOffset;
+                                var ellipsisState = m_EllipsisInsertionCandidateStack.Pop();
+                                i = RestoreWordWrappingState(ref ellipsisState, textInfo);
 
-                            // Update maxDescender and maxVisibleDescender
-                            m_MaxDescender = m_MaxDescender < lineDescender ? m_MaxDescender : lineDescender;
-                            if (!isMaxVisibleDescenderSet)
-                                maxVisibleDescender = m_MaxDescender;
+                                i -= 1;
+                                m_CharacterCount -= 1;
+                                characterToSubstitute.index = m_CharacterCount;
+                                characterToSubstitute.unicode = 0x2026;
 
-                            if (generationSettings.useMaxVisibleDescender && (m_CharacterCount >= generationSettings.maxVisibleCharacters || m_LineNumber >= generationSettings.maxVisibleLines))
-                                isMaxVisibleDescenderSet = true;
+                                restoreCount += 1;
+                                continue;
+                            case TextOverflowMode.Linked:
+                                i = RestoreWordWrappingState(ref m_SavedLastValidState, textInfo);
 
-                            // Track & Store lineInfo for the new line
-                            textInfo.lineInfo[m_LineNumber].firstCharacterIndex = m_FirstCharacterOfLine;
-                            textInfo.lineInfo[m_LineNumber].firstVisibleCharacterIndex = m_FirstVisibleCharacterOfLine = m_FirstCharacterOfLine > m_FirstVisibleCharacterOfLine ? m_FirstCharacterOfLine : m_FirstVisibleCharacterOfLine;
-                            textInfo.lineInfo[m_LineNumber].lastCharacterIndex = m_LastCharacterOfLine = m_CharacterCount - 1 > 0 ? m_CharacterCount - 1 : 0;
-                            textInfo.lineInfo[m_LineNumber].lastVisibleCharacterIndex = m_LastVisibleCharacterOfLine = m_LastVisibleCharacterOfLine < m_FirstVisibleCharacterOfLine ? m_FirstVisibleCharacterOfLine : m_LastVisibleCharacterOfLine;
+                                // Truncate remaining text
+                                characterToSubstitute.index = testedCharacterCount;
+                                characterToSubstitute.unicode = 0x03;
+                                continue;
 
-                            textInfo.lineInfo[m_LineNumber].characterCount = textInfo.lineInfo[m_LineNumber].lastCharacterIndex - textInfo.lineInfo[m_LineNumber].firstCharacterIndex + 1;
-                            textInfo.lineInfo[m_LineNumber].visibleCharacterCount = m_LineVisibleCharacterCount;
-                            textInfo.lineInfo[m_LineNumber].lineExtents.min = new Vector2(textInfo.textElementInfo[m_FirstVisibleCharacterOfLine].bottomLeft.x, lineDescender);
-                            textInfo.lineInfo[m_LineNumber].lineExtents.max = new Vector2(textInfo.textElementInfo[m_LastVisibleCharacterOfLine].topRight.x, lineAscender);
-                            textInfo.lineInfo[m_LineNumber].length = textInfo.lineInfo[m_LineNumber].lineExtents.max.x;
-                            textInfo.lineInfo[m_LineNumber].width = width;
+                            case TextOverflowMode.Page:
+                                // End layout of text if first character / page doesn't fit.
+                                if (i < 0 || testedCharacterCount == 0)
+                                {
+                                    i = -1;
+                                    m_CharacterCount = 0;
+                                    characterToSubstitute.index = 0;
+                                    characterToSubstitute.unicode = 0x03;
+                                    continue;
+                                }
+                                else if (m_MaxLineAscender - m_MaxLineDescender > marginHeight + 0.0001f)
+                                {
+                                    // Current line exceeds the height of the text container
+                                    // as such we stop on the previous line.
+                                    i = RestoreWordWrappingState(ref m_SavedLineState, textInfo);
 
-                            textInfo.lineInfo[m_LineNumber].maxAdvance = textInfo.textElementInfo[m_LastVisibleCharacterOfLine].xAdvance - (generationSettings.characterSpacing + m_CurrentFontAsset.regularStyleSpacing) * currentElementScale - m_CSpacing;
+                                    characterToSubstitute.index = testedCharacterCount;
+                                    characterToSubstitute.unicode = 0x03;
+                                    continue;
+                                }
 
-                            textInfo.lineInfo[m_LineNumber].baseline = 0 - m_LineOffset;
-                            textInfo.lineInfo[m_LineNumber].ascender = lineAscender;
-                            textInfo.lineInfo[m_LineNumber].descender = lineDescender;
-                            textInfo.lineInfo[m_LineNumber].lineHeight = lineAscender - lineDescender + lineGap * baseScale;
+                                // Go back to previous line and re-layout
+                                i = RestoreWordWrappingState(ref m_SavedLineState, textInfo);
 
-                            m_FirstCharacterOfLine = m_CharacterCount; // Store first character of the next line.
-                            m_LineVisibleCharacterCount = 0;
+                                m_IsNewPage = true;
+                                m_FirstCharacterOfLine = m_CharacterCount;
+                                m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
+                                m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
+                                m_StartOfLineAscender = 0;
 
-                            // Store the state of the line before starting on the new line.
-                            SaveWordWrappingState(ref m_SavedLineState, i, m_CharacterCount - 1, textInfo);
+                                m_XAdvance = 0 + m_TagIndent;
+                                m_LineOffset = 0;
+                                m_MaxAscender = 0;
+                                m_PageAscender = 0;
+                                m_LineNumber += 1;
+                                m_PageNumber += 1;
 
-                            m_LineNumber += 1;
-                            isStartOfNewLine = true;
-                            isFirstWord = true;
+                                // Should consider saving page data here
+                                continue;
+                        }
+                    }
+                    #endregion
 
-                            // Check to make sure Array is large enough to hold a new line.
-                            if (m_LineNumber >= textInfo.lineInfo.Length)
-                                TextGeneratorUtilities.ResizeLineExtents(m_LineNumber, textInfo);
+                    // Handling of Horizontal Bounds
+                    #region Current Line Horizontal Bounds Check
+                    if (isBaseGlyph && textWidth > widthOfTextArea * (isJustifiedOrFlush ? 1.05f : 1.0f))
+                    {
+                        // Handle Line Breaking (if still possible)
+                        if (wordWrap != TextWrappingMode.NoWrap && wordWrap != TextWrappingMode.PreserveWhitespaceNoWrap && m_CharacterCount != m_FirstCharacterOfLine)
+                        {
+                            // Restore state to previous safe line breaking
+                            i = RestoreWordWrappingState(ref m_SavedWordWrapState, textInfo);
 
-                            // Apply Line Spacing based on scale of the last character of the line.
+                            // Compute potential new line offset in the event a line break is needed.
+                            float lineOffsetDelta = 0;
                             if (m_LineHeight == k_FloatUnset)
                             {
-                                float ascender = textInfo.textElementInfo[m_CharacterCount].ascender - textInfo.textElementInfo[m_CharacterCount].baseLine;
-                                lineOffsetDelta = 0 - m_MaxLineDescender + ascender + (lineGap + generationSettings.lineSpacing + m_LineSpacingDelta) * baseScale;
-                                m_LineOffset += lineOffsetDelta;
-
-                                m_StartOfLineAscender = ascender;
+                                float ascender = textInfo.textElementInfo[m_CharacterCount].adjustedAscender;
+                                lineOffsetDelta = (m_LineOffset > 0 && m_IsDrivenLineSpacing == false ? m_MaxLineAscender - m_StartOfLineAscender : 0) - m_MaxLineDescender + ascender + (lineGap + m_LineSpacingDelta) * baseScale + generationSettings.lineSpacing * currentEmScale;
                             }
                             else
-                                m_LineOffset += m_LineHeight + generationSettings.lineSpacing * baseScale;
-
-                            m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
-                            m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
-
-                            m_XAdvance = 0 + m_TagIndent;
-
-                            continue;
-                        }
-
-                        // Text Auto-Sizing (text exceeding Width of container.
-                        if (generationSettings.autoSize && m_FontSize > generationSettings.fontSizeMin)
-                        {
-                            // Handle Character Width Adjustments
-                            if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100)
                             {
-                                m_LoopCountA = 0;
-                                m_CharWidthAdjDelta += 0.01f;
-                                GenerateTextMesh(generationSettings, textInfo);
-                                return;
+                                lineOffsetDelta = m_LineHeight + generationSettings.lineSpacing * currentEmScale;
+                                m_IsDrivenLineSpacing = true;
                             }
 
-                            // Adjust Point Size
-                            m_MaxFontSize = m_FontSize;
+                            // Calculate new text height
+                            float newTextHeight = m_MaxAscender + lineOffsetDelta + m_LineOffset - textInfo.textElementInfo[m_CharacterCount].adjustedDescender;
 
-                            m_FontSize -= Mathf.Max((m_FontSize - m_MinFontSize) / 2, 0.05f);
-                            m_FontSize = (int)(Mathf.Max(m_FontSize, generationSettings.fontSizeMin) * 20 + 0.5f) / 20f;
-
-                            if (m_LoopCountA > 20)
+                            // Replace Soft Hyphen by Hyphen Minus 0x2D
+                            #region Handle Soft Hyphenation
+                            if (textInfo.textElementInfo[m_CharacterCount - 1].character == 0xAD && isSoftHyphenIgnored == false)
                             {
-                                return; // Added to debug
+                                // Only inject Hyphen Minus if new line is possible
+                                if (generationSettings.overflowMode == TextOverflowMode.Overflow || newTextHeight < marginHeight + 0.0001f)
+                                {
+                                    characterToSubstitute.index = m_CharacterCount - 1;
+                                    characterToSubstitute.unicode = (uint)0x2D;
+
+                                    i -= 1;
+                                    m_CharacterCount -= 1;
+                                    continue;
+                                }
                             }
-                            GenerateTextMesh(generationSettings, textInfo);
-                            return;
-                        }
 
-                        // Handle Text Overflow
-                        switch (generationSettings.overflowMode)
-                        {
-                            case TextOverflowMode.Overflow:
-                                if (m_IsMaskingEnabled)
-                                    DisableMasking();
+                            isSoftHyphenIgnored = false;
 
-                                break;
-                            case TextOverflowMode.Ellipsis:
-                                if (m_IsMaskingEnabled)
-                                    DisableMasking();
+                            // Ignore Soft Hyphen to prevent it from wrapping
+                            if (textInfo.textElementInfo[m_CharacterCount].character == 0xAD)
+                            {
+                                isSoftHyphenIgnored = true;
+                                continue;
+                            }
+                            #endregion
 
-                                if (m_CharacterCount < 1)
+                            // Adjust character spacing before breaking up word if auto size is enabled
+                            if (generationSettings.autoSize && isFirstWordOfLine)
+                            {
+                                // Handle Character Width Adjustments
+                                #region Character Width Adjustments
+                                if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100 && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
                                 {
-                                    textInfo.textElementInfo[m_CharacterCount].isVisible = false;
-                                    break;
-                                }
+                                    float adjustedTextWidth = textWidth;
 
-                                m_CharBuffer[i - 1] = k_HorizontalEllipsis;
-                                m_CharBuffer[i] = (char)0;
+                                    // Determine full width of the text
+                                    if (m_CharWidthAdjDelta > 0)
+                                        adjustedTextWidth /= 1f - m_CharWidthAdjDelta;
 
-                                if (m_Ellipsis.character != null)
-                                {
-                                    textInfo.textElementInfo[ellipsisIndex].character = (char)k_HorizontalEllipsis;
-                                    textInfo.textElementInfo[ellipsisIndex].textElement = m_Ellipsis.character;
-                                    textInfo.textElementInfo[ellipsisIndex].fontAsset = m_MaterialReferences[0].fontAsset;
-                                    textInfo.textElementInfo[ellipsisIndex].material = m_MaterialReferences[0].material;
-                                    textInfo.textElementInfo[ellipsisIndex].materialReferenceIndex = 0;
+                                    float adjustmentDelta = textWidth - (widthOfTextArea - 0.0001f) * (isJustifiedOrFlush ? 1.05f : 1.0f);
+                                    m_CharWidthAdjDelta += adjustmentDelta / adjustedTextWidth;
+                                    m_CharWidthAdjDelta = Mathf.Min(m_CharWidthAdjDelta, generationSettings.charWidthMaxAdj / 100);
+
+                                    return;
                                 }
-                                else
+                                #endregion
+
+                                // Handle Text Auto-sizing resulting from text exceeding vertical bounds.
+                                #region Text Auto-Sizing (Text greater than vertical bounds)
+                                if (m_FontSize > generationSettings.fontSizeMin && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
                                 {
-                                    Debug.LogWarning("Unable to use Ellipsis character since it wasn't found in the current Font Asset [" + generationSettings.fontAsset.name + "]. Consider regenerating this font asset to include the Ellipsis character (u+2026).");
-                                }
+                                    m_MaxFontSize = m_FontSize;
 
-                                m_TotalCharacterCount = ellipsisIndex + 1;
+                                    float sizeDelta = Mathf.Max((m_FontSize - m_MinFontSize) / 2, 0.05f);
+                                    m_FontSize -= sizeDelta;
+                                    m_FontSize = Mathf.Max((int)(m_FontSize * 20 + 0.5f) / 20f, generationSettings.fontSizeMin);
 
-                                GenerateTextMesh(generationSettings, textInfo);
-                                return;
-                            case TextOverflowMode.Masking:
-                                if (!m_IsMaskingEnabled)
-                                    EnableMasking();
-                                break;
-                            case TextOverflowMode.ScrollRect:
-                                if (!m_IsMaskingEnabled)
-                                    EnableMasking();
-                                break;
-                            case TextOverflowMode.Truncate:
-                                if (m_IsMaskingEnabled)
-                                    DisableMasking();
+                                    return;
+                                }
+                                #endregion Text Auto-Sizing
+                            }
+
+
+                            // Special handling if first word of line and non breaking space
+                            int savedSoftLineBreakingSpace = m_SavedSoftLineBreakState.previousWordBreak;
+                            if (isFirstWordOfLine && savedSoftLineBreakingSpace != -1)
+                            {
+                                if (savedSoftLineBreakingSpace != lastSoftLineBreak)
+                                {
+                                    i = RestoreWordWrappingState(ref m_SavedSoftLineBreakState, textInfo);
+                                    lastSoftLineBreak = savedSoftLineBreakingSpace;
+
+                                    // check if soft hyphen
+                                    if (textInfo.textElementInfo[m_CharacterCount - 1].character == 0xAD)
+                                    {
+                                        characterToSubstitute.index = m_CharacterCount - 1;
+                                        characterToSubstitute.unicode = 0x2D;
+
+                                        i -= 1;
+                                        m_CharacterCount -= 1;
+                                        continue;
+                                    }
+                                }
+                            }
+
+                            // Determine if new line of text would exceed the vertical bounds of text container
+                            if (newTextHeight > marginHeight + 0.0001f)
+                            {
+                                // Set isTextOverflowing and firstOverflowCharacterIndex
+                                if (m_FirstOverflowCharacterIndex == -1)
+                                    m_FirstOverflowCharacterIndex = m_CharacterCount;
+
+                                // Check if Auto-Size is enabled
+                                if (generationSettings.autoSize)
+                                {
+                                    // Handle Line spacing adjustments
+                                    #region Line Spacing Adjustments
+                                    if (m_LineSpacingDelta > generationSettings.lineSpacingMax && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
+                                    {
+                                        float adjustmentDelta = (marginHeight - newTextHeight) / (m_LineNumber + 1);
+
+                                        m_LineSpacingDelta = Mathf.Max(m_LineSpacingDelta + adjustmentDelta / baseScale, generationSettings.lineSpacingMax);
+                                        return;
+                                    }
+                                    #endregion
+
+                                    // Handle Character Width Adjustments
+                                    #region Character Width Adjustments
+                                    if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100 && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
+                                    {
+                                        float adjustedTextWidth = textWidth;
+
+                                        // Determine full width of the text
+                                        if (m_CharWidthAdjDelta > 0)
+                                            adjustedTextWidth /= 1f - m_CharWidthAdjDelta;
+
+                                        float adjustmentDelta = textWidth - (widthOfTextArea - 0.0001f) * (isJustifiedOrFlush ? 1.05f : 1.0f);
+                                        m_CharWidthAdjDelta += adjustmentDelta / adjustedTextWidth;
+                                        m_CharWidthAdjDelta = Mathf.Min(m_CharWidthAdjDelta, generationSettings.charWidthMaxAdj / 100);
+
+                                        return;
+                                    }
+                                    #endregion
+
+                                    // Handle Text Auto-sizing resulting from text exceeding vertical bounds.
+                                    #region Text Auto-Sizing (Text greater than vertical bounds)
+                                    if (m_FontSize > generationSettings.fontSizeMin && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
+                                    {
+                                        m_MaxFontSize = m_FontSize;
+
+                                        float sizeDelta = Mathf.Max((m_FontSize - m_MinFontSize) / 2, 0.05f);
+                                        m_FontSize -= sizeDelta;
+                                        m_FontSize = Mathf.Max((int)(m_FontSize * 20 + 0.5f) / 20f, generationSettings.fontSizeMin);
+
+                                        return;
+                                    }
+                                    #endregion Text Auto-Sizing
+                                }
+
+                                // Check Text Overflow Modes
+                                switch (generationSettings.overflowMode)
+                                {
+                                    case TextOverflowMode.Overflow:
+                                    case TextOverflowMode.ScrollRect:
+                                    case TextOverflowMode.Masking:
+                                        InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender, generationSettings, textInfo);
+                                        isStartOfNewLine = true;
+                                        isFirstWordOfLine = true;
+                                        continue;
+
+                                    case TextOverflowMode.Truncate:
+                                        i = RestoreWordWrappingState(ref m_SavedLastValidState, textInfo);
+
+                                        characterToSubstitute.index = testedCharacterCount;
+                                        characterToSubstitute.unicode = 0x03;
+                                        continue;
+
+                                    case TextOverflowMode.Ellipsis:
+                                        if (m_EllipsisInsertionCandidateStack.Count == 0)
+                                        {
+                                            i = -1;
+                                            m_CharacterCount = 0;
+                                            characterToSubstitute.index = 0;
+                                            characterToSubstitute.unicode = 0x03;
+                                            m_FirstCharacterOfLine = 0;
+                                            continue;
+                                        }
+
+                                        var ellipsisState = m_EllipsisInsertionCandidateStack.Pop();
+                                        i = RestoreWordWrappingState(ref ellipsisState, textInfo);
+
+                                        i -= 1;
+                                        m_CharacterCount -= 1;
+                                        characterToSubstitute.index = m_CharacterCount;
+                                        characterToSubstitute.unicode = 0x2026;
+
+                                        restoreCount += 1;
+                                        continue;
+                                    case TextOverflowMode.Linked:
+                                        // Truncate remaining text
+                                        characterToSubstitute.index = m_CharacterCount;
+                                        characterToSubstitute.unicode = 0x03;
+                                        continue;
+
+                                    case TextOverflowMode.Page:
+                                        // Add new page
+                                        m_IsNewPage = true;
+
+                                        InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender, generationSettings, textInfo);
+
+                                        m_StartOfLineAscender = 0;
+                                        m_LineOffset = 0;
+                                        m_MaxAscender = 0;
+                                        m_PageAscender = 0;
+                                        m_PageNumber += 1;
+
+                                        isStartOfNewLine = true;
+                                        isFirstWordOfLine = true;
+                                        continue;
+                                }
+                            }
+                            else
+                            {
+                                //if (generationSettings.autoSize && isFirstWordOfLine)
+                                //{
+                                //    // Handle Character Width Adjustments
+                                //    #region Character Width Adjustments
+                                //    if (m_CharWidthAdjDelta < m_CharWidthMaxAdj / 100 && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
+                                //    {
+                                //        //m_AutoSizeIterationCount = 0;
+                                //        float adjustedTextWidth = textWidth;
+
+                                //        // Determine full width of the text
+                                //        if (m_CharWidthAdjDelta > 0)
+                                //            adjustedTextWidth /= 1f - m_CharWidthAdjDelta;
+
+                                //        float adjustmentDelta = textWidth - (widthOfTextArea - 0.0001f) * (isJustifiedOrFlush ? 1.05f : 1.0f);
+                                //        m_CharWidthAdjDelta += adjustmentDelta / adjustedTextWidth;
+                                //        m_CharWidthAdjDelta = Mathf.Min(m_CharWidthAdjDelta, m_CharWidthMaxAdj / 100);
+
+                                //        //Debug.Log("[" + m_AutoSizeIterationCount + "] Reducing Character Width by " + (m_CharWidthAdjDelta * 100) + "%");
+
+                                //        GenerateTextMesh();
+                                //        return;
+                                //    }
+                                //    #endregion
+                                //}
+
+                                // New line of text does not exceed vertical bounds of text container
+                                InsertNewLine(i, baseScale, currentElementScale, currentEmScale, boldSpacingAdjustment, characterSpacingAdjustment, widthOfTextArea, lineGap, ref isMaxVisibleDescenderSet, ref maxVisibleDescender, generationSettings, textInfo);
+                                isStartOfNewLine = true;
+                                isFirstWordOfLine = true;
+                                continue;
+                            }
+                        }
+                        else
+                        {
+                            if (generationSettings.autoSize && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
+                            {
+                                // Handle Character Width Adjustments
+                                #region Character Width Adjustments
+                                if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100)
+                                {
+                                    float adjustedTextWidth = textWidth;
+
+                                    // Determine full width of the text
+                                    if (m_CharWidthAdjDelta > 0)
+                                        adjustedTextWidth /= 1f - m_CharWidthAdjDelta;
+
+                                    float adjustmentDelta = textWidth - (widthOfTextArea - 0.0001f) * (isJustifiedOrFlush ? 1.05f : 1.0f);
+                                    m_CharWidthAdjDelta += adjustmentDelta / adjustedTextWidth;
+                                    m_CharWidthAdjDelta = Mathf.Min(m_CharWidthAdjDelta, generationSettings.charWidthMaxAdj / 100);
+
+                                    return;
+                                }
+                                #endregion
+
+                                // Handle Text Auto-sizing resulting from text exceeding horizontal bounds.
+                                #region Text Exceeds Horizontal Bounds - Reducing Point Size
+                                if (m_FontSize > generationSettings.fontSizeMin)
+                                {
+                                    // Adjust Point Size
+                                    m_MaxFontSize = m_FontSize;
+
+                                    float sizeDelta = Mathf.Max((m_FontSize - m_MinFontSize) / 2, 0.05f);
+                                    m_FontSize -= sizeDelta;
+                                    m_FontSize = Mathf.Max((int)(m_FontSize * 20 + 0.5f) / 20f, generationSettings.fontSizeMin);
+
+                                    return;
+                                }
+                                #endregion
+                            }
+
+                            // Check Text Overflow Modes
+                            switch (generationSettings.overflowMode)
+                            {
+                                case TextOverflowMode.Overflow:
+                                case TextOverflowMode.ScrollRect:
+                                case TextOverflowMode.Masking:
+                                    // Nothing happens as horizontal bounds are ignored in this mode.
+                                    break;
+
+                                case TextOverflowMode.Truncate:
+                                    i = RestoreWordWrappingState(ref m_SavedWordWrapState, textInfo);
+
+                                    characterToSubstitute.index = testedCharacterCount;
+                                    characterToSubstitute.unicode = 0x03;
+                                    continue;
+
+                                case TextOverflowMode.Ellipsis:
+                                    if (m_EllipsisInsertionCandidateStack.Count == 0)
+                                    {
+                                        i = -1;
+                                        m_CharacterCount = 0;
+                                        characterToSubstitute.index = 0;
+                                        characterToSubstitute.unicode = 0x03;
+                                        m_FirstCharacterOfLine = 0;
+                                        continue;
+                                    }
+
+                                    var ellipsisState = m_EllipsisInsertionCandidateStack.Pop();
+                                    i = RestoreWordWrappingState(ref ellipsisState, textInfo);
+
+                                    i -= 1;
+                                    m_CharacterCount -= 1;
+                                    characterToSubstitute.index = m_CharacterCount;
+                                    characterToSubstitute.unicode = 0x2026;
+
+                                    restoreCount += 1;
+                                    continue;
+                                case TextOverflowMode.Linked:
+                                    i = RestoreWordWrappingState(ref m_SavedWordWrapState, textInfo);
+
+                                    // Truncate text the overflows the vertical bounds
+                                    characterToSubstitute.index = m_CharacterCount;
+                                    characterToSubstitute.unicode = 0x03;
+                                    continue;
+                            }
 
-                                textInfo.textElementInfo[m_CharacterCount].isVisible = false;
-                                break;
-                            case TextOverflowMode.Linked:
-                                break;
                         }
                     }
+                    #endregion
+
 
                     // Special handling of characters that are not ignored at the end of a line.
-                    if (charCode == k_Tab || charCode == k_NoBreakSpace || charCode == k_FigureSpace)
+                    if (isWhiteSpace)
                     {
                         textInfo.textElementInfo[m_CharacterCount].isVisible = false;
                         m_LastVisibleCharacterOfLine = m_CharacterCount;
-                        textInfo.lineInfo[m_LineNumber].spaceCount += 1;
+                        m_LineVisibleSpaceCount = textInfo.lineInfo[m_LineNumber].spaceCount += 1;
+                        textInfo.lineInfo[m_LineNumber].marginLeft = marginLeft;
+                        textInfo.lineInfo[m_LineNumber].marginRight = marginRight;
                         textInfo.spaceCount += 1;
                     }
+                    else if (charCode == 0xAD)
+                    {
+                        textInfo.textElementInfo[m_CharacterCount].isVisible = false;
+                    }
                     else
                     {
                         // Determine Vertex Color
@@ -1310,11 +1968,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         {
                             SaveSpriteVertexInfo(vertexColor, generationSettings, textInfo);
                         }
-                    }
 
-                    // Increase visible count for Characters.
-                    if (textInfo.textElementInfo[m_CharacterCount].isVisible && charCode != k_SoftHyphen)
-                    {
                         if (isStartOfNewLine)
                         {
                             isStartOfNewLine = false;
@@ -1323,244 +1977,181 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                         m_LineVisibleCharacterCount += 1;
                         m_LastVisibleCharacterOfLine = m_CharacterCount;
+                        textInfo.lineInfo[m_LineNumber].marginLeft = marginLeft;
+                        textInfo.lineInfo[m_LineNumber].marginRight = marginRight;
                     }
                 }
                 else
                 {
-                    // This is a Space, Tab, LineFeed or Carriage Return
+                    // Special handling for text overflow linked mode
+                    #region Check Vertical Bounds
+                    if (generationSettings.overflowMode == TextOverflowMode.Linked && (charCode == k_LineFeed || charCode == 11))
+                    {
+                        float textHeight = m_MaxAscender - (m_MaxLineDescender - m_LineOffset) + (m_LineOffset > 0 && m_IsDrivenLineSpacing == false ? m_MaxLineAscender - m_StartOfLineAscender : 0);
+
+                        int testedCharacterCount = m_CharacterCount;
+
+                        if (textHeight > marginHeight + 0.0001f)
+                        {
+                            // Set isTextOverflowing and firstOverflowCharacterIndex
+                            if (m_FirstOverflowCharacterIndex == -1)
+                                m_FirstOverflowCharacterIndex = m_CharacterCount;
+
+                            i = RestoreWordWrappingState(ref m_SavedLastValidState, textInfo);
+
+                            // Truncate remaining text
+                            characterToSubstitute.index = testedCharacterCount;
+                            characterToSubstitute.unicode = 0x03;
+                            continue;
+                        }
+                    }
+                    #endregion
 
                     // Track # of spaces per line which is used for line justification.
-                    if ((charCode == k_LineFeed || char.IsSeparator((char)charCode)) && charCode != k_SoftHyphen && charCode != k_ZeroWidthSpace && charCode != k_WordJoiner)
+                    if ((charCode == k_LineFeed || charCode == 11 || charCode == 0xA0 || charCode == k_FigureSpace || charCode == 0x2028 || charCode == 0x2029 || char.IsSeparator((char)charCode)) && charCode != 0xAD && charCode != k_ZeroWidthSpace && charCode != k_WordJoiner)
                     {
                         textInfo.lineInfo[m_LineNumber].spaceCount += 1;
                         textInfo.spaceCount += 1;
-
-                        if (charCode == 0xA0)
-                            textInfo.lineInfo[m_LineNumber].controlCharacterCount = +1;
                     }
-                }
-
 
-                // Check if Line Spacing of previous line needs to be adjusted.
-                if (m_LineNumber > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_LineHeight == k_FloatUnset && !m_IsNewPage)
-                {
-                    float offsetDelta = m_MaxLineAscender - m_StartOfLineAscender;
-                    TextGeneratorUtilities.AdjustLineOffset(m_FirstCharacterOfLine, m_CharacterCount, offsetDelta, textInfo);
-                    elementDescenderIi -= offsetDelta;
-                    m_LineOffset += offsetDelta;
+                    // Special handling for control characters like <NBSP>
+                    if (charCode == 0xA0)
+                        textInfo.lineInfo[m_LineNumber].controlCharacterCount += 1;
 
-                    m_StartOfLineAscender += offsetDelta;
-                    m_SavedWordWrapState.lineOffset = m_LineOffset;
-                    m_SavedWordWrapState.previousLineAscender = m_StartOfLineAscender;
                 }
-
-                // Store Rectangle positions for each Character.
-                textInfo.textElementInfo[m_CharacterCount].lineNumber = m_LineNumber;
-                textInfo.textElementInfo[m_CharacterCount].pageNumber = m_PageNumber;
-
-                if (charCode != k_LineFeed && charCode != k_CarriageReturn && charCode != k_HorizontalEllipsis || textInfo.lineInfo[m_LineNumber].characterCount == 1)
-                    textInfo.lineInfo[m_LineNumber].alignment = m_LineJustification;
+                #endregion Handle Visible Characters
 
 
-                // Check if text Exceeds the vertical bounds of the margin area.
-                if (m_MaxAscender - elementDescenderIi > marginHeight + 0.0001f)
+                // Tracking of potential insertion positions for Ellipsis character
+                #region Track Potential Insertion Location for Ellipsis
+                if (generationSettings.overflowMode == TextOverflowMode.Ellipsis && (isInjectedCharacter == false || charCode == 0x2D))
                 {
-                    // Handle Line spacing adjustments
-                    if (generationSettings.autoSize && m_LineSpacingDelta > generationSettings.lineSpacingMax && m_LineNumber > 0)
-                    {
-                        m_LoopCountA = 0;
-
-                        m_LineSpacingDelta -= 1;
-                        GenerateTextMesh(generationSettings, textInfo);
-                        return;
-                    }
+                    float fontScale = m_CurrentFontSize / m_Ellipsis.fontAsset.m_FaceInfo.pointSize * m_Ellipsis.fontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+                    float scale = fontScale * m_FontScaleMultiplier * m_Ellipsis.character.m_Scale * m_Ellipsis.character.m_Glyph.scale;
+                    float marginLeft = m_MarginLeft;
+                    float marginRight = m_MarginRight;
 
-                    // Handle Text Auto-sizing resulting from text exceeding vertical bounds.
-                    if (generationSettings.autoSize && m_FontSize > generationSettings.fontSizeMin)
+                    // Use the scale and margins of the previous character if Line Feed (LF) is not the first character of a line.
+                    if (charCode == 0x0A && m_CharacterCount != m_FirstCharacterOfLine)
                     {
-                        m_MaxFontSize = m_FontSize;
-
-                        m_FontSize -= Mathf.Max((m_FontSize - m_MinFontSize) / 2, 0.05f);
-                        m_FontSize = (int)(Mathf.Max(m_FontSize, generationSettings.fontSizeMin) * 20 + 0.5f) / 20f;
-
-                        if (m_LoopCountA > 20)
-                        {
-                            return; // Added to debug
-                        }
-                        GenerateTextMesh(generationSettings, textInfo);
-                        return;
+                        fontScale = textInfo.textElementInfo[m_CharacterCount - 1].pointSize / m_Ellipsis.fontAsset.m_FaceInfo.pointSize * m_Ellipsis.fontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+                        scale = fontScale * m_FontScaleMultiplier * m_Ellipsis.character.m_Scale * m_Ellipsis.character.m_Glyph.scale;
+                        marginLeft = textInfo.lineInfo[m_LineNumber].marginLeft;
+                        marginRight = textInfo.lineInfo[m_LineNumber].marginRight;
                     }
 
-                    // Set isTextOverflowing and firstOverflowCharacterIndex
-                    if (m_FirstOverflowCharacterIndex == -1)
-                        m_FirstOverflowCharacterIndex = m_CharacterCount;
+                    float textHeight = m_MaxAscender - (m_MaxLineDescender - m_LineOffset) + (m_LineOffset > 0 && m_IsDrivenLineSpacing == false ? m_MaxLineAscender - m_StartOfLineAscender : 0);
+                    float textWidth = Mathf.Abs(m_XAdvance) + (!generationSettings.isRightToLeft ? m_Ellipsis.character.m_Glyph.metrics.horizontalAdvance : 0) * (1 - m_CharWidthAdjDelta) * scale;
+                    float widthOfTextAreaForEllipsis = m_Width != -1 ? Mathf.Min(marginWidth + 0.0001f - marginLeft - marginRight, m_Width) : marginWidth + 0.0001f - marginLeft - marginRight;
 
-                    // Handle Text Overflow
-                    switch (generationSettings.overflowMode)
+                    if (textWidth < widthOfTextAreaForEllipsis * (isJustifiedOrFlush ? 1.05f : 1.0f) && textHeight < marginHeight + 0.0001f)
                     {
-                        case TextOverflowMode.Overflow:
-                            if (m_IsMaskingEnabled)
-                                DisableMasking();
-
-                            break;
-                        case TextOverflowMode.Ellipsis:
-                            if (m_IsMaskingEnabled)
-                                DisableMasking();
-
-                            if (m_LineNumber > 0)
-                            {
-                                m_CharBuffer[textInfo.textElementInfo[ellipsisIndex].index] = k_HorizontalEllipsis;
-                                m_CharBuffer[textInfo.textElementInfo[ellipsisIndex].index + 1] = (char)0;
-
-                                if (m_Ellipsis.character != null)
-                                {
-                                    textInfo.textElementInfo[ellipsisIndex].character = (char)k_HorizontalEllipsis;
-                                    textInfo.textElementInfo[ellipsisIndex].textElement = m_Ellipsis.character;
-                                    textInfo.textElementInfo[ellipsisIndex].fontAsset = m_MaterialReferences[0].fontAsset;
-                                    textInfo.textElementInfo[ellipsisIndex].material = m_MaterialReferences[0].material;
-                                    textInfo.textElementInfo[ellipsisIndex].materialReferenceIndex = 0;
-                                }
-                                else
-                                {
-                                    Debug.LogWarning("Unable to use Ellipsis character since it wasn't found in the current Font Asset [" + generationSettings.fontAsset.name + "]. Consider regenerating this font asset to include the Ellipsis character (u+2026).");
-                                }
-
-                                m_TotalCharacterCount = ellipsisIndex + 1;
-
-                                GenerateTextMesh(generationSettings, textInfo);
-                                return;
-                            }
-                            else
-                            {
-                                break;
-                                //ClearMesh(false, textInfo);
-                                //return;
-                            }
-                        case TextOverflowMode.Masking:
-                            if (!m_IsMaskingEnabled)
-                                EnableMasking();
-                            break;
-                        case TextOverflowMode.ScrollRect:
-                            if (!m_IsMaskingEnabled)
-                                EnableMasking();
-                            break;
-                        case TextOverflowMode.Truncate:
-                            if (m_IsMaskingEnabled)
-                                DisableMasking();
-
-                            if (m_LineNumber > 0)
-                            {
-                                m_CharBuffer[textInfo.textElementInfo[ellipsisIndex].index + 1] = (char)0;
-
-                                m_TotalCharacterCount = ellipsisIndex + 1;
-
-                                GenerateTextMesh(generationSettings, textInfo);
-                                return;
-                            }
-                            else
-                            {
-                                ClearMesh(false, textInfo);
-                                return;
-                            }
-                        case TextOverflowMode.Page:
-                            if (m_IsMaskingEnabled)
-                                DisableMasking();
-
-                            // Ignore Page Break, Linefeed or carriage return
-                            if (charCode == k_CarriageReturn || charCode == k_LineFeed)
-                                break;
-
-                            // Return if the first character doesn't fit.
-                            if (i == 0)
-                            {
-                                return;
-                            }
-                            else if (previousPageOverflowChar == i)
-                            {
-                                m_CharBuffer[i] = 0;
-                            }
-
-                            previousPageOverflowChar = i;
+                        SaveWordWrappingState(ref m_SavedEllipsisState, i, m_CharacterCount, textInfo);
+                        m_EllipsisInsertionCandidateStack.Push(m_SavedEllipsisState);
+                    }
+                }
+                #endregion
 
-                            // Go back to previous line and re-layout
-                            i = RestoreWordWrappingState(ref m_SavedLineState, textInfo);
 
-                            m_IsNewPage = true;
-                            m_XAdvance = 0 + m_TagIndent;
-                            m_LineOffset = 0;
-                            m_MaxAscender = 0;
-                            pageAscender = 0;
-                            m_LineNumber += 1;
-                            m_PageNumber += 1;
-                            continue;
-                        case TextOverflowMode.Linked:
-                            // Truncate remaining text
-                            if (m_LineNumber > 0)
-                            {
-                                m_CharBuffer[i] = (char)0;
+                // Store Rectangle positions for each Character.
+                #region Store Character Data
+                textInfo.textElementInfo[m_CharacterCount].lineNumber = m_LineNumber;
+                textInfo.textElementInfo[m_CharacterCount].pageNumber = m_PageNumber;
 
-                                m_TotalCharacterCount = m_CharacterCount;
+                if (charCode != 10 && charCode != 11 && charCode != 13 && isInjectedCharacter == false /* && charCode != k_HorizontalEllipsis */ || textInfo.lineInfo[m_LineNumber].characterCount == 1)
+                    textInfo.lineInfo[m_LineNumber].alignment = m_LineJustification;
+                #endregion Store Character Data
 
-                                GenerateTextMesh(generationSettings, textInfo);
-                                return;
-                            }
-                            else
-                            {
-                                ClearMesh(true, textInfo);
-                                return;
-                            }
-                    }
-                }
 
                 // Handle xAdvance & Tabulation Stops. Tab stops at every 25% of Font Size.
-                if (charCode == 9)
+                #region XAdvance, Tabulation & Stops
+                if (charCode == k_Tab)
                 {
-                    float tabSize = m_CurrentFontAsset.faceInfo.tabWidth * m_CurrentFontAsset.tabMultiple * currentElementScale;
+                    float tabSize = m_CurrentFontAsset.m_FaceInfo.tabWidth * m_CurrentFontAsset.tabMultiple * currentElementScale;
                     float tabs = Mathf.Ceil(m_XAdvance / tabSize) * tabSize;
                     m_XAdvance = tabs > m_XAdvance ? tabs : m_XAdvance + tabSize;
                 }
                 else if (m_MonoSpacing != 0)
                 {
-                    m_XAdvance += (m_MonoSpacing - monoAdvance + ((generationSettings.characterSpacing + m_CurrentFontAsset.regularStyleSpacing) * currentElementScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
+                    m_XAdvance += (m_MonoSpacing - monoAdvance + ((m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment) * currentEmScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
 
-                    if (char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace)
-                        m_XAdvance += generationSettings.wordSpacing * currentElementScale;
+                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                        m_XAdvance += generationSettings.wordSpacing * currentEmScale;
                 }
-                else if (!generationSettings.isRightToLeft)
+                else if (generationSettings.isRightToLeft)
                 {
-                    float scaleFxMultiplier = 1;
-                    if (m_IsFxMatrixSet)
-                        scaleFxMultiplier = m_FxMatrix.m00;
+                    m_XAdvance -= ((glyphAdjustments.xAdvance * currentElementScale + (m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_CSpacing) * (1 - m_CharWidthAdjDelta));
 
-                    m_XAdvance += ((m_CachedTextElement.glyph.metrics.horizontalAdvance * scaleFxMultiplier * boldXAdvanceMultiplier + generationSettings.characterSpacing + m_CurrentFontAsset.regularStyleSpacing + glyphAdjustments.xAdvance) * currentElementScale + m_CSpacing) * (1 - m_CharWidthAdjDelta);
-
-                    if (char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace)
-                        m_XAdvance += generationSettings.wordSpacing * currentElementScale;
+                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                        m_XAdvance -= generationSettings.wordSpacing * currentEmScale;
                 }
                 else
                 {
-                    m_XAdvance -= glyphAdjustments.xAdvance * currentElementScale;
+                    m_XAdvance += ((currentGlyphMetrics.horizontalAdvance * m_FXScale.x + glyphAdjustments.xAdvance) * currentElementScale + (m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_CSpacing) * (1 - m_CharWidthAdjDelta);
+
+                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                        m_XAdvance += generationSettings.wordSpacing * currentEmScale;
                 }
 
                 // Store xAdvance information
                 textInfo.textElementInfo[m_CharacterCount].xAdvance = m_XAdvance;
+                #endregion Tabulation & Stops
+
 
                 // Handle Carriage Return
+                #region Carriage Return
                 if (charCode == k_CarriageReturn)
                 {
                     m_XAdvance = 0 + m_TagIndent;
                 }
+                #endregion Carriage Return
+
+
+                // Tracking of text overflow page mode
+                #region Save PageInfo
+                if (generationSettings.overflowMode == TextOverflowMode.Page && charCode != 10 && charCode != 11 && charCode != 13 && charCode != 0x2028 && charCode != 0x2029)
+                {
+                    // Check if we need to increase allocations for the pageInfo array.
+                    if (m_PageNumber + 1 > textInfo.pageInfo.Length)
+                        TextInfo.Resize(ref textInfo.pageInfo, m_PageNumber + 1, true);
+
+                    textInfo.pageInfo[m_PageNumber].ascender = m_PageAscender;
+                    textInfo.pageInfo[m_PageNumber].descender = m_MaxDescender < textInfo.pageInfo[m_PageNumber].descender
+                        ? m_MaxDescender
+                        : textInfo.pageInfo[m_PageNumber].descender;
+
+                    if (m_IsNewPage)
+                    {
+                        m_IsNewPage = false;
+                        textInfo.pageInfo[m_PageNumber].firstCharacterIndex = m_CharacterCount;
+                    }
+
+                    // Last index
+                    textInfo.pageInfo[m_PageNumber].lastCharacterIndex = m_CharacterCount;
+                }
+                #endregion Save PageInfo
+
 
                 // Handle Line Spacing Adjustments + Word Wrapping & special case for last line.
-                if (charCode == k_LineFeed || m_CharacterCount == totalCharacterCount - 1)
+                #region Check for Line Feed and Last Character
+                if (charCode == k_LineFeed || charCode == 11 || charCode == 0x03 || charCode == 0x2028 || charCode == 0x2029 || (charCode == 0x2D && isInjectedCharacter) || m_CharacterCount == totalCharacterCount - 1)
                 {
-                    // Check if Line Spacing of previous line needs to be adjusted.
-                    if (m_LineNumber > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_LineHeight == k_FloatUnset && !m_IsNewPage)
+                    // Adjust current line spacing (if necessary) before inserting new line
+                    float baselineAdjustmentDelta = m_MaxLineAscender - m_StartOfLineAscender;
+                    if (m_LineOffset > 0 && Math.Abs(baselineAdjustmentDelta) > 0.01f && m_IsDrivenLineSpacing == false && !m_IsNewPage)
                     {
-                        //Debug.Log("Line Feed - Adjusting Line Spacing on line #" + m_lineNumber);
-                        float offsetDelta = m_MaxLineAscender - m_StartOfLineAscender;
-                        TextGeneratorUtilities.AdjustLineOffset(m_FirstCharacterOfLine, m_CharacterCount, offsetDelta, textInfo);
-                        m_LineOffset += offsetDelta;
+                        TextGeneratorUtilities.AdjustLineOffset(m_FirstCharacterOfLine, m_CharacterCount, baselineAdjustmentDelta, textInfo);
+                        m_MaxDescender -= baselineAdjustmentDelta;
+                        m_LineOffset += baselineAdjustmentDelta;
+
+                        // Adjust saved ellipsis state only if we are adjusting the same line number
+                        if (m_SavedEllipsisState.lineNumber == m_LineNumber)
+                        {
+                            m_SavedEllipsisState = m_EllipsisInsertionCandidateStack.Pop();
+                            m_SavedEllipsisState.startOfLineAscender += baselineAdjustmentDelta;
+                            m_SavedEllipsisState.lineOffset += baselineAdjustmentDelta;
+                            m_EllipsisInsertionCandidateStack.Push(m_SavedEllipsisState);
+                        }
                     }
                     m_IsNewPage = false;
 
@@ -1584,69 +2175,83 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                     textInfo.lineInfo[m_LineNumber].characterCount = textInfo.lineInfo[m_LineNumber].lastCharacterIndex - textInfo.lineInfo[m_LineNumber].firstCharacterIndex + 1;
                     textInfo.lineInfo[m_LineNumber].visibleCharacterCount = m_LineVisibleCharacterCount;
+                    textInfo.lineInfo[m_LineNumber].visibleSpaceCount = m_LineVisibleSpaceCount;
                     textInfo.lineInfo[m_LineNumber].lineExtents.min = new Vector2(textInfo.textElementInfo[m_FirstVisibleCharacterOfLine].bottomLeft.x, lineDescender);
                     textInfo.lineInfo[m_LineNumber].lineExtents.max = new Vector2(textInfo.textElementInfo[m_LastVisibleCharacterOfLine].topRight.x, lineAscender);
                     textInfo.lineInfo[m_LineNumber].length = textInfo.lineInfo[m_LineNumber].lineExtents.max.x - (padding * currentElementScale);
-                    textInfo.lineInfo[m_LineNumber].width = width;
+                    textInfo.lineInfo[m_LineNumber].width = widthOfTextArea;
 
                     if (textInfo.lineInfo[m_LineNumber].characterCount == 1)
                         textInfo.lineInfo[m_LineNumber].alignment = m_LineJustification;
 
+                    float maxAdvanceOffset = ((m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_CSpacing) * (1 - m_CharWidthAdjDelta);
                     if (textInfo.textElementInfo[m_LastVisibleCharacterOfLine].isVisible)
-                        textInfo.lineInfo[m_LineNumber].maxAdvance = textInfo.textElementInfo[m_LastVisibleCharacterOfLine].xAdvance - (generationSettings.characterSpacing + m_CurrentFontAsset.regularStyleSpacing) * currentElementScale - m_CSpacing;
+                        textInfo.lineInfo[m_LineNumber].maxAdvance = textInfo.textElementInfo[m_LastVisibleCharacterOfLine].xAdvance + (generationSettings.isRightToLeft ? maxAdvanceOffset : -maxAdvanceOffset);
                     else
-                        textInfo.lineInfo[m_LineNumber].maxAdvance = textInfo.textElementInfo[m_LastCharacterOfLine].xAdvance - (generationSettings.characterSpacing + m_CurrentFontAsset.regularStyleSpacing) * currentElementScale - m_CSpacing;
+                        textInfo.lineInfo[m_LineNumber].maxAdvance = textInfo.textElementInfo[m_LastCharacterOfLine].xAdvance + (generationSettings.isRightToLeft ? maxAdvanceOffset : -maxAdvanceOffset);
 
                     textInfo.lineInfo[m_LineNumber].baseline = 0 - m_LineOffset;
                     textInfo.lineInfo[m_LineNumber].ascender = lineAscender;
                     textInfo.lineInfo[m_LineNumber].descender = lineDescender;
                     textInfo.lineInfo[m_LineNumber].lineHeight = lineAscender - lineDescender + lineGap * baseScale;
 
-                    m_FirstCharacterOfLine = m_CharacterCount + 1;
-                    m_LineVisibleCharacterCount = 0;
-
                     // Add new line if not last line or character.
-                    if (charCode == k_LineFeed)
+                    if (charCode == k_LineFeed || charCode == 11 || charCode == 0x2D || charCode == 0x2028 || charCode == 0x2029)
                     {
                         // Store the state of the line before starting on the new line.
                         SaveWordWrappingState(ref m_SavedLineState, i, m_CharacterCount, textInfo);
 
-                        // Store the state of the last Character before the new line.
-                        SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
-
                         m_LineNumber += 1;
                         isStartOfNewLine = true;
                         ignoreNonBreakingSpace = false;
-                        isFirstWord = true;
+                        isFirstWordOfLine = true;
+
+                        m_FirstCharacterOfLine = m_CharacterCount + 1;
+                        m_LineVisibleCharacterCount = 0;
+                        m_LineVisibleSpaceCount = 0;
 
                         // Check to make sure Array is large enough to hold a new line.
                         if (m_LineNumber >= textInfo.lineInfo.Length)
                             TextGeneratorUtilities.ResizeLineExtents(m_LineNumber, textInfo);
 
-                        // Apply Line Spacing
+                        float lastVisibleAscender = textInfo.textElementInfo[m_CharacterCount].adjustedAscender;
+
+                        // Apply Line Spacing with special handling for VT char(11)
                         if (m_LineHeight == k_FloatUnset)
                         {
-                            lineOffsetDelta = 0 - m_MaxLineDescender + elementAscender + (lineGap + generationSettings.lineSpacing + generationSettings.paragraphSpacing + m_LineSpacingDelta) * baseScale;
+                            float lineOffsetDelta = 0 - m_MaxLineDescender + lastVisibleAscender + (lineGap + m_LineSpacingDelta) * baseScale + (generationSettings.lineSpacing + (charCode == k_LineFeed || charCode == 0x2029 ? generationSettings.paragraphSpacing : 0)) * currentEmScale;
                             m_LineOffset += lineOffsetDelta;
+                            m_IsDrivenLineSpacing = false;
                         }
                         else
-                            m_LineOffset += m_LineHeight + (generationSettings.lineSpacing + generationSettings.paragraphSpacing) * baseScale;
+                        {
+                            m_LineOffset += m_LineHeight + (generationSettings.lineSpacing + (charCode == k_LineFeed || charCode == 0x2029 ? generationSettings.paragraphSpacing : 0)) * currentEmScale;
+                            m_IsDrivenLineSpacing = true;
+                        }
 
                         m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
                         m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
-                        m_StartOfLineAscender = elementAscender;
+                        m_StartOfLineAscender = lastVisibleAscender;
 
                         m_XAdvance = 0 + m_TagLineIndent + m_TagIndent;
 
-                        ellipsisIndex = m_CharacterCount - 1;
+                        SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
+                        SaveWordWrappingState(ref m_SavedLastValidState, i, m_CharacterCount, textInfo);
 
                         m_CharacterCount += 1;
+
                         continue;
                     }
+
+                    // If End of Text
+                    if (charCode == 0x03)
+                        i = m_TextProcessingArray.Length;
                 }
+                #endregion Check for Linefeed or Last Character
 
-                // Store Rectangle positions for each Character.
 
+                // Track extents of the text
+                #region Track Text Extents
                 // Determine the bounds of the Mesh.
                 if (textInfo.textElementInfo[m_CharacterCount].isVisible)
                 {
@@ -1655,104 +2260,131 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
                     m_MeshExtents.max.x = Mathf.Max(m_MeshExtents.max.x, textInfo.textElementInfo[m_CharacterCount].topRight.x);
                     m_MeshExtents.max.y = Mathf.Max(m_MeshExtents.max.y, textInfo.textElementInfo[m_CharacterCount].topRight.y);
-                }
 
-                // Save pageInfo Data
-                if (generationSettings.overflowMode == TextOverflowMode.Page && charCode != k_CarriageReturn && charCode != k_LineFeed) // && m_pageNumber < 16)
-                {
-                    // Check if we need to increase allocations for the pageInfo array.
-                    if (m_PageNumber + 1 > textInfo.pageInfo.Length)
-                        TextInfo.Resize(ref textInfo.pageInfo, m_PageNumber + 1, true);
-
-                    textInfo.pageInfo[m_PageNumber].ascender = pageAscender;
-                    textInfo.pageInfo[m_PageNumber].descender = elementDescender < textInfo.pageInfo[m_PageNumber].descender ? elementDescender : textInfo.pageInfo[m_PageNumber].descender;
-
-                    if (m_PageNumber == 0 && m_CharacterCount == 0)
-                        textInfo.pageInfo[m_PageNumber].firstCharacterIndex = m_CharacterCount;
-                    else if (m_CharacterCount > 0 && m_PageNumber != textInfo.textElementInfo[m_CharacterCount - 1].pageNumber)
-                    {
-                        textInfo.pageInfo[m_PageNumber - 1].lastCharacterIndex = m_CharacterCount - 1;
-                        textInfo.pageInfo[m_PageNumber].firstCharacterIndex = m_CharacterCount;
-                    }
-                    else if (m_CharacterCount == totalCharacterCount - 1)
-                        textInfo.pageInfo[m_PageNumber].lastCharacterIndex = m_CharacterCount;
+                    //m_MeshExtents.min = new Vector2(Mathf.Min(m_MeshExtents.min.x, textInfo.textElementInfo[m_CharacterCount].bottomLeft.x), Mathf.Min(m_MeshExtents.min.y, textInfo.textElementInfo[m_CharacterCount].bottomLeft.y));
+                    //m_MeshExtents.max = new Vector2(Mathf.Max(m_MeshExtents.max.x, textInfo.textElementInfo[m_CharacterCount].topRight.x), Mathf.Max(m_MeshExtents.max.y, textInfo.textElementInfo[m_CharacterCount].topRight.y));
                 }
+                #endregion Track Text Extents
+
 
                 // Save State of Mesh Creation for handling of Word Wrapping
-                if (generationSettings.wordWrap || generationSettings.overflowMode == TextOverflowMode.Truncate || generationSettings.overflowMode == TextOverflowMode.Ellipsis)
+                #region Save Word Wrapping State
+                if ((wordWrap != TextWrappingMode.NoWrap && wordWrap != TextWrappingMode.PreserveWhitespaceNoWrap) || generationSettings.overflowMode == TextOverflowMode.Truncate || generationSettings.overflowMode == TextOverflowMode.Ellipsis || generationSettings.overflowMode == TextOverflowMode.Linked)
                 {
-                    if ((char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace || charCode == k_HyphenMinus || charCode == k_SoftHyphen) && (!m_IsNonBreakingSpace || ignoreNonBreakingSpace) && charCode != k_NoBreakSpace && charCode != k_FigureSpace && charCode != k_NonBreakingHyphen && charCode != k_NarrowNoBreakSpace && charCode != k_WordJoiner)
+                    if ((isWhiteSpace || charCode == k_ZeroWidthSpace || charCode == 0x2D || charCode == 0xAD) && (!m_IsNonBreakingSpace || ignoreNonBreakingSpace) && charCode != 0xA0 && charCode != k_FigureSpace && charCode != k_NonBreakingHyphen && charCode != k_NarrowNoBreakSpace && charCode != k_WordJoiner)
                     {
                         // We store the state of numerous variables for the most recent Space, LineFeed or Carriage Return to enable them to be restored
                         // for Word Wrapping.
                         SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
-                        m_IsCharacterWrappingEnabled = false;
-                        isFirstWord = false;
+                        isFirstWordOfLine = false;
+
+                        // Reset soft line breaking point since we now have a valid hard break point.
+                        m_SavedSoftLineBreakState.previousWordBreak = -1;
                     }
-                    // Handling for East Asian languages
-                    else if ((charCode > k_HangulJamoStart && charCode < k_HangulJamoEnd || /* Hangul Jamo */
-                              charCode > k_CjkStart && charCode < k_CjkEnd || /* CJK */
-                              charCode > k_HangulJameExtendedStart && charCode < k_HangulJameExtendedEnd || /* Hangul Jame Extended-A */
-                              charCode > k_HangulSyllablesStart && charCode < k_HangulSyllablesEnd || /* Hangul Syllables */
-                              charCode > k_CjkIdeographsStart && charCode < k_CjkIdeographsEnd || /* CJK Compatibility Ideographs */
-                              charCode > k_CjkFormsStart && charCode < k_CjkFormsEnd || /* CJK Compatibility Forms */
-                              charCode > k_CjkHalfwidthStart && charCode < k_CjkHalfwidthEnd) /* CJK Half-Width */
-                             && !m_IsNonBreakingSpace)
+                    // Handling for East Asian characters
+                    else if (m_IsNonBreakingSpace == false &&
+                             ((charCode > k_HangulJamoStart && charCode < k_HangulJamoEnd || /* Hangul Jamo */
+                               charCode > k_HangulJameExtendedStart && charCode < k_HangulJameExtendedEnd || /* Hangul Jamo Extended-A */
+                               charCode > k_HangulSyllablesStart && charCode < k_HangulSyllablesEnd) && /* Hangul Syllables */
+                              generationSettings.textSettings.lineBreakingRules.useModernHangulLineBreakingRules == false ||
+
+                              (charCode > k_CjkStart && charCode < k_CjkEnd || /* CJK */
+                               charCode > k_CjkIdeographsStart && charCode < k_CjkIdeographsEnd || /* CJK Compatibility Ideographs */
+                               charCode > k_CjkFormsStart && charCode < k_CjkFormsEnd || /* CJK Compatibility Forms */
+                               charCode > k_CjkHalfwidthStart && charCode < k_CjkHalfwidthEnd))) /* CJK Halfwidth */
                     {
-                        if (isFirstWord || isLastBreakingChar || textSettings.lineBreakingRules.leadingCharactersLookup.Contains((uint)charCode) == false &&
-                            (m_CharacterCount < totalCharacterCount - 1 &&
-                             textSettings.lineBreakingRules.followingCharactersLookup.Contains(textInfo.textElementInfo[m_CharacterCount + 1].character) == false))
+                        bool isCurrentLeadingCharacter = textSettings.lineBreakingRules.leadingCharactersLookup.Contains((uint)charCode);
+                        bool isNextFollowingCharacter = m_CharacterCount < totalCharacterCount - 1 && textSettings.lineBreakingRules.followingCharactersLookup.Contains((uint)textInfo.textElementInfo[m_CharacterCount + 1].character);
+
+                        if (isCurrentLeadingCharacter == false)
+                        {
+                            if (isNextFollowingCharacter == false)
+                            {
+                                SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
+                                isFirstWordOfLine = false;
+                            }
+
+                            if (isFirstWordOfLine)
+                            {
+                                // Special handling for non-breaking space and soft line breaks
+                                if (isWhiteSpace)
+                                    SaveWordWrappingState(ref m_SavedSoftLineBreakState, i, m_CharacterCount, textInfo);
+
+                                SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
+                            }
+                        }
+                        else
                         {
-                            SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
-                            m_IsCharacterWrappingEnabled = false;
-                            isFirstWord = false;
+                            if (isFirstWordOfLine && isFirstCharacterOfLine)
+                            {
+                                // Special handling for non-breaking space and soft line breaks
+                                if (isWhiteSpace)
+                                    SaveWordWrappingState(ref m_SavedSoftLineBreakState, i, m_CharacterCount, textInfo);
+
+                                SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
+                            }
                         }
                     }
-                    else if (isFirstWord || m_IsCharacterWrappingEnabled || isLastBreakingChar)
+                    else if (isFirstWordOfLine)
+                    {
+                        // Special handling for non-breaking space and soft line breaks
+                        if (isWhiteSpace && charCode != 0xA0 || (charCode == 0xAD && isSoftHyphenIgnored == false))
+                            SaveWordWrappingState(ref m_SavedSoftLineBreakState, i, m_CharacterCount, textInfo);
+
                         SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
+                    }
                 }
+                #endregion Save Word Wrapping State
+
+                // Consider only saving state on base glyphs
+                SaveWordWrappingState(ref m_SavedLastValidState, i, m_CharacterCount, textInfo);
 
                 m_CharacterCount += 1;
             }
 
             // Check Auto Sizing and increase font size to fill text container.
-            var fontSizeDelta = m_MaxFontSize - m_MinFontSize;
-            if (!m_IsCharacterWrappingEnabled && generationSettings.autoSize && fontSizeDelta > 0.051f && m_FontSize < generationSettings.fontSizeMax)
+            #region Check Auto-Sizing (Upper Font Size Bounds)
+            fontSizeDelta = m_MaxFontSize - m_MinFontSize;
+            if (/* !m_isCharacterWrappingEnabled && */ generationSettings.autoSize && fontSizeDelta > 0.051f && m_FontSize < generationSettings.fontSizeMax && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
             {
+                // Reset character width adjustment delta
+                if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100)
+                    m_CharWidthAdjDelta = 0;
+
                 m_MinFontSize = m_FontSize;
-                m_FontSize += Mathf.Max((m_MaxFontSize - m_FontSize) / 2, 0.05f);
-                m_FontSize = (int)(Mathf.Min(m_FontSize, generationSettings.fontSizeMax) * 20 + 0.5f) / 20f;
 
-                if (m_LoopCountA > 20)
-                {
-                    return; // Added to debug
-                }
-                GenerateTextMesh(generationSettings, textInfo);
+                float sizeDelta = Mathf.Max((m_MaxFontSize - m_FontSize) / 2, 0.05f);
+                m_FontSize += sizeDelta;
+                m_FontSize = Mathf.Min((int)(m_FontSize * 20 + 0.5f) / 20f, generationSettings.charWidthMaxAdj);
+
                 return;
             }
+            #endregion End Auto-sizing Check
 
-            m_IsCharacterWrappingEnabled = false;
+            m_IsAutoSizePointSizeSet = true;
 
-            // *** PHASE II of Text Generation ***
+            if (m_AutoSizeIterationCount >= m_AutoSizeMaxIterationCount)
+                Debug.Log("Auto Size Iteration Count: " + m_AutoSizeIterationCount + ". Final Point Size: " + m_FontSize);
 
-            // If there are no visible characters... no need to continue
-            if (m_CharacterCount == 0)
+            // If there are no visible characters or only character is End of Text (0x03)... no need to continue
+            if (m_CharacterCount == 0 || (m_CharacterCount == 1 && charCode == 0x03))
             {
                 ClearMesh(true, textInfo);
                 return;
             }
 
             // *** PHASE II of Text Generation ***
-            int lastVertIndex = m_MaterialReferences[0].referenceCount * 4;
+            int lastVertIndex = m_MaterialReferences[m_Underline.materialIndex].referenceCount * 4;
 
             // Partial clear of the vertices array to mark unused vertices as degenerate.
             textInfo.meshInfo[0].Clear(false);
 
             // Handle Text Alignment
-
+            #region Text Vertical Alignment
             Vector3 anchorOffset = Vector3.zero;
-            Vector3[] corners = m_RectTransformCorners;
+            Vector3[] corners = m_RectTransformCorners; // GetTextContainerLocalCorners();
 
+            // Handle Vertical Text Alignment
             switch (generationSettings.textAlignment)
             {
                 // Top Vertically
@@ -1824,9 +2456,11 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     anchorOffset = (corners[0] + corners[1]) / 2 + new Vector3(0 + margins.x, 0 - (m_MaxCapHeight - margins.y - margins.w) / 2, 0);
                     break;
             }
+            #endregion
 
             // Initialization for Second Pass
             Vector3 justificationOffset = Vector3.zero;
+            Vector3 offset = Vector3.zero;
 
             int wordCount = 0;
             int lineCount = 0;
@@ -1835,14 +2469,16 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
 
             bool isStartOfWord = false;
             int wordFirstChar = 0;
+            int wordLastChar = 0;
 
             // Second Pass : Line Justification, UV Mapping, Character & Line Visibility & more.
-
             Color32 underlineColor = Color.white;
             Color32 strikethroughColor = Color.white;
-            Color32 highlightColor = new Color32(255, 255, 0, 64);
+            HighlightState highlightState = new HighlightState(new Color32(255, 255, 0, 64), Offset.zero);
             float xScale = 0;
+            float xScaleMax = 0;
             float underlineStartScale = 0;
+            float underlineEndScale = 0;
             float underlineMaxScale = 0;
             float underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
             int lastPage = 0;
@@ -1852,12 +2488,13 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             float strikethroughBaseline = 0;
 
             TextElementInfo[] textElementInfos = textInfo.textElementInfo;
-
+            #region Handle Line Justification & UV Mapping & Character Visibility & More
             for (int i = 0; i < m_CharacterCount; i++)
             {
                 FontAsset currentFontAsset = textElementInfos[i].fontAsset;
 
-                char currentCharacter = textElementInfos[i].character;
+                char unicode = textElementInfos[i].character;
+                bool isWhiteSpace = char.IsWhiteSpace(unicode);
 
                 int currentLine = textElementInfos[i].lineNumber;
                 LineInfo lineInfo = textInfo.lineInfo[currentLine];
@@ -1866,7 +2503,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 TextAlignment lineAlignment = lineInfo.alignment;
 
                 // Process Line Justification
-
+                #region Handle Line Justification
                 switch (lineAlignment)
                 {
                     case TextAlignment.TopLeft:
@@ -1923,12 +2560,11 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     case TextAlignment.BaselineFlush:
                     case TextAlignment.MidlineFlush:
                     case TextAlignment.CaplineFlush:
-
-                        // Skip Zero Width Characters
-                        if (currentCharacter == k_SoftHyphen || currentCharacter == k_ZeroWidthSpace || currentCharacter == k_WordJoiner)
-                            break;
+                        // Skip Zero Width Characters and spaces outside of the margins.
+                        if (i > lineInfo.lastVisibleCharacterIndex || unicode == 0x0A || unicode == 0xAD || unicode == k_ZeroWidthSpace || unicode == k_WordJoiner || unicode == 0x03) break;
 
                         char lastCharOfCurrentLine = textElementInfos[lineInfo.lastCharacterIndex].character;
+
                         bool isFlush = ((HorizontalAlignment)lineAlignment & HorizontalAlignment.Flush) == HorizontalAlignment.Flush;
 
                         // In Justified mode, all lines are justified except the last one.
@@ -1943,7 +2579,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                 else
                                     justificationOffset = new Vector3(lineInfo.marginLeft + lineInfo.width, 0, 0);
 
-                                if (char.IsSeparator(currentCharacter))
+                                if (char.IsSeparator(unicode))
                                     isFirstSeperator = true;
                                 else
                                     isFirstSeperator = false;
@@ -1951,24 +2587,16 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                             else
                             {
                                 float gap = !generationSettings.isRightToLeft ? lineInfo.width - lineInfo.maxAdvance : lineInfo.width + lineInfo.maxAdvance;
-
                                 int visibleCount = lineInfo.visibleCharacterCount - 1 + lineInfo.controlCharacterCount;
+                                int spaces = lineInfo.visibleSpaceCount - lineInfo.controlCharacterCount;
 
-                                // Get the number of spaces for each line ignoring the last character if it is not visible (ie. a space or linefeed).
-                                int spaces = (textElementInfos[lineInfo.lastCharacterIndex].isVisible ? lineInfo.spaceCount : lineInfo.spaceCount - 1) - lineInfo.controlCharacterCount;
-
-                                if (isFirstSeperator)
-                                {
-                                    spaces -= 1;
-                                    visibleCount += 1;
-                                }
+                                if (isFirstSeperator) { spaces -= 1; visibleCount += 1; }
 
-                                float ratio = spaces > 0 ? generationSettings.wordWrappingRatio : 1f;
+                                float ratio = spaces > 0 ? generationSettings.wordWrappingRatio : 1;
 
-                                if (spaces < 1)
-                                    spaces = 1;
+                                if (spaces < 1) spaces = 1;
 
-                                if (currentCharacter != 0xA0 && (currentCharacter == 9 || char.IsSeparator(currentCharacter)))
+                                if (unicode != 0xA0 && (unicode == k_Tab || char.IsSeparator(unicode)))
                                 {
                                     if (!generationSettings.isRightToLeft)
                                         justificationOffset += new Vector3(gap * (1 - ratio) / spaces, 0, 0);
@@ -1993,11 +2621,12 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         }
                         break;
                 }
+                #endregion End Text Justification
 
-                var offset = anchorOffset + justificationOffset;
+                offset = anchorOffset + justificationOffset;
 
                 // Handle UV2 mapping options and packing of scale information into UV2.
-
+                #region Handling of UV2 mapping & Scale packing
                 bool isCharacterVisible = textElementInfos[i].isVisible;
                 if (isCharacterVisible)
                 {
@@ -2007,17 +2636,17 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         // CHARACTERS
                         case TextElementType.Character:
                             Extents lineExtents = lineInfo.lineExtents;
-                            float uvOffset = (generationSettings.uvLineOffset * currentLine) % 1;
+                            float uvOffset = (generationSettings.uvLineOffset * currentLine) % 1; // + m_uvOffset.x;
 
                             // Setup UV2 based on Character Mapping Options Selected
-
+                            #region Handle UV Mapping Options
                             switch (generationSettings.horizontalMapping)
                             {
                                 case TextureMapping.Character:
-                                    textElementInfos[i].vertexBottomLeft.uv2.x = 0;
-                                    textElementInfos[i].vertexTopLeft.uv2.x = 0;
-                                    textElementInfos[i].vertexTopRight.uv2.x = 1;
-                                    textElementInfos[i].vertexBottomRight.uv2.x = 1;
+                                    textElementInfos[i].vertexBottomLeft.uv2.x = 0; //+ m_uvOffset.x;
+                                    textElementInfos[i].vertexTopLeft.uv2.x = 0; //+ m_uvOffset.x;
+                                    textElementInfos[i].vertexTopRight.uv2.x = 1; //+ m_uvOffset.x;
+                                    textElementInfos[i].vertexBottomRight.uv2.x = 1; //+ m_uvOffset.x;
                                     break;
 
                                 case TextureMapping.Line:
@@ -2050,10 +2679,10 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                     switch (generationSettings.verticalMapping)
                                     {
                                         case TextureMapping.Character:
-                                            textElementInfos[i].vertexBottomLeft.uv2.y = 0;
-                                            textElementInfos[i].vertexTopLeft.uv2.y = 1;
-                                            textElementInfos[i].vertexTopRight.uv2.y = 0;
-                                            textElementInfos[i].vertexBottomRight.uv2.y = 1;
+                                            textElementInfos[i].vertexBottomLeft.uv2.y = 0; // + m_uvOffset.y;
+                                            textElementInfos[i].vertexTopLeft.uv2.y = 1; // + m_uvOffset.y;
+                                            textElementInfos[i].vertexTopRight.uv2.y = 0; // + m_uvOffset.y;
+                                            textElementInfos[i].vertexBottomRight.uv2.y = 1; // + m_uvOffset.y;
                                             break;
 
                                         case TextureMapping.Line:
@@ -2075,6 +2704,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                             break;
                                     }
 
+                                    //float xDelta = 1 - (_uv2s[vert_index + 0].y * textMeshCharacterInfo[i].AspectRatio); // Left aligned
                                     float xDelta = (1 - ((textElementInfos[i].vertexBottomLeft.uv2.y + textElementInfos[i].vertexTopLeft.uv2.y) * textElementInfos[i].aspectRatio)) / 2; // Center of Rectangle
 
                                     textElementInfos[i].vertexBottomLeft.uv2.x = (textElementInfos[i].vertexBottomLeft.uv2.y * textElementInfos[i].aspectRatio) + xDelta + uvOffset;
@@ -2087,22 +2717,22 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                             switch (generationSettings.verticalMapping)
                             {
                                 case TextureMapping.Character:
-                                    textElementInfos[i].vertexBottomLeft.uv2.y = 0;
-                                    textElementInfos[i].vertexTopLeft.uv2.y = 1;
-                                    textElementInfos[i].vertexTopRight.uv2.y = 1;
-                                    textElementInfos[i].vertexBottomRight.uv2.y = 0;
+                                    textElementInfos[i].vertexBottomLeft.uv2.y = 0; // + m_uvOffset.y;
+                                    textElementInfos[i].vertexTopLeft.uv2.y = 1; // + m_uvOffset.y;
+                                    textElementInfos[i].vertexTopRight.uv2.y = 1; // + m_uvOffset.y;
+                                    textElementInfos[i].vertexBottomRight.uv2.y = 0; // + m_uvOffset.y;
                                     break;
 
                                 case TextureMapping.Line:
-                                    textElementInfos[i].vertexBottomLeft.uv2.y = (textElementInfos[i].vertexBottomLeft.position.y - lineInfo.descender) / (lineInfo.ascender - lineInfo.descender);
+                                    textElementInfos[i].vertexBottomLeft.uv2.y = (textElementInfos[i].vertexBottomLeft.position.y - lineInfo.descender) / (lineInfo.ascender - lineInfo.descender); // + m_uvOffset.y;
                                     textElementInfos[i].vertexTopLeft.uv2.y = (textElementInfos[i].vertexTopLeft.position.y - lineInfo.descender) / (lineInfo.ascender - lineInfo.descender); // + m_uvOffset.y;
                                     textElementInfos[i].vertexTopRight.uv2.y = textElementInfos[i].vertexTopLeft.uv2.y;
                                     textElementInfos[i].vertexBottomRight.uv2.y = textElementInfos[i].vertexBottomLeft.uv2.y;
                                     break;
 
                                 case TextureMapping.Paragraph:
-                                    textElementInfos[i].vertexBottomLeft.uv2.y = (textElementInfos[i].vertexBottomLeft.position.y - m_MeshExtents.min.y) / (m_MeshExtents.max.y - m_MeshExtents.min.y);
-                                    textElementInfos[i].vertexTopLeft.uv2.y = (textElementInfos[i].vertexTopLeft.position.y - m_MeshExtents.min.y) / (m_MeshExtents.max.y - m_MeshExtents.min.y);
+                                    textElementInfos[i].vertexBottomLeft.uv2.y = (textElementInfos[i].vertexBottomLeft.position.y - m_MeshExtents.min.y) / (m_MeshExtents.max.y - m_MeshExtents.min.y); // + m_uvOffset.y;
+                                    textElementInfos[i].vertexTopLeft.uv2.y = (textElementInfos[i].vertexTopLeft.position.y - m_MeshExtents.min.y) / (m_MeshExtents.max.y - m_MeshExtents.min.y); // + m_uvOffset.y;
                                     textElementInfos[i].vertexTopRight.uv2.y = textElementInfos[i].vertexTopLeft.uv2.y;
                                     textElementInfos[i].vertexBottomRight.uv2.y = textElementInfos[i].vertexBottomLeft.uv2.y;
                                     break;
@@ -2110,19 +2740,26 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                                 case TextureMapping.MatchAspect:
                                     float yDelta = (1 - ((textElementInfos[i].vertexBottomLeft.uv2.x + textElementInfos[i].vertexTopRight.uv2.x) / textElementInfos[i].aspectRatio)) / 2; // Center of Rectangle
 
-                                    textElementInfos[i].vertexBottomLeft.uv2.y = yDelta + (textElementInfos[i].vertexBottomLeft.uv2.x / textElementInfos[i].aspectRatio);
-                                    textElementInfos[i].vertexTopLeft.uv2.y = yDelta + (textElementInfos[i].vertexTopRight.uv2.x / textElementInfos[i].aspectRatio);
+                                    textElementInfos[i].vertexBottomLeft.uv2.y = yDelta + (textElementInfos[i].vertexBottomLeft.uv2.x / textElementInfos[i].aspectRatio); // + m_uvOffset.y;
+                                    textElementInfos[i].vertexTopLeft.uv2.y = yDelta + (textElementInfos[i].vertexTopRight.uv2.x / textElementInfos[i].aspectRatio); // + m_uvOffset.y;
                                     textElementInfos[i].vertexBottomRight.uv2.y = textElementInfos[i].vertexBottomLeft.uv2.y;
                                     textElementInfos[i].vertexTopRight.uv2.y = textElementInfos[i].vertexTopLeft.uv2.y;
                                     break;
                             }
+                            #endregion
 
                             // Pack UV's so that we can pass Xscale needed for Shader to maintain 1:1 ratio.
-
+                            #region Pack Scale into UV2
                             xScale = textElementInfos[i].scale * (1 - m_CharWidthAdjDelta) * 1; // generationSettings.scale;
-                            if (!textElementInfos[i].isUsingAlternateTypeface && (textElementInfos[i].style & FontStyles.Bold) == FontStyles.Bold)
-                                xScale *= -1;
+                            if (!textElementInfos[i].isUsingAlternateTypeface && (textElementInfos[i].style & FontStyles.Bold) == FontStyles.Bold) xScale *= -1;
+
+                            // Set SDF Scale
+                            textElementInfos[i].vertexBottomLeft.uv.w = xScale;
+                            textElementInfos[i].vertexTopLeft.uv.w = xScale;
+                            textElementInfos[i].vertexTopRight.uv.w = xScale;
+                            textElementInfos[i].vertexBottomRight.uv.w = xScale;
 
+                            // TODO: To revise the code below. Right now, it is required by UITK to handle bold styling, while in TMP is not necessary.
                             // Optimization to avoid having a vector2 returned from the Pack UV function.
                             textElementInfos[i].vertexBottomLeft.uv2.x = 1;
                             textElementInfos[i].vertexBottomLeft.uv2.y = xScale;
@@ -2132,17 +2769,17 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                             textElementInfos[i].vertexTopRight.uv2.y = xScale;
                             textElementInfos[i].vertexBottomRight.uv2.x = 1;
                             textElementInfos[i].vertexBottomRight.uv2.y = xScale;
+                            #endregion
                             break;
 
                         // SPRITES
                         case TextElementType.Sprite:
-
                             // Nothing right now
                             break;
                     }
 
                     // Handle maxVisibleCharacters, maxVisibleLines and Overflow Page Mode.
-
+                    #region Handle maxVisibleCharacters / maxVisibleLines / Page Mode
                     if (i < generationSettings.maxVisibleCharacters && wordCount < generationSettings.maxVisibleWords && currentLine < generationSettings.maxVisibleLines && generationSettings.overflowMode != TextOverflowMode.Page)
                     {
                         textElementInfos[i].vertexBottomLeft.position += offset;
@@ -2165,17 +2802,22 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         textElementInfos[i].vertexBottomRight.position = Vector3.zero;
                         textElementInfos[i].isVisible = false;
                     }
+                    #endregion
+
+                    bool convertToLinearSpace = QualitySettings.activeColorSpace == ColorSpace.Linear
+                                                && generationSettings.shouldConvertToLinearSpace;
 
                     // Fill Vertex Buffers for the various types of element
                     if (elementType == TextElementType.Character)
                     {
-                        TextGeneratorUtilities.FillCharacterVertexBuffers(i, generationSettings, textInfo);
+                        TextGeneratorUtilities.FillCharacterVertexBuffers(i, convertToLinearSpace, generationSettings, textInfo);
                     }
                     else if (elementType == TextElementType.Sprite)
                     {
-                        TextGeneratorUtilities.FillSpriteVertexBuffers(i, generationSettings, textInfo);
+                        TextGeneratorUtilities.FillSpriteVertexBuffers(i, convertToLinearSpace, generationSettings, textInfo);
                     }
                 }
+                #endregion
 
                 // Apply Alignment and Justification Offset
                 textInfo.textElementInfo[i].bottomLeft += offset;
@@ -2190,8 +2832,15 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 textInfo.textElementInfo[i].descender += offset.y;
                 textInfo.textElementInfo[i].baseLine += offset.y;
 
-                // Need to recompute lineExtent to account for the offset from justification.
+                // Update MeshExtents
+                if (isCharacterVisible)
+                {
+                    //m_MeshExtents.min = new Vector2(Mathf.Min(m_MeshExtents.min.x, textInfo.textElementInfo[i].bottomLeft.x), Mathf.Min(m_MeshExtents.min.y, textInfo.textElementInfo[i].bottomLeft.y));
+                    //m_MeshExtents.max = new Vector2(Mathf.Max(m_MeshExtents.max.x, textInfo.textElementInfo[i].topRight.x), Mathf.Max(m_MeshExtents.max.y, textInfo.textElementInfo[i].topLeft.y));
+                }
 
+                // Need to recompute lineExtent to account for the offset from justification.
+                #region Adjust lineExtents resulting from alignment offset
                 if (currentLine != lastLine || i == m_CharacterCount - 1)
                 {
                     // Update the previous line's extents
@@ -2201,6 +2850,8 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         textInfo.lineInfo[lastLine].ascender += offset.y;
                         textInfo.lineInfo[lastLine].descender += offset.y;
 
+                        textInfo.lineInfo[lastLine].maxAdvance += offset.x;
+
                         textInfo.lineInfo[lastLine].lineExtents.min = new Vector2(textInfo.textElementInfo[textInfo.lineInfo[lastLine].firstCharacterIndex].bottomLeft.x, textInfo.lineInfo[lastLine].descender);
                         textInfo.lineInfo[lastLine].lineExtents.max = new Vector2(textInfo.textElementInfo[textInfo.lineInfo[lastLine].lastVisibleCharacterIndex].topRight.x, textInfo.lineInfo[lastLine].ascender);
                     }
@@ -2212,15 +2863,18 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         textInfo.lineInfo[currentLine].ascender += offset.y;
                         textInfo.lineInfo[currentLine].descender += offset.y;
 
+                        textInfo.lineInfo[currentLine].maxAdvance += offset.x;
+
                         textInfo.lineInfo[currentLine].lineExtents.min = new Vector2(textInfo.textElementInfo[textInfo.lineInfo[currentLine].firstCharacterIndex].bottomLeft.x, textInfo.lineInfo[currentLine].descender);
                         textInfo.lineInfo[currentLine].lineExtents.max = new Vector2(textInfo.textElementInfo[textInfo.lineInfo[currentLine].lastVisibleCharacterIndex].topRight.x, textInfo.lineInfo[currentLine].ascender);
                     }
                 }
+                #endregion
 
-                // Track Word Count per line and for the object
 
-                int wordLastChar;
-                if (char.IsLetterOrDigit(currentCharacter) || currentCharacter == k_HyphenMinus || currentCharacter == k_SoftHyphen || currentCharacter == k_Hyphen || currentCharacter == k_NonBreakingHyphen)
+                // Track Word Count per line and for the object
+                #region Track Word Count
+                if (char.IsLetterOrDigit(unicode) || unicode == 0x2D || unicode == 0xAD || unicode == k_Hyphen || unicode == k_NonBreakingHyphen)
                 {
                     if (isStartOfWord == false)
                     {
@@ -2248,11 +2902,15 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         textInfo.lineInfo[currentLine].wordCount += 1;
                     }
                 }
-                else if (isStartOfWord || i == 0 && (!char.IsPunctuation(currentCharacter) || char.IsWhiteSpace(currentCharacter) || currentCharacter == k_ZeroWidthSpace || i == m_CharacterCount - 1))
+                else if (isStartOfWord || i == 0 && (!char.IsPunctuation(unicode) || isWhiteSpace || unicode == k_ZeroWidthSpace || i == m_CharacterCount - 1))
                 {
-                    if (!(i > 0 && i < textElementInfos.Length - 1 && i < m_CharacterCount && (currentCharacter == k_SingleQuote || currentCharacter == k_RightSingleQuote) && char.IsLetterOrDigit(textElementInfos[i - 1].character) && char.IsLetterOrDigit(textElementInfos[i + 1].character)))
+                    if (i > 0 && i < textElementInfos.Length - 1 && i < m_CharacterCount && (unicode == k_SingleQuote || unicode == k_RightSingleQuote) && char.IsLetterOrDigit(textElementInfos[i - 1].character) && char.IsLetterOrDigit(textElementInfos[i + 1].character))
+                    {
+
+                    }
+                    else
                     {
-                        wordLastChar = i == m_CharacterCount - 1 && char.IsLetterOrDigit(currentCharacter) ? i : i - 1;
+                        wordLastChar = i == m_CharacterCount - 1 && char.IsLetterOrDigit(unicode) ? i : i - 1;
                         isStartOfWord = false;
 
                         int size = textInfo.wordInfo.Length;
@@ -2270,36 +2928,44 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         textInfo.lineInfo[currentLine].wordCount += 1;
                     }
                 }
+                #endregion
 
-                // Setup & Handle Underline
 
+                // Setup & Handle Underline
+                #region Underline
                 // NOTE: Need to figure out how underline will be handled with multiple fonts and which font will be used for the underline.
                 bool isUnderline = (textInfo.textElementInfo[i].style & FontStyles.Underline) == FontStyles.Underline;
-                float underlineEndScale;
                 if (isUnderline)
                 {
                     bool isUnderlineVisible = true;
                     int currentPage = textInfo.textElementInfo[i].pageNumber;
+                    textInfo.textElementInfo[i].underlineVertexIndex = lastVertIndex;
 
                     if (i > generationSettings.maxVisibleCharacters || currentLine > generationSettings.maxVisibleLines || (generationSettings.overflowMode == TextOverflowMode.Page && currentPage + 1 != generationSettings.pageToDisplay))
                         isUnderlineVisible = false;
 
                     // We only use the scale of visible characters.
-                    if (!char.IsWhiteSpace(currentCharacter) && currentCharacter != k_ZeroWidthSpace)
+                    if (!isWhiteSpace && unicode != k_ZeroWidthSpace)
                     {
                         underlineMaxScale = Mathf.Max(underlineMaxScale, textInfo.textElementInfo[i].scale);
+                        xScaleMax = Mathf.Max(xScaleMax, Mathf.Abs(xScale));
                         underlineBaseLine = Mathf.Min(currentPage == lastPage ? underlineBaseLine : TextGeneratorUtilities.largePositiveFloat, textInfo.textElementInfo[i].baseLine + generationSettings.fontAsset.faceInfo.underlineOffset * underlineMaxScale);
                         lastPage = currentPage; // Need to track pages to ensure we reset baseline for the new pages.
                     }
 
-                    if (!beginUnderline && isUnderlineVisible && i <= lineInfo.lastVisibleCharacterIndex && currentCharacter != k_LineFeed && currentCharacter != k_CarriageReturn)
+                    if (beginUnderline == false && isUnderlineVisible == true && i <= lineInfo.lastVisibleCharacterIndex && unicode != 10 && unicode != 11 && unicode != 13)
                     {
-                        if (!(i == lineInfo.lastVisibleCharacterIndex && char.IsSeparator(currentCharacter)))
+                        if (i == lineInfo.lastVisibleCharacterIndex && char.IsSeparator(unicode))
+                        { }
+                        else
                         {
                             beginUnderline = true;
                             underlineStartScale = textInfo.textElementInfo[i].scale;
                             if (underlineMaxScale == 0)
+                            {
                                 underlineMaxScale = underlineStartScale;
+                                xScaleMax = xScale;
+                            }
                             underlineStart = new Vector3(textInfo.textElementInfo[i].bottomLeft.x, underlineBaseLine, 0);
                             underlineColor = textInfo.textElementInfo[i].underlineColor;
                         }
@@ -2312,29 +2978,30 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         underlineEnd = new Vector3(textInfo.textElementInfo[i].topRight.x, underlineBaseLine, 0);
                         underlineEndScale = textInfo.textElementInfo[i].scale;
 
-                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScale, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
+                        xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
                     }
                     else if (beginUnderline && (i == lineInfo.lastCharacterIndex || i >= lineInfo.lastVisibleCharacterIndex))
                     {
                         // Terminate underline at previous visible character if space or carriage return.
-                        if (char.IsWhiteSpace(currentCharacter) || currentCharacter == 0x200B)
+                        if (isWhiteSpace || unicode == k_ZeroWidthSpace)
                         {
                             int lastVisibleCharacterIndex = lineInfo.lastVisibleCharacterIndex;
                             underlineEnd = new Vector3(textInfo.textElementInfo[lastVisibleCharacterIndex].topRight.x, underlineBaseLine, 0);
                             underlineEndScale = textInfo.textElementInfo[lastVisibleCharacterIndex].scale;
                         }
                         else
-                        {
-                            // End underline if last character of the line.
+                        {   // End underline if last character of the line.
                             underlineEnd = new Vector3(textInfo.textElementInfo[i].topRight.x, underlineBaseLine, 0);
                             underlineEndScale = textInfo.textElementInfo[i].scale;
                         }
 
                         beginUnderline = false;
-                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScale, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
+                        xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
                     }
                     else if (beginUnderline && !isUnderlineVisible)
@@ -2343,8 +3010,9 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         underlineEnd = new Vector3(textInfo.textElementInfo[i - 1].topRight.x, underlineBaseLine, 0);
                         underlineEndScale = textInfo.textElementInfo[i - 1].scale;
 
-                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScale, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
+                        xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
                     }
                     else if (beginUnderline && i < m_CharacterCount - 1 && !ColorUtilities.CompareColors(underlineColor, textInfo.textElementInfo[i + 1].underlineColor))
@@ -2354,39 +3022,49 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         underlineEnd = new Vector3(textInfo.textElementInfo[i].topRight.x, underlineBaseLine, 0);
                         underlineEndScale = textInfo.textElementInfo[i].scale;
 
-                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScale, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
+                        xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
                     }
                 }
                 else
                 {
                     // End Underline
-                    if (beginUnderline)
+                    if (beginUnderline == true)
                     {
                         beginUnderline = false;
                         underlineEnd = new Vector3(textInfo.textElementInfo[i - 1].topRight.x, underlineBaseLine, 0);
                         underlineEndScale = textInfo.textElementInfo[i - 1].scale;
 
-                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScale, underlineColor, generationSettings, textInfo);
+                        DrawUnderlineMesh(underlineStart, underlineEnd, ref lastVertIndex, underlineStartScale, underlineEndScale, underlineMaxScale, xScaleMax, underlineColor, generationSettings, textInfo);
                         underlineMaxScale = 0;
+                        xScaleMax = 0;
                         underlineBaseLine = TextGeneratorUtilities.largePositiveFloat;
                     }
                 }
+                #endregion
 
-                // Setup & Handle Strikethrough
 
+                // Setup & Handle Strikethrough
+                #region Strikethrough
                 // NOTE: Need to figure out how underline will be handled with multiple fonts and which font will be used for the underline.
                 bool isStrikethrough = (textInfo.textElementInfo[i].style & FontStyles.Strikethrough) == FontStyles.Strikethrough;
-                float strikethroughOffset = currentFontAsset.faceInfo.strikethroughOffset;
+                float strikethroughOffset = currentFontAsset.m_FaceInfo.strikethroughOffset;
 
                 if (isStrikethrough)
                 {
-                    bool isStrikeThroughVisible = !(i > generationSettings.maxVisibleCharacters || currentLine > generationSettings.maxVisibleLines || (generationSettings.overflowMode == TextOverflowMode.Page && textInfo.textElementInfo[i].pageNumber + 1 != generationSettings.pageToDisplay));
+                    bool isStrikeThroughVisible = true;
+                    textInfo.textElementInfo[i].strikethroughVertexIndex = lastVertIndex;
 
-                    if (beginStrikethrough == false && isStrikeThroughVisible && i <= lineInfo.lastVisibleCharacterIndex && currentCharacter != k_LineFeed && currentCharacter != k_CarriageReturn)
+                    if (i > generationSettings.maxVisibleCharacters || currentLine > generationSettings.maxVisibleLines || (generationSettings.overflowMode == TextOverflowMode.Page && textInfo.textElementInfo[i].pageNumber + 1 != generationSettings.pageToDisplay))
+                        isStrikeThroughVisible = false;
+
+                    if (beginStrikethrough == false && isStrikeThroughVisible && i <= lineInfo.lastVisibleCharacterIndex && unicode != 10 && unicode != 11 && unicode != 13)
                     {
-                        if (!(i == lineInfo.lastVisibleCharacterIndex && char.IsSeparator(currentCharacter)))
+                        if (i == lineInfo.lastVisibleCharacterIndex && char.IsSeparator(unicode))
+                        { }
+                        else
                         {
                             beginStrikethrough = true;
                             strikethroughPointSize = textInfo.textElementInfo[i].pointSize;
@@ -2408,7 +3086,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     else if (beginStrikethrough && i == lineInfo.lastCharacterIndex)
                     {
                         // Terminate Strikethrough at previous visible character if space or carriage return.
-                        if (char.IsWhiteSpace(currentCharacter) || currentCharacter == k_ZeroWidthSpace)
+                        if (isWhiteSpace || unicode == k_ZeroWidthSpace)
                         {
                             int lastVisibleCharacterIndex = lineInfo.lastVisibleCharacterIndex;
                             strikethroughEnd = new Vector3(textInfo.textElementInfo[lastVisibleCharacterIndex].topRight.x, textInfo.textElementInfo[lastVisibleCharacterIndex].baseLine + strikethroughOffset * strikethroughScale, 0);
@@ -2455,7 +3133,7 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                 else
                 {
                     // End Strikethrough
-                    if (beginStrikethrough)
+                    if (beginStrikethrough == true)
                     {
                         beginStrikethrough = false;
                         strikethroughEnd = new Vector3(textInfo.textElementInfo[i - 1].topRight.x, textInfo.textElementInfo[i - 1].baseLine + strikethroughOffset * strikethroughScale, 0);
@@ -2463,9 +3141,11 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                         DrawUnderlineMesh(strikethroughStart, strikethroughEnd, ref lastVertIndex, strikethroughScale, strikethroughScale, strikethroughScale, xScale, strikethroughColor, generationSettings, textInfo);
                     }
                 }
+                #endregion
 
-                // HANDLE TEXT HIGHLIGHTING
 
+                // HANDLE TEXT HIGHLIGHTING
+                #region Text Highlighting
                 bool isHighlight = (textInfo.textElementInfo[i].style & FontStyles.Highlight) == FontStyles.Highlight;
                 if (isHighlight)
                 {
@@ -2475,50 +3155,70 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     if (i > generationSettings.maxVisibleCharacters || currentLine > generationSettings.maxVisibleLines || (generationSettings.overflowMode == TextOverflowMode.Page && currentPage + 1 != generationSettings.pageToDisplay))
                         isHighlightVisible = false;
 
-                    if (!beginHighlight && isHighlightVisible && i <= lineInfo.lastVisibleCharacterIndex && currentCharacter != k_LineFeed && currentCharacter != k_CarriageReturn)
+                    if (beginHighlight == false && isHighlightVisible == true && i <= lineInfo.lastVisibleCharacterIndex && unicode != 10 && unicode != 11 && unicode != 13)
                     {
-                        if (!(i == lineInfo.lastVisibleCharacterIndex && char.IsSeparator(currentCharacter)))
+                        if (i == lineInfo.lastVisibleCharacterIndex && char.IsSeparator(unicode))
+                        { }
+                        else
                         {
                             beginHighlight = true;
                             highlightStart = TextGeneratorUtilities.largePositiveVector2;
                             highlightEnd = TextGeneratorUtilities.largeNegativeVector2;
-                            highlightColor = textInfo.textElementInfo[i].highlightColor;
+                            highlightState = textInfo.textElementInfo[i].highlightState;
                         }
                     }
 
                     if (beginHighlight)
                     {
-                        Color32 currentHighlightColor = textInfo.textElementInfo[i].highlightColor;
+                        TextElementInfo currentCharacter = textInfo.textElementInfo[i];
+                        HighlightState currentState = currentCharacter.highlightState;
+
                         bool isColorTransition = false;
 
                         // Handle Highlight color changes
-                        if (!ColorUtilities.CompareColors(highlightColor, currentHighlightColor))
+                        if (highlightState != currentState)
                         {
-                            // End drawing at the start of new highlight color to prevent a gap between highlight sections.
-                            highlightEnd.x = (highlightEnd.x + textInfo.textElementInfo[i].bottomLeft.x) / 2;
+                            // Adjust previous highlight section to prevent a gaps between sections.
+                            if (isWhiteSpace)
+                                highlightEnd.x = (highlightEnd.x - highlightState.padding.right + currentCharacter.origin) / 2;
+                            else
+                                highlightEnd.x = (highlightEnd.x - highlightState.padding.right + currentCharacter.bottomLeft.x) / 2;
 
-                            highlightStart.y = Mathf.Min(highlightStart.y, textInfo.textElementInfo[i].descender);
-                            highlightEnd.y = Mathf.Max(highlightEnd.y, textInfo.textElementInfo[i].ascender);
+                            highlightStart.y = Mathf.Min(highlightStart.y, currentCharacter.descender);
+                            highlightEnd.y = Mathf.Max(highlightEnd.y, currentCharacter.ascender);
 
-                            DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightColor, generationSettings, textInfo);
+                            DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
 
                             beginHighlight = true;
-                            highlightStart = highlightEnd;
+                            highlightStart = new Vector2(highlightEnd.x, currentCharacter.descender - currentState.padding.bottom);
+
+                            if (isWhiteSpace)
+                                highlightEnd = new Vector2(currentCharacter.xAdvance + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
+                            else
+                                highlightEnd = new Vector2(currentCharacter.topRight.x + currentState.padding.right, currentCharacter.ascender + currentState.padding.top);
 
-                            highlightEnd = new Vector3(textInfo.textElementInfo[i].topRight.x, textInfo.textElementInfo[i].descender, 0);
-                            highlightColor = textInfo.textElementInfo[i].highlightColor;
+                            highlightState = currentState;
 
                             isColorTransition = true;
                         }
 
                         if (!isColorTransition)
                         {
-                            // Use the Min / Max Extents of the Highlight area to handle different character sizes and fonts.
-                            highlightStart.x = Mathf.Min(highlightStart.x, textInfo.textElementInfo[i].bottomLeft.x);
-                            highlightStart.y = Mathf.Min(highlightStart.y, textInfo.textElementInfo[i].descender);
+                            if (isWhiteSpace)
+                            {
+                                // Use the Min / Max of glyph metrics if white space.
+                                highlightStart.x = Mathf.Min(highlightStart.x, currentCharacter.origin - highlightState.padding.left);
+                                highlightEnd.x = Mathf.Max(highlightEnd.x, currentCharacter.xAdvance + highlightState.padding.right);
+                            }
+                            else
+                            {
+                                // Use the Min / Max of character bounds
+                                highlightStart.x = Mathf.Min(highlightStart.x, currentCharacter.bottomLeft.x - highlightState.padding.left);
+                                highlightEnd.x = Mathf.Max(highlightEnd.x, currentCharacter.topRight.x + highlightState.padding.right);
+                            }
 
-                            highlightEnd.x = Mathf.Max(highlightEnd.x, textInfo.textElementInfo[i].topRight.x);
-                            highlightEnd.y = Mathf.Max(highlightEnd.y, textInfo.textElementInfo[i].ascender);
+                            highlightStart.y = Mathf.Min(highlightStart.y, currentCharacter.descender - highlightState.padding.bottom);
+                            highlightEnd.y = Mathf.Max(highlightEnd.y, currentCharacter.ascender + highlightState.padding.top);
                         }
                     }
 
@@ -2527,31 +3227,36 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
                     {
                         beginHighlight = false;
 
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightColor, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
                     }
                     else if (beginHighlight && (i == lineInfo.lastCharacterIndex || i >= lineInfo.lastVisibleCharacterIndex))
                     {
                         beginHighlight = false;
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightColor, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
                     }
                     else if (beginHighlight && !isHighlightVisible)
                     {
                         beginHighlight = false;
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightColor, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
                     }
                 }
                 else
                 {
                     // End Highlight
-                    if (beginHighlight)
+                    if (beginHighlight == true)
                     {
                         beginHighlight = false;
-                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightColor, generationSettings, textInfo);
+                        DrawTextHighlight(highlightStart, highlightEnd, ref lastVertIndex, highlightState.color, generationSettings, textInfo);
                     }
                 }
+                #endregion
 
                 lastLine = currentLine;
             }
+            #endregion
+
+            // Set vertex count for Underline geometry
+            textInfo.meshInfo[m_Underline.materialIndex].vertexCount = lastVertIndex;
 
             // METRICS ABOUT THE TEXT OBJECT
             textInfo.characterCount = m_CharacterCount;
@@ -2559,7 +3264,8 @@ void GenerateTextMesh(TextGenerationSettings generationSettings, TextInfo textIn
             textInfo.lineCount = lineCount;
             textInfo.wordCount = wordCount != 0 && m_CharacterCount > 0 ? wordCount : 1;
             textInfo.pageCount = m_PageNumber + 1;
-            textInfo.meshInfo[m_Underline.materialIndex].vertexCount = lastVertIndex;
+
+            // Phase III - Update Mesh Vertex Data
 
             // *** UPLOAD MESH DATA ***
             if (generationSettings.geometrySortingOrder != VertexSortingOrder.Normal)
@@ -2587,7 +3293,7 @@ void SaveWordWrappingState(ref WordWrapState state, int index, int count, TextIn
             state.previousWordBreak = index;
             state.totalCharacterCount = count;
             state.visibleCharacterCount = m_LineVisibleCharacterCount;
-
+            state.visibleSpaceCount = m_LineVisibleSpaceCount;
             state.visibleLinkCount = textInfo.linkCount;
 
             state.firstCharacterIndex = m_FirstCharacterOfLine;
@@ -2606,30 +3312,37 @@ void SaveWordWrappingState(ref WordWrapState state, int index, int count, TextIn
             state.maxDescender = m_MaxDescender;
             state.maxLineAscender = m_MaxLineAscender;
             state.maxLineDescender = m_MaxLineDescender;
-            state.previousLineAscender = m_StartOfLineAscender;
+            state.startOfLineAscender = m_StartOfLineAscender;
             state.preferredWidth = m_PreferredWidth;
             state.preferredHeight = m_PreferredHeight;
             state.meshExtents = m_MeshExtents;
+            state.pageAscender = m_PageAscender;
 
             state.lineNumber = m_LineNumber;
             state.lineOffset = m_LineOffset;
             state.baselineOffset = m_BaselineOffset;
+            state.isDrivenLineSpacing = m_IsDrivenLineSpacing;
 
             state.vertexColor = m_HtmlColor;
             state.underlineColor = m_UnderlineColor;
             state.strikethroughColor = m_StrikethroughColor;
             state.highlightColor = m_HighlightColor;
+            state.highlightState = m_HighlightState;
 
             state.isNonBreakingSpace = m_IsNonBreakingSpace;
             state.tagNoParsing = m_TagNoParsing;
+            state.fxScale = m_FXScale;
+            state.fxRotation = m_FXRotation;
 
             // XML Tag Stack
             state.basicStyleStack = m_FontStyleStack;
+            state.italicAngleStack = m_ItalicAngleStack;
             state.colorStack = m_ColorStack;
             state.underlineColorStack = m_UnderlineColorStack;
             state.strikethroughColorStack = m_StrikethroughColorStack;
             state.highlightColorStack = m_HighlightColorStack;
             state.colorGradientStack = m_ColorGradientStack;
+            state.highlightStateStack = m_HighlightStateStack;
             state.sizeStack = m_SizeStack;
             state.indentStack = m_IndentStack;
             state.fontWeightStack = m_FontWeightStack;
@@ -2639,6 +3352,7 @@ void SaveWordWrappingState(ref WordWrapState state, int index, int count, TextIn
             state.materialReferenceStack = m_MaterialReferenceStack;
             state.lineJustificationStack = m_LineJustificationStack;
 
+            state.lastBaseGlyphIndex = m_LastBaseGlyphIndex;
             state.spriteAnimationId = m_SpriteAnimationId;
 
             if (m_LineNumber < textInfo.lineInfo.Length)
@@ -2657,6 +3371,7 @@ protected int RestoreWordWrappingState(ref WordWrapState state, TextInfo textInf
 
             m_CharacterCount = state.totalCharacterCount + 1;
             m_LineVisibleCharacterCount = state.visibleCharacterCount;
+            m_LineVisibleSpaceCount = state.visibleSpaceCount;
 
             textInfo.linkCount = state.visibleLinkCount;
 
@@ -2665,6 +3380,7 @@ protected int RestoreWordWrappingState(ref WordWrapState state, TextInfo textInf
             m_LastVisibleCharacterOfLine = state.lastVisibleCharIndex;
 
             m_FontStyleInternal = state.fontStyle;
+            m_ItalicAngle = state.italicAngle;
             m_FontScale = state.fontScale;
             m_FontScaleMultiplier = state.fontScaleMultiplier;
 
@@ -2676,30 +3392,37 @@ protected int RestoreWordWrappingState(ref WordWrapState state, TextInfo textInf
             m_MaxDescender = state.maxDescender;
             m_MaxLineAscender = state.maxLineAscender;
             m_MaxLineDescender = state.maxLineDescender;
-            m_StartOfLineAscender = state.previousLineAscender;
+            m_StartOfLineAscender = state.startOfLineAscender;
             m_PreferredWidth = state.preferredWidth;
             m_PreferredHeight = state.preferredHeight;
             m_MeshExtents = state.meshExtents;
+            m_PageAscender = state.pageAscender;
 
             m_LineNumber = state.lineNumber;
             m_LineOffset = state.lineOffset;
             m_BaselineOffset = state.baselineOffset;
+            m_IsDrivenLineSpacing = state.isDrivenLineSpacing;
 
             m_HtmlColor = state.vertexColor;
             m_UnderlineColor = state.underlineColor;
             m_StrikethroughColor = state.strikethroughColor;
             m_HighlightColor = state.highlightColor;
+            m_HighlightState = state.highlightState;
 
             m_IsNonBreakingSpace = state.isNonBreakingSpace;
             m_TagNoParsing = state.tagNoParsing;
+            m_FXScale = state.fxScale;
+            m_FXRotation = state.fxRotation;
 
             // XML Tag Stack
             m_FontStyleStack = state.basicStyleStack;
+            m_ItalicAngleStack = state.italicAngleStack;
             m_ColorStack = state.colorStack;
             m_UnderlineColorStack = state.underlineColorStack;
             m_StrikethroughColorStack = state.strikethroughColorStack;
             m_HighlightColorStack = state.highlightColorStack;
             m_ColorGradientStack = state.colorGradientStack;
+            m_HighlightStateStack = state.highlightStateStack;
             m_SizeStack = state.sizeStack;
             m_IndentStack = state.indentStack;
             m_FontWeightStack = state.fontWeightStack;
@@ -2709,6 +3432,7 @@ protected int RestoreWordWrappingState(ref WordWrapState state, TextInfo textInf
             m_MaterialReferenceStack = state.materialReferenceStack;
             m_LineJustificationStack = state.lineJustificationStack;
 
+            m_LastBaseGlyphIndex = state.lastBaseGlyphIndex;
             m_SpriteAnimationId = state.spriteAnimationId;
 
             if (m_LineNumber < textInfo.lineInfo.Length)
@@ -2717,276 +3441,109 @@ protected int RestoreWordWrappingState(ref WordWrapState state, TextInfo textInf
             return index;
         }
 
-        /// <summary>
-        /// Improved rich text validation function.
-        /// </summary>
-        /// <param name="sourceText"></param>
-        /// <param name="readIndex"></param>
-        /// <param name="writeIndex"></param>
-        /// <param name="generationSettings"></param>
-        /// <param name="textInfo"></param>
-        /// <returns></returns>
-        bool ValidateRichTextTag(string sourceText, ref int readIndex, ref int writeIndex, TextGenerationSettings generationSettings, TextInfo textInfo)
-        {
-            int srcReadIndex = readIndex;
-            int srcWriteIndex = writeIndex;
-
-            int srcLength = sourceText.Length;
-            bool isTagPotentiallyValid = false;
-
-            byte readingFlag = 0;
-            bool isValueInQuotes = false;
-
-            int attributeIndex = 0;
-            m_Attributes[attributeIndex].nameHashCode = 0;
-            m_Attributes[attributeIndex].valueHashCode = 0;
-            m_Attributes[attributeIndex].valueLength = 0;
-
-            // TODO : Add limit on tag search
-            for (; readIndex < srcLength && sourceText[readIndex] != 0 /* && tagCharCount < s_RichTextTag.Length */; readIndex++)
-            {
-                uint c = sourceText[readIndex];
-
-                // Write character into internal array.
-                if (writeIndex == m_InternalTextParsingBuffer.Length)
-                    TextGeneratorUtilities.ResizeArray(m_InternalTextParsingBuffer);
-
-                m_InternalTextParsingBuffer[writeIndex] = c;
-                writeIndex += 1;
-
-                if (c == '<')
-                {
-                    if (readIndex > srcReadIndex)
-                        break;
-
-                    continue;
-                }
-
-                // Check for closing tag
-                if (c == '>')
-                {
-                    isTagPotentiallyValid = true;
-                    break;
-                }
-
-
-                // Compute hashcode for Tag and Attribute names
-                if (readingFlag == 0)
-                {
-                    // Compute hashcode value for tag and attribute names
-                    if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '/' || c == '-')
-                    {
-                        m_Attributes[attributeIndex].nameHashCode = ((m_Attributes[attributeIndex].nameHashCode << 5) + m_Attributes[attributeIndex].nameHashCode) ^ (int)TextUtilities.ToUpperASCIIFast(c);
-                        continue;
-                    }
-
-                    // Next - Determine the value and type.
-                    if (c == '=')
-                    {
-                        readingFlag = 1;
-                        continue;
-                    }
-
-                    // Special handling if using a short color tag like <#FF00FF>
-                    if (c == '#')
-                    {
-                        m_Attributes[attributeIndex].nameHashCode = (int)MarkupTag.COLOR;
-
-                        readingFlag = 2;
-                        readIndex -= 1;
-                        continue;
-                    }
-
-                    // Space separates tag names from attributes
-                    // Reset next attribute before going to read it
-                    if (c == ' ')
-                    {
-                        attributeIndex += 1;
-                        m_Attributes[attributeIndex].nameHashCode = 0;
-                        m_Attributes[attributeIndex].valueHashCode = 0;
-                        m_Attributes[attributeIndex].valueLength = 0;
-                        continue;
-                    }
-
-                    break;
-                }
-
-                // Determine value type for tag and attribute with special handling for values contained in quotes
-                if (readingFlag == 1)
-                {
-                    isValueInQuotes = false;
-                    readingFlag = 2;
-
-                    // Check for format where all values are now enclosed in quotes.
-                    if (c == '"')
-                    {
-                        isValueInQuotes = true;
-                        continue;
-                    }
-                }
-
-                // Read value
-                if (readingFlag == 2)
-                {
-                    // We are done reading the value if we run into a quote.
-                    if (c == '"')
-                    {
-                        if (!isValueInQuotes)
-                            break;
-
-                        readingFlag = 0;
-                        continue;
-                    }
-
-                    // Also done reading the value if we run into a space when quotes are not being used.
-                    if (!isValueInQuotes && c == ' ')
-                    {
-                        attributeIndex += 1;
-                        m_Attributes[attributeIndex].nameHashCode = 0;
-                        m_Attributes[attributeIndex].valueHashCode = 0;
-                        m_Attributes[attributeIndex].valueLength = 0;
-                        readingFlag = 0;
-                        continue;
-                    }
-
-                    if (m_Attributes[attributeIndex].valueLength == 0)
-                    {
-                        m_Attributes[attributeIndex].valueStartIndex = readIndex;
-                    }
-
-                    // Compute Hashcode value irrespective of the value type
-                    m_Attributes[attributeIndex].valueHashCode = ((m_Attributes[attributeIndex].valueHashCode << 5) + m_Attributes[attributeIndex].valueHashCode) ^ (int)TextUtilities.ToUpperASCIIFast(c);
-
-                    m_Attributes[attributeIndex].valueLength += 1;
-                }
-            }
-
-            if (isTagPotentiallyValid == false)
-            {
-                // Reset read and write positions to what they were when function was first called.
-                readIndex = srcReadIndex;
-                writeIndex = srcWriteIndex;
-                return false;
-            }
-
-            //Debug.Log("Hashcode: " + m_Attributes[0].nameHashCode + "  Start Index: " + srcReadIndex + "  End Index: " + readIndex + "  Length: " + (writeIndex - srcWriteIndex));
-
-
-            return false;
-        }
-
-        /// <summary>
-        /// Function to identify and validate the rich tag. Returns the position of the > if the tag was valid.
-        /// </summary>
-        /// <param name="chars"></param>
-        /// <param name="startIndex"></param>
-        /// <param name="endIndex"></param>
-        /// <param name="generationSettings"></param>
-        /// <param name="textInfo"></param>
-        /// <returns></returns>
-        protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, TextGenerationSettings generationSettings, TextInfo textInfo)
+        protected bool ValidateHtmlTag(UnicodeChar[] chars, int startIndex, out int endIndex, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             TextSettings textSettings = generationSettings.textSettings;
 
             int tagCharCount = 0;
             byte attributeFlag = 0;
 
-            TagUnitType tagUnits = TagUnitType.Pixels;
-            TagValueType tagType = TagValueType.None;
-
             int attributeIndex = 0;
-            m_XmlAttribute[attributeIndex].nameHashCode = 0;
-            m_XmlAttribute[attributeIndex].valueType = TagValueType.None;
-            m_XmlAttribute[attributeIndex].valueHashCode = 0;
-            m_XmlAttribute[attributeIndex].valueStartIndex = 0;
-            m_XmlAttribute[attributeIndex].valueLength = 0;
-
-            // Clear attribute name hash codes
-            m_XmlAttribute[1].nameHashCode = 0;
-            m_XmlAttribute[2].nameHashCode = 0;
-            m_XmlAttribute[3].nameHashCode = 0;
-            m_XmlAttribute[4].nameHashCode = 0;
+            ClearMarkupTagAttributes();
+            TagValueType tagValueType = TagValueType.None;
+            TagUnitType tagUnitType = TagUnitType.Pixels;
 
             endIndex = startIndex;
             bool isTagSet = false;
             bool isValidHtmlTag = false;
 
-            for (int i = startIndex; i < chars.Length && chars[i] != 0 && tagCharCount < m_RichTextTag.Length && chars[i] != '<'; i++)
+            for (int i = startIndex; i < chars.Length && chars[i].unicode != 0 && tagCharCount < m_HtmlTag.Length && chars[i].unicode != '<'; i++)
             {
-                uint unicode = (uint)chars[i];
+                int unicode = chars[i].unicode;
 
                 if (unicode == '>') // ASCII Code of End HTML tag '>'
                 {
                     isValidHtmlTag = true;
                     endIndex = i;
-                    m_RichTextTag[tagCharCount] = (char)0;
+                    m_HtmlTag[tagCharCount] = (char)0;
                     break;
                 }
 
-                m_RichTextTag[tagCharCount] = (char)unicode;
+                m_HtmlTag[tagCharCount] = (char)unicode;
                 tagCharCount += 1;
 
                 if (attributeFlag == 1)
                 {
-                    if (tagType == TagValueType.None)
+                    if (tagValueType == TagValueType.None)
                     {
                         // Check for attribute type
                         if (unicode == '+' || unicode == '-' || unicode == '.' || (unicode >= '0' && unicode <= '9'))
                         {
-                            tagType = TagValueType.NumericalValue;
-                            m_XmlAttribute[attributeIndex].valueType = TagValueType.NumericalValue;
+                            tagUnitType = TagUnitType.Pixels;
+                            tagValueType = m_XmlAttribute[attributeIndex].valueType = TagValueType.NumericalValue;
                             m_XmlAttribute[attributeIndex].valueStartIndex = tagCharCount - 1;
                             m_XmlAttribute[attributeIndex].valueLength += 1;
                         }
                         else if (unicode == '#')
                         {
-                            tagType = TagValueType.ColorValue;
-                            m_XmlAttribute[attributeIndex].valueType = TagValueType.ColorValue;
+                            tagUnitType = TagUnitType.Pixels;
+                            tagValueType = m_XmlAttribute[attributeIndex].valueType = TagValueType.ColorValue;
                             m_XmlAttribute[attributeIndex].valueStartIndex = tagCharCount - 1;
                             m_XmlAttribute[attributeIndex].valueLength += 1;
                         }
                         else if (unicode == '"')
                         {
-                            tagType = TagValueType.StringValue;
-                            m_XmlAttribute[attributeIndex].valueType = TagValueType.StringValue;
+                            tagUnitType = TagUnitType.Pixels;
+                            tagValueType = m_XmlAttribute[attributeIndex].valueType = TagValueType.StringValue;
                             m_XmlAttribute[attributeIndex].valueStartIndex = tagCharCount;
                         }
                         else
                         {
-                            tagType = TagValueType.StringValue;
-                            m_XmlAttribute[attributeIndex].valueType = TagValueType.StringValue;
+                            tagUnitType = TagUnitType.Pixels;
+                            tagValueType = m_XmlAttribute[attributeIndex].valueType = TagValueType.StringValue;
                             m_XmlAttribute[attributeIndex].valueStartIndex = tagCharCount - 1;
-                            m_XmlAttribute[attributeIndex].valueHashCode = (m_XmlAttribute[attributeIndex].valueHashCode << 5) + m_XmlAttribute[attributeIndex].valueHashCode ^ (int)TextUtilities.ToUpperASCIIFast(unicode);
+                            m_XmlAttribute[attributeIndex].valueHashCode = (m_XmlAttribute[attributeIndex].valueHashCode << 5) + m_XmlAttribute[attributeIndex].valueHashCode ^ TextGeneratorUtilities.ToUpperFast((char)unicode);
                             m_XmlAttribute[attributeIndex].valueLength += 1;
                         }
                     }
                     else
                     {
-                        if (tagType == TagValueType.NumericalValue)
+                        if (tagValueType == TagValueType.NumericalValue)
                         {
                             // Check for termination of numerical value.
                             if (unicode == 'p' || unicode == 'e' || unicode == '%' || unicode == ' ')
                             {
                                 attributeFlag = 2;
-                                tagType = TagValueType.None;
+                                tagValueType = TagValueType.None;
+
+                                switch (unicode)
+                                {
+                                    case 'e':
+                                        m_XmlAttribute[attributeIndex].unitType = tagUnitType = TagUnitType.FontUnits;
+                                        break;
+                                    case '%':
+                                        m_XmlAttribute[attributeIndex].unitType = tagUnitType = TagUnitType.Percentage;
+                                        break;
+                                    default:
+                                        m_XmlAttribute[attributeIndex].unitType = tagUnitType = TagUnitType.Pixels;
+                                        break;
+                                }
+
                                 attributeIndex += 1;
                                 m_XmlAttribute[attributeIndex].nameHashCode = 0;
-                                m_XmlAttribute[attributeIndex].valueType = TagValueType.None;
                                 m_XmlAttribute[attributeIndex].valueHashCode = 0;
+                                m_XmlAttribute[attributeIndex].valueType = TagValueType.None;
+                                m_XmlAttribute[attributeIndex].unitType = TagUnitType.Pixels;
                                 m_XmlAttribute[attributeIndex].valueStartIndex = 0;
                                 m_XmlAttribute[attributeIndex].valueLength = 0;
 
-                                if (unicode == 'e')
-                                    tagUnits = TagUnitType.FontUnits;
-                                else if (unicode == '%')
-                                    tagUnits = TagUnitType.Percentage;
                             }
                             else if (attributeFlag != 2)
                             {
                                 m_XmlAttribute[attributeIndex].valueLength += 1;
                             }
                         }
-                        else if (tagType == TagValueType.ColorValue)
+                        else if (tagValueType == TagValueType.ColorValue)
                         {
                             if (unicode != ' ')
                             {
@@ -2995,30 +3552,34 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             else
                             {
                                 attributeFlag = 2;
-                                tagType = TagValueType.None;
+                                tagValueType = TagValueType.None;
+                                tagUnitType = TagUnitType.Pixels;
                                 attributeIndex += 1;
                                 m_XmlAttribute[attributeIndex].nameHashCode = 0;
                                 m_XmlAttribute[attributeIndex].valueType = TagValueType.None;
+                                m_XmlAttribute[attributeIndex].unitType = TagUnitType.Pixels;
                                 m_XmlAttribute[attributeIndex].valueHashCode = 0;
                                 m_XmlAttribute[attributeIndex].valueStartIndex = 0;
                                 m_XmlAttribute[attributeIndex].valueLength = 0;
                             }
                         }
-                        else if (tagType == TagValueType.StringValue)
+                        else if (tagValueType == TagValueType.StringValue)
                         {
                             // Compute HashCode value for the named tag.
                             if (unicode != '"')
                             {
-                                m_XmlAttribute[attributeIndex].valueHashCode = (m_XmlAttribute[attributeIndex].valueHashCode << 5) + m_XmlAttribute[attributeIndex].valueHashCode ^ (int)TextUtilities.ToUpperASCIIFast(unicode);
+                                m_XmlAttribute[attributeIndex].valueHashCode = (m_XmlAttribute[attributeIndex].valueHashCode << 5) + m_XmlAttribute[attributeIndex].valueHashCode ^ TextGeneratorUtilities.ToUpperFast((char)unicode);
                                 m_XmlAttribute[attributeIndex].valueLength += 1;
                             }
                             else
                             {
                                 attributeFlag = 2;
-                                tagType = TagValueType.None;
+                                tagValueType = TagValueType.None;
+                                tagUnitType = TagUnitType.Pixels;
                                 attributeIndex += 1;
                                 m_XmlAttribute[attributeIndex].nameHashCode = 0;
                                 m_XmlAttribute[attributeIndex].valueType = TagValueType.None;
+                                m_XmlAttribute[attributeIndex].unitType = TagUnitType.Pixels;
                                 m_XmlAttribute[attributeIndex].valueHashCode = 0;
                                 m_XmlAttribute[attributeIndex].valueStartIndex = 0;
                                 m_XmlAttribute[attributeIndex].valueLength = 0;
@@ -3027,95 +3588,95 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                     }
                 }
 
-                if (unicode == '=')
+
+                if (unicode == '=') // '='
                     attributeFlag = 1;
 
                 // Compute HashCode for the name of the attribute
                 if (attributeFlag == 0 && unicode == ' ')
                 {
-                    if (isTagSet)
-                        return false;
+                    if (isTagSet) return false;
 
                     isTagSet = true;
                     attributeFlag = 2;
 
-                    tagType = TagValueType.None;
+                    tagValueType = TagValueType.None;
+                    tagUnitType = TagUnitType.Pixels;
                     attributeIndex += 1;
                     m_XmlAttribute[attributeIndex].nameHashCode = 0;
                     m_XmlAttribute[attributeIndex].valueType = TagValueType.None;
+                    m_XmlAttribute[attributeIndex].unitType = TagUnitType.Pixels;
                     m_XmlAttribute[attributeIndex].valueHashCode = 0;
                     m_XmlAttribute[attributeIndex].valueStartIndex = 0;
                     m_XmlAttribute[attributeIndex].valueLength = 0;
                 }
 
                 if (attributeFlag == 0)
-                    m_XmlAttribute[attributeIndex].nameHashCode = (m_XmlAttribute[attributeIndex].nameHashCode << 5) + m_XmlAttribute[attributeIndex].nameHashCode ^ (int)TextUtilities.ToUpperASCIIFast(unicode);
+                    m_XmlAttribute[attributeIndex].nameHashCode = (m_XmlAttribute[attributeIndex].nameHashCode << 5) + m_XmlAttribute[attributeIndex].nameHashCode ^ TextGeneratorUtilities.ToUpperFast((char)unicode);
 
                 if (attributeFlag == 2 && unicode == ' ')
                     attributeFlag = 0;
+
             }
 
             if (!isValidHtmlTag)
+            {
                 return false;
+            }
 
-            // Output rich text tag parsing results.
-            //Debug.Log("Tag is [" + m_htmlTag.ArrayToString() + "].  Tag HashCode: " + m_xmlAttribute[0].nameHashCode + "  Tag Value HashCode: " + m_xmlAttribute[0].valueHashCode + "  Attribute 1 HashCode: " + m_xmlAttribute[1].nameHashCode + " Value HashCode: " + m_xmlAttribute[1].valueHashCode);
-            //for (int i = 0; i < attributeIndex; i++)
-            //    Debug.Log("Tag [" + i + "] with HashCode: " + m_XmlAttribute[i].nameHashCode + " has value of [" + new string(m_RichTextTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength) + "] Numerical Value: " + TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength));
-
+            #region Rich Text Tag Processing
             // Special handling of the no parsing tag </noparse> </NOPARSE> tag
-            if (m_TagNoParsing && ((MarkupTag)m_XmlAttribute[0].nameHashCode != MarkupTag.SLASH_NO_PARSE))
-            {
+            if (m_TagNoParsing && (m_XmlAttribute[0].nameHashCode != (int)MarkupTag.SLASH_NO_PARSE))
                 return false;
-            }
-            if ((MarkupTag)m_XmlAttribute[0].nameHashCode == MarkupTag.SLASH_NO_PARSE)
+
+            if (m_XmlAttribute[0].nameHashCode == (int)MarkupTag.SLASH_NO_PARSE)
             {
                 m_TagNoParsing = false;
                 return true;
             }
 
             // Color <#FFF> 3 Hex values (short form)
-            if (m_RichTextTag[0] == '#' && tagCharCount == 4)
+            if (m_HtmlTag[0] == k_NumberSign && tagCharCount == 4)
             {
-                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                 m_ColorStack.Add(m_HtmlColor);
                 return true;
             }
             // Color <#FFF7> 4 Hex values with alpha (short form)
-            if (m_RichTextTag[0] == '#' && tagCharCount == 5)
+            else if (m_HtmlTag[0] == k_NumberSign && tagCharCount == 5)
             {
-                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                 m_ColorStack.Add(m_HtmlColor);
                 return true;
             }
             // Color <#FF00FF>
-            if (m_RichTextTag[0] == '#' && tagCharCount == 7) // if Tag begins with # and contains 7 characters.
+            else if (m_HtmlTag[0] == k_NumberSign && tagCharCount == 7) // if Tag begins with # and contains 7 characters.
             {
-                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                 m_ColorStack.Add(m_HtmlColor);
                 return true;
             }
             // Color <#FF00FF00> with alpha
-            if (m_RichTextTag[0] == '#' && tagCharCount == 9) // if Tag begins with # and contains 9 characters.
+            else if (m_HtmlTag[0] == k_NumberSign && tagCharCount == k_Tab) // if Tag begins with # and contains 9 characters.
             {
-                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                 m_ColorStack.Add(m_HtmlColor);
                 return true;
             }
             else
             {
-                float value;
+                float value = 0;
+                float fontScale;
 
                 switch ((MarkupTag)m_XmlAttribute[0].nameHashCode)
                 {
-                    case MarkupTag.BOLD: // <b>
+                    case MarkupTag.BOLD:
                         m_FontStyleInternal |= FontStyles.Bold;
                         m_FontStyleStack.Add(FontStyles.Bold);
 
                         m_FontWeightInternal = TextFontWeight.Bold;
                         return true;
-
-                    case MarkupTag.SLASH_BOLD: // </b>
+                    case MarkupTag.SLASH_BOLD:
                         if ((generationSettings.fontStyle & FontStyles.Bold) != FontStyles.Bold)
                         {
                             if (m_FontStyleStack.Remove(FontStyles.Bold) == 0)
@@ -3125,28 +3686,40 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             }
                         }
                         return true;
-
-                    case MarkupTag.ITALIC: // <i>
+                    case MarkupTag.ITALIC:
                         m_FontStyleInternal |= FontStyles.Italic;
                         m_FontStyleStack.Add(FontStyles.Italic);
-                        return true;
 
-                    case MarkupTag.SLASH_ITALIC: // </i>
+                        if (m_XmlAttribute[1].nameHashCode == (int)MarkupTag.ANGLE)
+                        {
+                            m_ItalicAngle = (int)TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
+
+                            // Make sure angle is within valid range.
+                            if (m_ItalicAngle < -180 || m_ItalicAngle > 180) return false;
+                        }
+                        else
+                            m_ItalicAngle = m_CurrentFontAsset.italicStyleSlant;
+
+                        m_ItalicAngleStack.Add(m_ItalicAngle);
+
+                        return true;
+                    case MarkupTag.SLASH_ITALIC:
                         if ((generationSettings.fontStyle & FontStyles.Italic) != FontStyles.Italic)
                         {
+                            m_ItalicAngle = m_ItalicAngleStack.Remove();
+
                             if (m_FontStyleStack.Remove(FontStyles.Italic) == 0)
                                 m_FontStyleInternal &= ~FontStyles.Italic;
                         }
                         return true;
-
-                    case MarkupTag.STRIKETHROUGH: // <s>
+                    case MarkupTag.STRIKETHROUGH:
                         m_FontStyleInternal |= FontStyles.Strikethrough;
                         m_FontStyleStack.Add(FontStyles.Strikethrough);
 
-                        if (m_XmlAttribute[1].nameHashCode == (uint)MarkupTag.COLOR)
+                        if (m_XmlAttribute[1].nameHashCode == (int)MarkupTag.COLOR)
                         {
-                            m_StrikethroughColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
-                            m_StrikethroughColor.a = m_HtmlColor.a < m_StrikethroughColor.a ? m_HtmlColor.a : m_StrikethroughColor.a;
+                            m_StrikethroughColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
+                            m_StrikethroughColor.a = m_HtmlColor.a < m_StrikethroughColor.a ? (byte)(m_HtmlColor.a) : (byte)(m_StrikethroughColor.a);
                         }
                         else
                             m_StrikethroughColor = m_HtmlColor;
@@ -3154,23 +3727,23 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         m_StrikethroughColorStack.Add(m_StrikethroughColor);
 
                         return true;
-
-                    case MarkupTag.SLASH_STRIKETHROUGH: // </s>
+                    case MarkupTag.SLASH_STRIKETHROUGH:
                         if ((generationSettings.fontStyle & FontStyles.Strikethrough) != FontStyles.Strikethrough)
                         {
                             if (m_FontStyleStack.Remove(FontStyles.Strikethrough) == 0)
                                 m_FontStyleInternal &= ~FontStyles.Strikethrough;
                         }
-                        return true;
 
-                    case MarkupTag.UNDERLINE: // <u>
+                        m_StrikethroughColor = m_StrikethroughColorStack.Remove();
+                        return true;
+                    case MarkupTag.UNDERLINE:
                         m_FontStyleInternal |= FontStyles.Underline;
                         m_FontStyleStack.Add(FontStyles.Underline);
 
-                        if (m_XmlAttribute[1].nameHashCode == (uint)MarkupTag.COLOR)
+                        if (m_XmlAttribute[1].nameHashCode == (int)MarkupTag.COLOR)
                         {
-                            m_UnderlineColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
-                            m_UnderlineColor.a = m_HtmlColor.a < m_UnderlineColor.a ? m_HtmlColor.a : m_UnderlineColor.a;
+                            m_UnderlineColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
+                            m_UnderlineColor.a = m_HtmlColor.a < m_UnderlineColor.a ? (m_HtmlColor.a) : (m_UnderlineColor.a);
                         }
                         else
                             m_UnderlineColor = m_HtmlColor;
@@ -3178,46 +3751,75 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         m_UnderlineColorStack.Add(m_UnderlineColor);
 
                         return true;
-
-                    case MarkupTag.SLASH_UNDERLINE: // </u>
+                    case MarkupTag.SLASH_UNDERLINE:
                         if ((generationSettings.fontStyle & FontStyles.Underline) != FontStyles.Underline)
                         {
-                            m_UnderlineColor = m_UnderlineColorStack.Remove();
-
                             if (m_FontStyleStack.Remove(FontStyles.Underline) == 0)
                                 m_FontStyleInternal &= ~FontStyles.Underline;
                         }
-                        return true;
 
-                    case MarkupTag.MARK: // <mark=#FF00FF80>
+                        m_UnderlineColor = m_UnderlineColorStack.Remove();
+                        return true;
+                    case MarkupTag.MARK:
                         m_FontStyleInternal |= FontStyles.Highlight;
                         m_FontStyleStack.Add(FontStyles.Highlight);
 
-                        m_HighlightColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        m_HighlightColor.a = m_HtmlColor.a < m_HighlightColor.a ? m_HtmlColor.a : m_HighlightColor.a;
-                        m_HighlightColorStack.Add(m_HighlightColor);
-                        return true;
+                        Color32 highlightColor = new Color32(255, 255, 0, 64);
+                        Offset highlightPadding = Offset.zero;
+
+                        // Handle Mark Tag and potential attributes
+                        for (int i = 0; i < m_XmlAttribute.Length && m_XmlAttribute[i].nameHashCode != 0; i++)
+                        {
+                            switch ((MarkupTag)m_XmlAttribute[i].nameHashCode)
+                            {
+                                // Mark tag
+                                case MarkupTag.MARK:
+                                    if (m_XmlAttribute[i].valueType == TagValueType.ColorValue)
+                                        highlightColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
+                                    break;
+
+                                // Color attribute
+                                case MarkupTag.COLOR:
+                                    highlightColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength);
+                                    break;
+
+                                // Padding attribute
+                                case MarkupTag.PADDING:
+                                    int paramCount = TextGeneratorUtilities.GetAttributeParameters(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength, ref m_AttributeParameterValues);
+                                    if (paramCount != 4) return false;
+
+                                    highlightPadding = new Offset(m_AttributeParameterValues[0], m_AttributeParameterValues[1], m_AttributeParameterValues[2], m_AttributeParameterValues[3]);
+                                    highlightPadding *= m_FontSize * 0.01f * (generationSettings.isOrthographic ? 1 : 0.1f);
+                                    break;
+                            }
+                        }
 
-                    case MarkupTag.SLASH_MARK: // </mark>
+                        highlightColor.a = m_HtmlColor.a < highlightColor.a ? (byte)(m_HtmlColor.a) : (byte)(highlightColor.a);
+
+                        m_HighlightState = new HighlightState(highlightColor, highlightPadding);
+                        m_HighlightStateStack.Push(m_HighlightState);
+
+                        return true;
+                    case MarkupTag.SLASH_MARK:
                         if ((generationSettings.fontStyle & FontStyles.Highlight) != FontStyles.Highlight)
                         {
-                            m_HighlightColor = m_HighlightColorStack.Remove();
+                            m_HighlightStateStack.Remove();
+                            m_HighlightState = m_HighlightStateStack.current;
 
                             if (m_FontStyleStack.Remove(FontStyles.Highlight) == 0)
                                 m_FontStyleInternal &= ~FontStyles.Highlight;
                         }
                         return true;
-
-                    case MarkupTag.SUBSCRIPT: // <sub>
+                    case MarkupTag.SUBSCRIPT:
                         m_FontScaleMultiplier *= m_CurrentFontAsset.faceInfo.subscriptSize > 0 ? m_CurrentFontAsset.faceInfo.subscriptSize : 1;
                         m_BaselineOffsetStack.Push(m_BaselineOffset);
-                        m_BaselineOffset += m_CurrentFontAsset.faceInfo.subscriptOffset * m_FontScale * m_FontScaleMultiplier;
+                        fontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
+                        m_BaselineOffset += m_CurrentFontAsset.faceInfo.subscriptOffset * fontScale * m_FontScaleMultiplier;
 
                         m_FontStyleStack.Add(FontStyles.Subscript);
                         m_FontStyleInternal |= FontStyles.Subscript;
                         return true;
-
-                    case MarkupTag.SLASH_SUBSCRIPT: // </sub>
+                    case MarkupTag.SLASH_SUBSCRIPT:
                         if ((m_FontStyleInternal & FontStyles.Subscript) == FontStyles.Subscript)
                         {
                             if (m_FontScaleMultiplier < 1)
@@ -3230,17 +3832,16 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                                 m_FontStyleInternal &= ~FontStyles.Subscript;
                         }
                         return true;
-
-                    case MarkupTag.SUPERSCRIPT: // <sup>
+                    case MarkupTag.SUPERSCRIPT:
                         m_FontScaleMultiplier *= m_CurrentFontAsset.faceInfo.superscriptSize > 0 ? m_CurrentFontAsset.faceInfo.superscriptSize : 1;
                         m_BaselineOffsetStack.Push(m_BaselineOffset);
-                        m_BaselineOffset += m_CurrentFontAsset.faceInfo.superscriptOffset * m_FontScale * m_FontScaleMultiplier;
+                        fontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
+                        m_BaselineOffset += m_CurrentFontAsset.faceInfo.superscriptOffset * fontScale * m_FontScaleMultiplier;
 
                         m_FontStyleStack.Add(FontStyles.Superscript);
                         m_FontStyleInternal |= FontStyles.Superscript;
                         return true;
-
-                    case MarkupTag.SLASH_SUPERSCRIPT: // </sup>
+                    case MarkupTag.SLASH_SUPERSCRIPT:
                         if ((m_FontStyleInternal & FontStyles.Superscript) == FontStyles.Superscript)
                         {
                             if (m_FontScaleMultiplier < 1)
@@ -3253,9 +3854,11 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                                 m_FontStyleInternal &= ~FontStyles.Superscript;
                         }
                         return true;
+                    case MarkupTag.FONT_WEIGHT:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.FONT_WEIGHT: // <font-weight>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
                         switch ((int)value)
                         {
@@ -3291,63 +3894,63 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         m_FontWeightStack.Add(m_FontWeightInternal);
 
                         return true;
-
-                    case MarkupTag.SLASH_FONT_WEIGHT: // </font-weight>
+                    case MarkupTag.SLASH_FONT_WEIGHT:
                         m_FontWeightStack.Remove();
 
                         if (m_FontStyleInternal == FontStyles.Bold)
                             m_FontWeightInternal = TextFontWeight.Bold;
                         else
                             m_FontWeightInternal = m_FontWeightStack.Peek();
+
                         return true;
+                    case MarkupTag.POSITION:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.POSITION: // <pos=000.00px> <pos=0em> <pos=50%>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_XAdvance = value;
+                                m_XAdvance = value * (generationSettings.isOrthographic ? 1.0f : 0.1f);
+                                //m_isIgnoringAlignment = true;
                                 return true;
                             case TagUnitType.FontUnits:
-                                m_XAdvance = value * m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_XAdvance = value * m_CurrentFontSize * (generationSettings.isOrthographic ? 1.0f : 0.1f);
+                                //m_isIgnoringAlignment = true;
                                 return true;
                             case TagUnitType.Percentage:
                                 m_XAdvance = m_MarginWidth * value / 100;
+                                //m_isIgnoringAlignment = true;
                                 return true;
                         }
                         return false;
-
-                    case MarkupTag.SLASH_POSITION: // </pos>
-                        // No affect.
+                    case MarkupTag.SLASH_POSITION:
+                        m_IsIgnoringAlignment = false;
                         return true;
+                    case MarkupTag.VERTICAL_OFFSET:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                    case MarkupTag.VERTICAL_OFFSET: // <voffset>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
-
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_BaselineOffset = value;
+                                m_BaselineOffset = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 return true;
                             case TagUnitType.FontUnits:
-                                m_BaselineOffset = value * m_FontScale * generationSettings.fontAsset.faceInfo.ascentLine;
+                                m_BaselineOffset = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 return true;
                             case TagUnitType.Percentage:
+                                //m_BaselineOffset = m_MarginHeight * val / 100;
                                 return false;
                         }
                         return false;
-
-                    case MarkupTag.SLASH_VERTICAL_OFFSET: // </voffset>
+                    case MarkupTag.SLASH_VERTICAL_OFFSET:
                         m_BaselineOffset = 0;
                         return true;
-
-                    case MarkupTag.PAGE: // <page>
+                    case MarkupTag.PAGE:
                         // This tag only works when Overflow - Page mode is used.
                         if (generationSettings.overflowMode == TextOverflowMode.Page)
                         {
@@ -3357,65 +3960,53 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             m_IsNewPage = true;
                         }
                         return true;
-
-                    // <BR> tag is now handled inline where it is replaced by a linefeed or \n.
-
-                    case MarkupTag.NO_BREAK: // <nobr>
+                    case MarkupTag.NO_BREAK:
                         m_IsNonBreakingSpace = true;
                         return true;
-
-                    case MarkupTag.SLASH_NO_BREAK: // </nobr>
+                    case MarkupTag.SLASH_NO_BREAK:
                         m_IsNonBreakingSpace = false;
                         return true;
+                    case MarkupTag.SIZE:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.SIZE: // <size=>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                if (m_RichTextTag[5] == '+') // <size=+00>
+                                if (m_HtmlTag[5] == k_Plus) // <size=+00>
                                 {
                                     m_CurrentFontSize = m_FontSize + value;
                                     m_SizeStack.Add(m_CurrentFontSize);
-                                    m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
                                     return true;
                                 }
-                                else if (m_RichTextTag[5] == '-') // <size=-00>
+                                else if (m_HtmlTag[5] == k_Minus) // <size=-00>
                                 {
                                     m_CurrentFontSize = m_FontSize + value;
                                     m_SizeStack.Add(m_CurrentFontSize);
-                                    m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
                                     return true;
                                 }
                                 else // <size=00.0>
                                 {
                                     m_CurrentFontSize = value;
                                     m_SizeStack.Add(m_CurrentFontSize);
-                                    m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
                                     return true;
                                 }
                             case TagUnitType.FontUnits:
                                 m_CurrentFontSize = m_FontSize * value;
                                 m_SizeStack.Add(m_CurrentFontSize);
-                                m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
                                 return true;
                             case TagUnitType.Percentage:
                                 m_CurrentFontSize = m_FontSize * value / 100;
                                 m_SizeStack.Add(m_CurrentFontSize);
-                                m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
                                 return true;
                         }
                         return false;
-
-                    case MarkupTag.SLASH_SIZE: // </size>
+                    case MarkupTag.SLASH_SIZE:
                         m_CurrentFontSize = m_SizeStack.Remove();
-                        m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
                         return true;
-
-                    case MarkupTag.FONT: // <font=xx>
+                    case MarkupTag.FONT:
                         int fontHashCode = m_XmlAttribute[0].valueHashCode;
                         int materialAttributeHashCode = m_XmlAttribute[1].nameHashCode;
                         int materialHashCode = m_XmlAttribute[1].valueHashCode;
@@ -3426,9 +4017,6 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             m_CurrentFontAsset = m_MaterialReferences[0].fontAsset;
                             m_CurrentMaterial = m_MaterialReferences[0].material;
                             m_CurrentMaterialIndex = 0;
-
-                            m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
-
                             m_MaterialReferenceStack.Add(m_MaterialReferences[0]);
 
                             return true;
@@ -3438,10 +4026,18 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         Material tempMaterial;
 
                         // HANDLE NEW FONT ASSET
-                        if (!MaterialReferenceManager.TryGetFontAsset(fontHashCode, out tempFont))
+
+                        // Check if we already have a reference to this font asset.
+                        MaterialReferenceManager.TryGetFontAsset(fontHashCode, out tempFont);
+
+                        // Try loading font asset from potential delegate or resources.
+                        if (tempFont == null)
                         {
-                            // Load Font Asset
-                            tempFont = Resources.Load<FontAsset>(textSettings.defaultFontAssetPath + new string(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
+                            if (tempFont == null)
+                            {
+                                // Load Font Asset
+                                tempFont = Resources.Load<FontAsset>(textSettings.defaultFontAssetPath + new string(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
+                            }
 
                             if (tempFont == null)
                                 return false;
@@ -3460,7 +4056,7 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
 
                             m_MaterialReferenceStack.Add(m_MaterialReferences[m_CurrentMaterialIndex]);
                         }
-                        else if (materialAttributeHashCode == (uint)MarkupTag.MATERIAL) // using material attribute
+                        else if (materialAttributeHashCode == (int)MarkupTag.MATERIAL) // using material attribute
                         {
                             if (MaterialReferenceManager.TryGetMaterial(materialHashCode, out tempMaterial))
                             {
@@ -3473,7 +4069,7 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             else
                             {
                                 // Load new material
-                                tempMaterial = Resources.Load<Material>(textSettings.defaultFontAssetPath + new string(m_RichTextTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength));
+                                tempMaterial = Resources.Load<Material>(textSettings.defaultFontAssetPath + new string(m_HtmlTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength));
 
                                 if (tempMaterial == null)
                                     return false;
@@ -3492,29 +4088,27 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             return false;
 
                         m_CurrentFontAsset = tempFont;
-                        m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
 
                         return true;
+                    case MarkupTag.SLASH_FONT:
+                        {
+                            MaterialReference materialReference = m_MaterialReferenceStack.Remove();
 
-                    case MarkupTag.SLASH_FONT: // </font>
-                    {
-                        MaterialReference materialReference = m_MaterialReferenceStack.Remove();
-
-                        m_CurrentFontAsset = materialReference.fontAsset;
-                        m_CurrentMaterial = materialReference.material;
-                        m_CurrentMaterialIndex = materialReference.index;
-
-                        m_FontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale);
-
-                        return true;
-                    }
+                            m_CurrentFontAsset = materialReference.fontAsset;
+                            m_CurrentMaterial = materialReference.material;
+                            m_CurrentMaterialIndex = materialReference.index;
 
-                    case MarkupTag.MATERIAL: // <material="material name">
+                            return true;
+                        }
+                    case MarkupTag.MATERIAL:
                         materialHashCode = m_XmlAttribute[0].valueHashCode;
 
                         // Special handling for <material=default> or <material=Default>
                         if (materialHashCode == (int)MarkupTag.DEFAULT)
                         {
+                            // Check if material font atlas texture matches that of the current font asset.
+                            //if (m_CurrentFontAsset.atlas.GetInstanceID() != m_CurrentMaterial.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID()) return false;
+
                             m_CurrentMaterial = m_MaterialReferences[0].material;
                             m_CurrentMaterialIndex = 0;
 
@@ -3523,9 +4117,13 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             return true;
                         }
 
+
                         // Check if material
                         if (MaterialReferenceManager.TryGetMaterial(materialHashCode, out tempMaterial))
                         {
+                            // Check if material font atlas texture matches that of the current font asset.
+                            //if (m_CurrentFontAsset.atlas.GetInstanceID() != tempMaterial.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID()) return false;
+
                             m_CurrentMaterial = tempMaterial;
 
                             m_CurrentMaterialIndex = MaterialReference.AddMaterialReference(m_CurrentMaterial, m_CurrentFontAsset, ref m_MaterialReferences, m_MaterialReferenceIndexLookup);
@@ -3535,11 +4133,14 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         else
                         {
                             // Load new material
-                            tempMaterial = Resources.Load<Material>(textSettings.defaultFontAssetPath + new string(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
+                            tempMaterial = Resources.Load<Material>(textSettings.defaultFontAssetPath + new string(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
 
                             if (tempMaterial == null)
                                 return false;
 
+                            // Check if material font atlas texture matches that of the current font asset.
+                            //if (m_CurrentFontAsset.atlas.GetInstanceID() != tempMaterial.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID()) return false;
+
                             // Add new reference to this material in the MaterialReferenceManager
                             MaterialReferenceManager.AddFontMaterial(materialHashCode, tempMaterial);
 
@@ -3550,51 +4151,48 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             m_MaterialReferenceStack.Add(m_MaterialReferences[m_CurrentMaterialIndex]);
                         }
                         return true;
+                    case MarkupTag.SLASH_MATERIAL:
+                        {
+                            //if (m_CurrentMaterial.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID() != m_MaterialReferenceStack.PreviousItem().material.GetTexture(ShaderUtilities.ID_MainTex).GetInstanceID())
+                            //    return false;
 
-                    case MarkupTag.SLASH_MATERIAL: // </material>
-                    {
-                        MaterialReference materialReference = m_MaterialReferenceStack.Remove();
+                            MaterialReference materialReference = m_MaterialReferenceStack.Remove();
 
-                        m_CurrentMaterial = materialReference.material;
-                        m_CurrentMaterialIndex = materialReference.index;
+                            m_CurrentMaterial = materialReference.material;
+                            m_CurrentMaterialIndex = materialReference.index;
 
-                        return true;
-                    }
+                            return true;
+                        }
+                    case MarkupTag.SPACE:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.SPACE: // <space=000.00>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_XAdvance += value;
+                                m_XAdvance += value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 return true;
                             case TagUnitType.FontUnits:
-                                m_XAdvance += value * m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_XAdvance += value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 return true;
                             case TagUnitType.Percentage:
-
                                 // Not applicable
                                 return false;
                         }
                         return false;
+                    case MarkupTag.ALPHA:
+                        if (m_XmlAttribute[0].valueLength != 3) return false;
 
-                    case MarkupTag.ALPHA: // <alpha=#FF>
-                        if (m_XmlAttribute[0].valueLength != 3)
-                            return false;
-
-                        m_HtmlColor.a = (byte)(TextGeneratorUtilities.HexToInt(m_RichTextTag[7]) * 16 + TextGeneratorUtilities.HexToInt(m_RichTextTag[8]));
+                        m_HtmlColor.a = (byte)(TextGeneratorUtilities.HexToInt(m_HtmlTag[7]) * 16 + TextGeneratorUtilities.HexToInt(m_HtmlTag[8]));
                         return true;
 
-                    case MarkupTag.A: // <a href=" ">
+                    case MarkupTag.A:
                         return false;
-
-                    case MarkupTag.SLASH_A: // </a>
+                    case MarkupTag.SLASH_A:
                         return true;
-
-                    case MarkupTag.LINK: // <link="name">
+                    case MarkupTag.LINK:
                         if (m_IsParsingText && !m_IsCalculatingPreferredValues)
                         {
                             int index = textInfo.linkCount;
@@ -3607,11 +4205,10 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
 
                             textInfo.linkInfo[index].linkIdFirstCharacterIndex = startIndex + m_XmlAttribute[0].valueStartIndex;
                             textInfo.linkInfo[index].linkIdLength = m_XmlAttribute[0].valueLength;
-                            textInfo.linkInfo[index].SetLinkId(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
+                            textInfo.linkInfo[index].SetLinkId(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
                         }
                         return true;
-
-                    case MarkupTag.SLASH_LINK: // </link>
+                    case MarkupTag.SLASH_LINK:
                         if (m_IsParsingText && !m_IsCalculatingPreferredValues)
                         {
                             if (textInfo.linkCount < textInfo.linkInfo.Length)
@@ -3622,7 +4219,6 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             }
                         }
                         return true;
-
                     case MarkupTag.ALIGN: // <align=>
                         switch ((MarkupTag)m_XmlAttribute[0].valueHashCode)
                         {
@@ -3648,109 +4244,147 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                                 return true;
                         }
                         return false;
-
-                    case MarkupTag.SLASH_ALIGN: // </align>
+                    case MarkupTag.SLASH_ALIGN:
                         m_LineJustification = m_LineJustificationStack.Remove();
                         return true;
+                    case MarkupTag.WIDTH:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.WIDTH: // <width=xx>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_Width = value;
+                                m_Width = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
                                 return false;
-
                             //break;
                             case TagUnitType.Percentage:
                                 m_Width = m_MarginWidth * value / 100;
                                 break;
                         }
                         return true;
-
-                    case MarkupTag.SLASH_WIDTH: // </width>
+                    case MarkupTag.SLASH_WIDTH:
                         m_Width = -1;
                         return true;
-
-                    case MarkupTag.COLOR: // <color> <color=#FF00FF> or <color=#FF00FF00>
+                    // STYLE tag is now handled inline and replaced by its definition.
+                    //case 322689: // <style="name">
+                    //case 233057: // <STYLE>
+                    //    Style style = StyleSheet.GetStyle(m_XmlAttribute[0].valueHashCode);
+
+                    //    if (style == null) return false;
+
+                    //    m_StyleStack.Add(style.hashCode);
+
+                    //    // Parse Style Macro
+                    //    for (int i = 0; i < style.styleOpeningTagArray.Length; i++)
+                    //    {
+                    //        if (style.styleOpeningTagArray[i] == k_LesserThan)
+                    //        {
+                    //            if (ValidateHtmlTag(style.styleOpeningTagArray, i + 1, out i) == false) return false;
+                    //        }
+                    //    }
+                    //    return true;
+                    //case 1112618: // </style>
+                    //case 1022986: // </STYLE>
+                    //    style = StyleSheet.GetStyle(m_XmlAttribute[0].valueHashCode);
+
+                    //    if (style == null)
+                    //    {
+                    //        // Get style from the Style Stack
+                    //        int styleHashCode = m_StyleStack.CurrentItem();
+                    //        style = StyleSheet.GetStyle(styleHashCode);
+
+                    //        m_StyleStack.Remove();
+                    //    }
+
+                    //    if (style == null) return false;
+                    //    //// Parse Style Macro
+                    //    for (int i = 0; i < style.styleClosingTagArray.Length; i++)
+                    //    {
+                    //        if (style.styleClosingTagArray[i] == k_LesserThan)
+                    //            ValidateHtmlTag(style.styleClosingTagArray, i + 1, out i);
+                    //    }
+                    //    return true;
+                    case MarkupTag.COLOR:
                         // <color=#FFF> 3 Hex (short hand)
-                        if (m_RichTextTag[6] == '#' && tagCharCount == 10)
+                        if (m_HtmlTag[6] == k_NumberSign && tagCharCount == k_LineFeed)
                         {
-                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                             m_ColorStack.Add(m_HtmlColor);
                             return true;
                         }
                         // <color=#FFF7> 4 Hex (short hand)
-                        else if (m_RichTextTag[6] == '#' && tagCharCount == 11)
+                        else if (m_HtmlTag[6] == k_NumberSign && tagCharCount == 11)
                         {
-                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                             m_ColorStack.Add(m_HtmlColor);
                             return true;
                         }
-
                         // <color=#FF00FF> 3 Hex pairs
-                        if (m_RichTextTag[6] == '#' && tagCharCount == 13)
+                        if (m_HtmlTag[6] == k_NumberSign && tagCharCount == k_CarriageReturn)
                         {
-                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                             m_ColorStack.Add(m_HtmlColor);
                             return true;
                         }
                         // <color=#FF00FF00> 4 Hex pairs
-                        else if (m_RichTextTag[6] == '#' && tagCharCount == 15)
+                        else if (m_HtmlTag[6] == k_NumberSign && tagCharCount == 15)
                         {
-                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, tagCharCount);
+                            m_HtmlColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, tagCharCount);
                             m_ColorStack.Add(m_HtmlColor);
                             return true;
                         }
 
                         // <color=name>
-                        switch ((MarkupTag)m_XmlAttribute[0].valueHashCode)
+                        switch (m_XmlAttribute[0].valueHashCode)
                         {
-                            case MarkupTag.RED: // <color=red>
+                            case (int)MarkupTag.RED: // <color=red>
                                 m_HtmlColor = Color.red;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case MarkupTag.BLUE: // <color=blue>
+                            case -992792864: // <color=lightblue>
+                                m_HtmlColor = new Color32(173, 216, 230, 255);
+                                m_ColorStack.Add(m_HtmlColor);
+                                return true;
+                            case (int)MarkupTag.BLUE: // <color=blue>
                                 m_HtmlColor = Color.blue;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case MarkupTag.BLACK: // <color=black>
+                            case 3680713: // <color=grey>
+                                m_HtmlColor = new Color32(128, 128, 128, 255);
+                                m_ColorStack.Add(m_HtmlColor);
+                                return true;
+                            case (int)MarkupTag.BLACK: // <color=black>
                                 m_HtmlColor = Color.black;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case MarkupTag.GREEN: // <color=green>
+                            case (int)MarkupTag.GREEN: // <color=green>
                                 m_HtmlColor = Color.green;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case MarkupTag.WHITE: // <color=white>
+                            case (int)MarkupTag.WHITE: // <color=white>
                                 m_HtmlColor = Color.white;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case MarkupTag.ORANGE: // <color=orange>
+                            case (int)MarkupTag.ORANGE: // <color=orange>
                                 m_HtmlColor = new Color32(255, 128, 0, 255);
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case MarkupTag.PURPLE: // <color=purple>
+                            case (int)MarkupTag.PURPLE: // <color=purple>
                                 m_HtmlColor = new Color32(160, 32, 240, 255);
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
-                            case MarkupTag.YELLOW: // <color=yellow>
+                            case (int)MarkupTag.YELLOW: // <color=yellow>
                                 m_HtmlColor = Color.yellow;
                                 m_ColorStack.Add(m_HtmlColor);
                                 return true;
                         }
                         return false;
 
-                    case MarkupTag.SLASH_COLOR: // </color>
-                        m_HtmlColor = m_ColorStack.Remove();
-                        return true;
-
-                    case MarkupTag.GRADIENT: //<gradient>
+                    case MarkupTag.GRADIENT:
                         int gradientPresetHashCode = m_XmlAttribute[0].valueHashCode;
                         TextColorGradient tempColorGradientPreset;
 
@@ -3764,7 +4398,7 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             // Load Color Gradient Preset
                             if (tempColorGradientPreset == null)
                             {
-                                tempColorGradientPreset = Resources.Load<TextColorGradient>(textSettings.defaultColorGradientPresetsPath + new string(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
+                                tempColorGradientPreset = Resources.Load<TextColorGradient>(textSettings.defaultColorGradientPresetsPath + new string(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
                             }
 
                             if (tempColorGradientPreset == null)
@@ -3774,36 +4408,52 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             m_ColorGradientPreset = tempColorGradientPreset;
                         }
 
+                        m_ColorGradientPresetIsTinted = false;
+
+                        // Check Attributes
+                        for (int i = 1; i < m_XmlAttribute.Length && m_XmlAttribute[i].nameHashCode != 0; i++)
+                        {
+                            // Get attribute name
+                            int nameHashCode = m_XmlAttribute[i].nameHashCode;
+
+                            switch ((MarkupTag)nameHashCode)
+                            {
+                                case MarkupTag.TINT:
+                                    m_ColorGradientPresetIsTinted = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength) != 0;
+                                    break;
+                            }
+                        }
+
                         m_ColorGradientStack.Add(m_ColorGradientPreset);
 
+                        // TODO : Add support for defining preset in the tag itself
+
                         return true;
 
-                    case MarkupTag.SLASH_GRADIENT: // </gradient>
+                    case MarkupTag.SLASH_GRADIENT:
                         m_ColorGradientPreset = m_ColorGradientStack.Remove();
                         return true;
 
-                    case MarkupTag.CHARACTER_SPACE: // <cspace=xx.x>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                    case MarkupTag.CHARACTER_SPACE:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
+
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_CSpacing = value;
+                                m_CSpacing = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
-                                m_CSpacing = value;
-                                m_CSpacing *= m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_CSpacing = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 break;
                             case TagUnitType.Percentage:
                                 return false;
                         }
                         return true;
-
-                    case MarkupTag.SLASH_CHARACTER_SPACE: // </cspace>
-                        if (!m_IsParsingText)
-                            return true;
+                    case MarkupTag.SLASH_CHARACTER_SPACE:
+                        if (!m_IsParsingText) return true;
 
                         // Adjust xAdvance to remove extra space from last character.
                         if (m_CharacterCount > 0)
@@ -3813,46 +4463,45 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         }
                         m_CSpacing = 0;
                         return true;
+                    case MarkupTag.MONOSPACE:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.MONOSPACE: // <mspace=xx.x>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_MonoSpacing = value;
+                                m_MonoSpacing = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
-                                m_MonoSpacing = value;
-                                m_MonoSpacing *= m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_MonoSpacing = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 break;
                             case TagUnitType.Percentage:
                                 return false;
                         }
                         return true;
-
-                    case MarkupTag.SLASH_MONOSPACE: // </mspace>
+                    case MarkupTag.SLASH_MONOSPACE:
                         m_MonoSpacing = 0;
                         return true;
-
-                    case MarkupTag.CLASS: // <class="name">
+                    case MarkupTag.CLASS:
                         return false;
+                    case MarkupTag.SLASH_COLOR:
+                        m_HtmlColor = m_ColorStack.Remove();
+                        return true;
+                    case MarkupTag.INDENT:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.INDENT: // <indent=10px> <indent=10em> <indent=50%>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_TagIndent = value;
+                                m_TagIndent = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
-                                m_TagIndent = value;
-                                m_TagIndent *= m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_TagIndent = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 break;
                             case TagUnitType.Percentage:
                                 m_TagIndent = m_MarginWidth * value / 100;
@@ -3862,24 +4511,23 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
 
                         m_XAdvance = m_TagIndent;
                         return true;
-
-                    case MarkupTag.SLASH_INDENT: // </indent>
+                    case MarkupTag.SLASH_INDENT:
                         m_TagIndent = m_IndentStack.Remove();
+                        //m_XAdvance = m_TagIndent;
                         return true;
+                    case MarkupTag.LINE_INDENT:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.LINE_INDENT: // <line-indent>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-                                m_TagLineIndent = value;
+                                m_TagLineIndent = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
-                                m_TagLineIndent = value;
-                                m_TagLineIndent *= m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_TagLineIndent = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 break;
                             case TagUnitType.Percentage:
                                 m_TagLineIndent = m_MarginWidth * value / 100;
@@ -3888,13 +4536,12 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
 
                         m_XAdvance += m_TagLineIndent;
                         return true;
-
-                    case MarkupTag.SLASH_LINE_INDENT: // </line-indent>
+                    case MarkupTag.SLASH_LINE_INDENT:
                         m_TagLineIndent = 0;
                         return true;
-
-                    case MarkupTag.SPRITE: // <sprite=x>
+                    case MarkupTag.SPRITE:
                         int spriteAssetHashCode = m_XmlAttribute[0].valueHashCode;
+                        SpriteAsset tempSpriteAsset;
                         m_SpriteIndex = -1;
 
                         // CHECK TAG FORMAT
@@ -3925,7 +4572,6 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         }
                         else
                         {
-                            SpriteAsset tempSpriteAsset;
                             // A Sprite Asset has been specified
                             if (MaterialReferenceManager.TryGetSpriteAsset(spriteAssetHashCode, out tempSpriteAsset))
                             {
@@ -3936,7 +4582,8 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                                 // Load Sprite Asset
                                 if (tempSpriteAsset == null)
                                 {
-                                    tempSpriteAsset = Resources.Load<SpriteAsset>(textSettings.defaultSpriteAssetPath + new string(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
+                                    if (tempSpriteAsset == null)
+                                        tempSpriteAsset = Resources.Load<SpriteAsset>(textSettings.defaultSpriteAssetPath + new string(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength));
                                 }
 
                                 if (tempSpriteAsset == null)
@@ -3950,13 +4597,13 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         // Handling of <sprite=index> legacy tag format.
                         if (m_XmlAttribute[0].valueType == TagValueType.NumericalValue) // <sprite=index>
                         {
-                            int index = (int)TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                            if (index == k_FloatUnset)
-                                return false;
+                            int index = (int)TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
+
+                            // Reject tag if value is invalid.
+                            if (index == Int16.MinValue) return false;
 
                             // Check to make sure sprite index is valid
-                            if (index > m_CurrentSpriteAsset.spriteCharacterTable.Count - 1)
-                                return false;
+                            if (index > m_CurrentSpriteAsset.spriteCharacterTable.Count - 1) return false;
 
                             m_SpriteIndex = index;
                         }
@@ -3968,38 +4615,47 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                         for (int i = 0; i < m_XmlAttribute.Length && m_XmlAttribute[i].nameHashCode != 0; i++)
                         {
                             int nameHashCode = m_XmlAttribute[i].nameHashCode;
-                            int index;
+                            int index = 0;
 
                             switch ((MarkupTag)nameHashCode)
                             {
-                                case MarkupTag.NAME: // <sprite name="">
+                                case MarkupTag.NAME:
                                     m_CurrentSpriteAsset = SpriteAsset.SearchForSpriteByHashCode(m_CurrentSpriteAsset, m_XmlAttribute[i].valueHashCode, true, out index);
-                                    if (index == -1)
-                                        return false;
+                                    if (index == -1) return false;
 
                                     m_SpriteIndex = index;
                                     break;
-                                case MarkupTag.INDEX: // <sprite index=>
-                                    index = (int)TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
-                                    if (index == k_FloatUnset)
-                                        return false;
+                                case MarkupTag.INDEX:
+                                    index = (int)TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
+
+                                    // Reject tag if value is invalid.
+                                    if (index == Int16.MinValue) return false;
 
                                     // Check to make sure sprite index is valid
-                                    if (index > m_CurrentSpriteAsset.spriteCharacterTable.Count - 1)
-                                        return false;
+                                    if (index > m_CurrentSpriteAsset.spriteCharacterTable.Count - 1) return false;
 
                                     m_SpriteIndex = index;
                                     break;
-                                case MarkupTag.TINT: // tint
-                                    m_TintSprite = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength) != 0;
-                                    break;
-                                case MarkupTag.COLOR: // color=#FF00FF80
-                                    m_SpriteColor = TextGeneratorUtilities.HexCharsToColor(m_RichTextTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength);
+                                case MarkupTag.TINT:
+                                    m_TintSprite = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength) != 0;
                                     break;
-                                case MarkupTag.ANIM: // anim="0,16,12"  start, end, fps
-                                    Debug.LogWarning("Sprite animations are not currently supported in TextCore");
+                                case MarkupTag.COLOR:
+                                    m_SpriteColor = TextGeneratorUtilities.HexCharsToColor(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength);
                                     break;
+                                case MarkupTag.ANIM:
+                                    int paramCount = TextGeneratorUtilities.GetAttributeParameters(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength, ref m_AttributeParameterValues);
+                                    if (paramCount != 3) return false;
+
+                                    m_SpriteIndex = (int)m_AttributeParameterValues[0];
+
+                                    if (m_IsParsingText)
+                                    {
+                                        // It is possible for a sprite to get animated when it ends up being truncated.
+                                        // Should consider moving the animation of the sprite after text geometry upload.
+                                        //spriteAnimator.DoSpriteAnimation(m_CharacterCount, m_CurrentSpriteAsset, m_SpriteIndex, (int)m_AttributeParameterValues[1], (int)m_AttributeParameterValues[2]);
+                                    }
 
+                                    break;
                                 //case 45545: // size
                                 //case 32745: // SIZE
 
@@ -4011,201 +4667,333 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
                             }
                         }
 
-                        if (m_SpriteIndex == -1)
-                            return false;
+                        if (m_SpriteIndex == -1) return false;
 
                         // Material HashCode for the Sprite Asset is the Sprite Asset Hash Code
                         m_CurrentMaterialIndex = MaterialReference.AddMaterialReference(m_CurrentSpriteAsset.material, m_CurrentSpriteAsset, ref m_MaterialReferences, m_MaterialReferenceIndexLookup);
 
                         m_TextElementType = TextElementType.Sprite;
                         return true;
-
-                    case MarkupTag.LOWERCASE: // <lowercase>
+                    case MarkupTag.LOWERCASE:
                         m_FontStyleInternal |= FontStyles.LowerCase;
                         m_FontStyleStack.Add(FontStyles.LowerCase);
                         return true;
-
-                    case MarkupTag.SLASH_LOWERCASE: // </lowercase>
+                    case MarkupTag.SLASH_LOWERCASE:
                         if ((generationSettings.fontStyle & FontStyles.LowerCase) != FontStyles.LowerCase)
                         {
                             if (m_FontStyleStack.Remove(FontStyles.LowerCase) == 0)
                                 m_FontStyleInternal &= ~FontStyles.LowerCase;
                         }
                         return true;
-
-                    case MarkupTag.ALLCAPS: // <allcaps>
-                    case MarkupTag.UPPERCASE: // <uppercase>
+                    case MarkupTag.ALLCAPS:
+                    case MarkupTag.UPPERCASE:
                         m_FontStyleInternal |= FontStyles.UpperCase;
                         m_FontStyleStack.Add(FontStyles.UpperCase);
                         return true;
-
-                    case MarkupTag.SLASH_ALLCAPS: // </allcaps>
-                    case MarkupTag.SLASH_UPPERCASE: // </uppercase>
+                    case MarkupTag.SLASH_ALLCAPS:
+                    case MarkupTag.SLASH_UPPERCASE:
                         if ((generationSettings.fontStyle & FontStyles.UpperCase) != FontStyles.UpperCase)
                         {
                             if (m_FontStyleStack.Remove(FontStyles.UpperCase) == 0)
                                 m_FontStyleInternal &= ~FontStyles.UpperCase;
                         }
                         return true;
-
-                    case MarkupTag.SMALLCAPS: // <smallcaps>
+                    case MarkupTag.SMALLCAPS:
                         m_FontStyleInternal |= FontStyles.SmallCaps;
                         m_FontStyleStack.Add(FontStyles.SmallCaps);
                         return true;
-
-                    case MarkupTag.SLASH_SMALLCAPS: // </smallcaps>
+                    case MarkupTag.SLASH_SMALLCAPS:
                         if ((generationSettings.fontStyle & FontStyles.SmallCaps) != FontStyles.SmallCaps)
                         {
                             if (m_FontStyleStack.Remove(FontStyles.SmallCaps) == 0)
                                 m_FontStyleInternal &= ~FontStyles.SmallCaps;
                         }
                         return true;
+                    case MarkupTag.MARGIN:
+                        // Check value type
+                        switch (m_XmlAttribute[0].valueType)
+                        {
+                            case TagValueType.NumericalValue:
+                                value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength); // px
 
-                    case MarkupTag.MARGIN: // <margin=00.0> <margin=00em> <margin=50%>
-                        // TODO: Revise margin tag to make left and right variants be attribute based.
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength); // px
-                        if (value == k_FloatUnset)
-                            return false;
+                                // Reject tag if value is invalid.
+                                if (value == Int16.MinValue) return false;
 
-                        m_MarginLeft = value;
-                        switch (tagUnits)
-                        {
-                            case TagUnitType.Pixels:
+                                // Determine tag unit type
+                                switch (tagUnitType)
+                                {
+                                    case TagUnitType.Pixels:
+                                        m_MarginLeft = value * (generationSettings.isOrthographic ? 1 : 0.1f);
+                                        break;
+                                    case TagUnitType.FontUnits:
+                                        m_MarginLeft = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
+                                        break;
+                                    case TagUnitType.Percentage:
+                                        m_MarginLeft = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * value / 100;
+                                        break;
+                                }
+                                m_MarginLeft = m_MarginLeft >= 0 ? m_MarginLeft : 0;
+                                m_MarginRight = m_MarginLeft;
+                                return true;
 
-                                // Default behavior
-                                break;
-                            case TagUnitType.FontUnits:
-                                m_MarginLeft *= m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
-                                break;
-                            case TagUnitType.Percentage:
-                                m_MarginLeft = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * m_MarginLeft / 100;
-                                break;
-                        }
-                        m_MarginLeft = m_MarginLeft >= 0 ? m_MarginLeft : 0;
-                        m_MarginRight = m_MarginLeft;
+                            case TagValueType.None:
+                                for (int i = 1; i < m_XmlAttribute.Length && m_XmlAttribute[i].nameHashCode != 0; i++)
+                                {
+                                    // Get attribute name
+                                    int nameHashCode = m_XmlAttribute[i].nameHashCode;
 
-                        return true;
+                                    switch ((MarkupTag)nameHashCode)
+                                    {
+                                        case MarkupTag.LEFT:
+                                            value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength); // px
+
+                                            // Reject tag if value is invalid.
+                                            if (value == Int16.MinValue) return false;
+
+                                            switch (m_XmlAttribute[i].unitType)
+                                            {
+                                                case TagUnitType.Pixels:
+                                                    m_MarginLeft = value * (generationSettings.isOrthographic ? 1 : 0.1f);
+                                                    break;
+                                                case TagUnitType.FontUnits:
+                                                    m_MarginLeft = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
+                                                    break;
+                                                case TagUnitType.Percentage:
+                                                    m_MarginLeft = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * value / 100;
+                                                    break;
+                                            }
+                                            m_MarginLeft = m_MarginLeft >= 0 ? m_MarginLeft : 0;
+                                            break;
+
+                                        case MarkupTag.RIGHT:
+                                            value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength); // px
+
+                                            // Reject tag if value is invalid.
+                                            if (value == Int16.MinValue) return false;
+
+                                            switch (m_XmlAttribute[i].unitType)
+                                            {
+                                                case TagUnitType.Pixels:
+                                                    m_MarginRight = value * (generationSettings.isOrthographic ? 1 : 0.1f);
+                                                    break;
+                                                case TagUnitType.FontUnits:
+                                                    m_MarginRight = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
+                                                    break;
+                                                case TagUnitType.Percentage:
+                                                    m_MarginRight = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * value / 100;
+                                                    break;
+                                            }
+                                            m_MarginRight = m_MarginRight >= 0 ? m_MarginRight : 0;
+                                            break;
+                                    }
+                                }
+                                return true;
+                        }
 
-                    case MarkupTag.SLASH_MARGIN: // </margin>
+                        return false;
+                    case MarkupTag.SLASH_MARGIN:
                         m_MarginLeft = 0;
                         m_MarginRight = 0;
                         return true;
+                    case MarkupTag.MARGIN_LEFT:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength); // px
 
-                    case MarkupTag.MARGIN_LEFT: // <margin-left=xx.x>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength); // px
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        m_MarginLeft = value;
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-
-                                // Default behavior
+                                m_MarginLeft = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
-                                m_MarginLeft *= m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_MarginLeft = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 break;
                             case TagUnitType.Percentage:
-                                m_MarginLeft = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * m_MarginLeft / 100;
+                                m_MarginLeft = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * value / 100;
                                 break;
                         }
                         m_MarginLeft = m_MarginLeft >= 0 ? m_MarginLeft : 0;
                         return true;
+                    case MarkupTag.MARGIN_RIGHT:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength); // px
 
-                    case MarkupTag.MARGIN_RIGHT: // <margin-right=xx.x>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength); // px
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        m_MarginRight = value;
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-
-                                // Default behavior
+                                m_MarginRight = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
-                                m_MarginRight *= m_FontScale * generationSettings.fontAsset.faceInfo.tabWidth / generationSettings.fontAsset.tabMultiple;
+                                m_MarginRight = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 break;
                             case TagUnitType.Percentage:
-                                m_MarginRight = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * m_MarginRight / 100;
+                                m_MarginRight = (m_MarginWidth - (m_Width != -1 ? m_Width : 0)) * value / 100;
                                 break;
                         }
                         m_MarginRight = m_MarginRight >= 0 ? m_MarginRight : 0;
                         return true;
+                    case MarkupTag.LINE_HEIGHT:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.LINE_HEIGHT: // <line-height=xx.x>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset || value == 0)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        m_LineHeight = value;
-                        switch (tagUnits)
+                        switch (tagUnitType)
                         {
                             case TagUnitType.Pixels:
-
-                                //m_lineHeight = value;
+                                m_LineHeight = value * (generationSettings.isOrthographic ? 1 : 0.1f);
                                 break;
                             case TagUnitType.FontUnits:
-                                m_LineHeight *= generationSettings.fontAsset.faceInfo.lineHeight * m_FontScale;
+                                m_LineHeight = value * (generationSettings.isOrthographic ? 1 : 0.1f) * m_CurrentFontSize;
                                 break;
                             case TagUnitType.Percentage:
-                                m_LineHeight = generationSettings.fontAsset.faceInfo.lineHeight * m_LineHeight / 100 * m_FontScale;
+                                fontScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
+                                m_LineHeight = generationSettings.fontAsset.faceInfo.lineHeight * value / 100 * fontScale;
                                 break;
                         }
                         return true;
-
-                    case MarkupTag.SLASH_LINE_HEIGHT: // </line-height>
+                    case MarkupTag.SLASH_LINE_HEIGHT:
                         m_LineHeight = k_FloatUnset;
                         return true;
-
-                    case MarkupTag.NO_PARSE: // <noparse>
+                    case MarkupTag.NO_PARSE:
                         m_TagNoParsing = true;
                         return true;
+                    case MarkupTag.ACTION:
+                        int actionID = m_XmlAttribute[0].valueHashCode;
+
+                        if (m_IsParsingText)
+                        {
+                            m_ActionStack.Add(actionID);
+
+                            Debug.Log("Action ID: [" + actionID + "] First character index: " + m_CharacterCount);
 
-                    case MarkupTag.ACTION: // <action>
-                        int actionId = m_XmlAttribute[0].valueHashCode;
 
+                        }
+                        //if (m_IsParsingText)
+                        //{
+                        // TMP_Action action = TMP_Action.GetAction(m_XmlAttribute[0].valueHashCode);
+                        //}
+                        return true;
+                    case MarkupTag.SLASH_ACTION:
                         if (m_IsParsingText)
                         {
-                            m_ActionStack.Add(actionId);
+                            Debug.Log("Action ID: [" + m_ActionStack.CurrentItem() + "] Last character index: " + (m_CharacterCount - 1));
                         }
-                        return false;
 
-                    case MarkupTag.SLASH_ACTION: // </action>
                         m_ActionStack.Remove();
-                        return false;
+                        return true;
+                    case MarkupTag.SCALE:
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.SCALE: // <scale=xx.x>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        m_FxMatrix = Matrix4x4.TRS(Vector3.zero, Quaternion.identity, new Vector3(value, 1, 1));
-                        m_IsFxMatrixSet = true;
+                        m_FXScale = new Vector3(value, 1, 1);
 
                         return true;
-
-                    case MarkupTag.SLASH_SCALE: // </scale>
-                        m_IsFxMatrixSet = false;
+                    case MarkupTag.SLASH_SCALE:
+                        m_FXScale = Vector3.one;
                         return true;
+                    case MarkupTag.ROTATE:
+                        // TODO: Add attribute to provide for ability to use Random Rotation
+                        value = TextGeneratorUtilities.ConvertToFloat(m_HtmlTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
 
-                    case MarkupTag.ROTATE: // <rotate=xx.x>
-                        value = TextGeneratorUtilities.ConvertToFloat(m_RichTextTag, m_XmlAttribute[0].valueStartIndex, m_XmlAttribute[0].valueLength);
-                        if (value == k_FloatUnset)
-                            return false;
+                        // Reject tag if value is invalid.
+                        if (value == Int16.MinValue) return false;
 
-                        m_FxMatrix = Matrix4x4.TRS(Vector3.zero, Quaternion.Euler(0, 0, value), Vector3.one);
-                        m_IsFxMatrixSet = true;
+                        m_FXRotation = Quaternion.Euler(0, 0, value);
 
                         return true;
-
-                    case MarkupTag.SLASH_ROTATE: // </rotate>
-                        m_IsFxMatrixSet = false;
+                    case MarkupTag.SLASH_ROTATE:
+                        m_FXRotation = Quaternion.identity;
                         return true;
+                    case MarkupTag.TABLE:
+                        //switch (m_XmlAttribute[1].nameHashCode)
+                        //{
+                        //    case 327550: // width
+                        //        float tableWidth = ConvertToFloat(m_HtmlTag, m_XmlAttribute[1].valueStartIndex, m_XmlAttribute[1].valueLength);
+
+                        //        // Reject tag if value is invalid.
+                        //        if (tableWidth == Int16.MinValue) return false;
+
+                        //        switch (tagUnitType)
+                        //        {
+                        //            case TagUnitType.Pixels:
+                        //                Debug.Log("Table width = " + tableWidth + "px.");
+                        //                break;
+                        //            case TagUnitType.FontUnits:
+                        //                Debug.Log("Table width = " + tableWidth + "em.");
+                        //                break;
+                        //            case TagUnitType.Percentage:
+                        //                Debug.Log("Table width = " + tableWidth + "%.");
+                        //                break;
+                        //        }
+                        //        break;
+                        //}
+                        return false;
+                    case MarkupTag.SLASH_TABLE:
+                        return false;
+                    case MarkupTag.TR:
+                        return false;
+                    case MarkupTag.SLASH_TR:
+                        return false;
+                    case MarkupTag.TH:
+                        // Set style to bold and center alignment
+                        return false;
+                    case MarkupTag.SLASH_TH:
+                        return false;
+                    case MarkupTag.TD:
+                        // Style options
+                        //for (int i = 1; i < m_XmlAttribute.Length && m_XmlAttribute[i].nameHashCode != 0; i++)
+                        //{
+                        //    switch (m_XmlAttribute[i].nameHashCode)
+                        //    {
+                        //        case 327550: // width
+                        //            float tableWidth = ConvertToFloat(m_HtmlTag, m_XmlAttribute[i].valueStartIndex, m_XmlAttribute[i].valueLength);
+
+                        //            switch (tagUnitType)
+                        //            {
+                        //                case TagUnitType.Pixels:
+                        //                    Debug.Log("Table width = " + tableWidth + "px.");
+                        //                    break;
+                        //                case TagUnitType.FontUnits:
+                        //                    Debug.Log("Table width = " + tableWidth + "em.");
+                        //                    break;
+                        //                case TagUnitType.Percentage:
+                        //                    Debug.Log("Table width = " + tableWidth + "%.");
+                        //                    break;
+                        //            }
+                        //            break;
+                        //        case 275917: // align
+                        //            switch (m_XmlAttribute[i].valueHashCode)
+                        //            {
+                        //                case 3774683: // left
+                        //                    Debug.Log("TD align=\"left\".");
+                        //                    break;
+                        //                case 136703040: // right
+                        //                    Debug.Log("TD align=\"right\".");
+                        //                    break;
+                        //                case -458210101: // center
+                        //                    Debug.Log("TD align=\"center\".");
+                        //                    break;
+                        //                case -523808257: // justified
+                        //                    Debug.Log("TD align=\"justified\".");
+                        //                    break;
+                        //            }
+                        //            break;
+                        //    }
+                        //}
+
+                        return false;
+                    case MarkupTag.SLASH_TD:
+                        return false;
                 }
             }
+            #endregion
+
             return false;
         }
 
@@ -4213,18 +5001,22 @@ protected bool ValidateHtmlTag(int[] chars, int startIndex, out int endIndex, Te
         /// Store vertex information for each character.
         /// </summary>
         /// <param name="padding"></param>
-        /// <param name="stylePadding">Style_padding.</param>
+        /// <param name="stylePadding">stylePadding.</param>
         /// <param name="vertexColor">Vertex color.</param>
         /// <param name="generationSettings"></param>
         /// <param name="textInfo"></param>
         void SaveGlyphVertexInfo(float padding, float stylePadding, Color32 vertexColor, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
+            #region Setup Mesh Vertices
             // Save the Vertex Position for the Character
             textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.position = textInfo.textElementInfo[m_CharacterCount].bottomLeft;
             textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.position = textInfo.textElementInfo[m_CharacterCount].topLeft;
             textInfo.textElementInfo[m_CharacterCount].vertexTopRight.position = textInfo.textElementInfo[m_CharacterCount].topRight;
             textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.position = textInfo.textElementInfo[m_CharacterCount].bottomRight;
+            #endregion
+
 
+            #region Setup Vertex Colors
             // Alpha is the lower of the vertex color or tag color alpha used.
             vertexColor.a = m_FontColor32.a < vertexColor.a ? m_FontColor32.a : vertexColor.a;
 
@@ -4247,36 +5039,62 @@ void SaveGlyphVertexInfo(float padding, float stylePadding, Color32 vertexColor,
                 }
                 else // Handle Vertex Color Gradient
                 {
-                    textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.color = generationSettings.fontColorGradient.bottomLeft * vertexColor;
-                    textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.color = generationSettings.fontColorGradient.topLeft * vertexColor;
-                    textInfo.textElementInfo[m_CharacterCount].vertexTopRight.color = generationSettings.fontColorGradient.topRight * vertexColor;
-                    textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.color = generationSettings.fontColorGradient.bottomRight * vertexColor;
+                    // Use Vertex Color Gradient Preset (if one is assigned)
+                    if (generationSettings.fontColorGradientPreset != null)
+                    {
+                        textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.color = generationSettings.fontColorGradientPreset.bottomLeft * vertexColor;
+                        textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.color = generationSettings.fontColorGradientPreset.topLeft * vertexColor;
+                        textInfo.textElementInfo[m_CharacterCount].vertexTopRight.color = generationSettings.fontColorGradientPreset.topRight * vertexColor;
+                        textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.color = generationSettings.fontColorGradientPreset.bottomRight * vertexColor;
+                    }
+                    else
+                    {
+                        textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.color = generationSettings.fontColorGradient.bottomLeft * vertexColor;
+                        textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.color = generationSettings.fontColorGradient.topLeft * vertexColor;
+                        textInfo.textElementInfo[m_CharacterCount].vertexTopRight.color = generationSettings.fontColorGradient.topRight * vertexColor;
+                        textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.color = generationSettings.fontColorGradient.bottomRight * vertexColor;
+                    }
                 }
             }
 
             if (m_ColorGradientPreset != null)
             {
-                textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.color *= m_ColorGradientPreset.bottomLeft;
-                textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.color *= m_ColorGradientPreset.topLeft;
-                textInfo.textElementInfo[m_CharacterCount].vertexTopRight.color *= m_ColorGradientPreset.topRight;
-                textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.color *= m_ColorGradientPreset.bottomRight;
+                if (m_ColorGradientPresetIsTinted)
+                {
+                    textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.color *= m_ColorGradientPreset.bottomLeft;
+                    textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.color *= m_ColorGradientPreset.topLeft;
+                    textInfo.textElementInfo[m_CharacterCount].vertexTopRight.color *= m_ColorGradientPreset.topRight;
+                    textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.color *= m_ColorGradientPreset.bottomRight;
+                }
+                else
+                {
+                    textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.color = TextGeneratorUtilities.MinAlpha(m_ColorGradientPreset.bottomLeft, vertexColor);
+                    textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.color = TextGeneratorUtilities.MinAlpha(m_ColorGradientPreset.topLeft, vertexColor);
+                    textInfo.textElementInfo[m_CharacterCount].vertexTopRight.color = TextGeneratorUtilities.MinAlpha(m_ColorGradientPreset.topRight, vertexColor);
+                    textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.color = TextGeneratorUtilities.MinAlpha(m_ColorGradientPreset.bottomRight, vertexColor);
+                }
             }
+            #endregion
 
-            // Apply style_padding only if this is a SDF Shader.
+            // Apply stylePadding only if this is a SDF Shader.
             if (!m_IsSdfShader)
                 stylePadding = 0;
 
             // Setup UVs for the Character
+            #region Setup UVs
+            Glyph altGlyph = textInfo.textElementInfo[m_CharacterCount].alternativeGlyph;
+            GlyphRect glyphRect = altGlyph == null ? m_CachedTextElement.m_Glyph.glyphRect : altGlyph.glyphRect;
+
             Vector2 uv0;
-            uv0.x = (m_CachedTextElement.glyph.glyphRect.x - padding - stylePadding) / m_CurrentFontAsset.atlasWidth;
-            uv0.y = (m_CachedTextElement.glyph.glyphRect.y - padding - stylePadding) / m_CurrentFontAsset.atlasHeight;
+            uv0.x = (glyphRect.x - padding - stylePadding) / m_CurrentFontAsset.atlasWidth;
+            uv0.y = (glyphRect.y - padding - stylePadding) / m_CurrentFontAsset.atlasHeight;
 
             Vector2 uv1;
             uv1.x = uv0.x;
-            uv1.y = (m_CachedTextElement.glyph.glyphRect.y + padding + stylePadding + m_CachedTextElement.glyph.glyphRect.height) / m_CurrentFontAsset.atlasHeight;
+            uv1.y = (glyphRect.y + padding + stylePadding + glyphRect.height) / m_CurrentFontAsset.atlasHeight;
 
             Vector2 uv2;
-            uv2.x = (m_CachedTextElement.glyph.glyphRect.x + padding + stylePadding + m_CachedTextElement.glyph.glyphRect.width) / m_CurrentFontAsset.atlasWidth;
+            uv2.x = (glyphRect.x + padding + stylePadding + glyphRect.width) / m_CurrentFontAsset.atlasWidth;
             uv2.y = uv1.y;
 
             Vector2 uv3;
@@ -4288,6 +5106,7 @@ void SaveGlyphVertexInfo(float padding, float stylePadding, Color32 vertexColor,
             textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.uv = uv1;
             textInfo.textElementInfo[m_CharacterCount].vertexTopRight.uv = uv2;
             textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.uv = uv3;
+            #endregion Setup UVs
         }
 
         /// <summary>
@@ -4299,18 +5118,19 @@ void SaveGlyphVertexInfo(float padding, float stylePadding, Color32 vertexColor,
         void SaveSpriteVertexInfo(Color32 vertexColor, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             // Save the Vertex Position for the Character
-
+            #region Setup Mesh Vertices
             textInfo.textElementInfo[m_CharacterCount].vertexBottomLeft.position = textInfo.textElementInfo[m_CharacterCount].bottomLeft;
             textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.position = textInfo.textElementInfo[m_CharacterCount].topLeft;
             textInfo.textElementInfo[m_CharacterCount].vertexTopRight.position = textInfo.textElementInfo[m_CharacterCount].topRight;
             textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.position = textInfo.textElementInfo[m_CharacterCount].bottomRight;
+            #endregion
 
             // Vertex Color Alpha
             if (generationSettings.tintSprites)
                 m_TintSprite = true;
 
             Color32 spriteColor = m_TintSprite ? ColorUtilities.MultiplyColors(m_SpriteColor, vertexColor) : m_SpriteColor;
-            spriteColor.a = spriteColor.a < m_FontColor32.a ? spriteColor.a = spriteColor.a < vertexColor.a ? spriteColor.a : vertexColor.a : m_FontColor32.a;
+            spriteColor.a = spriteColor.a < m_FontColor32.a ? spriteColor.a < vertexColor.a ? spriteColor.a : vertexColor.a : m_FontColor32.a;
 
             Color32 c0 = spriteColor;
             Color32 c1 = spriteColor;
@@ -4319,10 +5139,19 @@ void SaveSpriteVertexInfo(Color32 vertexColor, TextGenerationSettings generation
 
             if (generationSettings.fontColorGradient != null)
             {
-                c0 = m_TintSprite ? ColorUtilities.MultiplyColors(c0, generationSettings.fontColorGradient.bottomLeft) : c0;
-                c1 = m_TintSprite ? ColorUtilities.MultiplyColors(c1, generationSettings.fontColorGradient.topLeft) : c1;
-                c2 = m_TintSprite ? ColorUtilities.MultiplyColors(c2, generationSettings.fontColorGradient.topRight) : c2;
-                c3 = m_TintSprite ? ColorUtilities.MultiplyColors(c3, generationSettings.fontColorGradient.bottomRight) : c3;
+                if (generationSettings.fontColorGradientPreset != null) {
+                    c0 = m_TintSprite ? ColorUtilities.MultiplyColors(c0, generationSettings.fontColorGradientPreset.bottomLeft) : c0;
+                    c1 = m_TintSprite ? ColorUtilities.MultiplyColors(c1, generationSettings.fontColorGradientPreset.topLeft) : c1;
+                    c2 = m_TintSprite ? ColorUtilities.MultiplyColors(c2, generationSettings.fontColorGradientPreset.topRight) : c2;
+                    c3 = m_TintSprite ? ColorUtilities.MultiplyColors(c3, generationSettings.fontColorGradientPreset.bottomRight) : c3;
+                }
+                else
+                {
+                    c0 = m_TintSprite ? ColorUtilities.MultiplyColors(c0, generationSettings.fontColorGradient.bottomLeft) : c0;
+                    c1 = m_TintSprite ? ColorUtilities.MultiplyColors(c1, generationSettings.fontColorGradient.topLeft) : c1;
+                    c2 = m_TintSprite ? ColorUtilities.MultiplyColors(c2, generationSettings.fontColorGradient.topRight) : c2;
+                    c3 = m_TintSprite ? ColorUtilities.MultiplyColors(c3, generationSettings.fontColorGradient.bottomRight) : c3;
+                }
             }
 
             if (m_ColorGradientPreset != null)
@@ -4339,6 +5168,7 @@ void SaveSpriteVertexInfo(Color32 vertexColor, TextGenerationSettings generation
             textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.color = c3;
 
             // Setup UVs for the Character
+            #region Setup UVs
             Vector2 uv0 = new Vector2((float)m_CachedTextElement.glyph.glyphRect.x / m_CurrentSpriteAsset.spriteSheet.width, (float)m_CachedTextElement.glyph.glyphRect.y / m_CurrentSpriteAsset.spriteSheet.height); // bottom left
             Vector2 uv1 = new Vector2(uv0.x, (float)(m_CachedTextElement.glyph.glyphRect.y + m_CachedTextElement.glyph.glyphRect.height) / m_CurrentSpriteAsset.spriteSheet.height); // top left
             Vector2 uv2 = new Vector2((float)(m_CachedTextElement.glyph.glyphRect.x + m_CachedTextElement.glyph.glyphRect.width) / m_CurrentSpriteAsset.spriteSheet.width, uv1.y); // top right
@@ -4349,6 +5179,7 @@ void SaveSpriteVertexInfo(Color32 vertexColor, TextGenerationSettings generation
             textInfo.textElementInfo[m_CharacterCount].vertexTopLeft.uv = uv1;
             textInfo.textElementInfo[m_CharacterCount].vertexTopRight.uv = uv2;
             textInfo.textElementInfo[m_CharacterCount].vertexBottomRight.uv = uv3;
+            #endregion Setup UVs
         }
 
         /// <summary>
@@ -4410,7 +5241,8 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             float underlineThickness = m_Underline.fontAsset.faceInfo.underlineThickness;
 
             // UNDERLINE VERTICES FOR (3) LINE SEGMENTS
-            Vector3[] vertices = textInfo.meshInfo[0].vertices;
+            #region UNDERLINE VERTICES
+            Vector3[] vertices = textInfo.meshInfo[underlineMaterialIndex].vertices;
 
             // Front Part of the Underline
             vertices[index + 0] = start + new Vector3(0, 0 - (underlineThickness + m_Padding) * maxScale, 0); // BL
@@ -4429,6 +5261,7 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             vertices[index + 9] = vertices[index + 6]; // TL
             vertices[index + 10] = end + new Vector3(0, m_Padding * maxScale, 0); // TR
             vertices[index + 11] = end + new Vector3(0, -(underlineThickness + m_Padding) * maxScale, 0); // BR
+            #endregion
 
             // Handle potential axis inversion.
             if (generationSettings.inverseYAxis)
@@ -4466,22 +5299,24 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
                 vertices[index + 11].y = (vertices[index + 11].y * -1) + axisOffset.y;
             }
 
-
             // UNDERLINE UV0
-            Vector2[] uvs0 = textInfo.meshInfo[underlineMaterialIndex].uvs0;
+            #region HANDLE UV0
+            Vector4[] uvs0 = textInfo.meshInfo[underlineMaterialIndex].uvs0;
 
             int atlasWidth = m_Underline.fontAsset.atlasWidth;
             int atlasHeight = m_Underline.fontAsset.atlasHeight;
 
+            float xScale = Mathf.Abs(sdfScale);
+
             // Calculate UV required to setup the 3 Quads for the Underline.
-            Vector2 uv0 = new Vector2((underlineGlyphRect.x - startPadding) / atlasWidth, (underlineGlyphRect.y - m_Padding) / atlasHeight);  // bottom left
-            Vector2 uv1 = new Vector2(uv0.x, (underlineGlyphRect.y + underlineGlyphRect.height + m_Padding) / atlasHeight);  // top left
-            Vector2 uv2 = new Vector2((underlineGlyphRect.x - startPadding + (float)underlineGlyphRect.width / 2) / atlasWidth, uv1.y); // Mid Top Left
-            Vector2 uv3 = new Vector2(uv2.x, uv0.y); // Mid Bottom Left
-            Vector2 uv4 = new Vector2((underlineGlyphRect.x + endPadding + (float)underlineGlyphRect.width / 2) / atlasWidth, uv1.y); // Mid Top Right
-            Vector2 uv5 = new Vector2(uv4.x, uv0.y); // Mid Bottom right
-            Vector2 uv6 = new Vector2((underlineGlyphRect.x + endPadding + underlineGlyphRect.width) / atlasWidth, uv1.y); // End Part - Bottom Right
-            Vector2 uv7 = new Vector2(uv6.x, uv0.y); // End Part - Top Right
+            Vector4 uv0 = new Vector4((underlineGlyphRect.x - startPadding) / atlasWidth, (underlineGlyphRect.y - m_Padding) / atlasHeight, 0, xScale);  // bottom left
+            Vector4 uv1 = new Vector4(uv0.x, (underlineGlyphRect.y + underlineGlyphRect.height + m_Padding) / atlasHeight, 0, xScale);  // top left
+            Vector4 uv2 = new Vector4((underlineGlyphRect.x - startPadding + (float)underlineGlyphRect.width / 2) / atlasWidth, uv1.y, 0, xScale); // Mid Top Left
+            Vector4 uv3 = new Vector4(uv2.x, uv0.y, 0, xScale); // Mid Bottom Left
+            Vector4 uv4 = new Vector4((underlineGlyphRect.x + endPadding + (float)underlineGlyphRect.width / 2) / atlasWidth, uv1.y, 0, xScale); // Mid Top Right
+            Vector4 uv5 = new Vector4(uv4.x, uv0.y, 0, xScale); // Mid Bottom right
+            Vector4 uv6 = new Vector4((underlineGlyphRect.x + endPadding + underlineGlyphRect.width) / atlasWidth, uv1.y, 0, xScale); // End Part - Bottom Right
+            Vector4 uv7 = new Vector4(uv6.x, uv0.y, 0, xScale); // End Part - Top Right
 
             // Left Part of the Underline
             uvs0[0 + index] = uv0; // BL
@@ -4490,26 +5325,24 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             uvs0[3 + index] = uv3; // BR
 
             // Middle Part of the Underline
-            uvs0[4 + index] = new Vector2(uv2.x - uv2.x * 0.001f, uv0.y);
-            uvs0[5 + index] = new Vector2(uv2.x - uv2.x * 0.001f, uv1.y);
-            uvs0[6 + index] = new Vector2(uv2.x + uv2.x * 0.001f, uv1.y);
-            uvs0[7 + index] = new Vector2(uv2.x + uv2.x * 0.001f, uv0.y);
+            uvs0[4 + index] = new Vector4(uv2.x - uv2.x * 0.001f, uv0.y, 0, xScale);
+            uvs0[5 + index] = new Vector4(uv2.x - uv2.x * 0.001f, uv1.y, 0, xScale);
+            uvs0[6 + index] = new Vector4(uv2.x + uv2.x * 0.001f, uv1.y, 0, xScale);
+            uvs0[7 + index] = new Vector4(uv2.x + uv2.x * 0.001f, uv0.y, 0, xScale);
 
             // Right Part of the Underline
             uvs0[8 + index] = uv5;
             uvs0[9 + index] = uv4;
             uvs0[10 + index] = uv6;
             uvs0[11 + index] = uv7;
+            #endregion
 
             // UNDERLINE UV2
-
+            #region HANDLE UV2 - SDF SCALE
             // UV1 contains Face / Border UV layout.
-            float minUvX;
+            float minUvX = 0;
             float maxUvX = (vertices[index + 2].x - start.x) / (end.x - start.x);
 
-            //Calculate the xScale or how much the UV's are getting stretched on the X axis for the middle section of the underline.
-            float xScale = Mathf.Abs(sdfScale);
-
             Vector2[] uvs2 = textInfo.meshInfo[underlineMaterialIndex].uvs2;
 
             uvs2[0 + index] = TextGeneratorUtilities.PackUV(0, 0, xScale);
@@ -4531,9 +5364,10 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             uvs2[9 + index] = TextGeneratorUtilities.PackUV(minUvX, 1, xScale);
             uvs2[10 + index] = TextGeneratorUtilities.PackUV(1, 1, xScale);
             uvs2[11 + index] = TextGeneratorUtilities.PackUV(1, 0, xScale);
+            #endregion
 
             // UNDERLINE VERTEX COLORS
-
+            #region UNDERLINE VERTEX COLORS
             // Alpha is the lower of the vertex color or tag color alpha used.
             underlineColor.a = m_FontColor32.a < underlineColor.a ? m_FontColor32.a : underlineColor.a;
 
@@ -4552,6 +5386,7 @@ void DrawUnderlineMesh(Vector3 start, Vector3 end, ref int index, float startSca
             colors32[9 + index] = underlineColor;
             colors32[10 + index] = underlineColor;
             colors32[11 + index] = underlineColor;
+            #endregion
 
             index += 12;
         }
@@ -4585,6 +5420,7 @@ void DrawTextHighlight(Vector3 start, Vector3 end, ref int index, Color32 highli
             }
 
             // UNDERLINE VERTICES FOR (3) LINE SEGMENTS
+            #region HIGHLIGHT VERTICES
             Vector3[] vertices = textInfo.meshInfo[underlineMaterialIndex].vertices;
 
             // Front Part of the Underline
@@ -4592,8 +5428,8 @@ void DrawTextHighlight(Vector3 start, Vector3 end, ref int index, Color32 highli
             vertices[index + 1] = new Vector3(start.x, end.y, 0); // TL
             vertices[index + 2] = end; // TR
             vertices[index + 3] = new Vector3(end.x, start.y, 0); // BR
+            #endregion
 
-            // Handle potential axis inversion.
             if (generationSettings.inverseYAxis)
             {
                 Vector3 axisOffset;
@@ -4611,33 +5447,37 @@ void DrawTextHighlight(Vector3 start, Vector3 end, ref int index, Color32 highli
                 vertices[index + 3].y = (vertices[index + 3].y * -1) + axisOffset.y;
             }
 
-
             // UNDERLINE UV0
-            Vector2[] uvs0 = textInfo.meshInfo[underlineMaterialIndex].uvs0;
+            #region HANDLE UV0
+            Vector4[] uvs0 = textInfo.meshInfo[underlineMaterialIndex].uvs0;
 
             int atlasWidth = m_Underline.fontAsset.atlasWidth;
             int atlasHeight = m_Underline.fontAsset.atlasHeight;
             GlyphRect glyphRect = m_Underline.character.glyph.glyphRect;
 
-            // Calculate UV required to setup the 3 Quads for the Underline.
-            Vector2 uv0 = new Vector2(((float)glyphRect.x + glyphRect.width / 2) / atlasWidth, (glyphRect.y + (float)glyphRect.height / 2) / atlasHeight);
+            // Calculate UV
+            Vector2 uvGlyphCenter = new Vector2((glyphRect.x + (float)glyphRect.width / 2) / atlasWidth, (glyphRect.y + (float)glyphRect.height / 2) / atlasHeight);
+            Vector2 uvTexelSize = new Vector2(1.0f / atlasWidth, 1.0f / atlasHeight);
 
-            // Center of the underline + small padding
-            uvs0[0 + index] = uv0 + new Vector2(-0.0001f, -0.0001f); // BL
-            uvs0[1 + index] = uv0 + new Vector2(-0.0001f,  0.0001f); // TL
-            uvs0[2 + index] = uv0 + new Vector2(0.0001f,  0.0001f);  // TR
-            uvs0[3 + index] = uv0 + new Vector2(0.0001f, -0.0001f);  // BR
+            // UVs for the Quad
+            uvs0[0 + index] = uvGlyphCenter - uvTexelSize; // BL
+            uvs0[1 + index] = uvGlyphCenter + new Vector2(-uvTexelSize.x, uvTexelSize.y); // TL
+            uvs0[2 + index] = uvGlyphCenter + uvTexelSize; // TR
+            uvs0[3 + index] = uvGlyphCenter + new Vector2(uvTexelSize.x, -uvTexelSize.y); // BR
+            #endregion
 
-            // UNDERLINE UV2
+            // HIGHLIGHT UV2
+            #region HANDLE UV2 - SDF SCALE
             Vector2[] uvs2 = textInfo.meshInfo[underlineMaterialIndex].uvs2;
-            Vector2 customUv = new Vector2(0, 1);
-            uvs2[0 + index] = customUv;
-            uvs2[1 + index] = customUv;
-            uvs2[2 + index] = customUv;
-            uvs2[3 + index] = customUv;
+            Vector2 customUV = new Vector2(0, 1);
+            uvs2[0 + index] = customUV;
+            uvs2[1 + index] = customUV;
+            uvs2[2 + index] = customUV;
+            uvs2[3 + index] = customUV;
+            #endregion
 
             // HIGHLIGHT VERTEX COLORS
-
+            #region HIGHLIGHT VERTEX COLORS
             // Alpha is the lower of the vertex color or tag color alpha used.
             highlightColor.a = m_FontColor32.a < highlightColor.a ? m_FontColor32.a : highlightColor.a;
 
@@ -4646,6 +5486,7 @@ void DrawTextHighlight(Vector3 start, Vector3 end, ref int index, Color32 highli
             colors32[1 + index] = highlightColor;
             colors32[2 + index] = highlightColor;
             colors32[3 + index] = highlightColor;
+            #endregion
 
             index += 4;
         }
@@ -4669,9 +5510,7 @@ void DisableMasking()
             m_IsMaskingEnabled = false;
         }
 
-        // This function parses through the Char[] to determine how many characters will be visible. It then makes sure the arrays are large enough for all those characters.
-        // TODO: Generation settings should be a Struct.
-        void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextInfo textInfo)
+        internal int SetArraySizes(UnicodeChar[] textProcessingArray, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             TextSettings textSettings = generationSettings.textSettings;
 
@@ -4682,6 +5521,7 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
             m_IsParsingText = false;
             m_TagNoParsing = false;
             m_FontStyleInternal = generationSettings.fontStyle;
+            m_FontStyleStack.Clear();
 
             m_FontWeightInternal = (m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold ? TextFontWeight.Bold : generationSettings.fontWeight;
             m_FontWeightStack.SetDefault(m_FontWeightInternal);
@@ -4697,27 +5537,87 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
 
             if (textInfo == null)
                 textInfo = new TextInfo();
+            else if (textInfo.textElementInfo.Length < m_InternalTextProcessingArraySize)
+                TextInfo.Resize(ref textInfo.textElementInfo, m_InternalTextProcessingArraySize, false);
+
             m_TextElementType = TextElementType.Character;
 
+            // Handling for Underline special character
+            #region Setup Underline Special Character
+            /*
+            GetUnderlineSpecialCharacter(m_CurrentFontAsset);
+            if (m_Underline.character != null)
+            {
+                if (m_Underline.fontAsset.GetInstanceID() != m_CurrentFontAsset.GetInstanceID())
+                {
+                    if (generationSettings.textSettings.matchMaterialPreset && m_CurrentMaterial.GetInstanceID() != m_Underline.fontAsset.material.GetInstanceID())
+                        m_Underline.material = TMP_MaterialManager.GetFallbackMaterial(m_CurrentMaterial, m_Underline.fontAsset.material);
+                    else
+                        m_Underline.material = m_Underline.fontAsset.material;
+
+                    m_Underline.materialIndex = MaterialReference.AddMaterialReference(m_Underline.material, m_Underline.fontAsset, m_MaterialReferences, m_MaterialReferenceIndexLookup);
+                    m_MaterialReferences[m_Underline.materialIndex].referenceCount = 0;
+                }
+            }
+            */
+            #endregion
+
+
+            // Handling for Ellipsis special character
+            #region Setup Ellipsis Special Character
+            if (generationSettings.overflowMode == TextOverflowMode.Ellipsis)
+            {
+                GetEllipsisSpecialCharacter(generationSettings);
+
+                if (m_Ellipsis.character != null)
+                {
+                    if (m_Ellipsis.fontAsset.GetInstanceID() != m_CurrentFontAsset.GetInstanceID())
+                    {
+                        if (textSettings.matchMaterialPreset && m_CurrentMaterial.GetInstanceID() != m_Ellipsis.fontAsset.material.GetInstanceID())
+                            m_Ellipsis.material = MaterialManager.GetFallbackMaterial(m_CurrentMaterial, m_Ellipsis.fontAsset.material);
+                        else
+                            m_Ellipsis.material = m_Ellipsis.fontAsset.material;
+
+                        m_Ellipsis.materialIndex = MaterialReference.AddMaterialReference(m_Ellipsis.material, m_Ellipsis.fontAsset, ref m_MaterialReferences, m_MaterialReferenceIndexLookup);
+                        m_MaterialReferences[m_Ellipsis.materialIndex].referenceCount = 0;
+                    }
+                }
+                else
+                {
+                    generationSettings.overflowMode = TextOverflowMode.Truncate;
+
+                    if (textSettings.displayWarnings)
+                        Debug.LogWarning("The character used for Ellipsis is not available in font asset [" + m_CurrentFontAsset.name + "] or any potential fallbacks. Switching Text Overflow mode to Truncate.");
+                }
+            }
+            #endregion
+
+            // Clear Linked Text object if we have one
+            //if (generationSettings.overflowMode == TextOverflowMode.Linked && m_linkedTextComponent != null && !m_IsCalculatingPreferredValues)
+            //    m_linkedTextComponent.text = string.Empty;
+
             // Parsing XML tags in the text
-            for (int i = 0; i < chars.Length && chars[i] != 0; i++)
+            for (int i = 0; i < textProcessingArray.Length && textProcessingArray[i].unicode != 0; i++)
             {
-                //Make sure the text element info array can hold the next text element.
+                //Make sure the characterInfo array can hold the next text element.
                 if (textInfo.textElementInfo == null || m_TotalCharacterCount >= textInfo.textElementInfo.Length)
                     TextInfo.Resize(ref textInfo.textElementInfo, m_TotalCharacterCount + 1, true);
 
-                int unicode = chars[i];
+                int unicode = textProcessingArray[i].unicode;
+                int prevMaterialIndex = m_CurrentMaterialIndex;
 
                 // PARSE XML TAGS
-                if (generationSettings.richText && unicode == k_LesserThan) // if Char '<'
+                #region PARSE XML TAGS
+                if (generationSettings.richText && unicode == '<')
                 {
-                    int prevMatIndex = m_CurrentMaterialIndex;
+                    prevMaterialIndex = m_CurrentMaterialIndex;
+                    int endTagIndex;
 
                     // Check if Tag is Valid
-                    int tagEnd;
-                    if (ValidateHtmlTag(chars, i + 1, out tagEnd, generationSettings, textInfo))
+                    if (ValidateHtmlTag(textProcessingArray, i + 1, out endTagIndex, generationSettings, textInfo))
                     {
-                        i = tagEnd;
+                        int tagStartIndex = textProcessingArray[i].stringIndex;
+                        i = endTagIndex;
 
                         if ((m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold)
                             m_IsUsingBold = true;
@@ -4726,17 +5626,18 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                         {
                             m_MaterialReferences[m_CurrentMaterialIndex].referenceCount += 1;
 
-                            textInfo.textElementInfo[m_TotalCharacterCount].character = (char)(k_SpritesStart + m_SpriteIndex);
-                            textInfo.textElementInfo[m_TotalCharacterCount].spriteIndex = m_SpriteIndex;
+
+                            textInfo.textElementInfo[m_TotalCharacterCount].character = (char)(57344 + m_SpriteIndex);
                             textInfo.textElementInfo[m_TotalCharacterCount].fontAsset = m_CurrentFontAsset;
-                            textInfo.textElementInfo[m_TotalCharacterCount].spriteAsset = m_CurrentSpriteAsset;
                             textInfo.textElementInfo[m_TotalCharacterCount].materialReferenceIndex = m_CurrentMaterialIndex;
                             textInfo.textElementInfo[m_TotalCharacterCount].textElement = m_CurrentSpriteAsset.spriteCharacterTable[m_SpriteIndex];
                             textInfo.textElementInfo[m_TotalCharacterCount].elementType = m_TextElementType;
+                            textInfo.textElementInfo[m_TotalCharacterCount].index = tagStartIndex;
+                            textInfo.textElementInfo[m_TotalCharacterCount].stringLength = textProcessingArray[i].stringIndex - tagStartIndex + 1;
 
                             // Restore element type and material index to previous values.
                             m_TextElementType = TextElementType.Character;
-                            m_CurrentMaterialIndex = prevMatIndex;
+                            m_CurrentMaterialIndex = prevMaterialIndex;
 
                             spriteCount += 1;
                             m_TotalCharacterCount += 1;
@@ -4745,16 +5646,17 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                         continue;
                     }
                 }
+                #endregion
 
                 bool isUsingAlternativeTypeface;
                 bool isUsingFallbackOrAlternativeTypeface = false;
 
                 FontAsset prevFontAsset = m_CurrentFontAsset;
                 Material prevMaterial = m_CurrentMaterial;
-                int prevMaterialIndex = m_CurrentMaterialIndex;
+                prevMaterialIndex = m_CurrentMaterialIndex;
 
                 // Handle Font Styles like LowerCase, UpperCase and SmallCaps.
-
+                #region Handling of LowerCase, UpperCase and SmallCaps Font Styles
                 if (m_TextElementType == TextElementType.Character)
                 {
                     if ((m_FontStyleInternal & FontStyles.UpperCase) == FontStyles.UpperCase)
@@ -4762,6 +5664,7 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                         // If this character is lowercase, switch to uppercase.
                         if (char.IsLower((char)unicode))
                             unicode = char.ToUpper((char)unicode);
+
                     }
                     else if ((m_FontStyleInternal & FontStyles.LowerCase) == FontStyles.LowerCase)
                     {
@@ -4776,33 +5679,53 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                             unicode = char.ToUpper((char)unicode);
                     }
                 }
+                #endregion
 
                 // Lookup the Glyph data for each character and cache it.
+                #region LOOKUP GLYPH
                 TextElement character = GetTextElement(generationSettings, (uint)unicode, m_CurrentFontAsset, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
 
+                // Check if Lowercase or Uppercase variant of the character is available.
+                /* Not sure this is necessary anyone as it is very unlikely with recursive search through fallback fonts.
+                if (glyph == null)
+                {
+                    if (char.IsLower((char)c))
+                    {
+                        if (m_CurrentFontAsset.characterDictionary.TryGetValue(char.ToUpper((char)c), out glyph))
+                            c = chars[i] = char.ToUpper((char)c);
+                    }
+                    else if (char.IsUpper((char)c))
+                    {
+                        if (m_CurrentFontAsset.characterDictionary.TryGetValue(char.ToLower((char)c), out glyph))
+                            c = chars[i] = char.ToLower((char)c);
+                    }
+                }*/
+
                 // Special handling for missing character.
                 // Replace missing glyph by the Square (9633) glyph or possibly the Space (32) glyph.
                 if (character == null)
                 {
+                    DoMissingGlyphCallback(unicode, textProcessingArray[i].stringIndex, m_CurrentFontAsset, textInfo);
+
                     // Save the original unicode character
                     int srcGlyph = unicode;
 
-                    // Try replacing the missing glyph character by TMP Settings Missing Glyph or Square (9633) character.
-                    unicode = textSettings.missingCharacterUnicode == 0 ? 9633 : textSettings.missingCharacterUnicode;
+                    // Try replacing the missing glyph character by the Settings file Missing Glyph or Square (9633) character.
+                    unicode = textProcessingArray[i].unicode = textSettings.missingCharacterUnicode == 0 ? k_Square : textSettings.missingCharacterUnicode;
 
                     // Check for the missing glyph character in the currently assigned font asset and its fallbacks
                     character = FontAssetUtilities.GetCharacterFromFontAsset((uint)unicode, m_CurrentFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
 
                     if (character == null)
                     {
-                        // Search for the missing glyph character in the TMP Settings Fallback list.
+                        // Search for the missing glyph character in the Settings Fallback list.
                         if (textSettings.fallbackFontAssets != null && textSettings.fallbackFontAssets.Count > 0)
                             character = FontAssetUtilities.GetCharacterFromFontAssets((uint)unicode, m_CurrentFontAsset, textSettings.fallbackFontAssets, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
                     }
 
                     if (character == null)
                     {
-                        // Search for the missing glyph in the TMP Settings Default Font Asset.
+                        // Search for the missing glyph in the Settings Default Font Asset.
                         if (textSettings.defaultFontAsset != null)
                             character = FontAssetUtilities.GetCharacterFromFontAsset((uint)unicode, textSettings.defaultFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
                     }
@@ -4810,19 +5733,29 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                     if (character == null)
                     {
                         // Use Space (32) Glyph from the currently assigned font asset.
-                        unicode = 32;
+                        unicode = textProcessingArray[i].unicode = 32;
                         character = FontAssetUtilities.GetCharacterFromFontAsset((uint)unicode, m_CurrentFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
-                        if (textSettings.displayWarnings)
-                        {
-                            string formattedWarning = srcGlyph > 0xFFFF
-                                ? string.Format("The character with Unicode value \\U{0:X8} was not found in the [{1}] font asset or any potential fallbacks. It was replaced by a space.", srcGlyph, generationSettings.fontAsset.name)
-                                : string.Format("The character with Unicode value \\u{0:X4} was not found in the [{1}] font asset or any potential fallbacks. It was replaced by a space.", srcGlyph, generationSettings.fontAsset.name);
+                    }
 
-                            Debug.LogWarning(formattedWarning);
-                        }
+                    if (character == null)
+                    {
+                        // Use End of Text (0x03) Glyph from the currently assigned font asset.
+                        unicode = textProcessingArray[i].unicode = 0x03;
+                        character = FontAssetUtilities.GetCharacterFromFontAsset((uint)unicode, m_CurrentFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
+                    }
+
+                    if (textSettings.displayWarnings)
+                    {
+                        string formattedWarning = srcGlyph > 0xFFFF
+                            ? string.Format("The character with Unicode value \\U{0:X8} was not found in the [{1}] font asset or any potential fallbacks. It was replaced by Unicode character \\u{2:X4}.", srcGlyph, generationSettings.fontAsset.name, character.unicode)
+                            : string.Format("The character with Unicode value \\u{0:X4} was not found in the [{1}] font asset or any potential fallbacks. It was replaced by Unicode character \\u{2:X4}.", srcGlyph, generationSettings.fontAsset.name, character.unicode);
+
+                        Debug.LogWarning(formattedWarning);
                     }
                 }
 
+                textInfo.textElementInfo[m_TotalCharacterCount].alternativeGlyph = null;
+
                 if (character.elementType == TextElementType.Character)
                 {
                     if (character.textAsset.instanceID != m_CurrentFontAsset.instanceID)
@@ -4830,12 +5763,66 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                         isUsingFallbackOrAlternativeTypeface = true;
                         m_CurrentFontAsset = character.textAsset as FontAsset;
                     }
+                    // Process potential glyph substitutions
+                    if (m_CurrentFontAsset.fontFeatureTable.m_LigatureSubstitutionRecordLookup.TryGetValue(character.glyphIndex, out List<LigatureSubstitutionRecord> records))
+                    {
+                        if (records == null)
+                            break;
+
+                        for (int j = 0; j < records.Count; j++)
+                        {
+                            LigatureSubstitutionRecord record = records[j];
+
+                            int componentCount = record.componentGlyphIDs.Length;
+                            uint ligatureGlyphID = record.ligatureGlyphID;
+
+                            //
+                            for (int k = 1; k < componentCount; k++)
+                            {
+                                uint glyphIndex = m_CurrentFontAsset.GetGlyphIndex((uint)textProcessingArray[i + k].unicode);
+
+                                if (glyphIndex == record.componentGlyphIDs[k])
+                                    continue;
+
+                                ligatureGlyphID = 0;
+                                break;
+                            }
+
+                            if (ligatureGlyphID != 0)
+                            {
+                                if (m_CurrentFontAsset.TryAddGlyphInternal(ligatureGlyphID, out Glyph glyph))
+                                {
+                                    textInfo.textElementInfo[m_TotalCharacterCount].alternativeGlyph = glyph;
+
+                                    // Update text processing array
+                                    for (int c = 0; c < componentCount; c++)
+                                    {
+                                        if (c == 0)
+                                        {
+                                            textProcessingArray[i + c].length = componentCount;
+                                            continue;
+                                        }
+
+                                        textProcessingArray[i + c].unicode = 0x1A;
+                                    }
+
+                                    i += componentCount - 1;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
                 }
+                #endregion
 
+                // Save text element data
                 textInfo.textElementInfo[m_TotalCharacterCount].elementType = TextElementType.Character;
                 textInfo.textElementInfo[m_TotalCharacterCount].textElement = character;
                 textInfo.textElementInfo[m_TotalCharacterCount].isUsingAlternateTypeface = isUsingAlternativeTypeface;
                 textInfo.textElementInfo[m_TotalCharacterCount].character = (char)unicode;
+                textInfo.textElementInfo[m_TotalCharacterCount].index = textProcessingArray[i].stringIndex;
+                textInfo.textElementInfo[m_TotalCharacterCount].stringLength = textProcessingArray[i].length;
                 textInfo.textElementInfo[m_TotalCharacterCount].fontAsset = m_CurrentFontAsset;
 
                 // Special handling if the character is a sprite.
@@ -4847,8 +5834,6 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
 
                     textInfo.textElementInfo[m_TotalCharacterCount].elementType = TextElementType.Sprite;
                     textInfo.textElementInfo[m_TotalCharacterCount].materialReferenceIndex = m_CurrentMaterialIndex;
-                    textInfo.textElementInfo[m_TotalCharacterCount].spriteAsset = spriteAssetRef;
-                    textInfo.textElementInfo[m_TotalCharacterCount].spriteIndex = (int)character.glyphIndex;
 
                     // Restore element type and material index to previous values.
                     m_TextElementType = TextElementType.Character;
@@ -4881,7 +5866,7 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                     isUsingFallbackOrAlternativeTypeface = true;
                 }
 
-                if (!char.IsWhiteSpace((char)unicode) && unicode != 0x200B)
+                if (!char.IsWhiteSpace((char)unicode) && unicode != CodePoint.ZERO_WIDTH_SPACE)
                 {
                     // Limit the mesh of the main text object to 65535 vertices and use sub objects for the overflow.
                     if (m_MaterialReferences[m_CurrentMaterialIndex].referenceCount < 16383)
@@ -4913,7 +5898,8 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
             if (m_IsCalculatingPreferredValues)
             {
                 m_IsCalculatingPreferredValues = false;
-                return;
+
+                return m_TotalCharacterCount;
             }
 
             // Save material and sprite count.
@@ -4925,7 +5911,7 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                 TextInfo.Resize(ref textInfo.meshInfo, materialCount, false);
 
             // Resize textElementInfo[] if allocations are excessive
-            if (textInfo.textElementInfo.Length - m_TotalCharacterCount > 256)
+            if (m_VertexBufferAutoSizeReduction && textInfo.textElementInfo.Length - m_TotalCharacterCount > 256)
                 TextInfo.Resize(ref textInfo.textElementInfo, Mathf.Max(m_TotalCharacterCount + 1, 256), true);
 
             // Iterate through the material references to set the mesh buffer allocations
@@ -4952,6 +5938,8 @@ void SetArraySizes(int[] chars, TextGenerationSettings generationSettings, TextI
                 // Assign material reference
                 textInfo.meshInfo[i].material = m_MaterialReferences[i].material;
             }
+
+            return m_TotalCharacterCount;
         }
 
         internal TextElement GetTextElement(TextGenerationSettings generationSettings, uint unicode, FontAsset fontAsset, FontStyles fontStyle, TextFontWeight fontWeight, out bool isUsingAlternativeTypeface)
@@ -5015,7 +6003,7 @@ internal TextElement GetTextElement(TextGenerationSettings generationSettings, u
                     return spriteCharacter;
             }
 
-            // Search for the character in the list of fallback assigned in the TMP Settings (General Fallbacks).
+            // Search for the character in the list of fallback assigned in the settings (General Fallbacks).
             if (textSettings.fallbackFontAssets != null && textSettings.fallbackFontAssets.Count > 0)
                 character = FontAssetUtilities.GetCharacterFromFontAssets(unicode, fontAsset, textSettings.fallbackFontAssets, true, fontStyle, fontWeight, out isUsingAlternativeTypeface);
 
@@ -5027,7 +6015,7 @@ internal TextElement GetTextElement(TextGenerationSettings generationSettings, u
                 return character;
             }
 
-            // Search for the character in the Default Font Asset assigned in the TMP Settings file.
+            // Search for the character in the Default Font Asset assigned in the settings file.
             if (textSettings.defaultFontAsset != null)
                 character = FontAssetUtilities.GetCharacterFromFontAsset(unicode, textSettings.defaultFontAsset, true, fontStyle, fontWeight, out isUsingAlternativeTypeface);
 
@@ -5039,7 +6027,7 @@ internal TextElement GetTextElement(TextGenerationSettings generationSettings, u
                 return character;
             }
 
-            // Search for the character in the Default Sprite Asset assigned in the TMP Settings file.
+            // Search for the character in the Default Sprite Asset assigned in the settings file.
             if (textSettings.defaultSpriteAsset != null)
             {
                 SpriteCharacter spriteCharacter = FontAssetUtilities.GetSpriteCharacterFromSpriteAsset(unicode, textSettings.defaultSpriteAsset, true);
@@ -5114,14 +6102,14 @@ protected void GetEllipsisSpecialCharacter(TextGenerationSettings generationSett
                     character = FontAssetUtilities.GetCharacterFromFontAssets(0x2026, fontAsset, fontAsset.m_FallbackFontAssetTable, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
             }
 
-            // Search TMP Settings general fallback list
+            // Search the setting's general fallback list
             if (character == null)
             {
                 if (textSettings.fallbackFontAssets != null && textSettings.fallbackFontAssets.Count > 0)
                     character = FontAssetUtilities.GetCharacterFromFontAssets(0x2026, fontAsset, textSettings.fallbackFontAssets, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
             }
 
-            // Search TMP Settings' default font asset
+            // Search the setting's default font asset
             if (character == null)
             {
                 if (textSettings.defaultFontAsset != null)
@@ -5142,29 +6130,6 @@ protected void GetUnderlineSpecialCharacter(TextGenerationSettings generationSet
             // Search base font asset
             Character character = FontAssetUtilities.GetCharacterFromFontAsset(0x5F, fontAsset, false, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface);
 
-            /*
-            if (m_Underline.character == null)
-            {
-                // Search primary fallback list
-                if (fontAsset.m_FallbackFontAssetTable != null && fontAsset.m_FallbackFontAssetTable.Count > 0)
-                    m_Underline.character = TMP_FontAssetUtilities.GetCharacterFromFontAssets(0x5F, fontAsset.m_FallbackFontAssetTable, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface, out tempFontAsset);
-            }
-
-            // Search TMP Settings general fallback list
-            if (m_Underline.character == null)
-            {
-                if (TMP_Settings.fallbackFontAssets != null && TMP_Settings.fallbackFontAssets.Count > 0)
-                    m_Underline.character = TMP_FontAssetUtilities.GetCharacterFromFontAssets(0x5F, TMP_Settings.fallbackFontAssets, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface, out tempFontAsset);
-            }
-
-            // Search TMP Settings' default font asset
-            if (m_Underline.character == null)
-            {
-                if (TMP_Settings.defaultFontAsset != null)
-                    m_Underline.character = TMP_FontAssetUtilities.GetCharacterFromFontAsset(0x5F, TMP_Settings.defaultFontAsset, true, m_FontStyleInternal, m_FontWeightInternal, out isUsingAlternativeTypeface, out tempFontAsset);
-            }
-            */
-
             if (character != null)
             {
                 m_Underline = new SpecialCharacter(character, 0);
@@ -5213,8 +6178,11 @@ float GetPreferredWidthInternal(TextGenerationSettings generationSettings, TextI
             // Set Margins to Infinity
             Vector2 margin = TextGeneratorUtilities.largePositiveVector2;
 
-            m_RecursiveCount = 0;
-            float preferredWidth = CalculatePreferredValues(fontSize, margin, true, generationSettings, textInfo).x;
+            //TextWrappingMode wrapMode = m_TextWrappingMode == TextWrappingMode.Normal || m_TextWrappingMode == TextWrappingMode.NoWrap ? TextWrappingMode.NoWrap : TextWrappingMode.PreserveWhitespaceNoWrap;
+            TextWrappingMode wrapMode = generationSettings.wordWrap ? TextWrappingMode.NoWrap : TextWrappingMode.PreserveWhitespaceNoWrap;
+
+            m_AutoSizeIterationCount = 0;
+            float preferredWidth = CalculatePreferredValues(ref fontSize, margin, true, wrapMode, generationSettings, textInfo).x;
 
             return preferredWidth;
         }
@@ -5237,8 +6205,18 @@ float GetPreferredHeightInternal(TextGenerationSettings generationSettings, Text
 
             Vector2 margin = new Vector2(m_MarginWidth != 0 ? m_MarginWidth : TextGeneratorUtilities.largePositiveFloat, TextGeneratorUtilities.largePositiveFloat);
 
-            m_RecursiveCount = 0;
-            float preferredHeight = CalculatePreferredValues(fontSize, margin, !generationSettings.autoSize, generationSettings, textInfo).y;
+            // Reset Text Auto Size iteration tracking.
+            m_IsAutoSizePointSizeSet = false;
+            m_AutoSizeIterationCount = 0;
+
+            float preferredHeight = 0;
+            TextWrappingMode wrapMode = generationSettings.wordWrap ? TextWrappingMode.Normal : TextWrappingMode.NoWrap;
+
+            while (m_IsAutoSizePointSizeSet == false)
+            {
+                preferredHeight = CalculatePreferredValues(ref fontSize, margin, !generationSettings.autoSize, wrapMode, generationSettings, textInfo).y;
+                m_AutoSizeIterationCount += 1;
+            }
 
             return preferredHeight;
         }
@@ -5256,27 +6234,35 @@ Vector2 GetPreferredValuesInternal(TextGenerationSettings generationSettings, Te
             m_CharWidthAdjDelta = 0;
 
             Vector2 margin = new Vector2(m_MarginWidth != 0 ? m_MarginWidth : TextGeneratorUtilities.largePositiveFloat, TextGeneratorUtilities.largePositiveFloat);
+            TextWrappingMode wrapMode = generationSettings.wordWrap ? TextWrappingMode.Normal : TextWrappingMode.NoWrap;
+
+            m_AutoSizeIterationCount = 0;
 
-            m_RecursiveCount = 0;
-            return CalculatePreferredValues(fontSize, margin, !generationSettings.autoSize, generationSettings, textInfo);
+            return CalculatePreferredValues(ref fontSize, margin, !generationSettings.autoSize, wrapMode, generationSettings, textInfo);
         }
 
+
         /// <summary>
         /// Method to calculate the preferred width and height of the text object.
         /// </summary>
         /// <returns></returns>
-        protected virtual Vector2 CalculatePreferredValues(float defaultFontSize, Vector2 marginSize, bool ignoreTextAutoSizing, TextGenerationSettings generationSettings, TextInfo textInfo)
+        protected virtual Vector2 CalculatePreferredValues(ref float fontSize, Vector2 marginSize, bool isTextAutoSizingEnabled, TextWrappingMode textWrapMode, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             Profiler.BeginSample("TextGenerator.CalculatePreferredValues");
+
             // Early exit if no font asset was assigned. This should not be needed since LiberationSans SDF will be assigned by default.
             if (generationSettings.fontAsset == null || generationSettings.fontAsset.characterLookupTable == null)
             {
+                Debug.LogWarning("Can't Generate Mesh! No Font Asset has been assigned.");
+
+                m_IsAutoSizePointSizeSet = true;
                 return Vector2.zero;
             }
 
             // Early exit if we don't have any Text to generate.
-            if (m_CharBuffer == null || m_CharBuffer.Length == 0 || m_CharBuffer[0] == (char)0)
+            if (m_TextProcessingArray == null || m_TextProcessingArray.Length == 0 || m_TextProcessingArray[0].unicode == (char)0)
             {
+                m_IsAutoSizePointSizeSet = true;
                 return Vector2.zero;
             }
 
@@ -5286,43 +6272,39 @@ protected virtual Vector2 CalculatePreferredValues(float defaultFontSize, Vector
             m_MaterialReferenceStack.SetDefault(new MaterialReference(0, m_CurrentFontAsset, null, m_CurrentMaterial, m_Padding));
 
             // Total character count is computed when the text is parsed.
-            int totalCharacterCount = m_TotalCharacterCount;
+            int totalCharacterCount = m_TotalCharacterCount; // m_VisibleCharacters.Count;
 
             if (m_InternalTextElementInfo == null || totalCharacterCount > m_InternalTextElementInfo.Length)
-            {
                 m_InternalTextElementInfo = new TextElementInfo[totalCharacterCount > 1024 ? totalCharacterCount + 256 : Mathf.NextPowerOfTwo(totalCharacterCount)];
-            }
 
             // Calculate the scale of the font based on selected font size and sampling point size.
             // baseScale is calculated using the font asset assigned to the text object.
-            float baseScale = m_FontScale = (defaultFontSize / generationSettings.fontAsset.faceInfo.pointSize * generationSettings.fontAsset.faceInfo.scale);
+            float baseScale = (fontSize / generationSettings.fontAsset.faceInfo.pointSize * generationSettings.fontAsset.faceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
             float currentElementScale = baseScale;
+            float currentEmScale = fontSize * 0.01f * (generationSettings.isOrthographic ? 1 : 0.1f);
             m_FontScaleMultiplier = 1;
 
-            m_CurrentFontSize = defaultFontSize;
+            m_CurrentFontSize = fontSize;
             m_SizeStack.SetDefault(m_CurrentFontSize);
-
-            int charCode; // Holds the character code of the currently being processed character.
+            float fontSizeDelta = 0;
 
             m_FontStyleInternal = generationSettings.fontStyle; // Set the default style.
 
-            m_LineJustification = generationSettings.textAlignment; // Sets the line justification mode to match editor alignment.
+            m_LineJustification = generationSettings.textAlignment;  // m_textAlignment; // Sets the line justification mode to match editor alignment.
             m_LineJustificationStack.SetDefault(m_LineJustification);
 
-            float boldXAdvanceMultiplier; // Used to increase spacing between character when style is bold.
-
             m_BaselineOffset = 0; // Used by subscript characters.
             m_BaselineOffsetStack.Clear();
 
+            m_FXScale = Vector3.one;
+
             m_LineOffset = 0; // Amount of space between lines (font line spacing + m_linespacing).
             m_LineHeight = k_FloatUnset;
             float lineGap = m_CurrentFontAsset.faceInfo.lineHeight - (m_CurrentFontAsset.faceInfo.ascentLine - m_CurrentFontAsset.faceInfo.descentLine);
 
             m_CSpacing = 0; // Amount of space added between characters as a result of the use of the <cspace> tag.
             m_MonoSpacing = 0;
-            float lineOffsetDelta;
             m_XAdvance = 0; // Used to track the position of each character.
-            float maxXAdvance = 0; // Used to determine Preferred Width.
 
             m_TagLineIndent = 0; // Used for indentation of text.
             m_TagIndent = 0;
@@ -5336,55 +6318,70 @@ protected virtual Vector2 CalculatePreferredValues(float defaultFontSize, Vector
             m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
             m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
             m_LineNumber = 0;
+            m_StartOfLineAscender = 0;
+            m_IsDrivenLineSpacing = false;
+            m_LastBaseGlyphIndex = int.MinValue;
 
             TextSettings textSettings = generationSettings.textSettings;
 
             float marginWidth = marginSize.x;
+            float marginHeight = marginSize.y;
             m_MarginLeft = 0;
             m_MarginRight = 0;
+
             m_Width = -1;
+            float widthOfTextArea = marginWidth + 0.0001f - m_MarginLeft - m_MarginRight;
 
             // Used by Unity's Auto Layout system.
             float renderedWidth = 0;
             float renderedHeight = 0;
-            float linebreakingWidth = 0;
+            float textWidth = 0;
             m_IsCalculatingPreferredValues = true;
 
             // Tracking of the highest Ascender
+            m_MaxCapHeight = 0;
             m_MaxAscender = 0;
             m_MaxDescender = 0;
+            float maxVisibleDescender = 0;
+            bool isMaxVisibleDescenderSet = false;
 
             // Initialize struct to track states of word wrapping
-            bool isFirstWord = true;
-            bool isLastBreakingChar = false;
-            WordWrapState savedLineState = new WordWrapState();
-            SaveWordWrappingState(ref savedLineState, 0, 0, textInfo);
-            WordWrapState savedWordWrapState = new WordWrapState();
-            int wrappingIndex = 0;
-
+            bool isFirstWordOfLine = true;
+            m_IsNonBreakingSpace = false;
+            bool ignoreNonBreakingSpace = false;
+
+            CharacterSubstitution characterToSubstitute = new CharacterSubstitution(-1, 0);
+            bool isSoftHyphenIgnored = false;
+
+            WordWrapState internalWordWrapState = new WordWrapState();
+            WordWrapState internalLineState = new WordWrapState();
+            WordWrapState internalSoftLineBreak = new WordWrapState();
+
+            // Clear the previous truncated / ellipsed state
+            m_IsTextTruncated = false;
+
             // Counter to prevent recursive lockup when computing preferred values.
-            m_RecursiveCount += 1;
+            m_AutoSizeIterationCount += 1;
 
-            int endTagIndex;
             // Parse through Character buffer to read HTML tags and begin creating mesh.
-            for (int i = 0; m_CharBuffer[i] != 0; i++)
+            for (int i = 0; i < m_TextProcessingArray.Length && m_TextProcessingArray[i].unicode != 0; i++)
             {
-                charCode = m_CharBuffer[i];
-                m_TextElementType = textInfo.textElementInfo[m_CharacterCount].elementType;
-
-                m_CurrentMaterialIndex = textInfo.textElementInfo[m_CharacterCount].materialReferenceIndex;
-                m_CurrentFontAsset = m_MaterialReferences[m_CurrentMaterialIndex].fontAsset;
+                int charCode = m_TextProcessingArray[i].unicode;
 
-                int prevMaterialIndex = m_CurrentMaterialIndex;
+                // Skip characters that have been substituted.
+                if (charCode == 0x1A)
+                    continue;
 
                 // Parse Rich Text Tag
+                #region Parse Rich Text Tag
                 if (generationSettings.richText && charCode == k_LesserThan)  // '<'
                 {
                     m_IsParsingText = true;
                     m_TextElementType = TextElementType.Character;
+                    int endTagIndex;
 
                     // Check if Tag is valid. If valid, skip to the end of the validated tag.
-                    if (ValidateHtmlTag(m_CharBuffer, i + 1, out endTagIndex, generationSettings, textInfo))
+                    if (ValidateHtmlTag(m_TextProcessingArray, i + 1, out endTagIndex, generationSettings, textInfo))
                     {
                         i = endTagIndex;
 
@@ -5393,30 +6390,91 @@ protected virtual Vector2 CalculatePreferredValues(float defaultFontSize, Vector
                             continue;
                     }
                 }
+                else
+                {
+                    m_TextElementType = textInfo.textElementInfo[m_CharacterCount].elementType;
+                    m_CurrentMaterialIndex = textInfo.textElementInfo[m_CharacterCount].materialReferenceIndex;
+                    m_CurrentFontAsset = textInfo.textElementInfo[m_CharacterCount].fontAsset;
+                }
+                #endregion End Parse Rich Text Tag
+
+                int prevMaterialIndex = m_CurrentMaterialIndex;
+                bool isUsingAltTypeface = textInfo.textElementInfo[m_CharacterCount].isUsingAlternateTypeface;
 
                 m_IsParsingText = false;
 
-                bool isUsingAltTypeface = textInfo.textElementInfo[m_CharacterCount].isUsingAlternateTypeface;
+                // Handle potential character substitutions
+                #region Character Substitutions
+                bool isInjectedCharacter = false;
+
+                if (characterToSubstitute.index == m_CharacterCount)
+                {
+                    charCode = (int)characterToSubstitute.unicode;
+                    m_TextElementType = TextElementType.Character;
+                    isInjectedCharacter = true;
+
+                    switch (charCode)
+                    {
+                        case 0x03:
+                            m_InternalTextElementInfo[m_CharacterCount].textElement = m_CurrentFontAsset.characterLookupTable[0x03];
+                            m_IsTextTruncated = true;
+                            break;
+                        case 0x2D:
+                            //
+                            break;
+                        case 0x2026:
+                            m_InternalTextElementInfo[m_CharacterCount].textElement = m_Ellipsis.character;
+                            m_InternalTextElementInfo[m_CharacterCount].elementType = TextElementType.Character;
+                            m_InternalTextElementInfo[m_CharacterCount].fontAsset = m_Ellipsis.fontAsset;
+                            m_InternalTextElementInfo[m_CharacterCount].material = m_Ellipsis.material;
+                            m_InternalTextElementInfo[m_CharacterCount].materialReferenceIndex = m_Ellipsis.materialIndex;
+
+                            // Indicates the source parsing data has been modified.
+                            m_IsTextTruncated = true;
+
+                            // End Of Text
+                            characterToSubstitute.index = m_CharacterCount + 1;
+                            characterToSubstitute.unicode = 0x03;
+                            break;
+                    }
+                }
+                #endregion
+
+
+                // When using Linked text, mark character as ignored and skip to next character.
+                #region Linked Text
+                if (m_CharacterCount < generationSettings.firstVisibleCharacter && charCode != 0x03)
+                {
+                    m_InternalTextElementInfo[m_CharacterCount].isVisible = false;
+                    m_InternalTextElementInfo[m_CharacterCount].character = (char)k_ZeroWidthSpace;
+                    m_InternalTextElementInfo[m_CharacterCount].lineNumber = 0;
+                    m_CharacterCount += 1;
+                    continue;
+                }
+                #endregion
+
 
                 // Handle Font Styles like LowerCase, UpperCase and SmallCaps.
+                #region Handling of LowerCase, UpperCase and SmallCaps Font Styles
 
                 float smallCapsMultiplier = 1.0f;
 
                 if (m_TextElementType == TextElementType.Character)
                 {
-                    if ((m_FontStyleInternal & FontStyles.UpperCase) == FontStyles.UpperCase)
+                    if (/*(m_fontStyle & FontStyles.UpperCase) == FontStyles.UpperCase ||*/ (m_FontStyleInternal & FontStyles.UpperCase) == FontStyles.UpperCase)
                     {
                         // If this character is lowercase, switch to uppercase.
                         if (char.IsLower((char)charCode))
                             charCode = char.ToUpper((char)charCode);
+
                     }
-                    else if ((m_FontStyleInternal & FontStyles.LowerCase) == FontStyles.LowerCase)
+                    else if (/*(m_fontStyle & FontStyles.LowerCase) == FontStyles.LowerCase ||*/ (m_FontStyleInternal & FontStyles.LowerCase) == FontStyles.LowerCase)
                     {
                         // If this character is uppercase, switch to lowercase.
                         if (char.IsUpper((char)charCode))
                             charCode = char.ToLower((char)charCode);
                     }
-                    else if ((m_FontStyleInternal & FontStyles.SmallCaps) == FontStyles.SmallCaps)
+                    else if (/*(m_fontStyle & FontStyles.SmallCaps) == FontStyles.SmallCaps ||*/ (m_FontStyleInternal & FontStyles.SmallCaps) == FontStyles.SmallCaps)
                     {
                         if (char.IsLower((char)charCode))
                         {
@@ -5425,291 +6483,502 @@ protected virtual Vector2 CalculatePreferredValues(float defaultFontSize, Vector
                         }
                     }
                 }
+                #endregion
+
 
                 // Look up Character Data from Dictionary and cache it.
+                #region Look up Character Data
+                float baselineOffset = 0;
+                float elementAscentLine = 0;
+                float elementDescentLine = 0;
                 if (m_TextElementType == TextElementType.Sprite)
                 {
                     // If a sprite is used as a fallback then get a reference to it and set the color to white.
-                    m_CurrentSpriteAsset = textInfo.textElementInfo[m_CharacterCount].spriteAsset;
-                    m_SpriteIndex = textInfo.textElementInfo[m_CharacterCount].spriteIndex;
+                    m_CurrentSpriteAsset = textInfo.textElementInfo[m_CharacterCount].textElement.textAsset as SpriteAsset;
+                    m_SpriteIndex = (int)textInfo.textElementInfo[m_CharacterCount].textElement.glyphIndex;
 
                     SpriteCharacter sprite = m_CurrentSpriteAsset.spriteCharacterTable[m_SpriteIndex];
-                    if (sprite == null)
-                        continue;
+                    if (sprite == null) continue;
 
                     // Sprites are assigned in the E000 Private Area + sprite Index
                     if (charCode == k_LesserThan)
-                        charCode = k_SpritesStart + m_SpriteIndex;
-
-                    m_CurrentFontAsset = generationSettings.fontAsset;
+                        charCode = 57344 + m_SpriteIndex;
 
                     // The sprite scale calculations are based on the font asset assigned to the text object.
-                    // Sprite scale is used to determine line height
-                    // Current element scale represents a modified scale to normalize the sprite based on the font baseline to ascender.
-                    float spriteScale = (m_CurrentFontSize / generationSettings.fontAsset.faceInfo.pointSize * generationSettings.fontAsset.faceInfo.scale);
-                    currentElementScale = generationSettings.fontAsset.faceInfo.ascentLine / sprite.glyph.metrics.height * sprite.scale * sprite.glyph.scale * spriteScale * generationSettings.scale;
+                    if (m_CurrentSpriteAsset.faceInfo.pointSize > 0)
+                    {
+                        float spriteScale = (m_CurrentFontSize / m_CurrentSpriteAsset.faceInfo.pointSize * m_CurrentSpriteAsset.faceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
+                        currentElementScale = sprite.scale * sprite.glyph.scale * spriteScale;
+                        elementAscentLine = m_CurrentSpriteAsset.faceInfo.ascentLine;
+                        //baselineOffset = m_CurrentSpriteAsset.faceInfo.baseline * m_fontScale * m_FontScaleMultiplier * m_CurrentSpriteAsset.faceInfo.scale;
+                        elementDescentLine = m_CurrentSpriteAsset.faceInfo.descentLine;
+                    }
+                    else
+                    {
+                        float spriteScale = (m_CurrentFontSize / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f));
+                        currentElementScale = m_CurrentFontAsset.faceInfo.ascentLine / sprite.glyph.metrics.height * sprite.scale * sprite.glyph.scale * spriteScale;
+                        float scaleDelta = spriteScale / currentElementScale;
+                        elementAscentLine = m_CurrentFontAsset.faceInfo.ascentLine * scaleDelta;
+                        //baselineOffset = m_CurrentFontAsset.faceInfo.baseline * m_fontScale * m_FontScaleMultiplier * m_CurrentFontAsset.faceInfo.scale;
+                        elementDescentLine = m_CurrentFontAsset.faceInfo.descentLine * scaleDelta;
+                    }
 
                     m_CachedTextElement = sprite;
 
                     m_InternalTextElementInfo[m_CharacterCount].elementType = TextElementType.Sprite;
-                    m_InternalTextElementInfo[m_CharacterCount].scale = spriteScale;
+                    m_InternalTextElementInfo[m_CharacterCount].scale = currentElementScale;
 
                     m_CurrentMaterialIndex = prevMaterialIndex;
                 }
                 else if (m_TextElementType == TextElementType.Character)
                 {
                     m_CachedTextElement = textInfo.textElementInfo[m_CharacterCount].textElement;
-                    if (m_CachedTextElement == null)
-                        continue;
+                    if (m_CachedTextElement == null) continue;
 
                     m_CurrentMaterialIndex = textInfo.textElementInfo[m_CharacterCount].materialReferenceIndex;
 
-                    // Re-calculate font scale as the font asset may have changed.
-                    m_FontScale = m_CurrentFontSize * smallCapsMultiplier / m_CurrentFontAsset.faceInfo.pointSize * m_CurrentFontAsset.faceInfo.scale;
+                    float adjustedScale;
+                    if (isInjectedCharacter && m_TextProcessingArray[i].unicode == 0x0A && m_CharacterCount != m_FirstCharacterOfLine)
+                        adjustedScale = textInfo.textElementInfo[m_CharacterCount - 1].pointSize * smallCapsMultiplier / m_CurrentFontAsset.m_FaceInfo.pointSize * m_CurrentFontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+                    else
+                        adjustedScale = m_CurrentFontSize * smallCapsMultiplier / m_CurrentFontAsset.m_FaceInfo.pointSize * m_CurrentFontAsset.m_FaceInfo.scale * (generationSettings.isOrthographic ? 1 : 0.1f);
+
+                    // Special handling for injected Ellipsis
+                    if (isInjectedCharacter && charCode == 0x2026)
+                    {
+                        elementAscentLine = 0;
+                        elementDescentLine = 0;
+                    }
+                    else
+                    {
+                        elementAscentLine = m_CurrentFontAsset.m_FaceInfo.ascentLine;
+                        elementDescentLine = m_CurrentFontAsset.m_FaceInfo.descentLine;
+                    }
 
-                    currentElementScale = m_FontScale * m_FontScaleMultiplier * m_CachedTextElement.scale * generationSettings.scale;
+                    currentElementScale = adjustedScale * m_FontScaleMultiplier * m_CachedTextElement.scale;
 
                     m_InternalTextElementInfo[m_CharacterCount].elementType = TextElementType.Character;
                 }
+                #endregion
+
 
                 // Handle Soft Hyphen
-                float oldScale = currentElementScale;
-                if (charCode == k_SoftHyphen)
-                {
+                #region Handle Soft Hyphen
+                float currentElementUnmodifiedScale = currentElementScale;
+                if (charCode == 0xAD || charCode == 0x03)
                     currentElementScale = 0;
-                }
+                #endregion
+
 
                 // Store some of the text object's information
                 m_InternalTextElementInfo[m_CharacterCount].character = (char)charCode;
 
+                // Cache glyph metrics
+                Glyph altGlyph = textInfo.textElementInfo[m_CharacterCount].alternativeGlyph;
+                GlyphMetrics currentGlyphMetrics = altGlyph == null ? m_CachedTextElement.m_Glyph.metrics : altGlyph.metrics;
+
+                // Optimization to avoid calling this more than once per character.
+                bool isWhiteSpace = charCode <= 0xFFFF && char.IsWhiteSpace((char)charCode);
+
                 // Handle Kerning if Enabled.
+                #region Handle Kerning
                 GlyphValueRecord glyphAdjustments = new GlyphValueRecord();
                 float characterSpacingAdjustment = generationSettings.characterSpacing;
                 if (generationSettings.enableKerning)
                 {
                     GlyphPairAdjustmentRecord adjustmentPair;
-                    uint baseGlyphIndex = m_CachedTextElement.glyphIndex;
+                    uint baseGlyphIndex = m_CachedTextElement.m_GlyphIndex;
 
                     if (m_CharacterCount < totalCharacterCount - 1)
                     {
-                        uint nextGlyphIndex = textInfo.textElementInfo[m_CharacterCount + 1].textElement.glyphIndex;
+                        uint nextGlyphIndex = textInfo.textElementInfo[m_CharacterCount + 1].textElement.m_GlyphIndex;
                         uint key = nextGlyphIndex << 16 | baseGlyphIndex;
 
                         if (m_CurrentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
                         {
                             glyphAdjustments = adjustmentPair.firstAdjustmentRecord.glyphValueRecord;
-                            //characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
+                            characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
                         }
                     }
 
                     if (m_CharacterCount >= 1)
                     {
-                        uint previousGlyphIndex = textInfo.textElementInfo[m_CharacterCount - 1].textElement.glyphIndex;
+                        uint previousGlyphIndex = textInfo.textElementInfo[m_CharacterCount - 1].textElement.m_GlyphIndex;
                         uint key = baseGlyphIndex << 16 | previousGlyphIndex;
 
                         if (m_CurrentFontAsset.m_FontFeatureTable.m_GlyphPairAdjustmentRecordLookup.TryGetValue(key, out adjustmentPair))
                         {
                             glyphAdjustments += adjustmentPair.secondAdjustmentRecord.glyphValueRecord;
-                            //characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
+                            characterSpacingAdjustment = (adjustmentPair.featureLookupFlags & FontFeatureLookupFlags.IgnoreSpacingAdjustments) == FontFeatureLookupFlags.IgnoreSpacingAdjustments ? 0 : characterSpacingAdjustment;
                         }
                     }
+
+                    m_InternalTextElementInfo[m_CharacterCount].adjustedHorizontalAdvance = glyphAdjustments.xAdvance;
                 }
+                #endregion
+
+                // Handle Diacritical Marks
+                #region Handle Diacritical Marks
+                bool isBaseGlyph = TextGeneratorUtilities.IsBaseGlyph((uint)charCode);
+
+                if (isBaseGlyph)
+                    m_LastBaseGlyphIndex = m_CharacterCount;
+
+                if (m_CharacterCount > 0 && !isBaseGlyph)
+                {
+                    // Check for potential Mark-to-Base lookup if previous glyph was a base glyph
+                    if (m_LastBaseGlyphIndex != int.MinValue && m_LastBaseGlyphIndex == m_CharacterCount - 1)
+                    {
+                        Glyph baseGlyph = textInfo.textElementInfo[m_LastBaseGlyphIndex].textElement.glyph;
+                        uint baseGlyphIndex = baseGlyph.index;
+                        uint markGlyphIndex = m_CachedTextElement.glyphIndex;
+                        uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+                        if (m_CurrentFontAsset.fontFeatureTable.m_MarkToBaseAdjustmentRecordLookup.TryGetValue(key, out MarkToBaseAdjustmentRecord glyphAdjustmentRecord))
+                        {
+                            float advanceOffset = (m_InternalTextElementInfo[m_LastBaseGlyphIndex].origin - m_XAdvance) / currentElementScale;
+
+                            glyphAdjustments.xPlacement = advanceOffset + glyphAdjustmentRecord.baseGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.markPositionAdjustment.xPositionAdjustment;
+                            glyphAdjustments.yPlacement = glyphAdjustmentRecord.baseGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.markPositionAdjustment.yPositionAdjustment;
+
+                            characterSpacingAdjustment = 0;
+                        }
+                    }
+                    else
+                    {
+                        // Iterate from previous glyph to last base glyph checking for any potential Mark-to-Mark lookups to apply. Otherwise check for potential Mark-to-Base lookup between the current glyph and last base glyph
+                        bool wasLookupApplied = false;
+
+                        // Check for any potential Mark-to-Mark lookups
+                        for (int characterLookupIndex = m_CharacterCount - 1; characterLookupIndex >= 0 && characterLookupIndex != m_LastBaseGlyphIndex; characterLookupIndex--)
+                        {
+                            // Handle any potential Mark-to-Mark lookup
+                            Glyph baseMarkGlyph = textInfo.textElementInfo[characterLookupIndex].textElement.glyph;
+                            uint baseGlyphIndex = baseMarkGlyph.index;
+                            uint combiningMarkGlyphIndex = m_CachedTextElement.glyphIndex;
+                            uint key = combiningMarkGlyphIndex << 16 | baseGlyphIndex;
+
+                            if (m_CurrentFontAsset.fontFeatureTable.m_MarkToMarkAdjustmentRecordLookup.TryGetValue(key, out MarkToMarkAdjustmentRecord glyphAdjustmentRecord))
+                            {
+                                float baseMarkOrigin = (textInfo.textElementInfo[characterLookupIndex].origin - m_XAdvance) / currentElementScale;
+                                float currentBaseline = baselineOffset - m_LineOffset + m_BaselineOffset;
+                                float baseMarkBaseline = (m_InternalTextElementInfo[characterLookupIndex].baseLine - currentBaseline) / currentElementScale;
+
+                                glyphAdjustments.xPlacement = baseMarkOrigin + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.xPositionAdjustment;
+                                glyphAdjustments.yPlacement = baseMarkBaseline + glyphAdjustmentRecord.baseMarkGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.combiningMarkPositionAdjustment.yPositionAdjustment;
+
+                                characterSpacingAdjustment = 0;
+                                wasLookupApplied = true;
+                                break;
+                            }
+                        }
+
+                        // If no Mark-to-Mark lookups were applied, check for potential Mark-to-Base lookup.
+                        if (m_LastBaseGlyphIndex != int.MinValue && !wasLookupApplied)
+                        {
+                            // Handle lookup for Mark-to-Base
+                            Glyph baseGlyph = textInfo.textElementInfo[m_LastBaseGlyphIndex].textElement.glyph;
+                            uint baseGlyphIndex = baseGlyph.index;
+                            uint markGlyphIndex = m_CachedTextElement.glyphIndex;
+                            uint key = markGlyphIndex << 16 | baseGlyphIndex;
+
+                            if (m_CurrentFontAsset.fontFeatureTable.m_MarkToBaseAdjustmentRecordLookup.TryGetValue(key, out MarkToBaseAdjustmentRecord glyphAdjustmentRecord))
+                            {
+                                float advanceOffset = (m_InternalTextElementInfo[m_LastBaseGlyphIndex].origin - m_XAdvance) / currentElementScale;
+
+                                glyphAdjustments.xPlacement = advanceOffset + glyphAdjustmentRecord.baseGlyphAnchorPoint.xCoordinate - glyphAdjustmentRecord.markPositionAdjustment.xPositionAdjustment;
+                                glyphAdjustments.yPlacement = glyphAdjustmentRecord.baseGlyphAnchorPoint.yCoordinate - glyphAdjustmentRecord.markPositionAdjustment.yPositionAdjustment;
+
+                                characterSpacingAdjustment = 0;
+                            }
+                        }
+                    }
+                }
+
+                // Adjust relevant text metrics
+                elementAscentLine += glyphAdjustments.yPlacement;
+                elementDescentLine += glyphAdjustments.yPlacement;
+                #endregion
+
+
+                // Initial Implementation for RTL support.
+                #region Handle Right-to-Left
+                //if (generationSettings.isRightToLeft)
+                //{
+                //    m_XAdvance -= ((m_CachedTextElement.xAdvance * boldXAdvanceMultiplier + m_characterSpacing + generationSettings.wordSpacing + m_CurrentFontAsset.regularStyleSpacing) * currentElementScale + m_CSpacing) * (1 - m_CharWidthAdjDelta);
+
+                //    if (char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace)
+                //        m_XAdvance -= generationSettings.wordSpacing * currentElementScale;
+                //}
+                #endregion
+
 
                 // Handle Mono Spacing
+                #region Handle Mono Spacing
                 float monoAdvance = 0;
                 if (m_MonoSpacing != 0)
                 {
-                    monoAdvance = (m_MonoSpacing / 2 - (m_CachedTextElement.glyph.metrics.width / 2 + m_CachedTextElement.glyph.metrics.horizontalBearingX) * currentElementScale);
+                    monoAdvance = (m_MonoSpacing / 2 - (m_CachedTextElement.glyph.metrics.width / 2 + m_CachedTextElement.glyph.metrics.horizontalBearingX) * currentElementScale) * (1 - m_CharWidthAdjDelta);
                     m_XAdvance += monoAdvance;
                 }
+                #endregion
+
 
                 // Set Padding based on selected font style
+                #region Handle Style Padding
+                float boldSpacingAdjustment = 0;
                 if (m_TextElementType == TextElementType.Character && !isUsingAltTypeface && ((m_FontStyleInternal & FontStyles.Bold) == FontStyles.Bold)) // Checks for any combination of Bold Style.
+                    boldSpacingAdjustment = m_CurrentFontAsset.boldStyleSpacing;
+                #endregion Handle Style Padding
+
+                m_InternalTextElementInfo[m_CharacterCount].origin = m_XAdvance + glyphAdjustments.xPlacement * currentElementScale;
+                m_InternalTextElementInfo[m_CharacterCount].baseLine = (baselineOffset - m_LineOffset + m_BaselineOffset) + glyphAdjustments.yPlacement * currentElementScale;
+
+                // Compute text metrics
+                #region Compute Ascender & Descender values
+                // Element Ascender in line space
+                float elementAscender = m_TextElementType == TextElementType.Character
+                    ? elementAscentLine * currentElementScale / smallCapsMultiplier + m_BaselineOffset
+                    : elementAscentLine * currentElementScale + m_BaselineOffset;
+
+                // Element Descender in line space
+                float elementDescender = m_TextElementType == TextElementType.Character
+                    ? elementDescentLine * currentElementScale / smallCapsMultiplier + m_BaselineOffset
+                    : elementDescentLine * currentElementScale + m_BaselineOffset;
+
+                float adjustedAscender = elementAscender;
+                float adjustedDescender = elementDescender;
+
+                // Max line ascender and descender in line space
+                bool isFirstCharacterOfLine = m_CharacterCount == m_FirstCharacterOfLine;
+                if (isFirstCharacterOfLine || isWhiteSpace == false)
                 {
-                    boldXAdvanceMultiplier = 1 + m_CurrentFontAsset.boldStyleSpacing * 0.01f;
-                }
-                else
-                {
-                    boldXAdvanceMultiplier = 1.0f;
+                    // Special handling for Superscript and Subscript where we use the unadjusted line ascender and descender
+                    if (m_BaselineOffset != 0)
+                    {
+                        adjustedAscender = Mathf.Max((elementAscender - m_BaselineOffset) / m_FontScaleMultiplier, adjustedAscender);
+                        adjustedDescender = Mathf.Min((elementDescender - m_BaselineOffset) / m_FontScaleMultiplier, adjustedDescender);
+                    }
+
+                    m_MaxLineAscender = Mathf.Max(adjustedAscender, m_MaxLineAscender);
+                    m_MaxLineDescender = Mathf.Min(adjustedDescender, m_MaxLineDescender);
                 }
 
-                m_InternalTextElementInfo[m_CharacterCount].baseLine = 0 - m_LineOffset + m_BaselineOffset;
+                // Element Ascender and Descender in object space
+                if (isFirstCharacterOfLine || isWhiteSpace == false)
+                {
+                    m_InternalTextElementInfo[m_CharacterCount].adjustedAscender = adjustedAscender;
+                    m_InternalTextElementInfo[m_CharacterCount].adjustedDescender = adjustedDescender;
 
-                // Compute and save text element Ascender and maximum line Ascender.
-                float elementAscender = m_CurrentFontAsset.faceInfo.ascentLine * (m_TextElementType == TextElementType.Character ? currentElementScale / smallCapsMultiplier : m_InternalTextElementInfo[m_CharacterCount].scale) + m_BaselineOffset;
-                m_InternalTextElementInfo[m_CharacterCount].ascender = elementAscender - m_LineOffset;
-                m_MaxLineAscender = elementAscender > m_MaxLineAscender ? elementAscender : m_MaxLineAscender;
+                    m_InternalTextElementInfo[m_CharacterCount].ascender = elementAscender - m_LineOffset;
+                    m_MaxDescender = m_InternalTextElementInfo[m_CharacterCount].descender = elementDescender - m_LineOffset;
+                }
+                else
+                {
+                    m_InternalTextElementInfo[m_CharacterCount].adjustedAscender = m_MaxLineAscender;
+                    m_InternalTextElementInfo[m_CharacterCount].adjustedDescender = m_MaxLineDescender;
 
-                // Compute and save text element Descender and maximum line Descender.
-                float elementDescender = m_CurrentFontAsset.faceInfo.descentLine * (m_TextElementType == TextElementType.Character ? currentElementScale / smallCapsMultiplier : m_InternalTextElementInfo[m_CharacterCount].scale) + m_BaselineOffset;
-                m_MaxLineDescender = elementDescender < m_MaxLineDescender ? elementDescender : m_MaxLineDescender;
+                    m_InternalTextElementInfo[m_CharacterCount].ascender = m_MaxLineAscender - m_LineOffset;
+                    m_MaxDescender = m_InternalTextElementInfo[m_CharacterCount].descender = m_MaxLineDescender - m_LineOffset;
+                }
 
-                // Adjust maxLineAscender and maxLineDescender if style is superscript or subscript
-                if ((m_FontStyleInternal & FontStyles.Subscript) == FontStyles.Subscript || (m_FontStyleInternal & FontStyles.Superscript) == FontStyles.Superscript)
+                // Max text object ascender and cap height
+                if (m_LineNumber == 0 || m_IsNewPage)
                 {
-                    float baseAscender = (elementAscender - m_BaselineOffset) / m_CurrentFontAsset.faceInfo.subscriptSize;
-                    elementAscender = m_MaxLineAscender;
-                    m_MaxLineAscender = baseAscender > m_MaxLineAscender ? baseAscender : m_MaxLineAscender;
+                    if (isFirstCharacterOfLine || isWhiteSpace == false)
+                    {
+                        m_MaxAscender = m_MaxLineAscender;
+                        m_MaxCapHeight = Mathf.Max(m_MaxCapHeight, m_CurrentFontAsset.m_FaceInfo.capLine * currentElementScale / smallCapsMultiplier);
+                    }
+                }
 
-                    float baseDescender = (elementDescender - m_BaselineOffset) / m_CurrentFontAsset.faceInfo.subscriptSize;
-                    m_MaxLineDescender = baseDescender < m_MaxLineDescender ? baseDescender : m_MaxLineDescender;
+                // Page ascender
+                if (m_LineOffset == 0)
+                {
+                    if (!isWhiteSpace || m_CharacterCount == m_FirstCharacterOfLine)
+                        m_PageAscender = m_PageAscender > elementAscender ? m_PageAscender : elementAscender;
                 }
+                #endregion
 
-                if (m_LineNumber == 0)
-                    m_MaxAscender = m_MaxAscender > elementAscender ? m_MaxAscender : elementAscender;
+                bool isJustifiedOrFlush = ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Flush) == HorizontalAlignment.Flush || ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Justified) == HorizontalAlignment.Justified;
 
                 // Setup Mesh for visible text elements. ie. not a SPACE / LINEFEED / CARRIAGE RETURN.
-                if (charCode == 9 || (!char.IsWhiteSpace((char)charCode) && charCode != 0x200B) || m_TextElementType == TextElementType.Sprite)
+                #region Handle Visible Characters
+                if (charCode == k_Tab || charCode == k_ZeroWidthSpace || ((textWrapMode == TextWrappingMode.PreserveWhitespace || textWrapMode == TextWrappingMode.PreserveWhitespaceNoWrap) && (isWhiteSpace || charCode == k_ZeroWidthSpace)) || (isWhiteSpace == false && charCode != k_ZeroWidthSpace && charCode != 0xAD && charCode != 0x03) || (charCode == 0xAD && isSoftHyphenIgnored == false) || m_TextElementType == TextElementType.Sprite)
                 {
-                    // Check if Character exceeds the width of the Text Container
-                    float width = m_Width != -1 ? Mathf.Min(marginWidth + 0.0001f - m_MarginLeft - m_MarginRight, m_Width) : marginWidth + 0.0001f - m_MarginLeft - m_MarginRight;
+                    //float marginLeft = m_MarginLeft;
+                    //float marginRight = m_MarginRight;
+
+                    // Injected characters do not override margins
+                    //if (isInjectedCharacter)
+                    //{
+                    //    marginLeft = textInfo.lineInfo[m_LineNumber].marginLeft;
+                    //    marginRight = textInfo.lineInfo[m_LineNumber].marginRight;
+                    //}
 
-                    bool isJustifiedOrFlush = ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Flush) == HorizontalAlignment.Flush || ((HorizontalAlignment)m_LineJustification & HorizontalAlignment.Justified) == HorizontalAlignment.Justified;
+                    widthOfTextArea = m_Width != -1 ? Mathf.Min(marginWidth + 0.0001f - m_MarginLeft - m_MarginRight, m_Width) : marginWidth + 0.0001f - m_MarginLeft - m_MarginRight;
 
                     // Calculate the line breaking width of the text.
-                    linebreakingWidth = m_XAdvance + m_CachedTextElement.glyph.metrics.horizontalAdvance * (1 - m_CharWidthAdjDelta) * (charCode != k_SoftHyphen ? currentElementScale : oldScale);
+                    textWidth = Mathf.Abs(m_XAdvance) + currentGlyphMetrics.horizontalAdvance * (1 - m_CharWidthAdjDelta) * (charCode == 0xAD ? currentElementUnmodifiedScale : currentElementScale);
 
-                    // Check if Character exceeds the width of the Text Container
-                    if (linebreakingWidth > width * (isJustifiedOrFlush ? 1.05f : 1.0f))
+                    int testedCharacterCount = m_CharacterCount;
+
+                    // Handling of Horizontal Bounds
+                    #region Current Line Horizontal Bounds Check
+                    if (isBaseGlyph && textWidth > widthOfTextArea * (isJustifiedOrFlush ? 1.05f : 1.0f))
                     {
-                        // Word Wrapping
-                        if (generationSettings.wordWrap && m_CharacterCount != m_FirstCharacterOfLine)
+                        // Handle Line Breaking (if still possible)
+                        if (textWrapMode != TextWrappingMode.NoWrap && textWrapMode != TextWrappingMode.PreserveWhitespaceNoWrap && m_CharacterCount != m_FirstCharacterOfLine)
                         {
-                            // Check if word wrapping is still possible
-                            if (wrappingIndex == savedWordWrapState.previousWordBreak || isFirstWord)
+                            // Restore state to previous safe line breaking
+                            i = RestoreWordWrappingState(ref internalWordWrapState, textInfo);
+
+                            // Replace Soft Hyphen by Hyphen Minus 0x2D
+                            #region Handle Soft Hyphenation
+                            if (m_InternalTextElementInfo[m_CharacterCount - 1].character == 0xAD && isSoftHyphenIgnored == false && generationSettings.overflowMode == TextOverflowMode.Overflow)
                             {
-                                // Word wrapping is no longer possible. Shrink size of text if auto-sizing is enabled.
-                                if (ignoreTextAutoSizing == false && m_CurrentFontSize > generationSettings.fontSizeMin)
-                                {
-                                    // Handle Character Width Adjustments
-                                    if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100)
-                                    {
-                                        m_RecursiveCount = 0;
-                                        m_CharWidthAdjDelta += 0.01f;
-                                        return CalculatePreferredValues(defaultFontSize, marginSize, false, generationSettings, textInfo);
-                                    }
+                                characterToSubstitute.index = m_CharacterCount - 1;
+                                characterToSubstitute.unicode = 0x2D;
 
-                                    // Adjust Point Size
-                                    m_MaxFontSize = defaultFontSize;
+                                i -= 1;
+                                m_CharacterCount -= 1;
+                                continue;
+                            }
 
-                                    defaultFontSize -= Mathf.Max((defaultFontSize - m_MinFontSize) / 2, 0.05f);
-                                    defaultFontSize = (int)(Mathf.Max(defaultFontSize, generationSettings.fontSizeMin) * 20 + 0.5f) / 20f;
+                            isSoftHyphenIgnored = false;
 
-                                    if (m_RecursiveCount > 20)
-                                        return new Vector2(renderedWidth, renderedHeight);
-                                    return CalculatePreferredValues(defaultFontSize, marginSize, false, generationSettings, textInfo);
-                                }
+                            // Ignore Soft Hyphen to prevent it from wrapping
+                            if (m_InternalTextElementInfo[m_CharacterCount].character == 0xAD)
+                            {
+                                isSoftHyphenIgnored = true;
+                                continue;
+                            }
+                            #endregion
 
-                                // Word wrapping is no longer possible, now breaking up individual words.
-                                if (m_IsCharacterWrappingEnabled == false)
+                            // Adjust character spacing before breaking up word if auto size is enabled
+                            #region Handle Text Auto Size (if word wrapping is no longer possible)
+                            if (isTextAutoSizingEnabled && isFirstWordOfLine)
+                            {
+                                // Handle Character Width Adjustments
+                                #region Character Width Adjustments
+                                if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100 && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
                                 {
-                                    m_IsCharacterWrappingEnabled = true;
+                                    float adjustedTextWidth = textWidth;
+
+                                    // Determine full width of the text
+                                    if (m_CharWidthAdjDelta > 0)
+                                        adjustedTextWidth /= 1f - m_CharWidthAdjDelta;
+
+                                    float adjustmentDelta = textWidth - (widthOfTextArea - 0.0001f) * (isJustifiedOrFlush ? 1.05f : 1.0f);
+                                    m_CharWidthAdjDelta += adjustmentDelta / adjustedTextWidth;
+                                    m_CharWidthAdjDelta = Mathf.Min(m_CharWidthAdjDelta, generationSettings.charWidthMaxAdj / 100);
+
+                                    return Vector2.zero;
                                 }
-                                else
-                                    isLastBreakingChar = true;
-                            }
+                                #endregion
 
+                                // Handle Text Auto-sizing resulting from text exceeding vertical bounds.
+                                #region Text Auto-Sizing (Text greater than vertical bounds)
+                                if (fontSize > generationSettings.fontSizeMin && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
+                                {
+                                    m_MaxFontSize = fontSize;
 
-                            // Restore to previously stored state of last valid (space character or linefeed)
-                            i = RestoreWordWrappingState(ref savedWordWrapState, textInfo);
-                            wrappingIndex = i;  // Used to detect when line length can no longer be reduced.
+                                    float sizeDelta = Mathf.Max((fontSize - m_MinFontSize) / 2, 0.05f);
+                                    fontSize -= sizeDelta;
+                                    fontSize = Mathf.Max((int)(fontSize * 20 + 0.5f) / 20f, generationSettings.fontSizeMin);
 
-                            // Handling for Soft Hyphen
-                            if (m_CharBuffer[i] == k_SoftHyphen)
-                            {
-                                m_CharBuffer[i] = k_HyphenMinus;
-                                return CalculatePreferredValues(defaultFontSize, marginSize, true, generationSettings, textInfo);
+                                    // TODO: Need to investigate this value when moving it to a service as TMP might require this value to be zero.
+                                    //       It's currently omitted as UITK expects the text height to be auto-increased if a word becomes longer
+                                    //       and longer. User scenario: User enters a very long word with no spaces that spawns longer than it's container.
+                                    // return Vector2.zero;
+                                }
+                                #endregion Text Auto-Sizing
                             }
+                            #endregion
 
-                            // Check if Line Spacing of previous line needs to be adjusted.
-                            if (m_LineNumber > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_LineHeight == k_FloatUnset)
+                            // Adjust line spacing if necessary
+                            float baselineAdjustmentDelta = m_MaxLineAscender - m_StartOfLineAscender;
+                            if (m_LineOffset > 0 && Math.Abs(baselineAdjustmentDelta) > 0.01f && m_IsDrivenLineSpacing == false && !m_IsNewPage)
                             {
-                                float offsetDelta = m_MaxLineAscender - m_StartOfLineAscender;
-                                m_LineOffset += offsetDelta;
-                                savedWordWrapState.lineOffset = m_LineOffset;
-                                savedWordWrapState.previousLineAscender = m_MaxLineAscender;
+                                //AdjustLineOffset(m_FirstCharacterOfLine, m_CharacterCount, baselineAdjustmentDelta);
+                                m_MaxDescender -= baselineAdjustmentDelta;
+                                m_LineOffset += baselineAdjustmentDelta;
                             }
 
-                            // Calculate lineAscender & make sure if last character is superscript or subscript that we check that as well.
+                            // Calculate line ascender and make sure if last character is superscript or subscript that we check that as well.
                             float lineAscender = m_MaxLineAscender - m_LineOffset;
                             float lineDescender = m_MaxLineDescender - m_LineOffset;
 
                             // Update maxDescender and maxVisibleDescender
                             m_MaxDescender = m_MaxDescender < lineDescender ? m_MaxDescender : lineDescender;
+                            if (!isMaxVisibleDescenderSet)
+                                maxVisibleDescender = m_MaxDescender;
 
-                            m_FirstCharacterOfLine = m_CharacterCount; // Store first character of the next line.
-
-                            // Compute Preferred Width & Height
-                            renderedWidth += m_XAdvance;
+                            if (generationSettings.useMaxVisibleDescender && (m_CharacterCount >= generationSettings.maxVisibleCharacters || m_LineNumber >= generationSettings.maxVisibleLines))
+                                isMaxVisibleDescenderSet = true;
 
-                            if (generationSettings.wordWrap)
-                                renderedHeight = m_MaxAscender - m_MaxDescender;
-                            else
-                                renderedHeight = Mathf.Max(renderedHeight, lineAscender - lineDescender);
+                            // Store first character of the next line.
+                            m_FirstCharacterOfLine = m_CharacterCount;
+                            m_LineVisibleCharacterCount = 0;
 
                             // Store the state of the line before starting on the new line.
-                            SaveWordWrappingState(ref savedLineState, i, m_CharacterCount - 1, textInfo);
+                            SaveWordWrappingState(ref internalLineState, i, m_CharacterCount - 1, textInfo);
 
                             m_LineNumber += 1;
 
-                            // Apply Line Spacing based on scale of the last character of the line.
+                            float ascender = m_InternalTextElementInfo[m_CharacterCount].adjustedAscender;
+
+                            // Compute potential new line offset in the event a line break is needed.
                             if (m_LineHeight == k_FloatUnset)
                             {
-                                float ascender = m_InternalTextElementInfo[m_CharacterCount].ascender - m_InternalTextElementInfo[m_CharacterCount].baseLine;
-                                lineOffsetDelta = 0 - m_MaxLineDescender + ascender + (lineGap + generationSettings.lineSpacing + m_LineSpacingDelta) * baseScale;
-                                m_LineOffset += lineOffsetDelta;
-
-                                m_StartOfLineAscender = ascender;
+                                m_LineOffset += 0 - m_MaxLineDescender + ascender + (lineGap + m_LineSpacingDelta) * baseScale + generationSettings.lineSpacing * currentEmScale;
+                                m_IsDrivenLineSpacing = false;
                             }
                             else
-                                m_LineOffset += m_LineHeight + generationSettings.lineSpacing * baseScale;
+                            {
+                                m_LineOffset += m_LineHeight + generationSettings.lineSpacing * currentEmScale;
+                                m_IsDrivenLineSpacing = true;
+                            }
 
                             m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
                             m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
+                            m_StartOfLineAscender = ascender;
 
                             m_XAdvance = 0 + m_TagIndent;
-
+                            //isStartOfNewLine = true;
+                            isFirstWordOfLine = true;
                             continue;
                         }
+                    }
+                    #endregion
 
-                        // Text Auto-Sizing (text exceeding Width of container.
-                        if (ignoreTextAutoSizing == false && defaultFontSize > generationSettings.fontSizeMin)
-                        {
-                            // Handle Character Width Adjustments
-                            if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100)
-                            {
-                                m_RecursiveCount = 0;
-                                m_CharWidthAdjDelta += 0.01f;
-                                return CalculatePreferredValues(defaultFontSize, marginSize, false, generationSettings, textInfo);
-                            }
-
-                            // Adjust Point Size
-                            m_MaxFontSize = defaultFontSize;
-
-                            defaultFontSize -= Mathf.Max((defaultFontSize - m_MinFontSize) / 2, 0.05f);
-                            defaultFontSize = (int)(Mathf.Max(defaultFontSize, generationSettings.fontSizeMin) * 20 + 0.5f) / 20f;
+                    // Compute Preferred Width & Height
+                    renderedWidth = Mathf.Max(renderedWidth, textWidth + m_MarginLeft + m_MarginRight);
+                    renderedHeight = m_MaxAscender - m_MaxDescender;
 
-                            if (m_RecursiveCount > 20)
-                                return new Vector2(renderedWidth, renderedHeight);
-                            return CalculatePreferredValues(defaultFontSize, marginSize, false, generationSettings, textInfo);
-                        }
-                    }
                 }
+                #endregion Handle Visible Characters
+
 
                 // Check if Line Spacing of previous line needs to be adjusted.
-                if (m_LineNumber > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_LineHeight == k_FloatUnset && !m_IsNewPage)
+                #region Adjust Line Spacing
+                /*if (m_LineOffset > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_IsDrivenLineSpacing == false && !m_IsNewPage)
                 {
                     float offsetDelta = m_MaxLineAscender - m_StartOfLineAscender;
+                    //AdjustLineOffset(m_FirstCharacterOfLine, m_CharacterCount, offsetDelta);
+                    m_MaxDescender -= offsetDelta;
                     m_LineOffset += offsetDelta;
 
                     m_StartOfLineAscender += offsetDelta;
-                    savedWordWrapState.lineOffset = m_LineOffset;
-                    savedWordWrapState.previousLineAscender = m_StartOfLineAscender;
-                }
+                    internalWordWrapState.lineOffset = m_LineOffset;
+                    internalWordWrapState.startOfLineAscender = m_StartOfLineAscender;
+                }*/
+                #endregion
 
 
                 // Handle xAdvance & Tabulation Stops. Tab stops at every 25% of Font Size.
-                if (charCode == 9)
+                #region XAdvance, Tabulation & Stops
+                if (charCode == k_Tab)
                 {
                     float tabSize = m_CurrentFontAsset.faceInfo.tabWidth * m_CurrentFontAsset.tabMultiple * currentElementScale;
                     float tabs = Mathf.Ceil(m_XAdvance / tabSize) * tabSize;
@@ -5717,137 +6986,186 @@ protected virtual Vector2 CalculatePreferredValues(float defaultFontSize, Vector
                 }
                 else if (m_MonoSpacing != 0)
                 {
-                    m_XAdvance += (m_MonoSpacing - monoAdvance + ((generationSettings.characterSpacing + m_CurrentFontAsset.regularStyleSpacing) * currentElementScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
+                    m_XAdvance += (m_MonoSpacing - monoAdvance + ((m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment) * currentEmScale) + m_CSpacing) * (1 - m_CharWidthAdjDelta);
 
-                    if (char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace)
-                        m_XAdvance += generationSettings.wordSpacing * currentElementScale;
+                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                        m_XAdvance += generationSettings.wordSpacing * currentEmScale;
                 }
                 else
                 {
-                    m_XAdvance += ((m_CachedTextElement.glyph.metrics.horizontalAdvance * boldXAdvanceMultiplier + generationSettings.characterSpacing + m_CurrentFontAsset.regularStyleSpacing + glyphAdjustments.xAdvance) * currentElementScale + m_CSpacing) * (1 - m_CharWidthAdjDelta);
+                    m_XAdvance += ((currentGlyphMetrics.horizontalAdvance * m_FXScale.x + glyphAdjustments.xAdvance) * currentElementScale + (m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_CSpacing) * (1 - m_CharWidthAdjDelta);
 
-                    if (char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace)
-                        m_XAdvance += generationSettings.wordSpacing * currentElementScale;
+                    if (isWhiteSpace || charCode == k_ZeroWidthSpace)
+                        m_XAdvance += generationSettings.wordSpacing * currentEmScale;
                 }
+                #endregion Tabulation & Stops
+
 
                 // Handle Carriage Return
+                #region Carriage Return
                 if (charCode == k_CarriageReturn)
                 {
-                    maxXAdvance = Mathf.Max(maxXAdvance, renderedWidth + m_XAdvance);
-                    renderedWidth = 0;
                     m_XAdvance = 0 + m_TagIndent;
                 }
+                #endregion Carriage Return
+
 
                 // Handle Line Spacing Adjustments + Word Wrapping & special case for last line.
-                if (charCode == k_LineFeed || m_CharacterCount == totalCharacterCount - 1)
+                #region Check for Line Feed and Last Character
+                if (charCode == k_LineFeed || charCode == 11 || charCode == 0x03 || charCode == 0x2028 || charCode == 0x2029 || m_CharacterCount == totalCharacterCount - 1)
                 {
                     // Check if Line Spacing of previous line needs to be adjusted.
-                    if (m_LineNumber > 0 && !TextGeneratorUtilities.Approximately(m_MaxLineAscender, m_StartOfLineAscender) && m_LineHeight == k_FloatUnset)
+                    float baselineAdjustmentDelta = m_MaxLineAscender - m_StartOfLineAscender;
+                    if (m_LineOffset > 0 && Math.Abs(baselineAdjustmentDelta) > 0.01f && m_IsDrivenLineSpacing == false && !m_IsNewPage)
                     {
-                        float offsetDelta = m_MaxLineAscender - m_StartOfLineAscender;
-                        m_LineOffset += offsetDelta;
+                        m_MaxDescender -= baselineAdjustmentDelta;
+                        m_LineOffset += baselineAdjustmentDelta;
                     }
+                    m_IsNewPage = false;
 
                     // Calculate lineAscender & make sure if last character is superscript or subscript that we check that as well.
+                    //float lineAscender = m_MaxLineAscender - m_LineOffset;
                     float lineDescender = m_MaxLineDescender - m_LineOffset;
 
                     // Update maxDescender and maxVisibleDescender
                     m_MaxDescender = m_MaxDescender < lineDescender ? m_MaxDescender : lineDescender;
 
-                    m_FirstCharacterOfLine = m_CharacterCount + 1;
-
-                    // Store PreferredWidth paying attention to linefeed and last character of text.
-                    if (charCode == k_LineFeed && m_CharacterCount != totalCharacterCount - 1)
-                    {
-                        maxXAdvance = Mathf.Max(maxXAdvance, renderedWidth + linebreakingWidth);
-                        renderedWidth = 0;
-                    }
-                    else
-                        renderedWidth = Mathf.Max(maxXAdvance, renderedWidth + linebreakingWidth);
-
-                    renderedHeight = m_MaxAscender - m_MaxDescender;
-
                     // Add new line if not last lines or character.
-                    if (charCode == k_LineFeed)
+                    if (charCode == k_LineFeed || charCode == 11 || charCode == 0x2D || charCode == 0x2028 || charCode == 0x2029)
                     {
                         // Store the state of the line before starting on the new line.
-                        SaveWordWrappingState(ref savedLineState, i, m_CharacterCount, textInfo);
+                        SaveWordWrappingState(ref internalLineState, i, m_CharacterCount, textInfo);
                         // Store the state of the last Character before the new line.
-                        SaveWordWrappingState(ref savedWordWrapState, i, m_CharacterCount, textInfo);
+                        SaveWordWrappingState(ref internalWordWrapState, i, m_CharacterCount, textInfo);
 
                         m_LineNumber += 1;
+                        m_FirstCharacterOfLine = m_CharacterCount + 1;
+
+                        float ascender = m_InternalTextElementInfo[m_CharacterCount].adjustedAscender;
 
-                        // Apply Line Spacing
+                        // Apply Line Spacing with special handling for VT char(11)
                         if (m_LineHeight == k_FloatUnset)
                         {
-                            lineOffsetDelta = 0 - m_MaxLineDescender + elementAscender + (lineGap + generationSettings.lineSpacing + generationSettings.paragraphSpacing + m_LineSpacingDelta) * baseScale;
+                            float lineOffsetDelta = 0 - m_MaxLineDescender + ascender + (lineGap + m_LineSpacingDelta) * baseScale + (generationSettings.lineSpacing + (charCode == k_LineFeed || charCode == 0x2029 ? generationSettings.paragraphSpacing : 0)) * currentEmScale;
                             m_LineOffset += lineOffsetDelta;
+                            m_IsDrivenLineSpacing = false;
                         }
                         else
-                            m_LineOffset += m_LineHeight + (generationSettings.lineSpacing + generationSettings.paragraphSpacing) * baseScale;
+                        {
+                            m_LineOffset += m_LineHeight + (generationSettings.lineSpacing + (charCode == k_LineFeed || charCode == 0x2029 ? generationSettings.paragraphSpacing : 0)) * currentEmScale;
+                            m_IsDrivenLineSpacing = true;
+                        }
 
                         m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
                         m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
-                        m_StartOfLineAscender = elementAscender;
+                        m_StartOfLineAscender = ascender;
 
                         m_XAdvance = 0 + m_TagLineIndent + m_TagIndent;
 
                         m_CharacterCount += 1;
                         continue;
                     }
+
+                    // If End of Text
+                    if (charCode == 0x03)
+                        i = m_TextProcessingArray.Length;
                 }
+                #endregion Check for Linefeed or Last Character
+
 
                 // Save State of Mesh Creation for handling of Word Wrapping
-                if (generationSettings.wordWrap || generationSettings.overflowMode == TextOverflowMode.Truncate || generationSettings.overflowMode == TextOverflowMode.Ellipsis)
+                #region Save Word Wrapping State
+                if ((textWrapMode != TextWrappingMode.NoWrap && textWrapMode != TextWrappingMode.PreserveWhitespaceNoWrap) || generationSettings.overflowMode == TextOverflowMode.Truncate || generationSettings.overflowMode == TextOverflowMode.Ellipsis)
                 {
-                    if ((char.IsWhiteSpace((char)charCode) || charCode == k_ZeroWidthSpace || charCode == k_HyphenMinus || charCode == k_SoftHyphen) && !m_IsNonBreakingSpace && charCode != k_NoBreakSpace && charCode != k_NonBreakingHyphen && charCode != k_NarrowNoBreakSpace && charCode != k_WordJoiner)
+                    if ((isWhiteSpace || charCode == k_ZeroWidthSpace || charCode == 0x2D || charCode == 0xAD) && (!m_IsNonBreakingSpace || ignoreNonBreakingSpace) && charCode != 0xA0 && charCode != k_FigureSpace && charCode != k_NonBreakingHyphen && charCode != k_NarrowNoBreakSpace && charCode != k_WordJoiner)
                     {
                         // We store the state of numerous variables for the most recent Space, LineFeed or Carriage Return to enable them to be restored
                         // for Word Wrapping.
-                        SaveWordWrappingState(ref savedWordWrapState, i, m_CharacterCount, textInfo);
-                        m_IsCharacterWrappingEnabled = false;
-                        isFirstWord = false;
+                        SaveWordWrappingState(ref internalWordWrapState, i, m_CharacterCount, textInfo);
+                        isFirstWordOfLine = false;
+
+                        // Reset soft line breaking point since we now have a valid hard break point.
+                        internalSoftLineBreak.previousWordBreak = -1;
                     }
                     // Handling for East Asian languages
-                    else if ((charCode > k_HangulJamoStart && charCode < k_HangulJamoEnd || /* Hangul Jamo */
-                              charCode > k_CjkStart && charCode < k_CjkEnd ||   /* CJK */
-                              charCode > k_HangulJameExtendedStart && charCode < k_HangulJameExtendedEnd ||   /* Hangul Jame Extended-A */
-                              charCode > k_HangulSyllablesStart && charCode < k_HangulSyllablesEnd ||   /* Hangul Syllables */
-                              charCode > k_CjkIdeographsStart && charCode < k_CjkIdeographsEnd ||   /* CJK Compatibility Ideographs */
-                              charCode > k_CjkFormsStart && charCode < k_CjkFormsEnd ||   /* CJK Compatibility Forms */
-                              charCode > k_CjkHalfwidthStart && charCode < k_CjkHalfwidthEnd)     /* CJK Halfwidth */
-                             && !m_IsNonBreakingSpace)
+                    else if (m_IsNonBreakingSpace == false &&
+                             ((charCode > k_HangulJamoStart && charCode < k_HangulJamoEnd || /* Hangul Jamo */
+                               charCode > k_HangulJameExtendedStart && charCode < k_HangulJameExtendedEnd || /* Hangul Jamo Extended-A */
+                               charCode > k_HangulSyllablesStart && charCode < k_HangulSyllablesEnd) && /* Hangul Syllables */
+                              textSettings.lineBreakingRules.useModernHangulLineBreakingRules == false ||
+
+                              (charCode > k_CjkStart && charCode < k_CjkEnd || /* CJK */
+                               charCode > k_CjkIdeographsStart && charCode < k_CjkIdeographsEnd || /* CJK Compatibility Ideographs */
+                               charCode > k_CjkFormsStart && charCode < k_CjkFormsEnd || /* CJK Compatibility Forms */
+                               charCode > k_CjkHalfwidthStart && charCode < k_CjkHalfwidthEnd))) /* CJK Halfwidth */
                     {
-                        if (isFirstWord || isLastBreakingChar || textSettings.lineBreakingRules.leadingCharactersLookup.Contains((uint)charCode) == false &&
-                            (m_CharacterCount < totalCharacterCount - 1 &&
-                             textSettings.lineBreakingRules.followingCharactersLookup.Contains(m_InternalTextElementInfo[m_CharacterCount + 1].character) == false))
+                        bool isCurrentLeadingCharacter = textSettings.lineBreakingRules.leadingCharactersLookup.Contains((uint)charCode);
+                        bool isNextFollowingCharacter = m_CharacterCount < totalCharacterCount - 1 && textSettings.lineBreakingRules.leadingCharactersLookup.Contains(m_InternalTextElementInfo[m_CharacterCount + 1].character);
+
+                        if (isCurrentLeadingCharacter == false)
                         {
-                            SaveWordWrappingState(ref savedWordWrapState, i, m_CharacterCount, textInfo);
-                            m_IsCharacterWrappingEnabled = false;
-                            isFirstWord = false;
+                            if (isNextFollowingCharacter == false)
+                            {
+                                SaveWordWrappingState(ref internalWordWrapState, i, m_CharacterCount, textInfo);
+                                isFirstWordOfLine = false;
+                            }
+
+                            if (isFirstWordOfLine)
+                            {
+                                // Special handling for non-breaking space and soft line breaks
+                                if (isWhiteSpace)
+                                    SaveWordWrappingState(ref internalSoftLineBreak, i, m_CharacterCount, textInfo);
+
+                                SaveWordWrappingState(ref internalWordWrapState, i, m_CharacterCount, textInfo);
+                            }
                         }
+                        else
+                        {
+                            if (isFirstWordOfLine && isFirstCharacterOfLine)
+                            {
+                                // Special handling for non-breaking space and soft line breaks
+                                if (isWhiteSpace)
+                                    SaveWordWrappingState(ref m_SavedSoftLineBreakState, i, m_CharacterCount, textInfo);
+
+                                SaveWordWrappingState(ref m_SavedWordWrapState, i, m_CharacterCount, textInfo);
+                            }
+                        }
+                    }
+                    else if (isFirstWordOfLine)
+                    {
+                        // Special handling for non-breaking space and soft line breaks
+                        if (isWhiteSpace && charCode != 0xA0 || (charCode == 0xAD && isSoftHyphenIgnored == false))
+                            SaveWordWrappingState(ref internalSoftLineBreak, i, m_CharacterCount, textInfo);
+
+                        SaveWordWrappingState(ref internalWordWrapState, i, m_CharacterCount, textInfo);
                     }
-                    else if (isFirstWord || m_IsCharacterWrappingEnabled || isLastBreakingChar)
-                        SaveWordWrappingState(ref savedWordWrapState, i, m_CharacterCount, textInfo);
                 }
+                #endregion Save Word Wrapping State
 
                 m_CharacterCount += 1;
             }
 
             // Check Auto Sizing and increase font size to fill text container.
-            var fontSizeDelta = m_MaxFontSize - m_MinFontSize;
-            if (!m_IsCharacterWrappingEnabled && !ignoreTextAutoSizing && fontSizeDelta > 0.051f && defaultFontSize < generationSettings.fontSizeMax)
+            #region Check Auto-Sizing (Upper Font Size Bounds)
+            fontSizeDelta = m_MaxFontSize - m_MinFontSize;
+            if (isTextAutoSizingEnabled && fontSizeDelta > 0.051f && fontSize < generationSettings.fontSizeMax && m_AutoSizeIterationCount < m_AutoSizeMaxIterationCount)
             {
-                m_MinFontSize = defaultFontSize;
-                defaultFontSize += Mathf.Max((m_MaxFontSize - defaultFontSize) / 2, 0.05f);
-                defaultFontSize = (int)(Mathf.Min(defaultFontSize, generationSettings.fontSizeMax) * 20 + 0.5f) / 20f;
+                // Reset character width adjustment delta
+                if (m_CharWidthAdjDelta < generationSettings.charWidthMaxAdj / 100)
+                    m_CharWidthAdjDelta = 0;
 
-                if (m_RecursiveCount > 20)
-                    return new Vector2(renderedWidth, renderedHeight);
-                return CalculatePreferredValues(defaultFontSize, marginSize, false, generationSettings, textInfo);
+                m_MinFontSize = fontSize;
+
+                float sizeDelta = Mathf.Max((m_MaxFontSize - fontSize) / 2, 0.05f);
+                fontSize += sizeDelta;
+                fontSize = Mathf.Min((int)(fontSize * 20 + 0.5f) / 20f, generationSettings.fontSizeMax);
+
+                return Vector2.zero;
             }
+            #endregion End Auto-sizing Check
+
+            m_IsAutoSizePointSizeSet = true;
 
-            m_IsCharacterWrappingEnabled = false;
             m_IsCalculatingPreferredValues = false;
 
             // Adjust Preferred Width and Height to account for Margins.
@@ -5865,5 +7183,485 @@ protected virtual Vector2 CalculatePreferredValues(float defaultFontSize, Vector
 
             return new Vector2(renderedWidth, renderedHeight);
         }
+
+        /// <summary>
+        /// Convert source text to Unicode (uint) and populate internal text backing array.
+        /// </summary>
+        /// <param name="sourceText">Source text to be converted</param>
+        void PopulateTextBackingArray(string sourceText)
+        {
+            int srcLength = sourceText == null ? 0 : sourceText.Length;
+
+            PopulateTextBackingArray(sourceText, 0, srcLength);
+        }
+
+        /// <summary>
+        /// Convert source text to uint and populate internal text backing array.
+        /// </summary>
+        /// <param name="sourceText">string containing the source text to be converted</param>
+        /// <param name="start">Index of the first element of the source array to be converted and copied to the internal text backing array.</param>
+        /// <param name="length">Number of elements in the array to be converted and copied to the internal text backing array.</param>
+        void PopulateTextBackingArray(string sourceText, int start, int length)
+        {
+            int readIndex;
+            int writeIndex = 0;
+
+            // Range check
+            if (sourceText == null)
+            {
+                readIndex = 0;
+                length = 0;
+            }
+            else
+            {
+                readIndex = Mathf.Clamp(start, 0, sourceText.Length);
+                length = Mathf.Clamp(length, 0, start + length < sourceText.Length ? length : sourceText.Length - start);
+            }
+
+            // Make sure array size is appropriate
+            if (length >= m_TextBackingArray.Capacity)
+                m_TextBackingArray.Resize((length));
+
+            int end = readIndex + length;
+            for (; readIndex < end; readIndex++)
+            {
+                m_TextBackingArray[writeIndex] = sourceText[readIndex];
+                writeIndex += 1;
+            }
+
+            // Terminate array with zero as we are not clearing the array on new invocation of this function.
+            m_TextBackingArray[writeIndex] = 0;
+            m_TextBackingArray.Count = writeIndex;
+        }
+
+        /// <summary>
+        /// Convert source text to uint and populate internal text backing array.
+        /// </summary>
+        /// <param name="sourceText">char array containing the source text to be converted</param>
+        /// <param name="start">Index of the first element of the source array to be converted and copied to the internal text backing array.</param>
+        /// <param name="length">Number of elements in the array to be converted and copied to the internal text backing array.</param>
+        void PopulateTextBackingArray(StringBuilder sourceText, int start, int length)
+        {
+            int readIndex;
+            int writeIndex = 0;
+
+            // Range check
+            if (sourceText == null)
+            {
+                readIndex = 0;
+                length = 0;
+            }
+            else
+            {
+                readIndex = Mathf.Clamp(start, 0, sourceText.Length);
+                length = Mathf.Clamp(length, 0, start + length < sourceText.Length ? length : sourceText.Length - start);
+            }
+
+            // Make sure array size is appropriate
+            if (length >= m_TextBackingArray.Capacity)
+                m_TextBackingArray.Resize((length));
+
+            int end = readIndex + length;
+            for (; readIndex < end; readIndex++)
+            {
+                m_TextBackingArray[writeIndex] = sourceText[readIndex];
+                writeIndex += 1;
+            }
+
+            // Terminate array with zero as we are not clearing the array on new invocation of this function.
+            m_TextBackingArray[writeIndex] = 0;
+            m_TextBackingArray.Count = writeIndex;
+        }
+
+        /// <summary>
+        /// Convert source text to Unicode (uint) and populate internal text backing array.
+        /// </summary>
+        /// <param name="sourceText">char array containing the source text to be converted</param>
+        /// <param name="start">Index of the first element of the source array to be converted and copied to the internal text backing array.</param>
+        /// <param name="length">Number of elements in the array to be converted and copied to the internal text backing array.</param>
+        void PopulateTextBackingArray(char[] sourceText, int start, int length)
+        {
+            int readIndex;
+            int writeIndex = 0;
+
+            // Range check
+            if (sourceText == null)
+            {
+                readIndex = 0;
+                length = 0;
+            }
+            else
+            {
+                readIndex = Mathf.Clamp(start, 0, sourceText.Length);
+                length = Mathf.Clamp(length, 0, start + length < sourceText.Length ? length : sourceText.Length - start);
+            }
+
+            // Make sure array size is appropriate
+            if (length >= m_TextBackingArray.Capacity)
+                m_TextBackingArray.Resize((length));
+
+            int end = readIndex + length;
+            for (; readIndex < end; readIndex++)
+            {
+                m_TextBackingArray[writeIndex] = sourceText[readIndex];
+                writeIndex += 1;
+            }
+
+            // Terminate array with zero as we are not clearing the array on new invocation of this function.
+            m_TextBackingArray[writeIndex] = 0;
+            m_TextBackingArray.Count = writeIndex;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        void PopulateTextProcessingArray(TextGenerationSettings generationSettings)
+        {
+            int srcLength = m_TextBackingArray.Count;
+
+            // Make sure parsing buffer is large enough to handle the required text.
+            if (m_TextProcessingArray.Length < srcLength)
+                TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray, srcLength);
+
+            // Reset Style stack back to default
+            TextProcessingStack<int>.SetDefault(m_TextStyleStacks, 0);
+
+            m_TextStyleStackDepth = 0;
+            int writeIndex = 0;
+
+            int styleHashCode = m_TextStyleStacks[0].Pop();
+            TextStyle style = TextGeneratorUtilities.GetStyle(generationSettings, styleHashCode);
+
+            // Insert Opening Style
+            if (style != null && style.hashCode != (int)MarkupTag.NORMAL)
+                TextGeneratorUtilities.InsertOpeningStyleTag(style, 0, ref m_TextProcessingArray, ref writeIndex, ref m_TextStyleStackDepth, ref m_TextStyleStacks, ref generationSettings);
+
+            int readIndex = 0;
+            for (; readIndex < srcLength; readIndex++)
+            {
+                uint c = m_TextBackingArray[readIndex];
+
+                if (c == 0)
+                    break;
+
+                // TODO: Since we do not set the TextInputSource at this very moment, we have defaulted this conditional to check for
+                //       TextInputSource.TextString whereas in TMP, it checks for TextInputSource.TextInputBox
+                if (generationSettings.inputSource == TextInputSource.TextString && c == '\\' && readIndex < srcLength - 1)
+                {
+                    switch (m_TextBackingArray[readIndex + 1])
+                    {
+                        case 92: // \ escape
+                            if (!generationSettings.parseControlCharacters) break;
+
+                            if (srcLength <= readIndex + 2) break;
+
+                            if (writeIndex + 2 > m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = (int)m_TextBackingArray[readIndex + 1];
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 1;
+
+                            m_TextProcessingArray[writeIndex + 1].unicode = (int)m_TextBackingArray[readIndex + 2];
+                            m_TextProcessingArray[writeIndex + 1].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex + 1].length = 1;
+
+                            readIndex += 2;
+                            writeIndex += 2;
+                            continue;
+                        case 110: // \n LineFeed
+                            if (!generationSettings.parseControlCharacters) break;
+
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 10;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 1;
+
+                            readIndex += 1;
+                            writeIndex += 1;
+                            continue;
+                        case 114: // \r Carriage Return
+                            if (!generationSettings.parseControlCharacters) break;
+
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 13;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 1;
+
+                            readIndex += 1;
+                            writeIndex += 1;
+                            continue;
+                        case 116: // \t Tab
+                            if (!generationSettings.parseControlCharacters) break;
+
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 9;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 1;
+
+                            readIndex += 1;
+                            writeIndex += 1;
+                            continue;
+                        case 118: // \v Vertical tab used as soft line break
+                            if (!generationSettings.parseControlCharacters) break;
+
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 11;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 1;
+
+                            readIndex += 1;
+                            writeIndex += 1;
+                            continue;
+                        case 117: // \u0000 for UTF-16 Unicode
+                            if (srcLength > readIndex + 5 && TextGeneratorUtilities.IsValidUTF16(m_TextBackingArray, readIndex + 2))
+                            {
+                                if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                                m_TextProcessingArray[writeIndex].unicode = TextGeneratorUtilities.GetUTF16(m_TextBackingArray, readIndex + 2);
+                                m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                                m_TextProcessingArray[writeIndex].length = 6;
+
+                                readIndex += 5;
+                                writeIndex += 1;
+                                continue;
+                            }
+                            break;
+                        case 85: // \U00000000 for UTF-32 Unicode
+                            if (srcLength > readIndex + 9 && TextGeneratorUtilities.IsValidUTF32(m_TextBackingArray, readIndex + 2))
+                            {
+                                if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                                m_TextProcessingArray[writeIndex].unicode = TextGeneratorUtilities.GetUTF32(m_TextBackingArray, readIndex + 2);
+                                m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                                m_TextProcessingArray[writeIndex].length = 10;
+
+                                readIndex += 9;
+                                writeIndex += 1;
+                                continue;
+                            }
+                            break;
+                    }
+                }
+
+                // Handle surrogate pair conversion in string, StringBuilder and char[] source.
+                if (c >= CodePoint.HIGH_SURROGATE_START && c <= CodePoint.HIGH_SURROGATE_END && srcLength > readIndex + 1 && m_TextBackingArray[readIndex + 1] >= CodePoint.LOW_SURROGATE_START && m_TextBackingArray[readIndex + 1] <= CodePoint.LOW_SURROGATE_END)
+                {
+                    if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                    m_TextProcessingArray[writeIndex].unicode = (int)TextGeneratorUtilities.ConvertToUTF32(c, m_TextBackingArray[readIndex + 1]);
+                    m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                    m_TextProcessingArray[writeIndex].length = 2;
+
+                    readIndex += 1;
+                    writeIndex += 1;
+                    continue;
+                }
+
+                // Handle inline replacement of <style> and <br> tags.
+                if (c == '<' && generationSettings.richText)
+                {
+                    // Read tag hash code
+                    int hashCode = TextGeneratorUtilities.GetMarkupTagHashCode(m_TextBackingArray, readIndex + 1);
+
+                    switch ((MarkupTag)hashCode)
+                    {
+                        case MarkupTag.BR:
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 10;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 4;
+
+                            writeIndex += 1;
+                            readIndex += 3;
+                            continue;
+                        case MarkupTag.CR:
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 13;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 4;
+
+                            writeIndex += 1;
+                            readIndex += 3;
+                            continue;
+                        case MarkupTag.NBSP:
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 160;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 6;
+
+                            writeIndex += 1;
+                            readIndex += 5;
+                            continue;
+                        case MarkupTag.ZWSP:
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = k_ZeroWidthSpace;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 6;
+
+                            writeIndex += 1;
+                            readIndex += 5;
+                            continue;
+                        case MarkupTag.SHY:
+                            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                            m_TextProcessingArray[writeIndex].unicode = 0xAD;
+                            m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                            m_TextProcessingArray[writeIndex].length = 5;
+
+                            writeIndex += 1;
+                            readIndex += 4;
+                            continue;
+                        case MarkupTag.STYLE:
+                            int openWriteIndex = writeIndex;
+                            if (TextGeneratorUtilities.ReplaceOpeningStyleTag(ref m_TextBackingArray, readIndex, out int srcOffset, ref m_TextProcessingArray, ref writeIndex, ref m_TextStyleStackDepth, ref m_TextStyleStacks, ref generationSettings))
+                            {
+                                // Update potential text elements added by the opening style.
+                                for (; openWriteIndex < writeIndex; openWriteIndex++)
+                                {
+                                    m_TextProcessingArray[openWriteIndex].stringIndex = readIndex;
+                                    m_TextProcessingArray[openWriteIndex].length = (srcOffset - readIndex) + 1;
+                                }
+
+                                readIndex = srcOffset;
+                                continue;
+                            }
+                            break;
+                        case MarkupTag.SLASH_STYLE:
+                            int closeWriteIndex = writeIndex;
+                            TextGeneratorUtilities.ReplaceClosingStyleTag(ref m_TextBackingArray, readIndex, ref m_TextProcessingArray, ref writeIndex, ref m_TextStyleStackDepth, ref m_TextStyleStacks, ref generationSettings);
+
+                            // Update potential text elements added by the closing style.
+                            for (; closeWriteIndex < writeIndex; closeWriteIndex++)
+                            {
+                                m_TextProcessingArray[closeWriteIndex].stringIndex = readIndex;
+                                m_TextProcessingArray[closeWriteIndex].length = 8;
+                            }
+
+                            readIndex += 7;
+                            continue;
+                    }
+                }
+
+                if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+                m_TextProcessingArray[writeIndex].unicode = (int)c;
+                m_TextProcessingArray[writeIndex].stringIndex = readIndex;
+                m_TextProcessingArray[writeIndex].length = 1;
+
+                writeIndex += 1;
+            }
+
+            m_TextStyleStackDepth = 0;
+
+            // Insert Closing Style
+            if (style != null && style.hashCode != (int)MarkupTag.NORMAL)
+                TextGeneratorUtilities.InsertClosingStyleTag(ref m_TextProcessingArray, ref writeIndex, ref m_TextStyleStackDepth, ref m_TextStyleStacks, ref generationSettings);
+
+            if (writeIndex == m_TextProcessingArray.Length) TextGeneratorUtilities.ResizeInternalArray(ref m_TextProcessingArray);
+
+            m_TextProcessingArray[writeIndex].unicode = 0;
+            m_InternalTextProcessingArraySize = writeIndex;
+        }
+
+        void InsertNewLine(int i, float baseScale, float currentElementScale, float currentEmScale, float boldSpacingAdjustment, float characterSpacingAdjustment, float width, float lineGap, ref bool isMaxVisibleDescenderSet, ref float maxVisibleDescender, TextGenerationSettings generationSettings, TextInfo textInfo)
+        {
+            // Adjust line spacing if necessary
+            float baselineAdjustmentDelta = m_MaxLineAscender - m_StartOfLineAscender;
+            if (m_LineOffset > 0 && Math.Abs(baselineAdjustmentDelta) > 0.01f && m_IsDrivenLineSpacing == false && !m_IsNewPage)
+            {
+                TextGeneratorUtilities.AdjustLineOffset(m_FirstCharacterOfLine, m_CharacterCount, baselineAdjustmentDelta, textInfo);
+                m_MaxDescender -= baselineAdjustmentDelta;
+                m_LineOffset += baselineAdjustmentDelta;
+            }
+
+            // Calculate lineAscender & make sure if last character is superscript or subscript that we check that as well.
+            float lineAscender = m_MaxLineAscender - m_LineOffset;
+            float lineDescender = m_MaxLineDescender - m_LineOffset;
+
+            // Update maxDescender and maxVisibleDescender
+            m_MaxDescender = m_MaxDescender < lineDescender ? m_MaxDescender : lineDescender;
+            if (!isMaxVisibleDescenderSet)
+                maxVisibleDescender = m_MaxDescender;
+
+            if (generationSettings.useMaxVisibleDescender && (m_CharacterCount >= generationSettings.maxVisibleCharacters || m_LineNumber >= generationSettings.maxVisibleLines))
+                isMaxVisibleDescenderSet = true;
+
+            // Track & Store lineInfo for the new line
+            textInfo.lineInfo[m_LineNumber].firstCharacterIndex = m_FirstCharacterOfLine;
+            textInfo.lineInfo[m_LineNumber].firstVisibleCharacterIndex = m_FirstVisibleCharacterOfLine = m_FirstCharacterOfLine > m_FirstVisibleCharacterOfLine ? m_FirstCharacterOfLine : m_FirstVisibleCharacterOfLine;
+            textInfo.lineInfo[m_LineNumber].lastCharacterIndex = m_LastCharacterOfLine = m_CharacterCount - 1 > 0 ? m_CharacterCount - 1 : 0;
+            textInfo.lineInfo[m_LineNumber].lastVisibleCharacterIndex = m_LastVisibleCharacterOfLine = m_LastVisibleCharacterOfLine < m_FirstVisibleCharacterOfLine ? m_FirstVisibleCharacterOfLine : m_LastVisibleCharacterOfLine;
+
+            textInfo.lineInfo[m_LineNumber].characterCount = textInfo.lineInfo[m_LineNumber].lastCharacterIndex - textInfo.lineInfo[m_LineNumber].firstCharacterIndex + 1;
+            textInfo.lineInfo[m_LineNumber].visibleCharacterCount = m_LineVisibleCharacterCount;
+            textInfo.lineInfo[m_LineNumber].visibleSpaceCount = m_LineVisibleSpaceCount;
+            textInfo.lineInfo[m_LineNumber].lineExtents.min = new Vector2(textInfo.textElementInfo[m_FirstVisibleCharacterOfLine].bottomLeft.x, lineDescender);
+            textInfo.lineInfo[m_LineNumber].lineExtents.max = new Vector2(textInfo.textElementInfo[m_LastVisibleCharacterOfLine].topRight.x, lineAscender);
+            textInfo.lineInfo[m_LineNumber].length = textInfo.lineInfo[m_LineNumber].lineExtents.max.x;
+            textInfo.lineInfo[m_LineNumber].width = width;
+
+            float glyphAdjustment = textInfo.textElementInfo[m_LastVisibleCharacterOfLine].adjustedHorizontalAdvance;
+            float maxAdvanceOffset = (glyphAdjustment * currentElementScale + (m_CurrentFontAsset.regularStyleSpacing + characterSpacingAdjustment + boldSpacingAdjustment) * currentEmScale + m_CSpacing) * (1 - generationSettings.charWidthMaxAdj);
+            float adjustedHorizontalAdvance = textInfo.lineInfo[m_LineNumber].maxAdvance = textInfo.textElementInfo[m_LastVisibleCharacterOfLine].xAdvance + (generationSettings.isRightToLeft ? maxAdvanceOffset : -maxAdvanceOffset);
+            textInfo.textElementInfo[m_LastVisibleCharacterOfLine].xAdvance = adjustedHorizontalAdvance;
+
+            textInfo.lineInfo[m_LineNumber].baseline = 0 - m_LineOffset;
+            textInfo.lineInfo[m_LineNumber].ascender = lineAscender;
+            textInfo.lineInfo[m_LineNumber].descender = lineDescender;
+            textInfo.lineInfo[m_LineNumber].lineHeight = lineAscender - lineDescender + lineGap * baseScale;
+
+            m_FirstCharacterOfLine = m_CharacterCount; // Store first character of the next line.
+            m_LineVisibleCharacterCount = 0;
+            m_LineVisibleSpaceCount = 0;
+
+            // Store the state of the line before starting on the new line.
+            SaveWordWrappingState(ref m_SavedLineState, i, m_CharacterCount - 1, textInfo);
+
+            m_LineNumber += 1;
+
+            // Check to make sure Array is large enough to hold a new line.
+            if (m_LineNumber >= textInfo.lineInfo.Length)
+                TextGeneratorUtilities.ResizeLineExtents(m_LineNumber, textInfo);
+
+            // Apply Line Spacing based on scale of the last character of the line.
+            if (m_LineHeight == k_FloatUnset)
+            {
+                float ascender = textInfo.textElementInfo[m_CharacterCount].adjustedAscender;
+                float lineOffsetDelta = 0 - m_MaxLineDescender + ascender + (lineGap + m_LineSpacingDelta) * baseScale + generationSettings.lineSpacing * currentEmScale;
+                m_LineOffset += lineOffsetDelta;
+
+                m_StartOfLineAscender = ascender;
+            }
+            else
+            {
+                m_LineOffset += m_LineHeight + generationSettings.lineSpacing * currentEmScale;
+            }
+
+            m_MaxLineAscender = TextGeneratorUtilities.largeNegativeFloat;
+            m_MaxLineDescender = TextGeneratorUtilities.largePositiveFloat;
+
+            m_XAdvance = 0 + m_TagIndent;
+        }
+
+        protected void DoMissingGlyphCallback(int unicode, int stringIndex, FontAsset fontAsset, TextInfo textInfo)
+        {
+            // Event to allow users to modify the content of the text info before the text is rendered.
+            OnMissingCharacter?.Invoke(unicode, stringIndex, textInfo, fontAsset);
+        }
+
+        void ClearMarkupTagAttributes()
+        {
+            int length = m_XmlAttribute.Length;
+            for (int i = 0; i < length; i++)
+                m_XmlAttribute[i] = new RichTextTagAttribute();
+        }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextGeneratorCommon.cs b/Modules/TextCoreTextEngine/Managed/TextGeneratorCommon.cs
index bb5d8b782e..fdba67ebd0 100644
--- a/Modules/TextCoreTextEngine/Managed/TextGeneratorCommon.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextGeneratorCommon.cs
@@ -102,4 +102,9 @@ public enum FontStyles
         Subscript       = 0x100,
         Highlight       = 0x200,
     }
+
+    internal enum TextOverflowMode { Overflow = 0, Ellipsis = 1, Masking = 2, Truncate = 3, ScrollRect = 4, Page = 5, Linked = 6 }
+    internal enum TextureMapping { Character = 0, Line = 1, Paragraph = 2, MatchAspect = 3 }
+    internal enum TextWrappingMode { NoWrap = 0, Normal = 1, PreserveWhitespace = 2, PreserveWhitespaceNoWrap = 3 };
+    internal enum TextInputSource { TextInputBox = 0, SetText = 1, SetTextArray = 2, TextString = 3 };
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs b/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs
index e35538ac3d..453d398637 100644
--- a/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextGeneratorUtilities.cs
@@ -3,7 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
-using UnityEngine;
+using System.Text;
 
 namespace UnityEngine.TextCore.Text
 {
@@ -35,13 +35,220 @@ struct XmlTagAttribute
         public int valueHashCode;
     }
 
-    struct RichTextTagAttribute
+    internal struct RichTextTagAttribute
     {
         public int nameHashCode;
         public int valueHashCode;
         public TagValueType valueType;
         public int valueStartIndex;
         public int valueLength;
+        public TagUnitType unitType;
+    }
+
+    [System.Diagnostics.DebuggerDisplay("Unicode ({unicode})  '{(char)unicode}'")]
+    internal struct UnicodeChar
+    {
+        public int unicode;
+        public int stringIndex;
+        public int length;
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    struct TextBackingContainer
+    {
+        public int Capacity
+        {
+            get { return m_Array.Length; }
+        }
+
+        public int Count
+        {
+            get { return m_Count; }
+            set { m_Count = value; }
+        }
+
+        private uint[] m_Array;
+        private int m_Count;
+
+        public uint this[int index]
+        {
+            get { return m_Array[index]; }
+            set
+            {
+                if (index >= m_Array.Length)
+                    Resize(index);
+
+                m_Array[index] = value;
+            }
+        }
+
+        public TextBackingContainer(int size)
+        {
+            m_Array = new uint[size];
+            m_Count = 0;
+        }
+
+        public void Resize(int size)
+        {
+            size = Mathf.NextPowerOfTwo(size + 1);
+
+            Array.Resize(ref m_Array, size);
+        }
+
+    }
+
+    internal struct CharacterSubstitution
+    {
+        public int index;
+        public uint unicode;
+
+        public CharacterSubstitution(int index, uint unicode)
+        {
+            this.index = index;
+            this.unicode = unicode;
+        }
+    }
+
+    /// <summary>
+    ///
+    /// </summary>
+    internal struct Offset
+    {
+        public float left { get { return m_Left; } set { m_Left = value; } }
+
+        public float right { get { return m_Right; } set { m_Right = value; } }
+
+        public float top { get { return m_Top; } set { m_Top = value; } }
+
+        public float bottom { get { return m_Bottom; } set { m_Bottom = value; } }
+
+        public float horizontal { get { return m_Left; } set { m_Left = value; m_Right = value; } }
+
+        public float vertical { get { return m_Top; } set { m_Top = value; m_Bottom = value; } }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public static Offset zero { get { return k_ZeroOffset; } }
+
+        // =============================================
+        // Private backing fields for public properties.
+        // =============================================
+
+        float m_Left;
+        float m_Right;
+        float m_Top;
+        float m_Bottom;
+
+        static readonly Offset k_ZeroOffset = new Offset(0F, 0F, 0F, 0F);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="left"></param>
+        /// <param name="right"></param>
+        /// <param name="top"></param>
+        /// <param name="bottom"></param>
+        public Offset(float left, float right, float top, float bottom)
+        {
+            m_Left = left;
+            m_Right = right;
+            m_Top = top;
+            m_Bottom = bottom;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="horizontal"></param>
+        /// <param name="vertical"></param>
+        public Offset(float horizontal, float vertical)
+        {
+            m_Left = horizontal;
+            m_Right = horizontal;
+            m_Top = vertical;
+            m_Bottom = vertical;
+        }
+
+        public static bool operator ==(Offset lhs, Offset rhs)
+        {
+            return lhs.m_Left == rhs.m_Left &&
+                    lhs.m_Right == rhs.m_Right &&
+                    lhs.m_Top == rhs.m_Top &&
+                    lhs.m_Bottom == rhs.m_Bottom;
+        }
+
+        public static bool operator !=(Offset lhs, Offset rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        public static Offset operator *(Offset a, float b)
+        {
+            return new Offset(a.m_Left * b, a.m_Right * b, a.m_Top * b, a.m_Bottom * b);
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return base.Equals(obj);
+        }
+
+        public bool Equals(Offset other)
+        {
+            return base.Equals(other);
+        }
+    }
+
+
+    /// <summary>
+    ///
+    /// </summary>
+    internal struct HighlightState
+    {
+        public Color32 color;
+        public Offset padding;
+
+        public HighlightState(Color32 color, Offset padding)
+        {
+            this.color = color;
+            this.padding = padding;
+        }
+
+        public static bool operator ==(HighlightState lhs, HighlightState rhs)
+        {
+            return lhs.color.r == rhs.color.r &&
+                lhs.color.g == rhs.color.g &&
+                lhs.color.b == rhs.color.b &&
+                lhs.color.a == rhs.color.a &&
+                lhs.padding == rhs.padding;
+        }
+
+        public static bool operator !=(HighlightState lhs, HighlightState rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            return base.Equals(obj);
+        }
+
+        public bool Equals(HighlightState other)
+        {
+            return base.Equals(other);
+        }
     }
 
     // Structure used for Word Wrapping which tracks the state of execution when the last space or carriage return character was encountered.
@@ -50,6 +257,7 @@ struct WordWrapState
         public int previousWordBreak;
         public int totalCharacterCount;
         public int visibleCharacterCount;
+        public int visibleSpaceCount;
         public int visibleSpriteCount;
         public int visibleLinkCount;
         public int firstCharacterIndex;
@@ -63,18 +271,20 @@ struct WordWrapState
         public float maxDescender;
         public float maxLineAscender;
         public float maxLineDescender;
-        public float previousLineAscender;
+        public float startOfLineAscender;
 
         public float xAdvance;
         public float preferredWidth;
         public float preferredHeight;
         public float previousLineScale;
+        public float pageAscender;
 
         public int wordCount;
         public FontStyles fontStyle;
         public float fontScale;
         public float fontScaleMultiplier;
 
+        public int italicAngle;
         public float currentFontSize;
         public float baselineOffset;
         public float lineOffset;
@@ -86,11 +296,14 @@ struct WordWrapState
         public Color32 underlineColor;
         public Color32 strikethroughColor;
         public Color32 highlightColor;
+        public HighlightState highlightState;
         public FontStyleStack basicStyleStack;
+        public TextProcessingStack<int> italicAngleStack;
         public TextProcessingStack<Color32> colorStack;
         public TextProcessingStack<Color32> underlineColorStack;
         public TextProcessingStack<Color32> strikethroughColorStack;
         public TextProcessingStack<Color32> highlightColorStack;
+        public TextProcessingStack<HighlightState> highlightStateStack;
         public TextProcessingStack<TextColorGradient> colorGradientStack;
         public TextProcessingStack<float> sizeStack;
         public TextProcessingStack<float> indentStack;
@@ -100,6 +313,8 @@ struct WordWrapState
         public TextProcessingStack<int> actionStack;
         public TextProcessingStack<MaterialReference> materialReferenceStack;
         public TextProcessingStack<TextAlignment> lineJustificationStack;
+
+        public int lastBaseGlyphIndex;
         public int spriteAnimationId;
 
         public FontAsset currentFontAsset;
@@ -111,6 +326,9 @@ struct WordWrapState
 
         public bool tagNoParsing;
         public bool isNonBreakingSpace;
+        public bool isDrivenLineSpacing;
+        public Vector3 fxScale;
+        public Quaternion fxRotation;
     }
 
     internal static class TextGeneratorUtilities
@@ -119,6 +337,15 @@ internal static class TextGeneratorUtilities
         public static readonly Vector2 largeNegativeVector2 = new Vector2(-214748364, -214748364);
         public const float largePositiveFloat = 32767;
         public const float largeNegativeFloat = -32767;
+        const int
+           k_DoubleQuotes = 34,
+           k_GreaterThan = 62,
+           k_ZeroWidthSpace = 0x200B;
+
+        /// <summary>
+        /// Table used to convert character to uppercase.
+        /// </summary>
+        const string k_LookupStringU = "-------------------------------- !-#$%&-()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[-]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~-";
 
         public static bool Approximately(float a, float b)
         {
@@ -559,22 +786,18 @@ public static void StringToCharArray(string sourceText, ref int[] charBuffer, re
             charBuffer[writeIndex] = (char)0;
         }
 
-        /// <summary>
-        ///
-        /// </summary>
-        static void ResizeInternalArray<T>(ref T[] array)
+        public static void ResizeInternalArray<T>(ref T[] array)
         {
             int size = Mathf.NextPowerOfTwo(array.Length + 1);
 
             Array.Resize(ref array, size);
         }
 
-        internal static void ResizeArray<T>(T[] array)
+        public static void ResizeInternalArray<T>(ref T[] array, int size)
         {
-            int size = array.Length * 2;
-            if (size == 0) size = 8;
+            size = Mathf.NextPowerOfTwo(size + 1);
 
-            System.Array.Resize(ref array, size);
+            Array.Resize(ref array, size);
         }
 
         /// <summary>
@@ -629,7 +852,7 @@ static bool IsTagName(ref int[] text, string tag, int index)
         /// <param name="writeIndex"></param>
         /// <param name="styleStack"></param>
         /// <returns></returns>
-        static bool ReplaceOpeningStyleTag(ref int[] sourceText, int srcIndex, out int srcOffset, ref int[] charBuffer, ref int writeIndex, ref TextProcessingStack<int> styleStack, ref TextGenerationSettings generationSettings)
+        public static bool ReplaceOpeningStyleTag(ref int[] sourceText, int srcIndex, out int srcOffset, ref int[] charBuffer, ref int writeIndex, ref TextProcessingStack<int> styleStack, ref TextGenerationSettings generationSettings)
         {
             // Validate <style> tag.
             int hashCode = GetTagHashCode(ref sourceText, srcIndex + 7, out srcOffset);
@@ -774,7 +997,7 @@ static bool ReplaceOpeningStyleTag(ref string sourceText, int srcIndex, out int
         /// <param name="writeIndex"></param>
         /// <param name="styleStack"></param>
         /// <returns></returns>
-        static void ReplaceClosingStyleTag(ref int[] charBuffer, ref int writeIndex, ref TextProcessingStack<int> styleStack, ref TextGenerationSettings generationSettings)
+        public static void ReplaceClosingStyleTag(ref int[] charBuffer, ref int writeIndex, ref TextProcessingStack<int> styleStack, ref TextGenerationSettings generationSettings)
         {
             // Get style from the Style Stack
             int hashCode = styleStack.CurrentItem();
@@ -835,120 +1058,1092 @@ static void ReplaceClosingStyleTag(ref int[] charBuffer, ref int writeIndex, ref
             }
         }
 
-        static TextStyle GetStyle(TextGenerationSettings generationSetting, int hashCode)
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="style"></param>
+        /// <param name="srcIndex"></param>
+        /// <param name="charBuffer"></param>
+        /// <param name="writeIndex"></param>
+        /// <returns></returns>
+        public static bool InsertOpeningStyleTag(TextStyle style, int srcIndex, ref UnicodeChar[] charBuffer, ref int writeIndex, ref int textStyleStackDepth, ref TextProcessingStack<int>[] textStyleStacks, ref TextGenerationSettings generationSettings)
         {
-            TextStyle style = null;
+            // Return if we don't have a valid style.
+            if (style == null) return false;
 
-            TextStyleSheet styleSheet = generationSetting.styleSheet;
+            textStyleStacks[0].Push(style.hashCode);
 
-            // Get Style from Style Sheet potentially assigned to text object.
-            if (styleSheet != null)
+            int styleLength = style.styleOpeningTagArray.Length;
+
+            // Replace <style> tag with opening definition
+            int[] tagDefinition = style.styleOpeningTagArray;
+
+            for (int i = 0; i < styleLength; i++)
             {
-                style = styleSheet.GetStyle(hashCode);
+                int c = tagDefinition[i];
 
-                if (style != null)
-                    return style;
-            }
+                if (c == '\\' && i + 1 < styleLength)
+                {
+                    switch (tagDefinition[i + 1])
+                    {
+                        case '\\':
+                            i += 1;
+                            break;
+                        case 'n':
+                            c = 10;
+                            i += 1;
+                            break;
+                        case 'r':
+                            break;
+                        case 't':
+                            break;
+                        case 'u':
+                            // UTF16 format is "\uFF00" or u + 2 hex pairs.
+                            if (i + 5 < styleLength)
+                            {
+                                c = GetUTF16(tagDefinition, i + 2);
 
-            // Use Global Style Sheet (if exists)
-            styleSheet = generationSetting.textSettings.defaultStyleSheet;
+                                i += 5;
+                            }
+                            break;
+                        case 'U':
+                            // UTF32 format is "\UFF00FF00" or U + 4 hex pairs.
+                            if (i + 9 < styleLength)
+                            {
+                                c = GetUTF32(tagDefinition, i + 2);
 
-            if (styleSheet != null)
-                style = styleSheet.GetStyle(hashCode);
+                                i += 9;
+                            }
+                            break;
+                    }
+                }
 
-            return style;
-        }
+                if (c == '<')
+                {
+                    int hashCode = GetMarkupTagHashCode(tagDefinition, i + 1);
 
-        /// <summary>
-        /// Convert UTF-32 Hex to Char
-        /// </summary>
-        /// <returns>The Unicode hex.</returns>
-        /// <param name="text"></param>
-        /// <param name="i">The index.</param>
-        static int GetUtf32(string text, int i)
-        {
-            int unicode = 0;
-            unicode += HexToInt(text[i]) << 30;
-            unicode += HexToInt(text[i + 1]) << 24;
-            unicode += HexToInt(text[i + 2]) << 20;
-            unicode += HexToInt(text[i + 3]) << 16;
-            unicode += HexToInt(text[i + 4]) << 12;
-            unicode += HexToInt(text[i + 5]) << 8;
-            unicode += HexToInt(text[i + 6]) << 4;
-            unicode += HexToInt(text[i + 7]);
-            return unicode;
-        }
+                    switch ((MarkupTag)hashCode)
+                    {
+                        case MarkupTag.BR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
 
-        /// <summary>
-        /// Convert UTF-16 Hex to Char
-        /// </summary>
-        /// <returns>The Unicode hex.</returns>
-        /// <param name="text"></param>
-        /// <param name="i">The index.</param>
-        static int GetUtf16(string text, int i)
-        {
-            int unicode = 0;
-            unicode += HexToInt(text[i]) << 12;
-            unicode += HexToInt(text[i + 1]) << 8;
-            unicode += HexToInt(text[i + 2]) << 4;
-            unicode += HexToInt(text[i + 3]);
-            return unicode;
-        }
+                            charBuffer[writeIndex].unicode = 10;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.CR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
 
-        /// <summary>
-        /// Get Hashcode for a given tag.
-        /// </summary>
-        /// <param name="text"></param>
-        /// <param name="index"></param>
-        /// <param name="closeIndex"></param>
-        /// <returns></returns>
-        static int GetTagHashCode(ref int[] text, int index, out int closeIndex)
-        {
-            int hashCode = 0;
-            closeIndex = 0;
+                            charBuffer[writeIndex].unicode = 13;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.NBSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
 
-            for (int i = index; i < text.Length; i++)
-            {
-                // Skip quote '"' character
-                if (text[i] == 34)
-                    continue;
+                            charBuffer[writeIndex].unicode = 160;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.ZWSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
 
-                // Break at '>'
-                if (text[i] == 62)
-                {
-                    closeIndex = i;
-                    break;
+                            charBuffer[writeIndex].unicode = k_ZeroWidthSpace;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.SHY:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 0xAD;
+                            writeIndex += 1;
+                            i += 4;
+                            continue;
+                        case MarkupTag.STYLE:
+                            if (ReplaceOpeningStyleTag(ref tagDefinition, i, out int offset, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings))
+                            {
+                                i = offset;
+                                continue;
+                            }
+                            break;
+                        case MarkupTag.SLASH_STYLE:
+                            ReplaceClosingStyleTag(ref tagDefinition, i, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings);
+
+                            i += 7;
+                            continue;
+                    }
                 }
 
-                hashCode = (hashCode << 5) + hashCode ^ (int)TextUtilities.ToUpperASCIIFast((char)text[i]);
+                if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                charBuffer[writeIndex].unicode = c;
+                writeIndex += 1;
             }
 
-            return hashCode;
+            textStyleStackDepth = 0;
+
+            return true;
         }
 
         /// <summary>
-        /// Get Hashcode for a given tag.
+        /// Method to handle inline replacement of style tag by opening style definition.
         /// </summary>
-        /// <param name="text"></param>
-        /// <param name="index"></param>
-        /// <param name="closeIndex"></param>
+        /// <param name="sourceText"></param>
+        /// <param name="srcIndex"></param>
+        /// <param name="srcOffset"></param>
+        /// <param name="charBuffer"></param>
+        /// <param name="writeIndex"></param>
         /// <returns></returns>
-        static int GetTagHashCode(ref string text, int index, out int closeIndex)
+        public static bool ReplaceOpeningStyleTag(ref TextBackingContainer sourceText, int srcIndex, out int srcOffset, ref UnicodeChar[] charBuffer, ref int writeIndex, ref int textStyleStackDepth, ref TextProcessingStack<int>[] textStyleStacks, ref TextGenerationSettings generationSettings)
         {
-            int hashCode = 0;
-            closeIndex = 0;
+            // Validate <style> tag.
+            int styleHashCode = GetStyleHashCode(ref sourceText, srcIndex + 7, out srcOffset);
+            TextStyle style = GetStyle(generationSettings, styleHashCode);
 
-            for (int i = index; i < text.Length; i++)
-            {
-                // Skip quote '"' character
-                if (text[i] == 34)
-                    continue;
+            // Return if we don't have a valid style.
+            if (style == null || srcOffset == 0) return false;
 
-                // Break at '>'
-                if (text[i] == 62)
-                {
-                    closeIndex = i;
-                    break;
+            // Increase style depth
+            textStyleStackDepth += 1;
+
+            // Push style hashcode onto stack
+            textStyleStacks[textStyleStackDepth].Push(style.hashCode);
+
+            int styleLength = style.styleOpeningTagArray.Length;
+
+            // Replace <style> tag with opening definition
+            int[] tagDefinition = style.styleOpeningTagArray;
+
+            for (int i = 0; i < styleLength; i++)
+            {
+                int c = tagDefinition[i];
+
+                if (c == '\\' && i + 1 < styleLength)
+                {
+                    switch (tagDefinition[i + 1])
+                    {
+                        case '\\':
+                            i += 1;
+                            break;
+                        case 'n':
+                            c = 10;
+                            i += 1;
+                            break;
+                        case 'r':
+                            break;
+                        case 't':
+                            break;
+                        case 'u':
+                            // UTF16 format is "\uFF00" or u + 2 hex pairs.
+                            if (i + 5 < styleLength)
+                            {
+                                c = GetUTF16(tagDefinition, i + 2);
+
+                                i += 5;
+                            }
+                            break;
+                        case 'U':
+                            // UTF32 format is "\UFF00FF00" or U + 4 hex pairs.
+                            if (i + 9 < styleLength)
+                            {
+                                c = GetUTF32(tagDefinition, i + 2);
+
+                                i += 9;
+                            }
+                            break;
+                    }
+                }
+
+                if (c == '<')
+                {
+                    int hashCode = GetMarkupTagHashCode(tagDefinition, i + 1);
+
+                    switch ((MarkupTag)hashCode)
+                    {
+                        case MarkupTag.BR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 10;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.CR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 13;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.NBSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 160;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.ZWSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = k_ZeroWidthSpace;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.SHY:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 0xAD;
+                            writeIndex += 1;
+                            i += 4;
+                            continue;
+                        case MarkupTag.STYLE:
+                            if (ReplaceOpeningStyleTag(ref tagDefinition, i, out int offset, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings))
+                            {
+                                i = offset;
+                                continue;
+                            }
+                            break;
+                        case MarkupTag.SLASH_STYLE:
+                            ReplaceClosingStyleTag(ref tagDefinition, i, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings);
+
+                            i += 7;
+                            continue;
+                    }
+                }
+
+                if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                charBuffer[writeIndex].unicode = c;
+                writeIndex += 1;
+            }
+
+            textStyleStackDepth -= 1;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Method to handle inline replacement of style tag by closing style definition.
+        /// </summary>
+        /// <param name="sourceText"></param>
+        /// <param name="srcIndex"></param>
+        /// <param name="charBuffer"></param>
+        /// <param name="writeIndex"></param>
+        /// <returns></returns>
+        public static void ReplaceClosingStyleTag(ref int[] sourceText, int srcIndex, ref UnicodeChar[] charBuffer, ref int writeIndex, ref int textStyleStackDepth, ref TextProcessingStack<int>[] textStyleStacks, ref TextGenerationSettings generationSettings)
+        {
+            // Get style from the Style Stack
+            int styleHashCode = textStyleStacks[textStyleStackDepth + 1].Pop();
+            TextStyle style = GetStyle(generationSettings, styleHashCode);
+
+            // Return if we don't have a valid style.
+            if (style == null) return;
+
+            // Increase style depth
+            textStyleStackDepth += 1;
+
+            int styleLength = style.styleClosingTagArray.Length;
+
+            // Replace <style> tag with opening definition
+            int[] tagDefinition = style.styleClosingTagArray;
+
+            for (int i = 0; i < styleLength; i++)
+            {
+                int c = tagDefinition[i];
+
+                if (c == '\\' && i + 1 < styleLength)
+                {
+                    switch (tagDefinition[i + 1])
+                    {
+                        case '\\':
+                            i += 1;
+                            break;
+                        case 'n':
+                            c = 10;
+                            i += 1;
+                            break;
+                        case 'r':
+                            break;
+                        case 't':
+                            break;
+                        case 'u':
+                            // UTF16 format is "\uFF00" or u + 2 hex pairs.
+                            if (i + 5 < styleLength)
+                            {
+                                c = GetUTF16(tagDefinition, i + 2);
+
+                                i += 5;
+                            }
+                            break;
+                        case 'U':
+                            // UTF32 format is "\UFF00FF00" or U + 4 hex pairs.
+                            if (i + 9 < styleLength)
+                            {
+                                c = GetUTF32(tagDefinition, i + 2);
+
+                                i += 9;
+                            }
+                            break;
+                    }
+                }
+
+                if (c == '<')
+                {
+                    int hashCode = GetMarkupTagHashCode(tagDefinition, i + 1);
+
+                    switch ((MarkupTag)hashCode)
+                    {
+                        case MarkupTag.BR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 10;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.CR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 13;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.NBSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 160;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.ZWSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = k_ZeroWidthSpace;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.SHY:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 0xAD;
+                            writeIndex += 1;
+                            i += 4;
+                            continue;
+                        case MarkupTag.STYLE:
+                            if (ReplaceOpeningStyleTag(ref tagDefinition, i, out int offset, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings))
+                            {
+                                i = offset;
+                                continue;
+                            }
+                            break;
+                        case MarkupTag.SLASH_STYLE:
+                            ReplaceClosingStyleTag(ref tagDefinition, i, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings);
+
+                            i += 7;
+                            continue;
+                    }
+                }
+
+                if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                charBuffer[writeIndex].unicode = c;
+                writeIndex += 1;
+            }
+
+            textStyleStackDepth -= 1;
+        }
+
+        /// <summary>
+        /// Method to handle inline replacement of style tag by closing style definition.
+        /// </summary>
+        /// <param name="sourceText"></param>
+        /// <param name="srcIndex"></param>
+        /// <param name="charBuffer"></param>
+        /// <param name="writeIndex"></param>
+        /// <returns></returns>
+        public static void ReplaceClosingStyleTag(ref TextBackingContainer sourceText, int srcIndex, ref UnicodeChar[] charBuffer, ref int writeIndex, ref int textStyleStackDepth, ref TextProcessingStack<int>[] textStyleStacks, ref TextGenerationSettings generationSettings)
+        {
+            // Get style from the Style Stack
+            int styleHashCode = textStyleStacks[textStyleStackDepth + 1].Pop();
+            TextStyle style = GetStyle(generationSettings, styleHashCode);
+
+            // Return if we don't have a valid style.
+            if (style == null) return;
+
+            // Increase style depth
+            textStyleStackDepth += 1;
+
+            int styleLength = style.styleClosingTagArray.Length;
+
+            // Replace <style> tag with opening definition
+            int[] tagDefinition = style.styleClosingTagArray;
+
+            for (int i = 0; i < styleLength; i++)
+            {
+                int c = tagDefinition[i];
+
+                if (c == '\\' && i + 1 < styleLength)
+                {
+                    switch (tagDefinition[i + 1])
+                    {
+                        case '\\':
+                            i += 1;
+                            break;
+                        case 'n':
+                            c = 10;
+                            i += 1;
+                            break;
+                        case 'r':
+                            break;
+                        case 't':
+                            break;
+                        case 'u':
+                            // UTF16 format is "\uFF00" or u + 2 hex pairs.
+                            if (i + 5 < styleLength)
+                            {
+                                c = GetUTF16(tagDefinition, i + 2);
+
+                                i += 5;
+                            }
+                            break;
+                        case 'U':
+                            // UTF32 format is "\UFF00FF00" or U + 4 hex pairs.
+                            if (i + 9 < styleLength)
+                            {
+                                c = GetUTF32(tagDefinition, i + 2);
+
+                                i += 9;
+                            }
+                            break;
+                    }
+                }
+
+                if (c == '<')
+                {
+                    int hashCode = GetMarkupTagHashCode(tagDefinition, i + 1);
+
+                    switch ((MarkupTag)hashCode)
+                    {
+                        case MarkupTag.BR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 10;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.CR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 13;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.NBSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 160;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.ZWSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = k_ZeroWidthSpace;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.SHY:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 0xAD;
+                            writeIndex += 1;
+                            i += 4;
+                            continue;
+                        case MarkupTag.STYLE:
+                            if (ReplaceOpeningStyleTag(ref tagDefinition, i, out int offset, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings))
+                            {
+                                i = offset;
+                                continue;
+                            }
+                            break;
+                        case MarkupTag.SLASH_STYLE:
+                            ReplaceClosingStyleTag(ref tagDefinition, i, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings);
+
+                            i += 7;
+                            continue;
+                    }
+                }
+
+                if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                charBuffer[writeIndex].unicode = c;
+                writeIndex += 1;
+            }
+
+            textStyleStackDepth -= 1;
+        }
+
+        /// <summary>
+        /// Method to handle inline replacement of style tag by opening style definition.
+        /// </summary>
+        /// <param name="sourceText"></param>
+        /// <param name="srcIndex"></param>
+        /// <param name="srcOffset"></param>
+        /// <param name="charBuffer"></param>
+        /// <param name="writeIndex"></param>
+        /// <returns></returns>
+        public static bool ReplaceOpeningStyleTag(ref int[] sourceText, int srcIndex, out int srcOffset, ref UnicodeChar[] charBuffer, ref int writeIndex, ref int textStyleStackDepth, ref TextProcessingStack<int>[] textStyleStacks, ref TextGenerationSettings generationSettings)
+        {
+            // Validate <style> tag.
+            int styleHashCode = GetStyleHashCode(ref sourceText, srcIndex + 7, out srcOffset);
+            TextStyle style = GetStyle(generationSettings, styleHashCode);
+
+            // Return if we don't have a valid style.
+            if (style == null || srcOffset == 0) return false;
+
+            // Increase style depth
+            textStyleStackDepth += 1;
+
+            // Push style hashcode onto stack
+            textStyleStacks[textStyleStackDepth].Push(style.hashCode);
+
+            int styleLength = style.styleOpeningTagArray.Length;
+
+            // Replace <style> tag with opening definition
+            int[] tagDefinition = style.styleOpeningTagArray;
+
+            for (int i = 0; i < styleLength; i++)
+            {
+                int c = tagDefinition[i];
+
+                if (c == '\\' && i + 1 < styleLength)
+                {
+                    switch (tagDefinition[i + 1])
+                    {
+                        case '\\':
+                            i += 1;
+                            break;
+                        case 'n':
+                            c = 10;
+                            i += 1;
+                            break;
+                        case 'r':
+                            break;
+                        case 't':
+                            break;
+                        case 'u':
+                            // UTF16 format is "\uFF00" or u + 2 hex pairs.
+                            if (i + 5 < styleLength)
+                            {
+                                c = GetUTF16(tagDefinition, i + 2);
+
+                                i += 5;
+                            }
+                            break;
+                        case 'U':
+                            // UTF32 format is "\UFF00FF00" or U + 4 hex pairs.
+                            if (i + 9 < styleLength)
+                            {
+                                c = GetUTF32(tagDefinition, i + 2);
+
+                                i += 9;
+                            }
+                            break;
+                    }
+                }
+
+                if (c == '<')
+                {
+                    int hashCode = GetMarkupTagHashCode(tagDefinition, i + 1);
+
+                    switch ((MarkupTag)hashCode)
+                    {
+                        case MarkupTag.BR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 10;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.CR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 13;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.NBSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 160;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.ZWSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = k_ZeroWidthSpace;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.SHY:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 0xAD;
+                            writeIndex += 1;
+                            i += 4;
+                            continue;
+                        case MarkupTag.STYLE:
+                            if (ReplaceOpeningStyleTag(ref tagDefinition, i, out int offset, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings))
+                            {
+                                i = offset;
+                                continue;
+                            }
+                            break;
+                        case MarkupTag.SLASH_STYLE:
+                            ReplaceClosingStyleTag(ref tagDefinition, i, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings);
+
+                            i += 7;
+                            continue;
+                    }
+                }
+
+                if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                charBuffer[writeIndex].unicode = c;
+                writeIndex += 1;
+            }
+
+            textStyleStackDepth -= 1;
+
+            return true;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="charBuffer"></param>
+        /// <param name="writeIndex"></param>
+        public static void InsertClosingStyleTag(ref UnicodeChar[] charBuffer, ref int writeIndex, ref int textStyleStackDepth, ref TextProcessingStack<int>[] textStyleStacks, ref TextGenerationSettings generationSettings)
+        {
+            // Get style from the Style Stack
+            int styleHashCode = textStyleStacks[0].Pop();
+            TextStyle style = GetStyle(generationSettings, styleHashCode);
+
+            int styleLength = style.styleClosingTagArray.Length;
+
+            // Replace <style> tag with opening definition
+            int[] tagDefinition = style.styleClosingTagArray;
+
+            for (int i = 0; i < styleLength; i++)
+            {
+                int c = tagDefinition[i];
+
+                if (c == '\\' && i + 1 < styleLength)
+                {
+                    switch (tagDefinition[i + 1])
+                    {
+                        case '\\':
+                            i += 1;
+                            break;
+                        case 'n':
+                            c = 10;
+                            i += 1;
+                            break;
+                        case 'r':
+                            break;
+                        case 't':
+                            break;
+                        case 'u':
+                            // UTF16 format is "\uFF00" or u + 2 hex pairs.
+                            if (i + 5 < styleLength)
+                            {
+                                c = GetUTF16(tagDefinition, i + 2);
+
+                                i += 5;
+                            }
+                            break;
+                        case 'U':
+                            // UTF32 format is "\UFF00FF00" or U + 4 hex pairs.
+                            if (i + 9 < styleLength)
+                            {
+                                c = GetUTF32(tagDefinition, i + 2);
+
+                                i += 9;
+                            }
+                            break;
+                    }
+                }
+
+                if (c == '<')
+                {
+                    int hashCode = GetMarkupTagHashCode(tagDefinition, i + 1);
+
+                    switch ((MarkupTag)hashCode)
+                    {
+                        case MarkupTag.BR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 10;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.CR:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 13;
+                            writeIndex += 1;
+                            i += 3;
+                            continue;
+                        case MarkupTag.NBSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 160;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.ZWSP:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = k_ZeroWidthSpace;
+                            writeIndex += 1;
+                            i += 5;
+                            continue;
+                        case MarkupTag.SHY:
+                            if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                            charBuffer[writeIndex].unicode = 0xAD;
+                            writeIndex += 1;
+                            i += 4;
+                            continue;
+                        case MarkupTag.STYLE:
+                            if (ReplaceOpeningStyleTag(ref tagDefinition, i, out int offset, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings))
+                            {
+                                i = offset;
+                                continue;
+                            }
+                            break;
+                        case MarkupTag.SLASH_STYLE:
+                            ReplaceClosingStyleTag(ref tagDefinition, i, ref charBuffer, ref writeIndex, ref textStyleStackDepth, ref textStyleStacks, ref generationSettings);
+
+                            i += 7;
+                            continue;
+                    }
+                }
+
+                if (writeIndex == charBuffer.Length) ResizeInternalArray(ref charBuffer);
+
+                charBuffer[writeIndex].unicode = c;
+                writeIndex += 1;
+            }
+
+            textStyleStackDepth = 0;
+        }
+
+        public static TextStyle GetStyle(TextGenerationSettings generationSetting, int hashCode)
+        {
+            TextStyle style = null;
+
+            TextStyleSheet styleSheet = generationSetting.styleSheet;
+
+            // Get Style from Style Sheet potentially assigned to text object.
+            if (styleSheet != null)
+            {
+                style = styleSheet.GetStyle(hashCode);
+
+                if (style != null)
+                    return style;
+            }
+
+            // Use Global Style Sheet (if exists)
+            styleSheet = generationSetting.textSettings.defaultStyleSheet;
+
+            if (styleSheet != null)
+                style = styleSheet.GetStyle(hashCode);
+
+            return style;
+        }
+
+        /// <summary>
+        /// Get Hashcode for a given tag.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="index"></param>
+        /// <param name="closeIndex"></param>
+        /// <returns></returns>
+        public static int GetStyleHashCode(ref int[] text, int index, out int closeIndex)
+        {
+            int hashCode = 0;
+            closeIndex = 0;
+
+            for (int i = index; i < text.Length; i++)
+            {
+                // Skip quote '"' character
+                if (text[i] == k_DoubleQuotes) continue;
+
+                // Break at '>'
+                if (text[i] == k_GreaterThan) { closeIndex = i; break; }
+
+                hashCode = (hashCode << 5) + hashCode ^ ToUpperASCIIFast((char)text[i]);
+            }
+
+            return hashCode;
+        }
+
+        /// <summary>
+        /// Get Hashcode for a given tag.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="index"></param>
+        /// <param name="closeIndex"></param>
+        /// <returns></returns>
+        public static int GetStyleHashCode(ref TextBackingContainer text, int index, out int closeIndex)
+        {
+            int hashCode = 0;
+            closeIndex = 0;
+
+            for (int i = index; i < text.Capacity; i++)
+            {
+                // Skip quote '"' character
+                if (text[i] == k_DoubleQuotes) continue;
+
+                // Break at '>'
+                if (text[i] == k_GreaterThan) { closeIndex = i; break; }
+
+                hashCode = (hashCode << 5) + hashCode ^ ToUpperASCIIFast((char)text[i]);
+            }
+
+            return hashCode;
+        }
+
+        /// <summary>
+        /// Convert UTF-32 Hex to Char
+        /// </summary>
+        /// <returns>The Unicode hex.</returns>
+        /// <param name="text"></param>
+        /// <param name="i">The index.</param>
+        public static int GetUtf32(string text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt(text[i]) << 30;
+            unicode += HexToInt(text[i + 1]) << 24;
+            unicode += HexToInt(text[i + 2]) << 20;
+            unicode += HexToInt(text[i + 3]) << 16;
+            unicode += HexToInt(text[i + 4]) << 12;
+            unicode += HexToInt(text[i + 5]) << 8;
+            unicode += HexToInt(text[i + 6]) << 4;
+            unicode += HexToInt(text[i + 7]);
+            return unicode;
+        }
+
+        /// <summary>
+        /// Convert UTF-16 Hex to Char
+        /// </summary>
+        /// <returns>The Unicode hex.</returns>
+        /// <param name="text"></param>
+        /// <param name="i">The index.</param>
+        public static int GetUtf16(string text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt(text[i]) << 12;
+            unicode += HexToInt(text[i + 1]) << 8;
+            unicode += HexToInt(text[i + 2]) << 4;
+            unicode += HexToInt(text[i + 3]);
+            return unicode;
+        }
+
+        /// <summary>
+        /// Convert UTF-16 Hex to Char
+        /// </summary>
+        /// <returns>The Unicode hex.</returns>
+        /// <param name="i">The index.</param>
+        public static int GetUTF16(string text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt(text[i]) << 12;
+            unicode += HexToInt(text[i + 1]) << 8;
+            unicode += HexToInt(text[i + 2]) << 4;
+            unicode += HexToInt(text[i + 3]);
+            return unicode;
+        }
+
+        public static int GetUTF16(int[] text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt((char)text[i]) << 12;
+            unicode += HexToInt((char)text[i + 1]) << 8;
+            unicode += HexToInt((char)text[i + 2]) << 4;
+            unicode += HexToInt((char)text[i + 3]);
+            return unicode;
+        }
+
+        public static int GetUTF16(uint[] text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt((char)text[i]) << 12;
+            unicode += HexToInt((char)text[i + 1]) << 8;
+            unicode += HexToInt((char)text[i + 2]) << 4;
+            unicode += HexToInt((char)text[i + 3]);
+            return unicode;
+        }
+
+        /// <summary>
+        /// Convert UTF-16 Hex to Char
+        /// </summary>
+        /// <returns>The Unicode hex.</returns>
+        /// <param name="i">The index.</param>
+        public static int GetUTF16(StringBuilder text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt(text[i]) << 12;
+            unicode += HexToInt(text[i + 1]) << 8;
+            unicode += HexToInt(text[i + 2]) << 4;
+            unicode += HexToInt(text[i + 3]);
+            return unicode;
+        }
+
+        public static int GetUTF16(TextBackingContainer text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt((char)text[i]) << 12;
+            unicode += HexToInt((char)text[i + 1]) << 8;
+            unicode += HexToInt((char)text[i + 2]) << 4;
+            unicode += HexToInt((char)text[i + 3]);
+            return unicode;
+        }
+
+        /// <summary>
+        /// Convert UTF-32 Hex to Char
+        /// </summary>
+        /// <returns>The Unicode hex.</returns>
+        /// <param name="i">The index.</param>
+        public static int GetUTF32(string text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt(text[i]) << 28;
+            unicode += HexToInt(text[i + 1]) << 24;
+            unicode += HexToInt(text[i + 2]) << 20;
+            unicode += HexToInt(text[i + 3]) << 16;
+            unicode += HexToInt(text[i + 4]) << 12;
+            unicode += HexToInt(text[i + 5]) << 8;
+            unicode += HexToInt(text[i + 6]) << 4;
+            unicode += HexToInt(text[i + 7]);
+            return unicode;
+        }
+
+        public static int GetUTF32(int[] text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt((char)text[i]) << 28;
+            unicode += HexToInt((char)text[i + 1]) << 24;
+            unicode += HexToInt((char)text[i + 2]) << 20;
+            unicode += HexToInt((char)text[i + 3]) << 16;
+            unicode += HexToInt((char)text[i + 4]) << 12;
+            unicode += HexToInt((char)text[i + 5]) << 8;
+            unicode += HexToInt((char)text[i + 6]) << 4;
+            unicode += HexToInt((char)text[i + 7]);
+            return unicode;
+        }
+
+        public static int GetUTF32(uint[] text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt((char)text[i]) << 28;
+            unicode += HexToInt((char)text[i + 1]) << 24;
+            unicode += HexToInt((char)text[i + 2]) << 20;
+            unicode += HexToInt((char)text[i + 3]) << 16;
+            unicode += HexToInt((char)text[i + 4]) << 12;
+            unicode += HexToInt((char)text[i + 5]) << 8;
+            unicode += HexToInt((char)text[i + 6]) << 4;
+            unicode += HexToInt((char)text[i + 7]);
+            return unicode;
+        }
+
+        /// <summary>
+        /// Convert UTF-32 Hex to Char
+        /// </summary>
+        /// <returns>The Unicode hex.</returns>
+        /// <param name="i">The index.</param>
+        public static int GetUTF32(StringBuilder text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt(text[i]) << 28;
+            unicode += HexToInt(text[i + 1]) << 24;
+            unicode += HexToInt(text[i + 2]) << 20;
+            unicode += HexToInt(text[i + 3]) << 16;
+            unicode += HexToInt(text[i + 4]) << 12;
+            unicode += HexToInt(text[i + 5]) << 8;
+            unicode += HexToInt(text[i + 6]) << 4;
+            unicode += HexToInt(text[i + 7]);
+            return unicode;
+        }
+
+        public static int GetUTF32(TextBackingContainer text, int i)
+        {
+            int unicode = 0;
+            unicode += HexToInt((char)text[i]) << 28;
+            unicode += HexToInt((char)text[i + 1]) << 24;
+            unicode += HexToInt((char)text[i + 2]) << 20;
+            unicode += HexToInt((char)text[i + 3]) << 16;
+            unicode += HexToInt((char)text[i + 4]) << 12;
+            unicode += HexToInt((char)text[i + 5]) << 8;
+            unicode += HexToInt((char)text[i + 6]) << 4;
+            unicode += HexToInt((char)text[i + 7]);
+            return unicode;
+        }
+
+        /// <summary>
+        /// Get Hashcode for a given tag.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="index"></param>
+        /// <param name="closeIndex"></param>
+        /// <returns></returns>
+        static int GetTagHashCode(ref int[] text, int index, out int closeIndex)
+        {
+            int hashCode = 0;
+            closeIndex = 0;
+
+            for (int i = index; i < text.Length; i++)
+            {
+                // Skip quote '"' character
+                if (text[i] == 34)
+                    continue;
+
+                // Break at '>'
+                if (text[i] == 62)
+                {
+                    closeIndex = i;
+                    break;
+                }
+
+                hashCode = (hashCode << 5) + hashCode ^ (int)TextUtilities.ToUpperASCIIFast((char)text[i]);
+            }
+
+            return hashCode;
+        }
+
+        /// <summary>
+        /// Get Hashcode for a given tag.
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="index"></param>
+        /// <param name="closeIndex"></param>
+        /// <returns></returns>
+        static int GetTagHashCode(ref string text, int index, out int closeIndex)
+        {
+            int hashCode = 0;
+            closeIndex = 0;
+
+            for (int i = index; i < text.Length; i++)
+            {
+                // Skip quote '"' character
+                if (text[i] == 34)
+                    continue;
+
+                // Break at '>'
+                if (text[i] == 62)
+                {
+                    closeIndex = i;
+                    break;
                 }
 
                 hashCode = (hashCode << 5) + hashCode ^ (int)TextUtilities.ToUpperASCIIFast(text[i]);
@@ -963,7 +2158,7 @@ static int GetTagHashCode(ref string text, int index, out int closeIndex)
         /// <param name="i"></param>
         /// <param name="generationSettings"></param>
         /// <param name="textInfo"></param>
-        public static void FillCharacterVertexBuffers(int i, TextGenerationSettings generationSettings, TextInfo textInfo)
+        public static void FillCharacterVertexBuffers(int i, bool convertToLinearSpace, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             int materialIndex = textInfo.textElementInfo[i].materialReferenceIndex;
             int indexX4 = textInfo.meshInfo[materialIndex].vertexCount;
@@ -1018,10 +2213,10 @@ public static void FillCharacterVertexBuffers(int i, TextGenerationSettings gene
             textInfo.meshInfo[materialIndex].uvs2[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv2;
 
             // setup Vertex Colors
-            textInfo.meshInfo[materialIndex].colors32[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.color;
-            textInfo.meshInfo[materialIndex].colors32[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.color;
-            textInfo.meshInfo[materialIndex].colors32[2 + indexX4] = textElementInfoArray[i].vertexTopRight.color;
-            textInfo.meshInfo[materialIndex].colors32[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.color;
+            textInfo.meshInfo[materialIndex].colors32[0 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomLeft.color) : textElementInfoArray[i].vertexBottomLeft.color;
+            textInfo.meshInfo[materialIndex].colors32[1 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopLeft.color) : textElementInfoArray[i].vertexTopLeft.color;
+            textInfo.meshInfo[materialIndex].colors32[2 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopRight.color) : textElementInfoArray[i].vertexTopRight.color;
+            textInfo.meshInfo[materialIndex].colors32[3 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomRight.color) : textElementInfoArray[i].vertexBottomRight.color;
 
             textInfo.meshInfo[materialIndex].vertexCount = indexX4 + 4;
         }
@@ -1032,7 +2227,7 @@ public static void FillCharacterVertexBuffers(int i, TextGenerationSettings gene
         /// <param name="i"></param>
         /// <param name="generationSettings"></param>
         /// <param name="textInfo"></param>
-        public static void FillSpriteVertexBuffers(int i, TextGenerationSettings generationSettings, TextInfo textInfo)
+        public static void FillSpriteVertexBuffers(int i, bool convertToLinearSpace, TextGenerationSettings generationSettings, TextInfo textInfo)
         {
             int materialIndex = textInfo.textElementInfo[i].materialReferenceIndex;
             int indexX4 = textInfo.meshInfo[materialIndex].vertexCount;
@@ -1083,10 +2278,10 @@ public static void FillSpriteVertexBuffers(int i, TextGenerationSettings generat
             textInfo.meshInfo[materialIndex].uvs2[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.uv2;
 
             // setup Vertex Colors
-            textInfo.meshInfo[materialIndex].colors32[0 + indexX4] = textElementInfoArray[i].vertexBottomLeft.color;
-            textInfo.meshInfo[materialIndex].colors32[1 + indexX4] = textElementInfoArray[i].vertexTopLeft.color;
-            textInfo.meshInfo[materialIndex].colors32[2 + indexX4] = textElementInfoArray[i].vertexTopRight.color;
-            textInfo.meshInfo[materialIndex].colors32[3 + indexX4] = textElementInfoArray[i].vertexBottomRight.color;
+            textInfo.meshInfo[materialIndex].colors32[0 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomLeft.color) : textElementInfoArray[i].vertexBottomLeft.color;
+            textInfo.meshInfo[materialIndex].colors32[1 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopLeft.color) : textElementInfoArray[i].vertexTopLeft.color;
+            textInfo.meshInfo[materialIndex].colors32[2 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexTopRight.color) : textElementInfoArray[i].vertexTopRight.color;
+            textInfo.meshInfo[materialIndex].colors32[3 + indexX4] = convertToLinearSpace ? GammaToLinear(textElementInfoArray[i].vertexBottomRight.color) : textElementInfoArray[i].vertexBottomRight.color;
 
             textInfo.meshInfo[materialIndex].vertexCount = indexX4 + 4;
         }
@@ -1185,5 +2380,188 @@ public static TextAlignment LegacyAlignmentToNewAlignment(TextAnchor anchor)
                     return TextAlignment.TopLeft;
             }
         }
+
+        public static uint ConvertToUTF32(uint highSurrogate, uint lowSurrogate)
+        {
+            return ((highSurrogate - CodePoint.HIGH_SURROGATE_START) * 0x400) + ((lowSurrogate - CodePoint.LOW_SURROGATE_START) + CodePoint.UNICODE_PLANE01_START);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="tagDefinition"></param>
+        /// <param name="readIndex"></param>
+        /// <returns></returns>
+        public static int GetMarkupTagHashCode(TextBackingContainer tagDefinition, int readIndex)
+        {
+            int hashCode = 0;
+            int maxReadIndex = readIndex + 16;
+            int tagDefinitionLength = tagDefinition.Capacity;
+
+            for (; readIndex < maxReadIndex && readIndex < tagDefinitionLength; readIndex++)
+            {
+                uint c = tagDefinition[readIndex];
+
+                if (c == '>' || c == '=' || c == ' ')
+                    return hashCode;
+
+                hashCode = ((hashCode << 5) + hashCode) ^ (int)ToUpperASCIIFast((uint)c);
+            }
+
+            return hashCode;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="tagDefinition"></param>
+        /// <param name="readIndex"></param>
+        /// <returns></returns>
+        public static int GetMarkupTagHashCode(int[] tagDefinition, int readIndex)
+        {
+            int hashCode = 0;
+            int maxReadIndex = readIndex + 16;
+            int tagDefinitionLength = tagDefinition.Length;
+
+            for (; readIndex < maxReadIndex && readIndex < tagDefinitionLength; readIndex++)
+            {
+                int c = tagDefinition[readIndex];
+
+                if (c == '>' || c == '=' || c == ' ')
+                    return hashCode;
+
+                hashCode = ((hashCode << 5) + hashCode) ^ (int)ToUpperASCIIFast((uint)c);
+            }
+
+            return hashCode;
+        }
+
+        /// <summary>
+        /// Get uppercase version of this ASCII character.
+        /// </summary>
+        //[MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static char ToUpperASCIIFast(char c)
+        {
+            if (c > k_LookupStringU.Length - 1)
+                return c;
+
+            return k_LookupStringU[c];
+        }
+
+
+        /// <summary>
+        /// Get uppercase version of this ASCII character.
+        /// </summary>
+        //[MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static uint ToUpperASCIIFast(uint c)
+        {
+            if (c > k_LookupStringU.Length - 1)
+                return c;
+
+            return k_LookupStringU[(int)c];
+        }
+
+        /// <summary>
+        /// Get uppercase version of this ASCII character.
+        /// </summary>
+        public static char ToUpperFast(char c)
+        {
+            if (c > k_LookupStringU.Length - 1)
+                return c;
+
+            return k_LookupStringU[c];
+        }
+
+        /// <summary>
+        /// Method which returns the number of parameters used in a tag attribute and populates an array with such values.
+        /// </summary>
+        /// <param name="chars">Char[] containing the tag attribute and data</param>
+        /// <param name="startIndex">The index of the first char of the data</param>
+        /// <param name="length">The length of the data</param>
+        /// <param name="parameters">The number of parameters contained in the Char[]</param>
+        /// <returns></returns>
+        public static int GetAttributeParameters(char[] chars, int startIndex, int length, ref float[] parameters)
+        {
+            int endIndex = startIndex;
+            int attributeCount = 0;
+
+            while (endIndex < startIndex + length)
+            {
+                parameters[attributeCount] = ConvertToFloat(chars, startIndex, length, out endIndex);
+
+                length -= (endIndex - startIndex) + 1;
+                startIndex = endIndex + 1;
+
+                attributeCount += 1;
+            }
+
+            return attributeCount;
+        }
+
+        public static bool IsBaseGlyph(uint c)
+        {
+            return !(c >= 0x300 && c <= 0x36F || c >= 0x1AB0 && c <= 0x1AFF || c >= 0x1DC0 && c <= 0x1DFF || c >= 0x20D0 && c <= 0x20FF || c >= 0xFE20 && c <= 0xFE2F ||
+                // Thai Marks
+                c == 0xE31 || c >= 0xE34 && c <= 0xE3A || c >= 0xE47 && c <= 0xE4E ||
+                // Hebrew Marks
+                c >= 0x591 && c <= 0x5BD || c == 0x5BF || c >= 0x5C1 && c <= 0x5C2 || c >= 0x5C4 && c <= 0x5C5 || c == 0x5C7 ||
+                // Arabic Marks
+                c >= 0x610 && c <= 0x61A || c >= 0x64B && c <= 0x65F || c == 0x670 || c >= 0x6D6 && c <= 0x6DC || c >= 0x6DF && c <= 0x6E4 || c >= 0x6E7 && c <= 0x6E8 || c >= 0x6EA && c <= 0x6ED ||
+                c >= 0x8D3 && c <= 0x8E1 || c >= 0x8E3 && c <= 0x8FF ||
+                c >= 0xFBB2 && c <= 0xFBC1
+            );
+        }
+
+        public static Color MinAlpha(this Color c1, Color c2)
+        {
+            float a = c1.a < c2.a ? c1.a : c2.a;
+
+            return new Color(c1.r, c1.g, c1.b, a);
+        }
+
+        internal static Color32 GammaToLinear(Color32 c)
+        {
+            return new Color32(GammaToLinear(c.r), GammaToLinear(c.g), GammaToLinear(c.b), c.a);
+        }
+
+        static byte GammaToLinear(byte value)
+        {
+            float v = value / 255f;
+
+            if (v <= 0.04045f)
+                return (byte)(v / 12.92f * 255f);
+
+            if (v < 1.0f)
+                return (byte)(Mathf.Pow((v + 0.055f) / 1.055f, 2.4f) * 255);
+
+            if (v == 1.0f)
+                return 255;
+
+            return (byte)(Mathf.Pow(v, 2.2f) * 255);
+        }
+
+        public static bool IsValidUTF16(TextBackingContainer text, int index)
+        {
+            for (int i = 0; i < 4; i++)
+            {
+                uint c = text[index + i];
+                if (!(c >= '0' && c <= '9' || c >= 'a' && c <= 'f' || c >= 'A' && c <= 'F'))
+                    return false;
+            }
+
+            return true;
+        }
+
+        public static bool IsValidUTF32(TextBackingContainer text, int index)
+        {
+            for (int i = 0; i < 8; i++)
+            {
+                uint c = text[index + i];
+                if (!(c >= '0' && c <= '9' || c >= 'a' && c <= 'f' || c >= 'A' && c <= 'F'))
+                    return false;
+            }
+
+            return true;
+        }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextHandle.cs b/Modules/TextCoreTextEngine/Managed/TextHandle.cs
index 3deee034a7..bd87f68fe8 100644
--- a/Modules/TextCoreTextEngine/Managed/TextHandle.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextHandle.cs
@@ -294,6 +294,10 @@ public int FindNearestCharacterOnLine(Vector2 position, int line, bool visibleOn
                 var cInfo = textInfo.textElementInfo[i];
                 if (visibleOnly && !cInfo.isVisible) continue;
 
+                // Ignore Carriage Returns <CR>
+                if (cInfo.character == '\r')
+                    continue;
+
                 // Get Bottom Left and Top Right position of the current character
                 Vector3 bl = cInfo.bottomLeft;
                 Vector3 tl = new Vector3(cInfo.bottomLeft.x, cInfo.topRight.y, 0);
@@ -446,7 +450,7 @@ public bool IsElided()
             if (textInfo.characterCount == 0) // impossible to differentiate between an empty string and a fully truncated string.
                 return true;
 
-            return textInfo.textElementInfo[textInfo.characterCount - 1].character == 0x2026; //the character is hardcoded in textcore
+            return TextGenerator.isTextTruncated;
         }
     }
 }
diff --git a/Modules/TextCoreTextEngine/Managed/TextInfo.cs b/Modules/TextCoreTextEngine/Managed/TextInfo.cs
index b5c1d24616..cab10a14bb 100644
--- a/Modules/TextCoreTextEngine/Managed/TextInfo.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextInfo.cs
@@ -125,6 +125,26 @@ internal void ClearLineInfo()
             }
         }
 
+        /// <summary>
+        ///
+        /// </summary>
+        internal void ClearPageInfo()
+        {
+            if (pageInfo == null)
+                pageInfo = new PageInfo[2];
+
+            int length = pageInfo.Length;
+
+            for (int i = 0; i < length; i++)
+            {
+                pageInfo[i].firstCharacterIndex = 0;
+                pageInfo[i].lastCharacterIndex = 0;
+                pageInfo[i].ascender = -32767;
+                pageInfo[i].baseLine = 0;
+                pageInfo[i].descender = 32767;
+            }
+        }
+
         /// <summary>
         /// Function to resize any of the structure contained in the TextInfo class.
         /// </summary>
diff --git a/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs b/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs
index 8dffabb214..824c41c9f4 100644
--- a/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextMarkupTagsCommon.cs
@@ -80,6 +80,15 @@ internal enum MarkupTag : int
         ROTATE = -1000007783,               // <rotate>
         SLASH_ROTATE = -764695562,          // </rotate>
 
+        TABLE = 226476955,                  // <table>
+        SLASH_TABLE = -979118220,           // </table>
+        TH = 5862489,                       // <th>
+        SLASH_TH = 193346070,               // </th>
+        TR = 5862467,                       // <tr>
+        SLASH_TR = 193346060,               // </tr>
+        TD = 5862485,                       // <td>
+        SLASH_TD = 193346074,               // </td>
+
         LOWERCASE = -1506899689,            // <lowercase>
         SLASH_LOWERCASE = -1451284584,      // </lowercase>
         ALLCAPS = 218273952,                // <allcaps>
@@ -104,6 +113,8 @@ internal enum MarkupTag : int
         HREF = 2535353,                 // <a href="url">text to be displayed.</a>
         ANGLE = 75347905,               // <i angle="40">Italic Slant Angle</i>
         PADDING = -2144568463,
+        FAMILYNAME = 704251153,
+        STYLENAME = -1207081936,
 
         // Named Colors
         RED = 91635,
@@ -117,6 +128,7 @@ internal enum MarkupTag : int
 
         // Unicode Characters
         BR = 2256,                          // <br> Line Feed (LF) \u0A
+        CR = 2289,                          // <cr> Carriage Return (CR) \u000D
         ZWSP = 3288238,                     // <zwsp> Zero Width Space \u200B
         NBSP = 2869039,                     // <nbsp> Non Breaking Space \u00A0
         SHY = 92674,                        // <SHY> Soft Hyphen \u00AD
@@ -149,9 +161,11 @@ internal enum MarkupTag : int
         FALSE = 85422813,
 
         INVALID = 1585415185,
+        NOTDEF = 612146780,             // .notdef
 
         NORMAL = -1183493901,           // <style="Normal">
         DEFAULT = -620974005,           // <font="Default">
+        REGULAR = 1291372090,
     }
 
     /// <summary>
@@ -175,7 +189,7 @@ internal enum TagUnitType
     /// <summary>
     /// Commonly referenced Unicode characters in the text generation process.
     /// </summary>
-    internal static class UnicodeCodePoint
+    internal static class CodePoint
     {
         public const uint SPACE = 0x20;
         public const uint DOUBLE_QUOTE = 0x22;
diff --git a/Modules/TextCoreTextEngine/Managed/TextResourcesManager.cs b/Modules/TextCoreTextEngine/Managed/TextResourcesManager.cs
index 9c572e5baf..f16b83a42e 100644
--- a/Modules/TextCoreTextEngine/Managed/TextResourcesManager.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextResourcesManager.cs
@@ -51,7 +51,8 @@ struct FontAssetRef
 
             public FontAssetRef(int nameHashCode, int familyNameHashCode, int styleNameHashCode, FontAsset fontAsset)
             {
-                this.nameHashCode = nameHashCode;
+                // Use familyNameHashCode for font assets created at runtime as these asset do not typically have a names.
+                this.nameHashCode = nameHashCode != 0 ? nameHashCode : familyNameHashCode;
                 this.familyNameHashCode = familyNameHashCode;
                 this.styleNameHashCode = styleNameHashCode;
                 this.familyNameAndStyleHashCode = (long)styleNameHashCode << 32 | (uint)familyNameHashCode;
@@ -127,15 +128,16 @@ internal static void AddFontAsset(FontAsset fontAsset)
         /// Remove font asset from resource manager.
         /// </summary>
         /// <param name="fontAsset">Font asset to be removed from the resource manager.</param>
-        internal static void RemoveFontAsset(FontAsset fontAsset)
+        public static void RemoveFontAsset(FontAsset fontAsset)
         {
-            //int hashCode = fontAsset.hashCode;
+            int instanceID = fontAsset.instanceID;
 
-            //if (s_FontAssetReferenceLookup.ContainsKey(hashCode))
-            //{
-            //    s_FontAssetReferenceLookup.Remove(hashCode);
-            //    s_FontAssetReferences.Remove(fontAsset);
-            //}
+            if (s_FontAssetReferences.TryGetValue(instanceID, out FontAssetRef reference))
+            {
+                s_FontAssetNameReferenceLookup.Remove(reference.nameHashCode);
+                s_FontAssetFamilyNameAndStyleReferenceLookup.Remove(reference.familyNameAndStyleHashCode);
+                s_FontAssetReferences.Remove(instanceID);
+            }
         }
 
         /// <summary>
diff --git a/Modules/TextCoreTextEngine/Managed/TextSettings.cs b/Modules/TextCoreTextEngine/Managed/TextSettings.cs
index 7c06f98010..b8e7322cd0 100644
--- a/Modules/TextCoreTextEngine/Managed/TextSettings.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextSettings.cs
@@ -80,6 +80,7 @@ public int missingCharacterUnicode
         [FormerlySerializedAs("m_missingGlyphCharacter")][SerializeField]
         protected int m_MissingCharacterUnicode;
 
+
         /// <summary>
         /// Determines if the "Clear Dynamic Data on Build" property will be set to true or false on newly created dynamic font assets.
         /// </summary>
diff --git a/Modules/TextCoreTextEngine/Managed/TextUtilities.cs b/Modules/TextCoreTextEngine/Managed/TextUtilities.cs
index edb4c14633..0987be48d7 100644
--- a/Modules/TextCoreTextEngine/Managed/TextUtilities.cs
+++ b/Modules/TextCoreTextEngine/Managed/TextUtilities.cs
@@ -149,7 +149,7 @@ public static uint GetSimpleHashCodeLowercase(string s)
         /// <returns></returns>
         internal static uint ConvertToUTF32(uint highSurrogate, uint lowSurrogate)
         {
-            return ((highSurrogate - UnicodeCodePoint.HIGH_SURROGATE_START) * 0x400) + ((lowSurrogate - UnicodeCodePoint.LOW_SURROGATE_START) + UnicodeCodePoint.UNICODE_PLANE01_START);
+            return ((highSurrogate - CodePoint.HIGH_SURROGATE_START) * 0x400) + ((lowSurrogate - CodePoint.LOW_SURROGATE_START) + CodePoint.UNICODE_PLANE01_START);
         }
 
         /// <summary>
diff --git a/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreatorWindow.cs b/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreatorWindow.cs
index 5adb65209b..7500a7c0f4 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreatorWindow.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/FontAssetCreatorWindow.cs
@@ -71,8 +71,8 @@ public static void ShowFontAtlasCreatorWindow(FontAsset fontAsset)
                 window.LoadFontCreationSettings(fontAsset.fontAssetCreationEditorSettings);
 
                 // Override settings to inject character list from font asset
-                window.m_CharacterSetSelectionMode = 6;
-                window.m_CharacterSequence = TextCoreEditorUtilities.GetUnicodeCharacterSequence(FontAsset.GetCharactersArray(fontAsset));
+                // window.m_CharacterSetSelectionMode = 6;
+                // window.m_CharacterSequence = TextCoreEditorUtilities.GetUnicodeCharacterSequence(FontAsset.GetCharactersArray(fontAsset));
 
 
                 window.m_ReferencedFontAsset = fontAsset;
@@ -688,7 +688,7 @@ void DrawControls()
                     m_IsFontAtlasInvalid = true;
                 }
 
-                m_IncludeFontFeatures = EditorGUILayout.Toggle("Get Kerning Pairs", m_IncludeFontFeatures);
+                m_IncludeFontFeatures = EditorGUILayout.Toggle("Get Font Features", m_IncludeFontFeatures);
 
                 EditorGUILayout.Space();
             }
@@ -848,7 +848,7 @@ void DrawControls()
                                     m_PointSize = (maxPointSize + minPointSize) / 2;
 
                                     bool optimumPointSizeFound = false;
-                                    for (int iteration = 0; iteration < 15 && optimumPointSizeFound == false; iteration++)
+                                    for (int iteration = 0; iteration < 15 && optimumPointSizeFound == false && m_PointSize > 0; iteration++)
                                     {
                                         m_AtlasGenerationProgressLabel = "Packing glyphs - Pass (" + iteration + ")";
 
@@ -1435,7 +1435,7 @@ void Save_Bitmap_FontAsset(string filePath)
 
                 // Get and Add Kerning Pairs to Font Asset
                 if (m_IncludeFontFeatures)
-                    fontAsset.fontFeatureTable = GetKerningTable();
+                    fontAsset.fontFeatureTable = GetAllFontFeatures();
 
 
                 // Add Font Atlas as Sub-Asset
@@ -1481,7 +1481,7 @@ void Save_Bitmap_FontAsset(string filePath)
 
                 // Get and Add Kerning Pairs to Font Asset
                 if (m_IncludeFontFeatures)
-                    fontAsset.fontFeatureTable = GetKerningTable();
+                    fontAsset.fontFeatureTable = GetAllFontFeatures();
 
                 // Destroy Assets that will be replaced.
                 if (fontAsset.atlasTextures != null && fontAsset.atlasTextures.Length > 0)
@@ -1611,7 +1611,7 @@ void Save_SDF_FontAsset(string filePath)
 
                 // Get and Add Kerning Pairs to Font Asset
                 if (m_IncludeFontFeatures)
-                    fontAsset.fontFeatureTable = GetKerningTable();
+                    fontAsset.fontFeatureTable = GetAllFontFeatures();
 
                 // Add Font Atlas as Sub-Asset
                 fontAsset.atlasTextures = new Texture2D[] { m_FontAtlasTexture };
@@ -1667,7 +1667,7 @@ void Save_SDF_FontAsset(string filePath)
                 // Get and Add Kerning Pairs to Font Asset
                 // TODO: Check and preserve existing adjustment pairs.
                 if (m_IncludeFontFeatures)
-                    fontAsset.fontFeatureTable = GetKerningTable();
+                    fontAsset.fontFeatureTable = GetAllFontFeatures();
 
                 // Destroy Assets that will be replaced.
                 if (fontAsset.atlasTextures != null && fontAsset.atlasTextures.Length > 0)
@@ -1786,6 +1786,7 @@ void LoadFontCreationSettings(FontAssetCreationEditorSettings settings)
         {
             m_SourceFont = AssetDatabase.LoadAssetAtPath<Font>(AssetDatabase.GUIDToAssetPath(settings.sourceFontFileGUID));
             m_SourceFontFaceIndex = settings.faceIndex;
+            m_SourceFontFaces = GetFontFaces();
             m_PointSizeSamplingMode  = settings.pointSizeSamplingMode;
             m_PointSize = settings.pointSize;
             m_Padding = settings.padding;
@@ -1910,15 +1911,29 @@ void CheckForLegacyGlyphRenderMode()
             }
         }
 
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        FontFeatureTable GetAllFontFeatures()
+        {
+            FontFeatureTable fontFeatureTable = new FontFeatureTable();
+
+            PopulateGlyphAdjustmentTable(fontFeatureTable);
+
+
+            return fontFeatureTable;
+        }
+
         // Get Kerning Pairs
-        public FontFeatureTable GetKerningTable()
+        void PopulateGlyphAdjustmentTable(FontFeatureTable fontFeatureTable)
         {
             GlyphPairAdjustmentRecord[] adjustmentRecords = FontEngine.GetGlyphPairAdjustmentTable(m_AvailableGlyphsToAdd.ToArray());
 
             if (adjustmentRecords == null)
-                return null;
+                return;
 
-            FontFeatureTable fontFeatureTable = new FontFeatureTable();
+            // FontFeatureTable fontFeatureTable = new FontFeatureTable();
 
             for (int i = 0; i < adjustmentRecords.Length && adjustmentRecords[i].firstAdjustmentRecord.glyphIndex != 0; i++)
             {
@@ -1926,8 +1941,7 @@ public FontFeatureTable GetKerningTable()
             }
 
             fontFeatureTable.SortGlyphPairAdjustmentRecords();
-
-            return fontFeatureTable;
         }
+
     }
 }
diff --git a/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs b/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs
index 3ca7807015..aa14759b44 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditor.cs
@@ -56,6 +56,7 @@ private struct UI_PanelState
             public static bool fontWeightPanel = true;
             public static bool fallbackFontAssetPanel = true;
             public static bool glyphTablePanel = false;
+            public static bool ligatureSubstitutionTablePanel = false;
             public static bool characterTablePanel = false;
             public static bool fontFeatureTablePanel = false;
             public static bool MarkToBaseTablePanel = false;
@@ -125,17 +126,19 @@ private struct Warning
 
         private int m_CurrentGlyphPage = 0;
         private int m_CurrentCharacterPage = 0;
+        private int m_CurrentLigaturePage = 0;
         private int m_CurrentKerningPage = 0;
         private int m_CurrentMarkToBasePage = 0;
         private int m_CurrentMarkToMarkPage = 0;
 
         private int m_SelectedGlyphRecord = -1;
         private int m_SelectedCharacterRecord = -1;
+        private int m_SelectedLigatureRecord = -1;
         private int m_SelectedAdjustmentRecord = -1;
         private int m_SelectedMarkToBaseRecord = -1;
         private int m_SelectedMarkToMarkRecord = -1;
 
-        enum RecordSelectionType { CharacterRecord, GlyphRecord, AdjustmentPairRecord, MarkToBaseRecord, MarkToMarkRecord }
+        enum RecordSelectionType { CharacterRecord, GlyphRecord, LigatureSubstitutionRecord, AdjustmentPairRecord, MarkToBaseRecord, MarkToMarkRecord }
 
         private string m_dstGlyphID;
         private string m_dstUnicode;
@@ -157,6 +160,9 @@ enum RecordSelectionType { CharacterRecord, GlyphRecord, AdjustmentPairRecord, M
         private string m_GlyphSearchPattern;
         private List<int> m_GlyphSearchList;
 
+        private string m_LigatureTableSearchPattern;
+        private List<int> m_LigatureTableSearchList;
+
         private string m_CharacterSearchPattern;
         private List<int> m_CharacterSearchList;
 
@@ -208,6 +214,7 @@ enum RecordSelectionType { CharacterRecord, GlyphRecord, AdjustmentPairRecord, M
         private FontFeatureTable m_FontFeatureTable;
         private SerializedProperty m_FontFeatureTable_prop;
         private SerializedProperty m_GlyphPairAdjustmentRecords_prop;
+        private SerializedProperty m_LigatureSubstitutionRecords_prop;
         private SerializedProperty m_MarkToBaseAdjustmentRecords_prop;
         private SerializedProperty m_MarkToMarkAdjustmentRecords_prop;
 
@@ -283,6 +290,7 @@ public void OnEnable()
 
             m_FontFeatureTable_prop = serializedObject.FindProperty("m_FontFeatureTable");
             m_GlyphPairAdjustmentRecords_prop = m_FontFeatureTable_prop.FindPropertyRelative("m_GlyphPairAdjustmentRecords");
+            m_LigatureSubstitutionRecords_prop = m_FontFeatureTable_prop.FindPropertyRelative("m_LigatureSubstitutionRecords");
             m_MarkToBaseAdjustmentRecords_prop = m_FontFeatureTable_prop.FindPropertyRelative("m_MarkToBaseAdjustmentRecords");
             m_MarkToMarkAdjustmentRecords_prop = m_FontFeatureTable_prop.FindPropertyRelative("m_MarkToMarkAdjustmentRecords");
 
@@ -1127,6 +1135,181 @@ public override void OnInspectorGUI()
             }
             #endregion
 
+            #region LIGATURE
+            EditorGUIUtility.labelWidth = labelWidth;
+            EditorGUIUtility.fieldWidth = fieldWidth;
+            EditorGUI.indentLevel = 0;
+            rect = EditorGUILayout.GetControlRect(false, 24);
+
+            int ligatureSubstitutionRecordCount = m_fontAsset.fontFeatureTable.ligatureRecords.Count;
+
+            if (GUI.Button(rect, new GUIContent("<b>Ligature Table</b>   [" + ligatureSubstitutionRecordCount + "]" + (rect.width > 340 ? " Records" : ""), "List of Ligature substitution records."), TM_EditorStyles.sectionHeader))
+                UI_PanelState.ligatureSubstitutionTablePanel = !UI_PanelState.ligatureSubstitutionTablePanel;
+
+            GUI.Label(rect, (UI_PanelState.ligatureSubstitutionTablePanel ? "" : s_UiStateLabel[1]), TM_EditorStyles.rightLabel);
+
+            if (UI_PanelState.ligatureSubstitutionTablePanel)
+            {
+                int arraySize = m_LigatureSubstitutionRecords_prop.arraySize;
+                int itemsPerPage = 20;
+
+                // Display Mark Adjust Records Management Tools
+                EditorGUILayout.BeginVertical(EditorStyles.helpBox);
+                {
+                    // Search Bar implementation
+                    #region DISPLAY SEARCH BAR
+                    EditorGUILayout.BeginHorizontal();
+                    {
+                        EditorGUIUtility.labelWidth = 150f;
+                        EditorGUI.BeginChangeCheck();
+                        string searchPattern = EditorGUILayout.TextField("Ligature Search", m_LigatureTableSearchPattern, "SearchTextField");
+                        if (EditorGUI.EndChangeCheck() || m_isSearchDirty)
+                        {
+                            if (string.IsNullOrEmpty(searchPattern) == false)
+                            {
+                                m_LigatureTableSearchPattern = searchPattern;
+
+                                // Search Glyph Table for potential matches
+                                SearchLigatureTable(m_LigatureTableSearchPattern, ref m_LigatureTableSearchList);
+                            }
+                            else
+                                m_LigatureTableSearchPattern = null;
+
+                            m_isSearchDirty = false;
+                        }
+
+                        string styleName = string.IsNullOrEmpty(m_LigatureTableSearchPattern) ? "SearchCancelButtonEmpty" : "SearchCancelButton";
+                        if (GUILayout.Button(GUIContent.none, styleName))
+                        {
+                            GUIUtility.keyboardControl = 0;
+                            m_LigatureTableSearchPattern = string.Empty;
+                        }
+                    }
+                    EditorGUILayout.EndHorizontal();
+                    #endregion
+
+                    // Display Page Navigation
+                    if (!string.IsNullOrEmpty(m_LigatureTableSearchPattern))
+                        arraySize = m_LigatureTableSearchList.Count;
+
+                    DisplayPageNavigation(ref m_CurrentLigaturePage, arraySize, itemsPerPage);
+                }
+                EditorGUILayout.EndVertical();
+
+                if (arraySize > 0)
+                {
+                    // Display each GlyphInfo entry using the GlyphInfo property drawer.
+                    for (int i = itemsPerPage * m_CurrentLigaturePage; i < arraySize && i < itemsPerPage * (m_CurrentLigaturePage + 1); i++)
+                    {
+                        // Define the start of the selection region of the element.
+                        Rect elementStartRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
+
+                        int elementIndex = i;
+                        if (!string.IsNullOrEmpty(m_LigatureTableSearchPattern))
+                            elementIndex = m_LigatureTableSearchList[i];
+
+                        SerializedProperty ligaturePropertyRecord = m_LigatureSubstitutionRecords_prop.GetArrayElementAtIndex(elementIndex);
+
+                        EditorGUILayout.BeginVertical(EditorStyles.helpBox);
+
+                        using (new EditorGUI.DisabledScope(i != m_SelectedLigatureRecord))
+                        {
+                            EditorGUI.BeginChangeCheck();
+                            EditorGUILayout.PropertyField(ligaturePropertyRecord, new GUIContent("Selectable"));
+
+                            if (EditorGUI.EndChangeCheck())
+                            {
+                                UpdateLigatureSubstitutionRecordLookup(ligaturePropertyRecord);
+                            }
+                        }
+
+                        EditorGUILayout.EndVertical();
+
+                        // Define the end of the selection region of the element.
+                        Rect elementEndRegion = GUILayoutUtility.GetRect(0f, 0f, GUILayout.ExpandWidth(true));
+
+                        // Check for Item selection
+                        Rect selectionArea = new Rect(elementStartRegion.x, elementStartRegion.y, elementEndRegion.width, elementEndRegion.y - elementStartRegion.y);
+                        if (DoSelectionCheck(selectionArea))
+                        {
+                            if (m_SelectedLigatureRecord == i)
+                            {
+                                m_SelectedLigatureRecord = -1;
+                            }
+                            else
+                            {
+                                m_SelectedLigatureRecord = i;
+                                GUIUtility.keyboardControl = 0;
+                            }
+                        }
+
+                        // Draw Selection Highlight and Kerning Pair Options
+                        if (m_SelectedLigatureRecord == i)
+                        {
+                            // Reset other selections
+                            ResetSelections(RecordSelectionType.LigatureSubstitutionRecord);
+
+                            TextCoreEditorUtilities.DrawBox(selectionArea, 2f, new Color32(40, 192, 255, 255));
+
+                            // Draw Glyph management options
+                            Rect controlRect = EditorGUILayout.GetControlRect(true, EditorGUIUtility.singleLineHeight * 1f);
+                            float optionAreaWidth = controlRect.width;
+                            float btnWidth = optionAreaWidth / 4;
+
+                            Rect position = new Rect(controlRect.x + controlRect.width - btnWidth, controlRect.y, btnWidth, controlRect.height);
+
+                            // Move record up
+                            bool guiEnabled = GUI.enabled;
+                            if (m_SelectedLigatureRecord == 0) { GUI.enabled = false; }
+                            if (GUI.Button(new Rect(controlRect.x, controlRect.y, btnWidth, controlRect.height), "Up"))
+                            {
+                                SwapCharacterElements(m_LigatureSubstitutionRecords_prop, m_SelectedLigatureRecord, m_SelectedLigatureRecord - 1);
+                                serializedObject.ApplyModifiedProperties();
+                                m_SelectedLigatureRecord -= 1;
+                                isAssetDirty = true;
+                                m_isSearchDirty = true;
+                                m_fontAsset.InitializeLigatureSubstitutionLookupDictionary();
+                            }
+                            GUI.enabled = guiEnabled;
+
+                            // Move record down
+                            if (m_SelectedLigatureRecord == arraySize - 1) { GUI.enabled = false; }
+                            if (GUI.Button(new Rect(controlRect.x + btnWidth, controlRect.y, btnWidth, controlRect.height), "Down"))
+                            {
+                                SwapCharacterElements(m_LigatureSubstitutionRecords_prop, m_SelectedLigatureRecord, m_SelectedLigatureRecord + 1);
+                                serializedObject.ApplyModifiedProperties();
+                                m_SelectedLigatureRecord += 1;
+                                isAssetDirty = true;
+                                m_isSearchDirty = true;
+                                m_fontAsset.InitializeLigatureSubstitutionLookupDictionary();
+                            }
+                            GUI.enabled = guiEnabled;
+
+                            // Remove record
+                            GUI.enabled = true;
+                            if (GUI.Button(position, "Remove"))
+                            {
+                                GUIUtility.keyboardControl = 0;
+
+                                RemoveRecord(m_LigatureSubstitutionRecords_prop, m_SelectedLigatureRecord);
+
+                                isAssetDirty = true;
+                                m_SelectedLigatureRecord = -1;
+                                m_isSearchDirty = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                DisplayAddRemoveButtons(m_LigatureSubstitutionRecords_prop, m_SelectedLigatureRecord, ligatureSubstitutionRecordCount);
+
+                DisplayPageNavigation(ref m_CurrentLigaturePage, arraySize, itemsPerPage);
+
+                GUILayout.Space(5);
+            }
+            #endregion
+
             // FONT FEATURE TABLE
             #region Font Feature Table
             EditorGUIUtility.labelWidth = labelWidth;
@@ -1699,12 +1882,21 @@ void ResetSelections(RecordSelectionType type)
             {
              case RecordSelectionType.CharacterRecord:
                  m_SelectedGlyphRecord = -1;
+                 m_SelectedLigatureRecord = -1;
                  m_SelectedAdjustmentRecord = -1;
                  m_SelectedMarkToBaseRecord = -1;
                  m_SelectedMarkToMarkRecord = -1;
                  break;
              case RecordSelectionType.GlyphRecord:
                  m_SelectedCharacterRecord = -1;
+                 m_SelectedLigatureRecord = -1;
+                 m_SelectedAdjustmentRecord = -1;
+                 m_SelectedMarkToBaseRecord = -1;
+                 m_SelectedMarkToMarkRecord = -1;
+                 break;
+             case RecordSelectionType.LigatureSubstitutionRecord:
+                 m_SelectedCharacterRecord = -1;
+                 m_SelectedGlyphRecord = -1;
                  m_SelectedAdjustmentRecord = -1;
                  m_SelectedMarkToBaseRecord = -1;
                  m_SelectedMarkToMarkRecord = -1;
@@ -1712,18 +1904,21 @@ void ResetSelections(RecordSelectionType type)
              case RecordSelectionType.AdjustmentPairRecord:
                  m_SelectedCharacterRecord = -1;
                  m_SelectedGlyphRecord = -1;
+                 m_SelectedLigatureRecord = -1;
                  m_SelectedMarkToBaseRecord = -1;
                  m_SelectedMarkToMarkRecord = -1;
                  break;
              case RecordSelectionType.MarkToBaseRecord:
                  m_SelectedCharacterRecord = -1;
                  m_SelectedGlyphRecord = -1;
+                 m_SelectedLigatureRecord = -1;
                  m_SelectedAdjustmentRecord = -1;
                  m_SelectedMarkToMarkRecord = -1;
                  break;
              case RecordSelectionType.MarkToMarkRecord:
                  m_SelectedCharacterRecord = -1;
                  m_SelectedGlyphRecord = -1;
+                 m_SelectedLigatureRecord = -1;
                  m_SelectedAdjustmentRecord = -1;
                  m_SelectedMarkToBaseRecord = -1;
                  break;
@@ -2058,6 +2253,21 @@ private bool DoSelectionCheck(Rect selectionArea)
             return false;
         }
 
+        private void UpdateLigatureSubstitutionRecordLookup(SerializedProperty property)
+        {
+            serializedObject.ApplyModifiedProperties();
+            m_fontAsset.InitializeLigatureSubstitutionLookupDictionary();
+            isAssetDirty = true;
+
+            /*LigatureSubstitutionRecord record = GetLigatureSubstitutionRecord(property);
+
+            uint firstComponentGlyphIndex = record.componentGlyphIDs[0];
+
+            // Lookup dictionary entry and update it
+            if (m_FontFeatureTable.m_LigatureSubstitutionRecordLookup.ContainsKey(firstComponentGlyphIndex))
+                m_FontFeatureTable.m_LigatureSubstitutionRecordLookup[firstComponentGlyphIndex] = record;*/
+        }
+
         private void UpdatePairAdjustmentRecordLookup(SerializedProperty property)
         {
             GlyphPairAdjustmentRecord pairAdjustmentRecord = GetGlyphPairAdjustmentRecord(property);
@@ -2095,6 +2305,23 @@ GlyphPairAdjustmentRecord GetGlyphPairAdjustmentRecord(SerializedProperty proper
             return pairAdjustmentRecord;
         }
 
+        void SwapCharacterElements(SerializedProperty property, int selectedIndex, int newIndex)
+        {
+            property.MoveArrayElement(selectedIndex, newIndex);
+        }
+
+        void RemoveRecord(SerializedProperty property, int index)
+        {
+            if (index > property.arraySize)
+                return;
+
+            property.DeleteArrayElementAtIndex(index);
+
+            serializedObject.ApplyModifiedProperties();
+
+            m_fontAsset.ReadFontAssetDefinition();
+        }
+
         GlyphValueRecord GetValueRecord(SerializedProperty property)
         {
             GlyphValueRecord record = new GlyphValueRecord();
@@ -2313,6 +2540,45 @@ void SearchCharacterTable(string searchPattern, ref List<int> searchResults)
             }
         }
 
+        void SearchLigatureTable(string searchPattern, ref List<int> searchResults)
+        {
+            if (searchResults == null) searchResults = new List<int>();
+
+            searchResults.Clear();
+
+            // Lookup glyph index of potential characters contained in the search pattern.
+            uint firstGlyphIndex = 0;
+            Character firstCharacterSearch;
+
+            if (searchPattern.Length > 0 && m_fontAsset.characterLookupTable.TryGetValue(searchPattern[0], out firstCharacterSearch))
+                firstGlyphIndex = firstCharacterSearch.glyphIndex;
+
+            uint secondGlyphIndex = 0;
+            Character secondCharacterSearch;
+
+            if (searchPattern.Length > 1 && m_fontAsset.characterLookupTable.TryGetValue(searchPattern[1], out secondCharacterSearch))
+                secondGlyphIndex = secondCharacterSearch.glyphIndex;
+
+            int arraySize = m_MarkToBaseAdjustmentRecords_prop.arraySize;
+
+            for (int i = 0; i < arraySize; i++)
+            {
+                SerializedProperty record = m_MarkToBaseAdjustmentRecords_prop.GetArrayElementAtIndex(i);
+
+                int baseGlyphIndex = record.FindPropertyRelative("m_BaseGlyphID").intValue;
+                int markGlyphIndex = record.FindPropertyRelative("m_MarkGlyphID").intValue;
+
+                if (firstGlyphIndex == baseGlyphIndex && secondGlyphIndex == markGlyphIndex)
+                    searchResults.Add(i);
+                else if (searchPattern.Length == 1 && (firstGlyphIndex == baseGlyphIndex || firstGlyphIndex == markGlyphIndex))
+                    searchResults.Add(i);
+                else if (baseGlyphIndex.ToString().Contains(searchPattern))
+                    searchResults.Add(i);
+                else if (markGlyphIndex.ToString().Contains(searchPattern))
+                    searchResults.Add(i);
+            }
+        }
+
         void SearchKerningTable(string searchPattern, ref List<int> searchResults)
         {
             if (searchResults == null) searchResults = new List<int>();
diff --git a/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditorUtilities.cs b/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditorUtilities.cs
new file mode 100644
index 0000000000..4f60305a79
--- /dev/null
+++ b/Modules/TextCoreTextEngineEditor/Managed/FontAssetEditorUtilities.cs
@@ -0,0 +1,71 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine.TextCore;
+
+namespace UnityEngine.TextCore.Text
+{
+    internal struct GlyphProxy
+    {
+        public uint index;
+        public GlyphRect glyphRect;
+        public GlyphMetrics metrics;
+        public int atlasIndex;
+    }
+
+    internal static class FontAssetEditorUtilities
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="so"></param>
+        /// <param name="lookupDictionary"></param>
+        internal static void PopulateGlyphProxyLookupDictionary(SerializedObject so, Dictionary<uint, GlyphProxy> lookupDictionary)
+        {
+            if (lookupDictionary == null)
+                return;
+
+            // Get reference to serialized property for the glyph table
+            SerializedProperty glyphTable = so.FindProperty("m_GlyphTable");
+
+            for (int i = 0; i < glyphTable.arraySize; i++)
+            {
+                SerializedProperty glyphProperty = glyphTable.GetArrayElementAtIndex(i);
+                GlyphProxy proxy = GetGlyphProxyFromSerializedProperty(glyphProperty);
+
+                lookupDictionary.Add(proxy.index, proxy);
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="property"></param>
+        /// <returns></returns>
+        static GlyphProxy GetGlyphProxyFromSerializedProperty(SerializedProperty property)
+        {
+            GlyphProxy proxy = new GlyphProxy();
+            proxy.index = (uint)property.FindPropertyRelative("m_Index").intValue;
+
+            SerializedProperty glyphRectProperty = property.FindPropertyRelative("m_GlyphRect");
+            proxy.glyphRect = new GlyphRect();
+            proxy.glyphRect.x = glyphRectProperty.FindPropertyRelative("m_X").intValue;
+            proxy.glyphRect.y = glyphRectProperty.FindPropertyRelative("m_Y").intValue;
+            proxy.glyphRect.width = glyphRectProperty.FindPropertyRelative("m_Width").intValue;
+            proxy.glyphRect.height = glyphRectProperty.FindPropertyRelative("m_Height").intValue;
+
+            SerializedProperty glyphMetricsProperty = property.FindPropertyRelative("m_Metrics");
+            proxy.metrics = new GlyphMetrics();
+            proxy.metrics.horizontalBearingX = glyphMetricsProperty.FindPropertyRelative("m_HorizontalBearingX").floatValue;
+            proxy.metrics.horizontalBearingY = glyphMetricsProperty.FindPropertyRelative("m_HorizontalBearingY").floatValue;
+            proxy.metrics.horizontalAdvance = glyphMetricsProperty.FindPropertyRelative("m_HorizontalAdvance").floatValue;
+            proxy.metrics.width = glyphMetricsProperty.FindPropertyRelative("m_Width").floatValue;
+            proxy.metrics.height = glyphMetricsProperty.FindPropertyRelative("m_Height").floatValue;
+
+            return proxy;
+        }
+    }
+}
diff --git a/Modules/TextCoreTextEngineEditor/Managed/LigatureSubstitutionRecordPropertyDrawer.cs b/Modules/TextCoreTextEngineEditor/Managed/LigatureSubstitutionRecordPropertyDrawer.cs
new file mode 100644
index 0000000000..6a61dcd4d4
--- /dev/null
+++ b/Modules/TextCoreTextEngineEditor/Managed/LigatureSubstitutionRecordPropertyDrawer.cs
@@ -0,0 +1,179 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.TextCore.Text;
+using UnityEngine.TextCore.LowLevel;
+
+namespace UnityEngine.TextCore.Text
+{
+    [CustomPropertyDrawer(typeof(LigatureSubstitutionRecord))]
+    internal class LigatureSubstitutionRecordPropertyDrawer : PropertyDrawer
+    {
+        //private bool isEditingEnabled;
+        private bool isSelectable;
+        private bool m_ShouldRefreshLookupDictionary;
+
+        private Dictionary<uint, GlyphProxy> m_GlyphLookupDictionary;
+
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            SerializedProperty prop_ComponentGlyphIDs = property.FindPropertyRelative("m_ComponentGlyphIDs");
+            int ComponentGlyphIDCount = prop_ComponentGlyphIDs.arraySize;
+            SerializedProperty prop_LigatureGlyphID = property.FindPropertyRelative("m_LigatureGlyphID");
+
+            // Refresh glyph proxy lookup dictionary if needed.
+            if (m_ShouldRefreshLookupDictionary)
+                RefreshLookupDictionary(property.serializedObject);
+
+            Rect rect = position;
+
+            //isEditingEnabled = GUI.enabled;
+            isSelectable = label.text == "Selectable";
+
+            if (isSelectable)
+                GUILayoutUtility.GetRect(position.width, 100);
+            else
+                GUILayoutUtility.GetRect(position.width, 80);
+
+            //GUIStyle style = new GUIStyle(EditorStyles.label) {richText = true, alignment = TextAnchor.UpperCenter};
+
+            EditorGUIUtility.labelWidth = 115;
+            EditorGUI.BeginChangeCheck();
+            int size = EditorGUI.DelayedIntField(new Rect(rect.x, position.y + 3, 130, rect.height), new GUIContent("Component Glyphs"), prop_ComponentGlyphIDs.arraySize);
+            if (EditorGUI.EndChangeCheck())
+            {
+                size = Mathf.Clamp(size, 0, 20);
+                prop_ComponentGlyphIDs.arraySize = size;
+                return;
+            }
+
+            // Spacing between glyphs
+            int glyphSpacing = 60;
+
+            // Draw Component Glyphs
+            for (int i = 0; i < ComponentGlyphIDCount; i++)
+            {
+                Rect componentGlyphPosition = new Rect(50 + (glyphSpacing * i), position.y + 24, 48, 48);
+
+                // Draw glyph
+                uint glyphIndex = (uint)prop_ComponentGlyphIDs.GetArrayElementAtIndex(i).intValue;
+                DrawGlyph(glyphIndex, componentGlyphPosition, property);
+
+                EditorGUI.BeginChangeCheck();
+                EditorGUI.DelayedIntField(new Rect(componentGlyphPosition.x - 13, componentGlyphPosition.y + 73, 40, EditorGUIUtility.singleLineHeight), prop_ComponentGlyphIDs.GetArrayElementAtIndex(i), GUIContent.none);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    m_ShouldRefreshLookupDictionary = true;
+                }
+            }
+
+            // Draw Ligature glyph
+            Rect ligatureGlyphPosition = new Rect(50 + (glyphSpacing * ComponentGlyphIDCount + 1), position.y + 3, 85, EditorGUIUtility.singleLineHeight);
+            ligatureGlyphPosition.x = Mathf.Max(200, ligatureGlyphPosition.x);
+            EditorGUI.LabelField(ligatureGlyphPosition, new GUIContent("Ligature Glyph"));
+
+            DrawGlyph((uint)prop_LigatureGlyphID.intValue, new Rect(ligatureGlyphPosition.x + 37, ligatureGlyphPosition.y + 21, 48, 48), property);
+
+            EditorGUI.BeginChangeCheck();
+            EditorGUI.DelayedIntField(new Rect(ligatureGlyphPosition.x + 24, ligatureGlyphPosition.y + 94, 40, EditorGUIUtility.singleLineHeight), prop_LigatureGlyphID, GUIContent.none);
+            if (EditorGUI.EndChangeCheck())
+            {
+                m_ShouldRefreshLookupDictionary = true;
+            }
+        }
+
+        void DrawGlyph(uint glyphIndex, Rect position, SerializedProperty property)
+        {
+            // Get a reference to the serialized object which can either be a TMP_FontAsset or FontAsset.
+            SerializedObject so = property.serializedObject;
+            if (so == null)
+                return;
+
+            if (m_GlyphLookupDictionary == null)
+            {
+                m_GlyphLookupDictionary = new Dictionary<uint, GlyphProxy>();
+                FontAssetEditorUtilities.PopulateGlyphProxyLookupDictionary(so, m_GlyphLookupDictionary);
+            }
+
+            // Try getting a reference to the glyph for the given glyph index.
+            if (!m_GlyphLookupDictionary.TryGetValue(glyphIndex, out GlyphProxy glyph))
+                return;
+
+            // Get the atlas index of the glyph and lookup its atlas texture
+            SerializedProperty atlasTextureProperty = so.FindProperty("m_AtlasTextures");
+            Texture2D atlasTexture = atlasTextureProperty.GetArrayElementAtIndex(glyph.atlasIndex).objectReferenceValue as Texture2D;
+            if (atlasTexture == null)
+                return;
+
+            Material mat;
+
+            GlyphRenderMode atlasRenderMode = (GlyphRenderMode)so.FindProperty("m_AtlasRenderMode").intValue;
+            int padding = so.FindProperty("m_AtlasPadding").intValue;
+
+            if (((GlyphRasterModes)atlasRenderMode & GlyphRasterModes.RASTER_MODE_BITMAP) == GlyphRasterModes.RASTER_MODE_BITMAP)
+            {
+                mat = FontAssetEditor.internalBitmapMaterial;
+
+                if (mat == null)
+                    return;
+
+                mat.mainTexture = atlasTexture;
+            }
+            else
+            {
+                mat = FontAssetEditor.internalSDFMaterial;
+
+                if (mat == null)
+                    return;
+
+                mat.mainTexture = atlasTexture;
+                mat.SetFloat(TextShaderUtilities.ID_GradientScale, padding + 1);
+            }
+
+            // Draw glyph from atlas texture.
+            Rect glyphDrawPosition = new Rect(position.x, position.y + 2, position.width, position.height);
+
+            GlyphRect glyphRect = glyph.glyphRect;
+            int glyphOriginX = glyphRect.x - padding;
+            int glyphOriginY = glyphRect.y - padding;
+            int glyphWidth = glyphRect.width + padding * 2;
+            int glyphHeight = glyphRect.height + padding * 2;
+
+            SerializedProperty faceInfoProperty = so.FindProperty("m_FaceInfo");
+            float ascentLine = faceInfoProperty.FindPropertyRelative("m_AscentLine").floatValue;
+            float descentLine = faceInfoProperty.FindPropertyRelative("m_DescentLine").floatValue;
+
+            float normalizedHeight = ascentLine - descentLine;
+            float scale = glyphDrawPosition.width / normalizedHeight;
+
+            // Compute the normalized texture coordinates
+            Rect texCoords = new Rect((float)glyphOriginX / atlasTexture.width, (float)glyphOriginY / atlasTexture.height, (float)glyphWidth / atlasTexture.width, (float)glyphHeight / atlasTexture.height);
+
+            if (Event.current.type == EventType.Repaint)
+            {
+                glyphDrawPosition.x += -(glyphWidth * scale / 2 - padding * scale);
+                glyphDrawPosition.y += glyphDrawPosition.height - glyph.metrics.horizontalBearingY * scale;
+                glyphDrawPosition.width = glyphWidth * scale;
+                glyphDrawPosition.height = glyphHeight * scale;
+
+                // Could switch to using the default material of the font asset which would require passing scale to the shader.
+                Graphics.DrawTexture(glyphDrawPosition, atlasTexture, texCoords, 0, 0, 0, 0, new Color(1f, 1f, 1f), mat);
+            }
+        }
+
+        void RefreshLookupDictionary(SerializedObject so)
+        {
+            if (m_GlyphLookupDictionary != null)
+            {
+                m_GlyphLookupDictionary.Clear();
+                FontAssetEditorUtilities.PopulateGlyphProxyLookupDictionary(so, m_GlyphLookupDictionary);
+            }
+
+            m_ShouldRefreshLookupDictionary = false;
+        }
+    }
+}
diff --git a/Modules/TextCoreTextEngineEditor/Managed/TextCoreShaderGUI.cs b/Modules/TextCoreTextEngineEditor/Managed/TextCoreShaderGUI.cs
index 397fd799b8..e98474e015 100644
--- a/Modules/TextCoreTextEngineEditor/Managed/TextCoreShaderGUI.cs
+++ b/Modules/TextCoreTextEngineEditor/Managed/TextCoreShaderGUI.cs
@@ -122,7 +122,12 @@ void SetStateKeywords(Material material)
         static TextCoreShaderGUI()
         {
             // Keep track of how many undo/redo events happened.
-            Undo.undoRedoPerformed += () => s_UndoRedoCount += 1;
+            Undo.undoRedoEvent += OnUndoRedo;
+        }
+
+        private static void OnUndoRedo(in UndoRedoInfo info)
+        {
+            s_UndoRedoCount += 1;
         }
 
         bool m_IsNewGUI = true;
diff --git a/Modules/Tilemap/Managed/ITilemap.cs b/Modules/Tilemap/Managed/ITilemap.cs
index cd7dd8c77a..97e4b184dd 100644
--- a/Modules/Tilemap/Managed/ITilemap.cs
+++ b/Modules/Tilemap/Managed/ITilemap.cs
@@ -19,22 +19,7 @@ public class ITilemap
         internal int m_RefreshCount;
         internal NativeArray<Vector3Int> m_RefreshPos;
 
-        internal AtomicSafetyHandle m_Safety;
-
-        internal ITilemap()
-        {
-            m_Safety = AtomicSafetyHandle.Create();
-        }
-
-        ~ITilemap()
-        {
-            OnDisable();
-        }
-
-        void OnDisable()
-        {
-            AtomicSafetyHandle.Release(m_Safety);
-        }
+        internal ITilemap() { }
 
         internal void SetTilemapInstance(Tilemap tilemap)
         {
@@ -123,9 +108,12 @@ private static unsafe void FindAllRefreshPositions(ITilemap tilemap, int count,
             var oldTilesIds = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<int>(oldTilesPtr, count, Allocator.Invalid);
             var newTilesIds = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<int>(newTilesPtr, count, Allocator.Invalid);
             var positions = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<Vector3Int>(positionsPtr, count, Allocator.Invalid);
-            NativeArrayUnsafeUtility.SetAtomicSafetyHandle<int>(ref oldTilesIds, tilemap.m_Safety);
-            NativeArrayUnsafeUtility.SetAtomicSafetyHandle<int>(ref newTilesIds, tilemap.m_Safety);
-            NativeArrayUnsafeUtility.SetAtomicSafetyHandle<Vector3Int>(ref positions, tilemap.m_Safety);
+            var ash1 = AtomicSafetyHandle.Create();
+            var ash2 = AtomicSafetyHandle.Create();
+            var ash3 = AtomicSafetyHandle.Create();
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle<int>(ref oldTilesIds, ash1);
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle<int>(ref newTilesIds, ash2);
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle<Vector3Int>(ref positions, ash3);
 
             for (int i = 0; i < count; ++i)
             {
@@ -147,6 +135,10 @@ private static unsafe void FindAllRefreshPositions(ITilemap tilemap, int count,
             tilemap.m_Tilemap.RefreshTilesNative(tilemap.m_RefreshPos.m_Buffer, tilemap.m_RefreshCount);
             tilemap.m_RefreshPos.Dispose();
             tilemap.m_AddToList = false;
+
+            AtomicSafetyHandle.Release(ash1);
+            AtomicSafetyHandle.Release(ash2);
+            AtomicSafetyHandle.Release(ash3);
         }
 
         [RequiredByNativeCode]
@@ -159,13 +151,17 @@ private unsafe static void GetAllTileData(ITilemap tilemap, int count, IntPtr ti
             var tiles = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<int>(tilesPtr, count, Allocator.Invalid);
             var positions = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<Vector3Int>(positionsPtr, count, Allocator.Invalid);
             var tileDataArray = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<TileData>(outTileDataPtr, count, Allocator.Invalid);
-            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref tiles, tilemap.m_Safety);
-            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref positions, tilemap.m_Safety);
-            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref tileDataArray, tilemap.m_Safety);
+
+            var ash1 = AtomicSafetyHandle.Create();
+            var ash2 = AtomicSafetyHandle.Create();
+            var ash3 = AtomicSafetyHandle.Create();
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref tiles, ash1);
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref positions, ash2);
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref tileDataArray, ash3);
 
             for (int i = 0; i < count; ++i)
             {
-                TileData tileData = default;
+                TileData tileData = TileData.Default;
                 var tileId = tiles[i];
                 if (tileId != 0)
                 {
@@ -174,6 +170,10 @@ private unsafe static void GetAllTileData(ITilemap tilemap, int count, IntPtr ti
                 }
                 tileDataArray[i] = tileData;
             }
+
+            AtomicSafetyHandle.Release(ash1);
+            AtomicSafetyHandle.Release(ash2);
+            AtomicSafetyHandle.Release(ash3);
         }
     }
 }
diff --git a/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs b/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs
index af8271aca2..2b579c41d2 100644
--- a/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs
+++ b/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs
@@ -134,6 +134,14 @@ public TileBase[] GetTilesBlock(BoundsInt bounds)
             return tiles;
         }
 
+        [FreeFunction(Name = "TilemapBindings::GetTileAssetsBlockNonAlloc", HasExplicitThis = true)]
+        internal extern int GetTileAssetsBlockNonAlloc(Vector3Int startPosition, Vector3Int endPosition, Object[] tiles);
+
+        public int GetTilesBlockNonAlloc(BoundsInt bounds, TileBase[] tiles)
+        {
+            return GetTileAssetsBlockNonAlloc(bounds.min, bounds.size, tiles);
+        }
+
         public extern int GetTilesRangeCount(Vector3Int startPosition, Vector3Int endPosition);
 
         [FreeFunction(Name = "TilemapBindings::GetTileAssetsRangeNonAlloc", HasExplicitThis = true)]
@@ -355,12 +363,19 @@ public TileData tileData
             }
         }
 
+        internal struct SyncTileCallbackSettings
+        {
+            internal bool hasSyncTileCallback;
+            internal bool hasPositionsChangedCallback;
+            internal bool isBufferSyncTile;
+        }
+
         [RequiredByNativeCode]
-        internal void GetSyncTileCallbackSettings(ref bool hasSyncTileCallback, ref bool hasPositionsChangedCallback, ref bool isBufferSyncTile)
+        internal void GetSyncTileCallbackSettings(ref SyncTileCallbackSettings settings)
         {
-            hasSyncTileCallback = HasSyncTileCallback();
-            hasPositionsChangedCallback = HasPositionsChangedCallback();
-            isBufferSyncTile = bufferSyncTile;
+            settings.hasSyncTileCallback = HasSyncTileCallback();
+            settings.hasPositionsChangedCallback = HasPositionsChangedCallback();
+            settings.isBufferSyncTile = bufferSyncTile;
         }
 
         internal extern void SendAndClearSyncTileBuffer();
@@ -489,6 +504,17 @@ public partial struct TileData
         private int m_GameObject;
         private TileFlags m_Flags;
         private Tile.ColliderType m_ColliderType;
+
+        internal static readonly TileData Default = CreateDefault();
+        private static TileData CreateDefault()
+        {
+            TileData tileData = default;
+            tileData.color = Color.white;
+            tileData.transform = Matrix4x4.identity;
+            tileData.flags = default;
+            tileData.colliderType = default;
+            return tileData;
+        }
     }
 
     [RequiredByNativeCode]
diff --git a/Modules/TilemapEditor/Editor/Managed/TileEditor.cs b/Modules/TilemapEditor/Editor/Managed/TileEditor.cs
index 0131c9af49..3d8695ed21 100644
--- a/Modules/TilemapEditor/Editor/Managed/TileEditor.cs
+++ b/Modules/TilemapEditor/Editor/Managed/TileEditor.cs
@@ -44,7 +44,7 @@ public void OnEnable()
 
         public override void OnInspectorGUI()
         {
-            DoTilePreview(tile.sprite, tile.color, Matrix4x4.identity);
+            DoTilePreview(tile.sprite, tile.color, tile.transform);
 
             serializedObject.Update();
 
@@ -129,7 +129,7 @@ private static Vector3 Round(Vector3 value, int digits)
 
         public override Texture2D RenderStaticPreview(string assetPath, Object[] subAssets, int width, int height)
         {
-            return SpriteUtility.RenderStaticPreview(tile.sprite, tile.color, width, height);
+            return SpriteUtility.RenderStaticPreview(tile.sprite, tile.color, width, height, tile.transform);
         }
     }
 }
diff --git a/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs b/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs
index 30b8d1fdef..49270d07ea 100644
--- a/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs
+++ b/Modules/TilemapEditor/Editor/Managed/TilemapCollider2DEditor.cs
@@ -41,7 +41,6 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_ExtrusionFactor, Styles.extrusionFactorLabel);
             EditorGUILayout.PropertyField(m_UseDelaunayMesh);
             base.OnInspectorGUI();
-            serializedObject.ApplyModifiedProperties();
 
             FinalizeInspectorGUI();
         }
diff --git a/Modules/UI/ScriptBindings/UICanvas.bindings.cs b/Modules/UI/ScriptBindings/UICanvas.bindings.cs
index 5104c649d3..ba41ee9160 100644
--- a/Modules/UI/ScriptBindings/UICanvas.bindings.cs
+++ b/Modules/UI/ScriptBindings/UICanvas.bindings.cs
@@ -5,6 +5,7 @@
 using System;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
+using Unity.Profiling;
 
 namespace UnityEngine
 {
@@ -123,6 +124,7 @@ private static void EndRenderExtraOverlays(int displayIndex)
         }
     }
 
+    [IgnoredByDeepProfiler]
     [NativeHeader("Modules/UI/Canvas.h"),
      StaticAccessor("UI::SystemProfilerApi", StaticAccessorType.DoubleColon)]
     public static class UISystemProfilerApi
diff --git a/Modules/UIAutomationEditor/AutomatedWindow.cs b/Modules/UIAutomationEditor/AutomatedWindow.cs
index 5f614f4058..2b47c495db 100644
--- a/Modules/UIAutomationEditor/AutomatedWindow.cs
+++ b/Modules/UIAutomationEditor/AutomatedWindow.cs
@@ -211,6 +211,11 @@ public IEnumerable<IAutomatedUIElement> FindElementsByNamedControl(string contro
             return m_Model.FindElementsByNamedControl(controlName);
         }
 
+        public IEnumerable<IAutomatedUIElement> FindElementsByGUIContentText(string text)
+        {
+            return m_Model.FindElementsByGUIContentText(text);
+        }
+
         public IAutomatedUIElement nextSibling
         {
             get { return m_Model.nextSibling; }
@@ -228,7 +233,6 @@ class IMModel : IElementFinder
         private AutomatedIMElement[] m_Elements;
         private AutomatedIMElement m_Root;
 
-
         public void Update()
         {
             //TODO: right now we simbolicate the stacktrace of all elements, but for this scenario we are not super interested in it.
@@ -345,6 +349,11 @@ public IEnumerable<IAutomatedUIElement> FindElementsByNamedControl(string contro
             return m_Root.FindElementsByNamedControl(controlName);
         }
 
+        public IEnumerable<IAutomatedUIElement> FindElementsByGUIContentText(string text)
+        {
+            return m_Root.FindElementsByGUIContentText(text);
+        }
+
         public IAutomatedUIElement nextSibling
         {
             get { return m_Root.nextSibling; }
@@ -363,6 +372,9 @@ interface IElementFinder
         IEnumerable<IAutomatedUIElement> FindElementsByGUIStyle(GUIStyle style);
         IEnumerable<IAutomatedUIElement> FindElementsByGUIContent(GUIContent guiContent);
         IEnumerable<IAutomatedUIElement> FindElementsByNamedControl(string controlName);
+        /// <summary>Work-around for finding UI elements for which we do not have a recognizable GUIContent.
+        /// Searches children elements recursively for recognizable text from GUIContents.</summary>
+        IEnumerable<IAutomatedUIElement> FindElementsByGUIContentText(string text);
         IAutomatedUIElement nextSibling { get; }
     }
 
@@ -498,6 +510,26 @@ public IEnumerable<IAutomatedUIElement> FindElementsByNamedControl(string contro
             return FindElements(element => element.controlName == controlName);
         }
 
+        public IEnumerable<IAutomatedUIElement> FindElementsByGUIContentText(string text)
+        {
+            foreach (IAutomatedUIElement matchingElement in FindElementsByGUIContentTextRecursive(children, text))
+                yield return matchingElement;
+        }
+
+        private static IEnumerable<IAutomatedUIElement> FindElementsByGUIContentTextRecursive(IEnumerable<IAutomatedUIElement> elements, string text)
+        {
+            if (elements == null)
+                yield break;
+            foreach (IAutomatedUIElement childElement in elements)
+            {
+                if (childElement.guiContent?.text?.Equals(text) ?? false)
+                    yield return childElement;
+
+                foreach (IAutomatedUIElement matchingSiblingElement in FindElementsByGUIContentTextRecursive(childElement.children, text))
+                    yield return matchingSiblingElement;
+            }
+        }
+
         private static string NullOrEmptyToNull(string input)
         {
             return string.IsNullOrEmpty(input) ? null : input;
diff --git a/Modules/UIElementsNative/Renderer/UIPainter2D.bindings.cs b/Modules/UIElementsNative/Renderer/UIPainter2D.bindings.cs
new file mode 100644
index 0000000000..0c1572d0ea
--- /dev/null
+++ b/Modules/UIElementsNative/Renderer/UIPainter2D.bindings.cs
@@ -0,0 +1,115 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Runtime.InteropServices;
+using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+using UnityEngine;
+using UnityEngine.Bindings;
+
+namespace UnityEngine.UIElements
+{
+    [NativeHeader("Modules/UIElementsNative/Renderer/UIPainter2D.bindings.h")]
+    internal static class UIPainter2D
+    {
+        public static extern IntPtr Create(float maxArcRadius);
+        public static extern void Destroy(IntPtr handle);
+
+        public static extern void Reset(IntPtr handle);
+
+        public static extern float GetLineWidth(IntPtr handle);
+        public static extern void SetLineWidth(IntPtr handle, float value);
+
+        public static extern Color GetStrokeColor(IntPtr handle);
+        public static extern void SetStrokeColor(IntPtr handle, Color value);
+
+        public static extern Color GetFillColor(IntPtr handle);
+        public static extern void SetFillColor(IntPtr handle, Color value);
+
+        public static extern LineJoin GetLineJoin(IntPtr handle);
+        public static extern void SetLineJoin(IntPtr handle, LineJoin value);
+
+        public static extern LineCap GetLineCap(IntPtr handle);
+        public static extern void SetLineCap(IntPtr handle, LineCap value);
+
+        public static extern float GetMiterLimit(IntPtr handle);
+        public static extern void SetMiterLimit(IntPtr handle, float value);
+
+        public static extern void BeginPath(IntPtr handle);
+        public static extern void MoveTo(IntPtr handle, Vector2 pos);
+        public static extern void LineTo(IntPtr handle, Vector2 pos);
+        public static extern void ArcTo(IntPtr handle, Vector2 p1, Vector2 p2, float radius);
+        public static extern void Arc(IntPtr handle, Vector2 center, float radius, float startAngleRads, float endAngleRads, ArcDirection direction);
+        public static extern void BezierCurveTo(IntPtr handle, Vector2 p1, Vector2 p2, Vector2 p3);
+        public static extern void QuadraticCurveTo(IntPtr handle, Vector2 p1, Vector2 p2);
+        public static extern void ClosePath(IntPtr handle);
+
+        public static extern MeshWriteDataInterface Stroke(IntPtr handle);
+        public static extern MeshWriteDataInterface Fill(IntPtr handle, FillRule fillRule);
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct MeshWriteDataInterface
+    {
+        public IntPtr vertices;
+        public IntPtr indices;
+        public int vertexCount;
+        public int indexCount;
+    }
+
+    /// <summary>
+    /// The fill rule to use when filling shapes with <see cref="Painter2D.Fill(FillRule)"/>.
+    /// </summary>
+    public enum FillRule
+    {
+        /// <summary>The "non-zero" winding rule.</summary>
+        NonZero,
+
+        /// <summary>The "odd-even" winding rule.</summary>
+        OddEven
+    }
+
+    /// <summary>
+    /// Join types connecting two sub-paths (see <see cref="Painter2D.lineJoin"/>).
+    /// </summary>
+    public enum LineJoin
+    {
+        /// <summary>
+        /// Joins the sub-paths with a sharp corner.
+        /// The join converts to a beveled join when the <see cref="Painter2D.miterLimit"/> ratio is reached.
+        /// </summary>
+        Miter,
+
+        /// <summary>Joins the sub-paths with a beveled corner.</summary>
+        Bevel,
+
+        /// <summary>Joins the sub-paths with a round corner.</summary>
+        Round
+    }
+
+    /// <summary>
+    /// Cap types for the beginning and end of paths (see <see cref="Painter2D.lineCap"/>).
+    /// </summary>
+    public enum LineCap
+    {
+        /// <summary>Terminates the path with no tip.</summary>
+        Butt,
+
+        /// <summary>Terminates the path with a round tip.</summary>
+        Round
+    }
+
+    /// <summary>
+    /// Direction to use when defining an arc (see <see cref="Painter2D.Arc(Vector2, float, Angle, Angle, ArcDirection)"/>).
+    /// </summary>
+    public enum ArcDirection
+    {
+        /// <summary>A clockwise direction.</summary>
+        Clockwise,
+
+        /// <summary>A counter-clockwise direction.</summary>
+        CounterClockwise
+    }
+}
diff --git a/Modules/UIElementsNative/UIElementsUtility.bindings.cs b/Modules/UIElementsNative/UIElementsUtility.bindings.cs
index ae562c9827..15720dfd80 100644
--- a/Modules/UIElementsNative/UIElementsUtility.bindings.cs
+++ b/Modules/UIElementsNative/UIElementsUtility.bindings.cs
@@ -32,5 +32,7 @@ public static void UpdateRuntimePanels()
 
         public extern static void RegisterPlayerloopCallback();
         public extern static void UnregisterPlayerloopCallback();
+
+        public extern static void VisualElementCreation();
     }
 }
diff --git a/Modules/UIElementsNative/UITessellation.bindings.cs b/Modules/UIElementsNative/UITessellation.bindings.cs
deleted file mode 100644
index a98ff94132..0000000000
--- a/Modules/UIElementsNative/UITessellation.bindings.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Runtime.InteropServices;
-using Unity.Collections;
-using Unity.Collections.LowLevel.Unsafe;
-using UnityEngine;
-using UnityEngine.Bindings;
-
-namespace UnityEngine.UIElements
-{
-    [NativeHeader("Modules/UIElementsNative/UITessellation.bindings.h")]
-    [VisibleToOtherModules("Unity.UIElements")]
-    internal static class UITessellation
-    {
-        [FreeFunction(Name = "UITessellation::BeginTess")]
-        public static unsafe extern IntPtr BeginTess();
-
-        [FreeFunction(Name = "UITessellation::AddContour")]
-        public static unsafe extern void AddContour(IntPtr handle, void* contour, int vertexCount, int stride);
-
-        [FreeFunction(Name = "UITessellation::Tessellate")]
-        public static unsafe extern bool Tessellate(IntPtr handle, bool oddEven);
-
-        [FreeFunction(Name = "UITessellation::GetVertexCount")]
-        public static unsafe extern int GetVertexCount(IntPtr handle);
-
-        [FreeFunction(Name = "UITessellation::GetVertices")]
-        public static unsafe extern float* GetVertices(IntPtr handle);
-
-        [FreeFunction(Name = "UITessellation::GetElementCount")]
-        public static unsafe extern int GetElementCount(IntPtr handle);
-
-        [FreeFunction(Name = "UITessellation::GetElements")]
-        public static unsafe extern int* GetElements(IntPtr handle);
-
-        [FreeFunction(Name = "UITessellation::GetVertexIndices")]
-        public static unsafe extern int* GetVertexIndices(IntPtr handle);
-
-        [FreeFunction(Name = "UITessellation::EndTess")]
-        public static unsafe extern void EndTess(IntPtr handle);
-    }
-}
diff --git a/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs
index eac77a39a8..756324dd5b 100644
--- a/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs
+++ b/Modules/UIElementsSamplesEditor/Snippets/ListViewSnippet.cs
@@ -37,10 +37,10 @@ internal override void Apply(VisualElement container)
             listView.selectionType = SelectionType.Multiple;
 
             // Callback invoked when the user double clicks an item
-            listView.onItemsChosen += Debug.Log;
+            listView.itemsChosen += Debug.Log;
 
             // Callback invoked when the user changes the selection inside the ListView
-            listView.onSelectionChange += Debug.Log;
+            listView.selectionChanged += Debug.Log;
             /// </sample>
         }
     }
diff --git a/Modules/UIElementsSamplesEditor/Snippets/TreeViewSnippet.cs b/Modules/UIElementsSamplesEditor/Snippets/TreeViewSnippet.cs
new file mode 100644
index 0000000000..91df56e386
--- /dev/null
+++ b/Modules/UIElementsSamplesEditor/Snippets/TreeViewSnippet.cs
@@ -0,0 +1,61 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using UnityEngine;
+using UnityEngine.UIElements;
+using System.Collections.Generic;
+using System;
+
+namespace UnityEditor.UIElements.Samples
+{
+    internal class TreeViewSnippet : ElementSnippet<TreeViewSnippet>
+    {
+        internal override void Apply(VisualElement container)
+        {
+            var treeView = container.Q<TreeView>();
+
+            /// <sample>
+            // Create some list of data, here simply numbers in a few foldouts
+            var items = new List<TreeViewItemData<string>>(110);
+            for (var i = 0; i < 10; i++)
+            {
+                var itemIndex = i * 10 + i;
+
+                var treeViewSubItemsData = new List<TreeViewItemData<string>>(10);
+                for (var j = 0; j < 10; j++)
+                    treeViewSubItemsData.Add(new TreeViewItemData<string>(itemIndex + j + 1, (j+1).ToString()));
+
+                var treeViewItemData = new TreeViewItemData<string>(itemIndex, (i+1).ToString(), treeViewSubItemsData);
+                items.Add(treeViewItemData);
+            };
+
+            // The "makeItem" function will be called as needed
+            // when the TreeView needs more items to render
+            Func<VisualElement> makeItem = () => new Label();
+
+            // As the user scrolls through the list, the TreeView object
+            // will recycle elements created by the "makeItem"
+            // and invoke the "bindItem" callback to associate
+            // the element with the matching data item (specified as an index in the list)
+            Action<VisualElement, int> bindItem = (e, i) =>
+            {
+                var item = treeView.GetItemDataForIndex<string>(i);
+                (e as Label).text = item;
+            };
+
+            treeView.SetRootItems(items);
+            treeView.makeItem = makeItem;
+            treeView.bindItem = bindItem;
+            treeView.selectionType = SelectionType.Multiple;
+            treeView.Rebuild();
+
+            // Callback invoked when the user double clicks an item
+            treeView.itemsChosen += Debug.Log;
+
+            // Callback invoked when the user changes the selection inside the TreeView
+            treeView.selectedIndicesChanged += Debug.Log;
+            /// </sample>
+        }
+    }
+}
diff --git a/Modules/UIElementsSamplesEditor/UIElementsSamples.cs b/Modules/UIElementsSamplesEditor/UIElementsSamples.cs
index 23fc2649a0..f03c267d58 100644
--- a/Modules/UIElementsSamplesEditor/UIElementsSamples.cs
+++ b/Modules/UIElementsSamplesEditor/UIElementsSamples.cs
@@ -94,6 +94,7 @@ public void OnEnable()
                 new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("HelpBox", HelpBoxSnippet.Create)),
                 new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Object Field", ObjectFieldSnippet.Create)),
                 new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("List View", ListViewSnippet.Create)),
+                new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Tree View", TreeViewSnippet.Create)),
                 new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Numeric Fields", MakeNumericFieldsPanel), new List<TreeViewItemData<SampleTreeItem>>()
                 {
                     new TreeViewItemData<SampleTreeItem>(nextId++, new SampleTreeItem("Integer", IntegerFieldSnippet.Create)),
@@ -178,7 +179,7 @@ public void OnEnable()
             treeView.SetRootItems(items);
             treeView.makeItem = makeItem;
             treeView.bindItem = bindItem;
-            treeView.onSelectedIndicesChange += onSelectionChanged;
+            treeView.selectedIndicesChanged += onSelectionChanged;
             treeView.Rebuild();
 
             // Force TreeView to call onSelectionChanged when it restores its own selection from view data.
diff --git a/Modules/UIServiceEditor/EditorUIService.cs b/Modules/UIServiceEditor/EditorUIService.cs
deleted file mode 100644
index 6b70009910..0000000000
--- a/Modules/UIServiceEditor/EditorUIService.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Linq;
-using UnityEditor.PackageManager.UI;
-using UnityEditor.ShortcutManagement;
-using UnityEditor.StyleSheets;
-using UnityEditor.Toolbars;
-using UnityEditor.UIElements;
-using UnityEditor.UIElements.StyleSheets;
-using UnityEditorInternal;
-using UnityEngine;
-using UnityEngine.Scripting;
-using UnityEngine.UIElements;
-
-namespace UnityEditor
-{
-    internal class EditorUIServiceImpl : IEditorUIService
-    {
-        // This is called on beforeProcessingInitializeOnLoad callback to ensure
-        // the instance is set before InitializeOnLoad attributes are processed
-        [RequiredByNativeCode]
-        static void InitializeInstance()
-        {
-            if (EditorUIService.instance == null)
-                EditorUIService.instance = new EditorUIServiceImpl();
-        }
-
-        private EditorUIServiceImpl()
-        {}
-
-        public IWindowBackend GetDefaultWindowBackend(IWindowModel model) => model is IEditorWindowModel ? new DefaultEditorWindowBackend() : new DefaultWindowBackend();
-
-        public Type GetDefaultToolbarType() => typeof(DefaultMainToolbar);
-        public void AddSubToolbar(SubToolbar subToolbar) => MainToolbarImguiContainer.AddDeprecatedSubToolbar(subToolbar);
-
-        public IEditorElement CreateEditorElement(int editorIndex, IPropertyView iw, string title) => new EditorElement(editorIndex, iw) {name = title};
-
-        public IEditorElement CreateCulledEditorElement(int editorIndex, IPropertyView iw, string title) => new EditorElement(editorIndex, iw, true) {name = title};
-
-        public void PackageManagerOpen() => PackageManagerWindow.OpenPackageManager(null);
-
-        public IShortcutManagerWindowView CreateShortcutManagerWindowView(IShortcutManagerWindowViewController viewController, IKeyBindingStateProvider bindingStateProvider) =>
-            new ShortcutManagerWindowView(viewController, bindingStateProvider);
-
-        public void ProgressWindowShowDetails(bool shouldReposition) => ProgressWindow.ShowDetails(shouldReposition);
-        public void ProgressWindowHideDetails() => ProgressWindow.HideDetails();
-        public bool ProgressWindowCanHideDetails() => ProgressWindow.canHideDetails;
-
-        public void AddDefaultEditorStyleSheets(VisualElement ve) => UIElementsEditorUtility.AddDefaultEditorStyleSheets(ve);
-        public string GetUIToolkitDefaultCommonDarkStyleSheetPath() => UIElementsEditorUtility.s_DefaultCommonDarkStyleSheetPath;
-        public string GetUIToolkitDefaultCommonLightStyleSheetPath() => UIElementsEditorUtility.s_DefaultCommonLightStyleSheetPath;
-        public StyleSheet GetUIToolkitDefaultCommonDarkStyleSheet() => UIElementsEditorUtility.GetCommonDarkStyleSheet();
-        public StyleSheet GetUIToolkitDefaultCommonLightStyleSheet() => UIElementsEditorUtility.GetCommonLightStyleSheet();
-
-        public StyleSheet CompileStyleSheetContent(string styleSheetContent, bool disableValidation, bool reportErrors)
-        {
-            var importer = new StyleSheetImporterImpl();
-            var styleSheet = ScriptableObject.CreateInstance<StyleSheet>();
-            importer.disableValidation = disableValidation;
-            importer.Import(styleSheet, styleSheetContent);
-            if (reportErrors)
-            {
-                foreach (var err in importer.importErrors)
-                    Debug.LogFormat(LogType.Warning, LogOption.NoStacktrace, styleSheet, err.ToString());
-            }
-            return styleSheet;
-        }
-
-        public VisualElement CreateUnityEventItem()
-        {
-            return new UnityEventItem();
-        }
-
-        public void BindUnityEventItem(VisualElement item, UnityEventDrawer.PropertyData propertyData, Func<GenericMenu> createMenuCallback, Func<string, string> formatSelectedValueCallback, Func<SerializedProperty> getArgumentCallback)
-        {
-            var eventItem = item as UnityEventItem;
-            eventItem.BindFields(propertyData, createMenuCallback, formatSelectedValueCallback, getArgumentCallback);
-        }
-
-        public BindableElement CreateObjectField()
-        {
-            var objectField = new ObjectField();
-            return objectField;
-        }
-
-        public void SetObjectField(VisualElement element, UnityEngine.Object value, Type type, string label)
-        {
-            var objectField = element as ObjectField;
-            objectField.label = label;
-            objectField.objectType = type;
-            objectField.value = value;
-        }
-
-        public ListView CreateListViewBinding(SerializedObject serializedObject)
-        {
-            var listView = new ListView();
-            listView.Bind(serializedObject);
-            return listView;
-        }
-
-        public VisualElement CreateDropdownField(string[] options, Func<int> getSelectedChoiceCallback)
-        {
-            var dropdownField = new DropdownField();
-            dropdownField.choices = options.ToList();
-            dropdownField.createMenuCallback = () =>
-            {
-                var osMenu = new GenericOSMenu();
-
-                for (int i = 0; i < options.Length; i++)
-                {
-                    var option = options[i];
-                    var isValueSelected = getSelectedChoiceCallback.Invoke() == i;
-
-                    osMenu.AddItem(option, isValueSelected, () =>
-                    {
-                        dropdownField.value = option;
-                    });
-                }
-
-                return osMenu;
-            };
-            dropdownField.formatSelectedValueCallback = (value) =>
-            {
-                // Don't show label for this dropdown
-                return "";
-            };
-
-            dropdownField.index = getSelectedChoiceCallback.Invoke();
-
-            return dropdownField;
-        }
-
-        public VisualElement CreatePropertyField(SerializedProperty serializedProperty, string label)
-        {
-            return new PropertyField(serializedProperty, label);
-        }
-
-        public BindableElement CreateFloatField(string name, Func<float, float> onValidateValue = null, bool isDelayed = false)
-        {
-            return SetupField(name, onValidateValue, isDelayed, new FloatField());
-        }
-
-        public BindableElement CreateDoubleField(string name, Func<double, double> onValidateValue = null, bool isDelayed = false)
-        {
-            return SetupField(name, onValidateValue, isDelayed, new DoubleField());
-        }
-
-        public BindableElement CreateIntField(string name, Func<int, int> onValidateValue = null, bool isDelayed = false)
-        {
-            return SetupField(name, onValidateValue, isDelayed, new IntegerField());
-        }
-
-        public BindableElement CreateLongField(string name, Func<long, long> onValidateValue = null, bool isDelayed = false)
-        {
-            return SetupField(name, onValidateValue, isDelayed, new LongField());
-        }
-
-        public BindableElement CreateVector2Field(string name, Func<Vector2, Vector2> onValidateValue)
-        {
-            return SetupField(name, onValidateValue, new Vector2Field());
-        }
-
-        public BindableElement CreateVector2IntField(string name, Func<Vector2Int, Vector2Int> onValidateValue)
-        {
-            return SetupField(name, onValidateValue, new Vector2IntField());
-        }
-
-        public BindableElement CreateVector3Field(string name, Func<Vector3, Vector3> onValidateValue)
-        {
-            return SetupField(name, onValidateValue, new Vector3Field());
-        }
-
-        public BindableElement CreateVector3IntField(string name, Func<Vector3Int, Vector3Int> onValidateValue)
-        {
-            return SetupField(name, onValidateValue, new Vector3IntField());
-        }
-
-        public BindableElement CreateVector4Field(string name, Func<Vector4, Vector4> onValidateValue)
-        {
-            return SetupField(name, onValidateValue, new Vector4Field());
-        }
-
-        public BindableElement CreateTextField(string name = null, bool isMultiLine = false, bool isDelayed = false)
-        {
-            var field = new TextField(name);
-            field.multiline = isMultiLine;
-            field.isDelayed = isDelayed;
-            return field;
-        }
-
-        public BindableElement CreateColorField(string name, bool showAlpha, bool hdr)
-        {
-            var field = new ColorField(name);
-            field.showAlpha = showAlpha;
-            field.hdr = hdr;
-            return field;
-        }
-
-        public BindableElement CreateGradientField(string name, bool hdr, ColorSpace colorSpace)
-        {
-            var field = new GradientField(name);
-            field.colorSpace = colorSpace;
-            field.hdr = hdr;
-            return field;
-        }
-
-        private TFieldType SetupField<TFieldType, TValueType>(string name, Func<TValueType, TValueType> onValidate, bool isDelayed, TFieldType field) where TFieldType : TextInputBaseField<TValueType>
-        {
-            SetupField(name, onValidate, field);
-
-            field.isDelayed = isDelayed;
-
-            return field;
-        }
-
-        private TFieldType SetupField<TFieldType, TValueType>(string name, Func<TValueType, TValueType> onValidate, TFieldType field) where TFieldType : BaseField<TValueType>
-        {
-            field.label = name;
-
-            if (onValidate != null)
-            {
-                field.onValidateValue += onValidate;
-            }
-
-            return field;
-        }
-    }
-}
diff --git a/Modules/UNET/Managed/MatchMakingClient.cs b/Modules/UNET/Managed/MatchMakingClient.cs
deleted file mode 100644
index d3d61e3c74..0000000000
--- a/Modules/UNET/Managed/MatchMakingClient.cs
+++ /dev/null
@@ -1,435 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine.Networking.Types;
-
-namespace UnityEngine.Networking.Match
-{
-    // returned when you create or join a match (private info)
-    //[Serializable] //TODO: enabled this when 64 bit enum issue is resolved
-    [Obsolete("The matchmaker and relay feature will be removed in the future, minimal support will continue until this can be safely done.")]
-    public class MatchInfo
-    {
-        public string address { get; private set; }
-        public int port { get; private set; }
-        public int domain { get; private set; }
-        public NetworkID networkId { get; private set; }
-        public NetworkAccessToken accessToken { get; private set; }
-        public NodeID nodeId { get; private set; }
-        public bool usingRelay { get; private set; }
-
-        public MatchInfo()
-        {}
-
-        internal MatchInfo(CreateMatchResponse matchResponse)
-        {
-            address = matchResponse.address;
-            port = matchResponse.port;
-            domain = matchResponse.domain;
-            networkId = (NetworkID)matchResponse.networkId;
-            accessToken = new NetworkAccessToken(matchResponse.accessTokenString);
-            nodeId = matchResponse.nodeId;
-            usingRelay = matchResponse.usingRelay;
-        }
-
-        internal MatchInfo(JoinMatchResponse matchResponse)
-        {
-            address = matchResponse.address;
-            port = matchResponse.port;
-            domain = matchResponse.domain;
-            networkId = (NetworkID)matchResponse.networkId;
-            accessToken = new NetworkAccessToken(matchResponse.accessTokenString);
-            nodeId = matchResponse.nodeId;
-            usingRelay = matchResponse.usingRelay;
-        }
-
-        public override string ToString()
-        {
-            return UnityString.Format("{0} @ {1}:{2} [{3},{4}]", networkId, address, port, nodeId, usingRelay);
-        }
-    }
-
-    [Obsolete("The matchmaker and relay feature will be removed in the future, minimal support will continue until this can be safely done.")]
-    public class MatchInfoSnapshot
-    {
-        public NetworkID networkId { get; private set; }
-        public NodeID hostNodeId { get; private set; }
-        public string name { get; private set; }
-        public int averageEloScore { get; private set; }
-        public int maxSize { get; private set; }
-        public int currentSize { get; private set; }
-        public bool isPrivate { get; private set; }
-
-        public Dictionary<string, long> matchAttributes { get; private set; }
-        public List<MatchInfoDirectConnectSnapshot> directConnectInfos { get; private set; }
-
-
-        public class MatchInfoDirectConnectSnapshot
-        {
-            public NodeID nodeId { get; private set; }
-            public string publicAddress { get; private set; }
-            public string privateAddress { get; private set; }
-            public HostPriority hostPriority { get; private set; }
-
-            public MatchInfoDirectConnectSnapshot()
-            {}
-
-            internal MatchInfoDirectConnectSnapshot(MatchDirectConnectInfo matchDirectConnectInfo)
-            {
-                nodeId = matchDirectConnectInfo.nodeId;
-                publicAddress = matchDirectConnectInfo.publicAddress;
-                privateAddress = matchDirectConnectInfo.privateAddress;
-                hostPriority = matchDirectConnectInfo.hostPriority;
-            }
-        }
-
-        public MatchInfoSnapshot()
-        {}
-
-        internal MatchInfoSnapshot(MatchDesc matchDesc)
-        {
-            networkId = (NetworkID)matchDesc.networkId;
-            hostNodeId = matchDesc.hostNodeId;
-            name = matchDesc.name;
-            averageEloScore = matchDesc.averageEloScore;
-            maxSize = matchDesc.maxSize;
-            currentSize = matchDesc.currentSize;
-            isPrivate = matchDesc.isPrivate;
-
-            matchAttributes = matchDesc.matchAttributes;
-
-            directConnectInfos = new List<MatchInfoDirectConnectSnapshot>();
-            foreach (MatchDirectConnectInfo dci in matchDesc.directConnectInfos)
-            {
-                directConnectInfos.Add(new MatchInfoDirectConnectSnapshot(dci));
-            }
-        }
-    }
-
-    [Obsolete("The matchmaker and relay feature will be removed in the future, minimal support will continue until this can be safely done.")]
-    public class NetworkMatch : MonoBehaviour
-    {
-        public delegate void BasicResponseDelegate(bool success, string extendedInfo);
-        public delegate void DataResponseDelegate<T>(bool success, string extendedInfo, T responseData);
-
-        private delegate void InternalResponseDelegate<T, U>(T response, U userCallback);
-
-        private Uri m_BaseUri = new Uri("https://mm.unet.unity3d.com");
-
-        public Uri baseUri { get { return m_BaseUri; } set { m_BaseUri = value; } }
-
-        // The methods that perform operations return an IEnumerator to pass to StartCoroutine.
-        // The specified delegate function will be called when the web request completed. For example:
-        // - StartCoroutine(myMatchMaker.Create(create, OnMatchCreate));
-        // - StartCoroutine(myMatchMaker.JoinMatch(myGuid, myMatch.matchId, "", OnMatchJoined));
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        [Obsolete("This function is not used any longer to interface with the matchmaker. Please set up your project by logging in through the editor connect dialog.", true)]
-        public void SetProgramAppID(AppID programAppID)
-        {
-        }
-
-        public Coroutine CreateMatch(string matchName, uint matchSize, bool matchAdvertise, string matchPassword, string publicClientAddress, string privateClientAddress, int eloScoreForMatch, int requestDomain, DataResponseDelegate<MatchInfo> callback)
-        {
-            if (UnityEngine.Application.platform == RuntimePlatform.WebGLPlayer)
-            {
-                Debug.LogError("Matchmaking is not supported on WebGL player.");
-                return null;
-            }
-            return CreateMatch(new CreateMatchRequest { name = matchName, size = matchSize, advertise = matchAdvertise, password = matchPassword, publicAddress = publicClientAddress, privateAddress = privateClientAddress, eloScore = eloScoreForMatch, domain = requestDomain }, callback);
-        }
-
-        internal Coroutine CreateMatch(CreateMatchRequest req, DataResponseDelegate<MatchInfo> callback)
-        {
-            if (callback == null)
-            {
-                Debug.Log("callback supplied is null, aborting CreateMatch Request.");
-                return null;
-            }
-
-            Uri uri = new Uri(baseUri, "/json/reply/CreateMatchRequest");
-            Debug.Log("MatchMakingClient Create :" + uri);
-
-            var data = new WWWForm();
-
-            data.AddField("version", UnityEngine.Networking.Match.Request.currentVersion);
-            data.AddField("projectId", Application.cloudProjectId);
-            data.AddField("sourceId", Utility.GetSourceID().ToString());
-            data.AddField("accessTokenString", 0); // Set the access token to 0 for any new match request
-            data.AddField("domain", req.domain);
-
-            data.AddField("name", req.name);
-            data.AddField("size", req.size.ToString());
-            data.AddField("advertise", req.advertise.ToString());
-            data.AddField("password", req.password);
-            data.AddField("publicAddress", req.publicAddress);
-            data.AddField("privateAddress", req.privateAddress);
-            data.AddField("eloScore", req.eloScore.ToString());
-
-            data.headers["Accept"] = "application/json";
-
-            var client = UnityWebRequest.Post(uri.ToString(), data);
-            return StartCoroutine(ProcessMatchResponse<CreateMatchResponse, DataResponseDelegate<MatchInfo>>(client, OnMatchCreate, callback));
-        }
-
-        internal virtual void OnMatchCreate(CreateMatchResponse response, DataResponseDelegate<MatchInfo> userCallback)
-        {
-            if (response.success)
-                Utility.SetAccessTokenForNetwork((NetworkID)response.networkId, new NetworkAccessToken(response.accessTokenString));
-
-            userCallback(response.success, response.extendedInfo, new MatchInfo(response));
-        }
-
-        public Coroutine JoinMatch(NetworkID netId, string matchPassword, string publicClientAddress, string privateClientAddress, int eloScoreForClient, int requestDomain, DataResponseDelegate<MatchInfo> callback)
-        {
-            return JoinMatch(new JoinMatchRequest { networkId = netId, password = matchPassword, publicAddress = publicClientAddress, privateAddress = privateClientAddress, eloScore = eloScoreForClient, domain = requestDomain }, callback);
-        }
-
-        // Begin joining a match
-        internal Coroutine JoinMatch(JoinMatchRequest req, DataResponseDelegate<MatchInfo> callback)
-        {
-            if (callback == null)
-            {
-                Debug.Log("callback supplied is null, aborting JoinMatch Request.");
-                return null;
-            }
-
-            Uri uri = new Uri(baseUri, "/json/reply/JoinMatchRequest");
-            Debug.Log("MatchMakingClient Join :" + uri);
-
-            var data = new WWWForm();
-
-            data.AddField("version", UnityEngine.Networking.Match.Request.currentVersion);
-            data.AddField("projectId", Application.cloudProjectId);
-            data.AddField("sourceId", Utility.GetSourceID().ToString());
-            data.AddField("accessTokenString", 0);
-            data.AddField("domain", req.domain);
-
-            data.AddField("networkId", req.networkId.ToString());
-            data.AddField("password", req.password);
-            data.AddField("publicAddress", req.publicAddress);
-            data.AddField("privateAddress", req.privateAddress);
-            data.AddField("eloScore", req.eloScore.ToString());
-
-            data.headers["Accept"] = "application/json";
-
-            var client = UnityWebRequest.Post(uri.ToString(), data);
-            return StartCoroutine(ProcessMatchResponse<JoinMatchResponse, DataResponseDelegate<MatchInfo>>(client, OnMatchJoined, callback));
-        }
-
-        internal void OnMatchJoined(JoinMatchResponse response, DataResponseDelegate<MatchInfo> userCallback)
-        {
-            if (response.success)
-                Utility.SetAccessTokenForNetwork((NetworkID)response.networkId, new NetworkAccessToken(response.accessTokenString));
-
-            userCallback(response.success, response.extendedInfo, new MatchInfo(response));
-        }
-
-        public Coroutine DestroyMatch(NetworkID netId, int requestDomain, BasicResponseDelegate callback)
-        {
-            return DestroyMatch(new DestroyMatchRequest { networkId = netId, domain = requestDomain }, callback);
-        }
-
-        // Start to destroy a match
-        internal Coroutine DestroyMatch(DestroyMatchRequest req, BasicResponseDelegate callback)
-        {
-            if (callback == null)
-            {
-                Debug.Log("callback supplied is null, aborting DestroyMatch Request.");
-                return null;
-            }
-
-            Uri uri = new Uri(baseUri, "/json/reply/DestroyMatchRequest");
-            Debug.Log("MatchMakingClient Destroy :" + uri);
-
-            var data = new WWWForm();
-
-            data.AddField("version", UnityEngine.Networking.Match.Request.currentVersion);
-            data.AddField("projectId", Application.cloudProjectId);
-            data.AddField("sourceId", Utility.GetSourceID().ToString());
-            data.AddField("accessTokenString", Utility.GetAccessTokenForNetwork(req.networkId).GetByteString());
-            data.AddField("domain", req.domain);
-
-            data.AddField("networkId", req.networkId.ToString());
-
-            data.headers["Accept"] = "application/json";
-
-            var client = UnityWebRequest.Post(uri.ToString(), data);
-            return StartCoroutine(ProcessMatchResponse<BasicResponse, BasicResponseDelegate>(client, OnMatchDestroyed, callback));
-        }
-
-        internal void OnMatchDestroyed(BasicResponse response, BasicResponseDelegate userCallback)
-        {
-            userCallback(response.success, response.extendedInfo);
-        }
-
-        public Coroutine DropConnection(NetworkID netId, NodeID dropNodeId, int requestDomain, BasicResponseDelegate callback)
-        {
-            return DropConnection(new DropConnectionRequest { networkId = netId, nodeId = dropNodeId, domain = requestDomain }, callback);
-        }
-
-        // Start to drop a connection from a match
-        internal Coroutine DropConnection(DropConnectionRequest req, BasicResponseDelegate callback)
-        {
-            if (callback == null)
-            {
-                Debug.Log("callback supplied is null, aborting DropConnection Request.");
-                return null;
-            }
-
-            Uri uri = new Uri(baseUri, "/json/reply/DropConnectionRequest");
-            Debug.Log("MatchMakingClient DropConnection :" + uri);
-
-            var data = new WWWForm();
-
-            data.AddField("version", UnityEngine.Networking.Match.Request.currentVersion);
-            data.AddField("projectId", Application.cloudProjectId);
-            data.AddField("sourceId", Utility.GetSourceID().ToString());
-            data.AddField("accessTokenString", Utility.GetAccessTokenForNetwork(req.networkId).GetByteString());
-            data.AddField("domain", req.domain);
-
-            data.AddField("networkId", req.networkId.ToString());
-            data.AddField("nodeId", req.nodeId.ToString());
-
-            data.headers["Accept"] = "application/json";
-
-            var client = UnityWebRequest.Post(uri.ToString(), data);
-            return StartCoroutine(ProcessMatchResponse<DropConnectionResponse, BasicResponseDelegate>(client, OnDropConnection, callback));
-        }
-
-        internal void OnDropConnection(DropConnectionResponse response, BasicResponseDelegate userCallback)
-        {
-            userCallback(response.success, response.extendedInfo);
-        }
-
-        public Coroutine ListMatches(int startPageNumber, int resultPageSize, string matchNameFilter, bool filterOutPrivateMatchesFromResults, int eloScoreTarget, int requestDomain, DataResponseDelegate<List<MatchInfoSnapshot>> callback)
-        {
-            if (UnityEngine.Application.platform == RuntimePlatform.WebGLPlayer)
-            {
-                Debug.LogError("Matchmaking is not supported on WebGL player.");
-                return null;
-            }
-            else
-                return ListMatches(new ListMatchRequest { pageNum = startPageNumber, pageSize = resultPageSize, nameFilter = matchNameFilter, filterOutPrivateMatches = filterOutPrivateMatchesFromResults, eloScore = eloScoreTarget, domain = requestDomain }, callback);
-        }
-
-        // Start getting a list of matches
-        internal Coroutine ListMatches(ListMatchRequest req, DataResponseDelegate<List<MatchInfoSnapshot>> callback)
-        {
-            if (callback == null)
-            {
-                Debug.Log("callback supplied is null, aborting ListMatch Request.");
-                return null;
-            }
-
-            Uri uri = new Uri(baseUri, "/json/reply/ListMatchRequest");
-            Debug.Log("MatchMakingClient ListMatches :" + uri);
-
-            var data = new WWWForm();
-
-            data.AddField("version", UnityEngine.Networking.Match.Request.currentVersion);
-            data.AddField("projectId", Application.cloudProjectId);
-            data.AddField("sourceId", Utility.GetSourceID().ToString());
-            data.AddField("accessTokenString", 0); // Set access token to 0 for list requests
-            data.AddField("domain", req.domain);
-
-            data.AddField("pageSize", req.pageSize);
-            data.AddField("pageNum", req.pageNum);
-            data.AddField("nameFilter", req.nameFilter);
-            data.AddField("filterOutPrivateMatches", req.filterOutPrivateMatches.ToString());
-            data.AddField("eloScore", req.eloScore.ToString());
-
-            data.headers["Accept"] = "application/json";
-
-            var client = UnityWebRequest.Post(uri.ToString(), data);
-            return StartCoroutine(ProcessMatchResponse<ListMatchResponse, DataResponseDelegate<List<MatchInfoSnapshot>>>(client, OnMatchList, callback));
-        }
-
-        internal void OnMatchList(ListMatchResponse response, DataResponseDelegate<List<MatchInfoSnapshot>> userCallback)
-        {
-            List<MatchInfoSnapshot> matchInfoList = new List<MatchInfoSnapshot>();
-            foreach (MatchDesc match in response.matches)
-            {
-                matchInfoList.Add(new MatchInfoSnapshot(match));
-            }
-
-            userCallback(response.success, response.extendedInfo, matchInfoList);
-        }
-
-        public Coroutine SetMatchAttributes(NetworkID networkId, bool isListed, int requestDomain, BasicResponseDelegate callback)
-        {
-            return SetMatchAttributes(new SetMatchAttributesRequest { networkId = networkId, isListed = isListed, domain = requestDomain }, callback);
-        }
-
-        // Set attributes for matches in progress
-        internal Coroutine SetMatchAttributes(SetMatchAttributesRequest req, BasicResponseDelegate callback)
-        {
-            if (callback == null)
-            {
-                Debug.Log("callback supplied is null, aborting SetMatchAttributes Request.");
-                return null;
-            }
-
-            Uri uri = new Uri(baseUri, "/json/reply/SetMatchAttributesRequest");
-            Debug.Log("MatchMakingClient SetMatchAttributes :" + uri);
-
-            var data = new WWWForm();
-
-            data.AddField("version", UnityEngine.Networking.Match.Request.currentVersion);
-            data.AddField("projectId", Application.cloudProjectId);
-            data.AddField("sourceId", Utility.GetSourceID().ToString());
-            data.AddField("accessTokenString", Utility.GetAccessTokenForNetwork(req.networkId).GetByteString());
-            data.AddField("domain", req.domain);
-
-            data.AddField("networkId", req.networkId.ToString());
-            data.AddField("isListed", req.isListed.ToString());
-
-            data.headers["Accept"] = "application/json";
-
-            var client = UnityWebRequest.Post(uri.ToString(), data);
-            return StartCoroutine(ProcessMatchResponse<BasicResponse, BasicResponseDelegate>(client, OnSetMatchAttributes, callback));
-        }
-
-        internal void OnSetMatchAttributes(BasicResponse response, BasicResponseDelegate userCallback)
-        {
-            userCallback(response.success, response.extendedInfo);
-        }
-
-        // ------------ private functions below ----------------------
-
-
-        // Coroutine for getting a match info response
-        private IEnumerator ProcessMatchResponse<JSONRESPONSE, USERRESPONSEDELEGATETYPE>(UnityWebRequest client, InternalResponseDelegate<JSONRESPONSE, USERRESPONSEDELEGATETYPE> internalCallback, USERRESPONSEDELEGATETYPE userCallback) where JSONRESPONSE : Response, new()
-        {
-            // wait for request to complete
-            yield return client.SendWebRequest();
-
-            JSONRESPONSE jsonInterface = new JSONRESPONSE();
-
-            if (client.result == UnityWebRequest.Result.Success)
-            {
-                try
-                {
-                    JsonUtility.FromJsonOverwrite(client.downloadHandler.text, jsonInterface);
-                }
-                catch (ArgumentException exception)
-                {
-                    jsonInterface.SetFailure(UnityString.Format("ArgumentException:[{0}] ", exception.ToString()));
-                }
-            }
-            else
-            {
-                jsonInterface.SetFailure(UnityString.Format("Request error:[{0}] Raw response:[{1}]", client.error, client.downloadHandler.text));
-            }
-
-            client.Dispose();
-
-            internalCallback(jsonInterface, userCallback);
-        }
-    }
-}
-
diff --git a/Modules/UNET/Managed/NetworkTransport.cs b/Modules/UNET/Managed/NetworkTransport.cs
deleted file mode 100644
index f3bd144807..0000000000
--- a/Modules/UNET/Managed/NetworkTransport.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-
-using System;
-using System.Net;
-using System.Runtime.InteropServices;
-
-namespace UnityEngine.Networking
-{
-    public sealed partial class NetworkTransport
-    {
-        public static bool DoesEndPointUsePlatformProtocols(EndPoint endPoint)
-        {
-            if (endPoint.GetType().FullName == "UnityEngine.PS4.SceEndPoint")
-            {
-                SocketAddress src = endPoint.Serialize();
-
-                // is vport area non zero?
-                if ((src[8] != 0) || (src[9] != 0))
-                    return true;
-            }
-            return false;
-        }
-
-        //function will return connection id for this connect request
-        ///PopData with eventtype ConnectEvent will be signal that this slot is successfully connected
-        ///exceptionConnectionId defines connectionId with exception tuning params (returned from AddConfigException)
-        ///exceptionConnectionId==0 means default connection
-        ///return connectionId if success 0 otherwise
-        public static int ConnectEndPoint(int hostId, EndPoint endPoint, int exceptionConnectionId, out byte error)
-        {
-            error = 0;
-
-            // This class is implemented in the Xbox One Plugins API
-            const string kXboxOneEndPointClass = "UnityEngine.XboxOne.XboxOneEndPoint";
-            // XboxOneEndPoint validation constants
-            byte[] XboxOneEndPointPacketSignature = new byte[] { 0x5f, 0x24, 0x13, 0xf6 }; // Our magic signature (it's a constant we randomly-generated)
-            const int kXboxOneEndPointPacketSize = 2 + 4 + 8; // sizeof(AddressFamily) + XboxOneEndPointPacketSignature.Length + 8 bytes(64bit pointer)
-            const int kSDASocketStorageOffset = 6; // sizeof(AddressFamily) + XboxOneEndPointPacketSignature.Length
-            const int kSockAddrStorageLength = 128; // sizeof(sockaddr_storage)
-
-            if (endPoint == null) // We require an XboxOneEndPoint to continue
-                throw new NullReferenceException("Null EndPoint provided");
-            if ((endPoint.GetType().FullName != kXboxOneEndPointClass) && (endPoint.GetType().FullName != "UnityEngine.PS4.SceEndPoint") && (endPoint.GetType().FullName != "UnityEngine.PSVita.SceEndPoint"))
-                throw new ArgumentException("Endpoint of type XboxOneEndPoint or SceEndPoint  required");
-
-            if (endPoint.GetType().FullName == kXboxOneEndPointClass)
-            {
-                EndPoint xboxOneEndPoint = endPoint;
-                if (xboxOneEndPoint.AddressFamily != System.Net.Sockets.AddressFamily.InterNetworkV6)
-                    throw new ArgumentException("XboxOneEndPoint has an invalid family");
-
-                // Okay, now serialise the endpoint, and convert it to a normal byte[] buffer
-                SocketAddress src = xboxOneEndPoint.Serialize();
-
-                if (src.Size != kXboxOneEndPointPacketSize) // The specified socket is not an XboxEndPoint (wrong size!)
-                    throw new ArgumentException("XboxOneEndPoint has an invalid size");
-
-                if (src[0] != 0 || src[1] != 0)
-                    throw new ArgumentException("XboxOneEndPoint has an invalid family signature");
-                if (src[2] != XboxOneEndPointPacketSignature[0] ||
-                    src[3] != XboxOneEndPointPacketSignature[1] ||
-                    src[4] != XboxOneEndPointPacketSignature[2] ||
-                    src[5] != XboxOneEndPointPacketSignature[3])
-                    throw new ArgumentException("XboxOneEndPoint has an invalid signature");
-
-                // Okay, now extract the pointer to the SOCKET_STORAGE address to a byte array
-                byte[] dst = new byte[8]; // 8 bytes (64bit pointer)
-                for (int i = 0; i < dst.Length; ++i)
-                {
-                    dst[i] = src[kSDASocketStorageOffset + i];
-                }
-
-                // Convert the byte[] pointer to an IntPtr so we can marshal copy info from the underlying native socket object below
-                IntPtr socketPointer = new IntPtr(BitConverter.ToInt64(dst, 0));
-                if (socketPointer == IntPtr.Zero)
-                    throw new ArgumentException("XboxOneEndPoint has an invalid SOCKET_STORAGE pointer");
-
-                // check that the socket pointed to by socketPointer has an address family of type IPv6
-                byte[] SocketAddressFamily = new byte[2]; // short
-                System.Runtime.InteropServices.Marshal.Copy(socketPointer, SocketAddressFamily, 0, SocketAddressFamily.Length); // copy over the first 2 bytes from the object pointed to by socketPointer
-                System.Net.Sockets.AddressFamily a = (System.Net.Sockets.AddressFamily)((((int)SocketAddressFamily[1]) << 8) + (int)SocketAddressFamily[0]);
-                if (a != System.Net.Sockets.AddressFamily.InterNetworkV6)
-                    throw new ArgumentException("XboxOneEndPoint has corrupt or invalid SOCKET_STORAGE pointer");
-
-                // everything should be OK so call the internal function to begin the connect handshake to this socket
-                return Internal_ConnectEndPoint(hostId, dst, kSockAddrStorageLength, exceptionConnectionId, out error);
-            }
-            else
-            {
-                const int kSceEndPointPacketSize = 16;
-                const int kSceSockAddrSize = 16;
-                const int kSCE_NET_AF_INET = 2; // from <socket.h>
-                // Sony platforms network code
-                SocketAddress src = endPoint.Serialize();
-
-                if (src.Size != kSceEndPointPacketSize) // The specified socket is not an XboxEndPoint (wrong size!)
-                    throw new ArgumentException("EndPoint has an invalid size");
-
-                if (src[0] != src.Size)
-                    throw new ArgumentException("EndPoint has an invalid size value");
-
-                if (src[1] != kSCE_NET_AF_INET)
-                    throw new ArgumentException("EndPoint has an invalid family value");
-
-                byte[] dst = new byte[kSceSockAddrSize];
-                for (int i = 0; i < dst.Length; ++i)
-                {
-                    dst[i] = src[i];
-                }
-
-                int result = Internal_ConnectEndPoint(hostId, dst, kSceSockAddrSize, exceptionConnectionId, out error);
-                return result;
-            }
-        }
-    } // NetworkTransport class
-} // UnityEngine.Networking namespace
-
diff --git a/Modules/UNET/Managed/NetworkTransportConfig.cs b/Modules/UNET/Managed/NetworkTransportConfig.cs
deleted file mode 100644
index 58215778dd..0000000000
--- a/Modules/UNET/Managed/NetworkTransportConfig.cs
+++ /dev/null
@@ -1,784 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-//part of user api
-
-using System;
-using UnityEngineInternal;
-using System.Collections.Generic;
-
-namespace UnityEngine.Networking
-{
-    public enum NetworkEventType
-    {
-        DataEvent = 0,
-        ConnectEvent = 1,
-        DisconnectEvent = 2,
-        Nothing = 3,
-        BroadcastEvent = 4
-    }
-
-    public enum QosType
-    {
-        Unreliable = 0,
-        UnreliableFragmented = 1,
-        UnreliableSequenced = 2,
-        Reliable = 3,
-        ReliableFragmented = 4,
-        ReliableSequenced = 5,
-        StateUpdate = 6,
-        ReliableStateUpdate = 7,
-        AllCostDelivery = 8,
-        UnreliableFragmentedSequenced = 9,
-        ReliableFragmentedSequenced = 10
-    }
-
-    public enum NetworkError
-    {
-        Ok = 0x0, //everything good
-        WrongHost, //host id mismatch or host not ready yet
-        WrongConnection, //connection id mismatch or connection is has not connected yet
-        WrongChannel, //channel id mismatch
-        NoResources, //system doesn't have resources to accomplish operation
-        BadMessage, //received message is malformed
-        Timeout,
-        //system cannot accomplish operation in time and connection will be closed, or connection to slow, or % of drop packet is high
-        MessageToLong,
-        //sending message it too long for sending channel qos or providing buffer is to small for receiving message
-        WrongOperation, //attempt to start sending message to group before previous sending has not finished
-        VersionMismatch, //library version are different for this connection
-        CRCMismatch, //quality of service mismatch for this connection
-        DNSFailure, //hostname was not able to be resolved to an IP address
-        UsageError //if any function is called with the wrong type of arguments or sizes
-    }
-
-    public enum ReactorModel
-    {
-        SelectReactor = 0,
-        FixRateReactor = 1
-    }
-
-    public enum ConnectionAcksType
-    {
-        Acks32 = 1,
-        Acks64 = 2,
-        Acks96 = 3,
-        Acks128 = 4
-    }
-
-    [Serializable]
-    [Obsolete("The UNET transport will be removed in the future as soon a replacement is ready.")]
-    public class ChannelQOS
-    {
-        [SerializeField]
-        internal QosType m_Type;
-
-        [SerializeField]
-        internal bool m_BelongsSharedOrderChannel;
-
-        public ChannelQOS(QosType value)
-        {
-            m_Type = value;
-            m_BelongsSharedOrderChannel = false;
-        }
-
-        public ChannelQOS()
-        {
-            m_Type = QosType.Unreliable;
-            m_BelongsSharedOrderChannel = false;
-        }
-
-        public ChannelQOS(ChannelQOS channel)
-        {
-            if (channel == null)
-                throw new NullReferenceException("channel is not defined");
-            m_Type = channel.m_Type;
-            m_BelongsSharedOrderChannel = channel.m_BelongsSharedOrderChannel;
-        }
-
-        public QosType QOS { get { return m_Type; } }
-        public bool BelongsToSharedOrderChannel { get { return m_BelongsSharedOrderChannel; } }
-    }
-
-    //connection configuration proxy class
-    //contains connection profile + channel definitions
-    //to allow user manipulate channel info via property with parameter (using array interface)
-    //all fields are defined for direct access from HLAPI (it it needed)
-    [Serializable]
-    [Obsolete("The UNET transport will be removed in the future as soon a replacement is ready.")]
-    public class ConnectionConfig
-    {
-        private  const int g_MinPacketSize = 128;
-        [SerializeField]
-        private ushort m_PacketSize;
-        [SerializeField]
-        private ushort m_FragmentSize;
-        [SerializeField]
-        private uint m_ResendTimeout;
-        [SerializeField]
-        private uint m_DisconnectTimeout;
-        [SerializeField]
-        private uint m_ConnectTimeout;
-        [SerializeField]
-        private uint m_MinUpdateTimeout;
-        [SerializeField]
-        private uint m_PingTimeout;
-        [SerializeField]
-        private uint m_ReducedPingTimeout;
-        [SerializeField]
-        private uint m_AllCostTimeout;
-        [SerializeField]
-        private byte m_NetworkDropThreshold;
-        [SerializeField]
-        private byte m_OverflowDropThreshold;
-        [SerializeField]
-        private byte m_MaxConnectionAttempt;
-        [SerializeField]
-        private uint m_AckDelay;
-        [SerializeField]
-        private uint m_SendDelay;
-        [SerializeField]
-        private ushort m_MaxCombinedReliableMessageSize;
-        [SerializeField]
-        private ushort m_MaxCombinedReliableMessageCount;
-        [SerializeField]
-        private ushort m_MaxSentMessageQueueSize;
-        [SerializeField]
-        private ConnectionAcksType m_AcksType;
-        [SerializeField]
-        private bool m_UsePlatformSpecificProtocols;
-        [SerializeField]
-        private uint m_InitialBandwidth;
-        [SerializeField]
-        private float m_BandwidthPeakFactor;
-        [SerializeField]
-        private ushort m_WebSocketReceiveBufferMaxSize;
-        [SerializeField]
-        private uint m_UdpSocketReceiveBufferMaxSize;
-        [SerializeField]
-        private string m_SSLCertFilePath;
-        [SerializeField]
-        private string m_SSLPrivateKeyFilePath;
-        [SerializeField]
-        private string m_SSLCAFilePath;
-        [SerializeField]
-        internal List<ChannelQOS> m_Channels = new List<ChannelQOS>();
-        [SerializeField]
-        internal List<List<byte>> m_SharedOrderChannels = new List<List<byte>>();
-
-        public ConnectionConfig()
-        {
-            m_PacketSize = 1440;
-            m_FragmentSize = 500;
-            m_ResendTimeout = 1200;
-            m_DisconnectTimeout = 2000;
-            m_ConnectTimeout = 2000;
-            m_MinUpdateTimeout = 10;
-            m_PingTimeout = 500;
-            m_ReducedPingTimeout = 100;
-            m_AllCostTimeout = 20;
-            m_NetworkDropThreshold = 5;
-            m_OverflowDropThreshold = 5;
-            m_MaxConnectionAttempt = 10;
-            m_AckDelay = 33;
-            m_SendDelay = 10;
-            m_MaxCombinedReliableMessageSize = 100;
-            m_MaxCombinedReliableMessageCount = 10;
-            m_MaxSentMessageQueueSize = 512;
-            m_AcksType = ConnectionAcksType.Acks32;
-            m_UsePlatformSpecificProtocols = false;
-            m_InitialBandwidth = 0;
-            m_BandwidthPeakFactor = 2.0f;
-            m_WebSocketReceiveBufferMaxSize = 0;
-            m_UdpSocketReceiveBufferMaxSize = 0;
-            m_SSLCertFilePath = null;
-            m_SSLPrivateKeyFilePath = null;
-            m_SSLCAFilePath = null;
-        }
-
-        public ConnectionConfig(ConnectionConfig config)
-        {
-            if (config == null)
-                throw new NullReferenceException("config is not defined");
-            m_PacketSize = config.m_PacketSize;
-            m_FragmentSize = config.m_FragmentSize;
-            m_ResendTimeout = config.m_ResendTimeout;
-            m_DisconnectTimeout = config.m_DisconnectTimeout;
-            m_ConnectTimeout = config.m_ConnectTimeout;
-            m_MinUpdateTimeout = config.m_MinUpdateTimeout;
-            m_PingTimeout = config.m_PingTimeout;
-            m_ReducedPingTimeout = config.m_ReducedPingTimeout;
-            m_AllCostTimeout = config.m_AllCostTimeout;
-            m_NetworkDropThreshold = config.m_NetworkDropThreshold;
-            m_OverflowDropThreshold = config.m_OverflowDropThreshold;
-            m_MaxConnectionAttempt = config.m_MaxConnectionAttempt;
-            m_AckDelay = config.m_AckDelay;
-            m_SendDelay = config.m_SendDelay;
-            m_MaxCombinedReliableMessageSize = config.MaxCombinedReliableMessageSize;
-            m_MaxCombinedReliableMessageCount = config.m_MaxCombinedReliableMessageCount;
-            m_MaxSentMessageQueueSize = config.m_MaxSentMessageQueueSize;
-            m_AcksType = config.m_AcksType;
-            m_UsePlatformSpecificProtocols = config.m_UsePlatformSpecificProtocols;
-            m_InitialBandwidth = config.m_InitialBandwidth;
-            if (m_InitialBandwidth == 0)
-            {
-                m_InitialBandwidth = (uint)m_PacketSize * 1000 / m_MinUpdateTimeout;
-            }
-            m_BandwidthPeakFactor = config.m_BandwidthPeakFactor;
-            m_WebSocketReceiveBufferMaxSize = config.m_WebSocketReceiveBufferMaxSize;
-            m_UdpSocketReceiveBufferMaxSize = config.m_UdpSocketReceiveBufferMaxSize;
-            m_SSLCertFilePath = config.m_SSLCertFilePath;
-            m_SSLPrivateKeyFilePath = config.m_SSLPrivateKeyFilePath;
-            m_SSLCAFilePath = config.m_SSLCAFilePath;
-            foreach (var channel in config.m_Channels)
-            {
-                m_Channels.Add(new ChannelQOS(channel));
-            }
-            foreach (var channelIds in config.m_SharedOrderChannels)
-            {
-                m_SharedOrderChannels.Add(channelIds);
-            }
-        }
-
-        public static void Validate(ConnectionConfig config)
-        {
-            if (config.m_PacketSize < g_MinPacketSize) //rough estimation of largest header, as it is defined in c++; we do not have access to it
-                throw new ArgumentOutOfRangeException("PacketSize should be > " + g_MinPacketSize);
-            if (config.m_FragmentSize >= config.m_PacketSize - g_MinPacketSize)
-                throw new ArgumentOutOfRangeException("FragmentSize should be < PacketSize - " + g_MinPacketSize);
-            if (config.m_Channels.Count > 255)
-                throw new ArgumentOutOfRangeException("Channels number should be less than 256");
-        }
-
-        //properties, it should be defines because set methods (which has not implemented yet) should check parameters correctnesses
-        public ushort PacketSize
-        {
-            get { return m_PacketSize; }
-            set
-            {
-                m_PacketSize = value;
-            }
-        }
-
-        public ushort FragmentSize
-        {
-            get { return m_FragmentSize; }
-            set { m_FragmentSize = value; }
-        }
-
-        public uint ResendTimeout
-        {
-            get { return m_ResendTimeout; }
-            set { m_ResendTimeout = value; }
-        }
-
-        public uint DisconnectTimeout
-        {
-            get { return m_DisconnectTimeout; }
-            set { m_DisconnectTimeout = value; }
-        }
-
-        public uint ConnectTimeout
-        {
-            get { return m_ConnectTimeout; }
-            set { m_ConnectTimeout = value; }
-        }
-
-        public uint MinUpdateTimeout
-        {
-            get { return m_MinUpdateTimeout; }
-            set
-            {
-                if (value == 0)
-                    throw new ArgumentOutOfRangeException("Minimal update timeout should be > 0");
-                m_MinUpdateTimeout = value;
-            }
-        }
-
-        public uint PingTimeout
-        {
-            get { return m_PingTimeout; }
-            set { m_PingTimeout = value; }
-        }
-
-        public uint ReducedPingTimeout
-        {
-            get { return m_ReducedPingTimeout; }
-            set { m_ReducedPingTimeout = value; }
-        }
-
-        public uint AllCostTimeout
-        {
-            get { return m_AllCostTimeout; }
-            set { m_AllCostTimeout = value; }
-        }
-
-        public byte NetworkDropThreshold
-        {
-            get { return m_NetworkDropThreshold; }
-            set { m_NetworkDropThreshold = value; }
-        }
-
-        public byte OverflowDropThreshold
-        {
-            get { return m_OverflowDropThreshold; }
-            set { m_OverflowDropThreshold = value; }
-        }
-
-        public byte MaxConnectionAttempt
-        {
-            get { return m_MaxConnectionAttempt; }
-            set { m_MaxConnectionAttempt = value; }
-        }
-
-        public uint AckDelay
-        {
-            get { return m_AckDelay; }
-            set { m_AckDelay = value; }
-        }
-
-        public uint SendDelay
-        {
-            get { return m_SendDelay; }
-            set { m_SendDelay = value; }
-        }
-
-        public ushort MaxCombinedReliableMessageSize
-        {
-            get { return m_MaxCombinedReliableMessageSize; }
-            set { m_MaxCombinedReliableMessageSize = value; }
-        }
-
-        public ushort MaxCombinedReliableMessageCount
-        {
-            get { return m_MaxCombinedReliableMessageCount; }
-            set { m_MaxCombinedReliableMessageCount = value; }
-        }
-
-        public ushort MaxSentMessageQueueSize
-        {
-            get { return m_MaxSentMessageQueueSize; }
-            set { m_MaxSentMessageQueueSize = value; }
-        }
-
-        public ConnectionAcksType AcksType
-        {
-            get { return m_AcksType; }
-            set { m_AcksType = value; }
-        }
-
-        [Obsolete("IsAcksLong is deprecated. Use AcksType = ConnectionAcksType.Acks64", false)]
-        public bool IsAcksLong
-        {
-            get { return m_AcksType != ConnectionAcksType.Acks32; }
-            set
-            {
-                if (value && m_AcksType == ConnectionAcksType.Acks32)
-                    m_AcksType = ConnectionAcksType.Acks64;
-                else if (!value)
-                    m_AcksType = ConnectionAcksType.Acks32;
-            }
-        }
-
-        public bool UsePlatformSpecificProtocols
-        {
-            get { return m_UsePlatformSpecificProtocols; }
-            set
-            {
-                if ((value == true) && (UnityEngine.Application.platform != RuntimePlatform.PS4))
-                    throw new ArgumentOutOfRangeException("Platform specific protocols are not supported on this platform");
-
-                m_UsePlatformSpecificProtocols = value;
-            }
-        }
-
-        public uint InitialBandwidth
-        {
-            get { return m_InitialBandwidth; }
-            set { m_InitialBandwidth = value; }
-        }
-
-        public float BandwidthPeakFactor
-        {
-            get { return m_BandwidthPeakFactor; }
-            set { m_BandwidthPeakFactor = value; }
-        }
-
-        public ushort WebSocketReceiveBufferMaxSize
-        {
-            get { return m_WebSocketReceiveBufferMaxSize; }
-            set { m_WebSocketReceiveBufferMaxSize = value; }
-        }
-        public uint UdpSocketReceiveBufferMaxSize
-        {
-            get { return m_UdpSocketReceiveBufferMaxSize; }
-            set { m_UdpSocketReceiveBufferMaxSize = value; }
-        }
-
-        public string SSLCertFilePath
-        {
-            get { return m_SSLCertFilePath; }
-            set { m_SSLCertFilePath = value; }
-        }
-
-        public string SSLPrivateKeyFilePath
-        {
-            get { return m_SSLPrivateKeyFilePath; }
-            set { m_SSLPrivateKeyFilePath = value; }
-        }
-
-        public string SSLCAFilePath
-        {
-            get { return m_SSLCAFilePath; }
-            set { m_SSLCAFilePath = value; }
-        }
-
-        //channels
-        public int ChannelCount
-        {
-            get { return m_Channels.Count; }
-        }
-        public int SharedOrderChannelCount
-        {
-            get { return m_SharedOrderChannels.Count; }
-        }
-        public byte AddChannel(QosType value)
-        {
-            if (m_Channels.Count > 255)
-                throw new ArgumentOutOfRangeException("Channels Count should be less than 256");
-            if (!Enum.IsDefined(typeof(QosType), value))
-            {
-                throw new ArgumentOutOfRangeException("requested qos type doesn't exist: " + (int)value);
-            }
-            ChannelQOS channel = new ChannelQOS(value);
-            m_Channels.Add(channel);
-            return (byte)(m_Channels.Count - 1);
-        }
-
-        public void MakeChannelsSharedOrder(List<byte> channelIndices)
-        {
-            if (channelIndices == null)
-                throw new NullReferenceException("channelIndices must not be null");
-            if (channelIndices.Count == 0)
-                throw new ArgumentOutOfRangeException("Received empty list of shared order channel indexes");
-            for (byte i = 0; i < channelIndices.Count; i++)
-            {
-                byte channelId = channelIndices[i];
-                if (channelId >= m_Channels.Count)
-                    throw new ArgumentOutOfRangeException("Shared order channel list contains wrong channel index " + channelId);
-                ChannelQOS channel = m_Channels[channelId];
-                if (channel.BelongsToSharedOrderChannel)
-                    throw new ArgumentException("Channel with index " + channelId + " has been already included to other shared order channel");
-                if (!(channel.QOS == QosType.Reliable || channel.QOS == QosType.Unreliable))
-                    throw new ArgumentException("Only Reliable and Unreliable QoS are allowed for shared order channel, wrong channel is with index " + channelId);
-            }
-            for (byte i = 0; i < channelIndices.Count; i++)
-            {
-                byte channelId = channelIndices[i];
-                m_Channels[channelId].m_BelongsSharedOrderChannel = true;
-            }
-            List<byte> newChannelIndices = new List<byte>(channelIndices);
-            m_SharedOrderChannels.Add(newChannelIndices);
-        }
-
-        public QosType GetChannel(byte idx)
-        {
-            if (idx >= m_Channels.Count)
-                throw new ArgumentOutOfRangeException("requested index greater than maximum channels count");
-            return m_Channels[idx].QOS;
-        }
-
-        public IList<byte> GetSharedOrderChannels(byte idx)
-        {
-            if (idx >= m_SharedOrderChannels.Count)
-                throw new ArgumentOutOfRangeException("requested index greater than maximum shared order channels count");
-            return m_SharedOrderChannels[idx].AsReadOnly();
-        }
-
-        public List<ChannelQOS> Channels { get { return m_Channels; } }
-    }
-
-    //--- topology described current network topology for the host
-    //it includes maximum default connections with them configs (parameters + channels configuration)
-    //and array of special connection (with special configuration)
-    //AddSpecialConnection will return connection id which user should use when he call connect to identify special configuration for this connection
-    [Serializable]
-    [Obsolete("The UNET transport will be removed in the future as soon a replacement is ready.")]
-    public class HostTopology
-    {
-        [SerializeField]
-        private ConnectionConfig m_DefConfig = null;
-        [SerializeField]
-        private int m_MaxDefConnections = 0;
-        [SerializeField]
-        private List<ConnectionConfig> m_SpecialConnections = new List<ConnectionConfig>();
-        [SerializeField]
-        private ushort m_ReceivedMessagePoolSize = 1024;   //TODO: default values should be initialized from c++ default constants
-        [SerializeField]
-        private ushort m_SentMessagePoolSize = 1024;
-        [SerializeField]
-        private float m_MessagePoolSizeGrowthFactor = 0.75f;
-
-        public HostTopology(ConnectionConfig defaultConfig, int maxDefaultConnections)
-        {
-            if (defaultConfig == null)
-                throw new NullReferenceException("config is not defined");
-            if (maxDefaultConnections <= 0)
-                throw new ArgumentOutOfRangeException("maxConnections", "Number of connections should be > 0");
-            if (maxDefaultConnections >= 65535)
-                throw new ArgumentOutOfRangeException("maxConnections", "Number of connections should be < 65535");
-            ConnectionConfig.Validate(defaultConfig);
-            m_DefConfig = new ConnectionConfig(defaultConfig);
-            m_MaxDefConnections = maxDefaultConnections;
-        }
-
-        private HostTopology() {}
-
-        public ConnectionConfig DefaultConfig
-        {
-            get { return m_DefConfig; }
-        }
-        public int MaxDefaultConnections
-        {
-            get { return m_MaxDefConnections; }
-        }
-        public int SpecialConnectionConfigsCount
-        {
-            get { return m_SpecialConnections.Count; }
-        }
-
-        public List<ConnectionConfig> SpecialConnectionConfigs
-        {
-            get { return m_SpecialConnections; }
-        }
-        public ConnectionConfig GetSpecialConnectionConfig(int i)
-        {
-            if (i > m_SpecialConnections.Count || i == 0)
-                throw new ArgumentException("special configuration index is out of valid range");
-            return m_SpecialConnections[i - 1];
-        }
-
-        public ushort ReceivedMessagePoolSize
-        {
-            get { return m_ReceivedMessagePoolSize; }
-            set { m_ReceivedMessagePoolSize = value; }
-        }
-
-        public ushort SentMessagePoolSize
-        {
-            get { return m_SentMessagePoolSize; }
-            set { m_SentMessagePoolSize = value; }
-        }
-
-        public float MessagePoolSizeGrowthFactor
-        {
-            get { return m_MessagePoolSizeGrowthFactor; }
-            set
-            {
-                if (value <= 0.5 || value > 1.0)
-                    throw new ArgumentException("pool growth factor should be varied between 0.5 and 1.0");
-                m_MessagePoolSizeGrowthFactor = value;
-            }
-        }
-
-        public int AddSpecialConnectionConfig(ConnectionConfig config)
-        {
-            if (m_MaxDefConnections + m_SpecialConnections.Count + 1 >= 65535)
-                throw new ArgumentOutOfRangeException("maxConnections", "Number of connections should be < 65535");
-            m_SpecialConnections.Add(new ConnectionConfig(config));
-            return m_SpecialConnections.Count;
-        }
-    }
-
-    [Serializable]
-    [Obsolete("The UNET transport will be removed in the future as soon a replacement is ready.")]
-    public class GlobalConfig
-    {
-        private const uint g_MaxTimerTimeout = 12000;         //before changing check UNETConfiguration.h file
-        private const uint g_MaxNetSimulatorTimeout = 12000;
-        private const ushort g_MaxHosts = 128;
-        [SerializeField]
-        private uint   m_ThreadAwakeTimeout;
-        [SerializeField]
-        private ReactorModel m_ReactorModel;
-        [SerializeField]
-        private ushort m_ReactorMaximumReceivedMessages;
-        [SerializeField]
-        private ushort m_ReactorMaximumSentMessages;
-        [SerializeField]
-        private ushort m_MaxPacketSize;
-        [SerializeField]
-        private ushort m_MaxHosts;
-        [SerializeField]
-        private byte m_ThreadPoolSize;
-        [SerializeField]
-        private uint m_MinTimerTimeout;
-        [SerializeField]
-        private uint m_MaxTimerTimeout;
-        [SerializeField]
-        private uint m_MinNetSimulatorTimeout;
-        [SerializeField]
-        private uint m_MaxNetSimulatorTimeout;
-        [SerializeField]
-        private Action<int, int> m_ConnectionReadyForSend;
-        [SerializeField]
-        private Action<int> m_NetworkEventAvailable;
-
-        public GlobalConfig()
-        {
-            m_ThreadAwakeTimeout             = 1; //1 ms
-            m_ReactorModel                   = ReactorModel.SelectReactor;
-            m_ReactorMaximumReceivedMessages = 1024;
-            m_ReactorMaximumSentMessages     = 1024;
-            m_MaxPacketSize                  = 2000; //2K
-            m_MaxHosts                       = 16;
-            m_ThreadPoolSize                 = 1;
-            m_MinTimerTimeout                = 1;
-            m_MaxTimerTimeout                = g_MaxTimerTimeout;
-            m_MinNetSimulatorTimeout         = 1;
-            m_MaxNetSimulatorTimeout         = g_MaxNetSimulatorTimeout;
-            m_ConnectionReadyForSend         = null;
-            m_NetworkEventAvailable          = null;
-        }
-
-        public uint ThreadAwakeTimeout
-        {
-            get { return m_ThreadAwakeTimeout; }
-            set
-            {
-                if (value == 0)
-                    throw new ArgumentOutOfRangeException("Minimal thread awake timeout should be > 0");
-                m_ThreadAwakeTimeout = value;
-            }
-        }
-
-        public ReactorModel ReactorModel
-        {
-            get { return m_ReactorModel; }
-            set { m_ReactorModel = value; }
-        }
-
-        public ushort ReactorMaximumReceivedMessages
-        {
-            get { return m_ReactorMaximumReceivedMessages; }
-            set { m_ReactorMaximumReceivedMessages = value; }
-        }
-
-        public ushort ReactorMaximumSentMessages
-        {
-            get { return m_ReactorMaximumSentMessages; }
-            set { m_ReactorMaximumSentMessages = value; }
-        }
-
-        public ushort MaxPacketSize
-        {
-            get { return m_MaxPacketSize; }
-            set { m_MaxPacketSize = value; }
-        }
-
-        public ushort MaxHosts
-        {
-            get { return m_MaxHosts; }
-            set
-            {
-                if (value == 0)
-                    throw new ArgumentOutOfRangeException("MaxHosts", "Maximum hosts number should be > 0");
-                if (value > g_MaxHosts)
-                    throw new ArgumentOutOfRangeException("MaxHosts", "Maximum hosts number should be <= " + g_MaxHosts);
-                m_MaxHosts = value;
-            }
-        }
-
-        public byte ThreadPoolSize
-        {
-            get { return m_ThreadPoolSize; }
-            set { m_ThreadPoolSize = value; }
-        }
-        public uint MinTimerTimeout
-        {
-            get { return m_MinTimerTimeout; }
-            set
-            {
-                if (value > MaxTimerTimeout)
-                    throw new ArgumentOutOfRangeException("MinTimerTimeout should be < MaxTimerTimeout");
-                if (value == 0)
-                    throw new ArgumentOutOfRangeException("MinTimerTimeout should be > 0");
-                m_MinTimerTimeout = value;
-            }
-        }
-        public uint MaxTimerTimeout
-        {
-            get { return m_MaxTimerTimeout; }
-            set
-            {
-                if (value == 0)
-                    throw new ArgumentOutOfRangeException("MaxTimerTimeout should be > 0");
-                if (value > g_MaxTimerTimeout)
-                    throw new ArgumentOutOfRangeException("MaxTimerTimeout should be <=" + g_MaxTimerTimeout);
-                m_MaxTimerTimeout = value;
-            }
-        }
-
-        public uint MinNetSimulatorTimeout
-        {
-            get { return m_MinNetSimulatorTimeout; }
-            set
-            {
-                if (value > MaxNetSimulatorTimeout)
-                    throw new ArgumentOutOfRangeException("MinNetSimulatorTimeout should be < MaxTimerTimeout");
-                if (value == 0)
-                    throw new ArgumentOutOfRangeException("MinNetSimulatorTimeout should be > 0");
-                m_MinNetSimulatorTimeout = value;
-            }
-        }
-        public uint MaxNetSimulatorTimeout
-        {
-            get { return m_MaxNetSimulatorTimeout; }
-            set
-            {
-                if (value == 0)
-                    throw new ArgumentOutOfRangeException("MaxNetSimulatorTimeout should be > 0");
-                if (value > g_MaxNetSimulatorTimeout)
-                    throw new ArgumentOutOfRangeException("MaxNetSimulatorTimeout should be <=" + g_MaxNetSimulatorTimeout);
-                m_MaxNetSimulatorTimeout = value;
-            }
-        }
-        public Action<int> NetworkEventAvailable
-        {
-            get { return m_NetworkEventAvailable; }
-            set { m_NetworkEventAvailable = value; }
-        }
-
-        public Action<int, int> ConnectionReadyForSend
-        {
-            get { return m_ConnectionReadyForSend; }
-            set { m_ConnectionReadyForSend = value; }
-        }
-    }
-
-    [Obsolete("The UNET transport will be removed in the future as soon a replacement is ready.")]
-    public class ConnectionSimulatorConfig : IDisposable
-    {
-        internal int m_OutMinDelay;
-        internal int m_OutAvgDelay;
-        internal int m_InMinDelay;
-        internal int m_InAvgDelay;
-        internal float m_PacketLossPercentage;
-        public ConnectionSimulatorConfig(int outMinDelay, int outAvgDelay, int inMinDelay, int inAvgDelay, float packetLossPercentage)
-        {
-            m_OutMinDelay = outMinDelay;
-            m_OutAvgDelay = outAvgDelay;
-            m_InMinDelay = inMinDelay;
-            m_InAvgDelay = inAvgDelay;
-            m_PacketLossPercentage = packetLossPercentage;
-        }
-
-        [ThreadAndSerializationSafe()]
-        public void Dispose()
-        {
-        }
-
-        ~ConnectionSimulatorConfig() { Dispose(); }
-    }
-}
diff --git a/Modules/UNET/Managed/UNETInterface.cs b/Modules/UNET/Managed/UNETInterface.cs
deleted file mode 100644
index 6c779636ed..0000000000
--- a/Modules/UNET/Managed/UNETInterface.cs
+++ /dev/null
@@ -1,471 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-using UnityEngine.Networking.Types;
-
-// We have a lot of fields we never write to in this file, but they are written to by the serialization system.
-#pragma warning disable 649
-
-namespace UnityEngine.Networking.Match
-{
-    internal abstract class Request
-    {
-        public static readonly int currentVersion = 3;
-
-        /// <summary>
-        /// The UNet web protocol version
-        /// </summary>
-        public int version { get; set; }
-
-        /// <summary>
-        /// The SourceID for the requesting client
-        /// </summary>
-        public SourceID sourceId { get; set; }
-
-        /// <summary>
-        /// The project GUID
-        /// </summary>
-        public string projectId { get; set; }
-
-        /// <summary>
-        /// The AppID for the requesting client.
-        /// /// </summary>
-        public AppID appId { get; set; }
-
-        /// <summary>
-        /// The unique access token that binds a sourceId to a session and authenticate's it to do privileged commands
-        /// </summary>
-        public string accessTokenString { get; set; }
-
-        /// <summary>
-        /// The domain to use for the given appId; Only clients with the same domain can interact with each other
-        /// </summary>
-        public int domain { get; set; }
-
-        public virtual bool IsValid()
-        {
-            return sourceId != SourceID.Invalid;
-        }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-SourceID:0x{1},projectId:{2},accessTokenString.IsEmpty:{3},domain:{4}", base.ToString(), sourceId.ToString("X"), projectId, string.IsNullOrEmpty(accessTokenString), domain);
-        }
-    }
-
-    internal interface IResponse
-    {
-        void SetSuccess();
-        void SetFailure(string info);
-    }
-
-    [Serializable]
-    internal abstract class Response : IResponse
-    {
-        /// <summary>
-        /// Indicator on request success
-        public bool success;
-
-        public string extendedInfo;
-
-        public void SetSuccess()
-        {
-            success = true;
-            extendedInfo = "";
-        }
-
-        public void SetFailure(string info)
-        {
-            success = false;
-            extendedInfo += info;
-        }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-success:{1}-extendedInfo:{2}", base.ToString(), success, extendedInfo);
-        }
-    }
-
-    internal class BasicResponse : Response
-    {
-    }
-
-    internal class CreateMatchRequest : Request
-    {
-        /// <summary>
-        /// Name for the match
-        /// </summary>
-        public string name { get; set; }
-
-        /// <summary>
-        /// Number of nodes the room may have
-        /// </summary>
-        public uint size { get; set; }
-
-        /// <summary>
-        /// Optional string to specify the internet address to connect to this client if it were to host
-        /// </summary>
-        public string publicAddress { get; set; }
-
-        /// <summary>
-        /// Optional string to specify the local network address to connect to this client if it were to host
-        /// </summary>
-        public string privateAddress { get; set; }
-
-        /// <summary>
-        /// Optional int to specify the game specific Elo score for this client. If left 0 for all clients will not affect result set
-        /// </summary>
-        public int eloScore { get; set; }
-
-        /// <summary>
-        /// Indicates if the match should be advertised to others
-        /// </summary>
-        public bool advertise { get; set; }
-
-        /// <summary>
-        /// Optional provided password to limit public joining of a room
-        /// </summary>
-        public string password { get; set; }
-
-        public Dictionary<string, long> matchAttributes { get; set; }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-name:{1},size:{2},publicAddress:{3},privateAddress:{4},eloScore:{5},advertise:{6},HasPassword:{7},matchAttributes.Count:{8}", base.ToString(), name, size, publicAddress, privateAddress, eloScore, advertise, string.IsNullOrEmpty(password) ? "NO" : "YES", matchAttributes == null ? 0 : matchAttributes.Count);
-        }
-
-        public override bool IsValid()
-        {
-            return base.IsValid()
-                && size >= 2
-                && (matchAttributes == null ? true : matchAttributes.Count <= 10);
-        }
-    }
-
-    internal class CreateMatchResponse : BasicResponse
-    {
-        /// <summary>
-        /// IP Address of Host. If self-hosting, ignore.
-        /// </summary>
-        public string address;
-
-        /// <summary>
-        /// Port to connect to at Host with specified IP. If self-hosting, ignore.
-        /// </summary>
-        public int port;
-
-        /// <summary>
-        /// Unity Multiplayer Domain this Response belongs to
-        /// </summary>
-        public int domain = 0;
-
-        /// <summary>
-        /// The match unique identifier for future commands
-        /// </summary>
-
-        // This should be a NetworkID, but our serialization system does not support 64-bit enums.
-        public ulong networkId;
-
-        /// <summary>
-        /// The access token for this client to interact with the match
-        /// </summary>
-        public string accessTokenString;
-
-        /// <summary>
-        /// The client id of the caller for this network
-        /// </summary>
-        public NodeID nodeId;
-
-        // Designation if a relay server is the destination (not self hosted)
-        public bool usingRelay;
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-address:{1},port:{2},networkId:0x{3},accessTokenString.IsEmpty:{4},nodeId:0x{5},usingRelay:{6}", base.ToString(), address, port, networkId.ToString("X"), string.IsNullOrEmpty(accessTokenString), nodeId.ToString("X"), usingRelay);
-        }
-    }
-
-    internal class JoinMatchRequest : Request
-    {
-        /// <summary>
-        /// The networkId to join
-        /// </summary>
-        public NetworkID networkId { get; set; }
-
-        /// <summary>
-        /// Optional string to specify the internet address to connect to this client if it were to host
-        /// </summary>
-        public string publicAddress { get; set; }
-
-        /// <summary>
-        /// Optional string to specify the local network address to connect to this client if it were to host
-        /// </summary>
-        public string privateAddress { get; set; }
-
-        /// <summary>
-        /// Optional int to specify the game specific Elo score for this client. If left 0 for all clients will not affect result set
-        /// </summary>
-        public int eloScore { get; set; }
-
-        /// <summary>
-        /// Optional provided password if required by match
-        /// </summary>
-        public string password { get; set; }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-networkId:0x{1},publicAddress:{2},privateAddress:{3},eloScore:{4},HasPassword:{5}", base.ToString(), networkId.ToString("X"), publicAddress, privateAddress, eloScore, string.IsNullOrEmpty(password) ? "NO" : "YES");
-        }
-
-        public override bool IsValid()
-        {
-            return base.IsValid()
-                && networkId != NetworkID.Invalid;
-        }
-    }
-
-    [Serializable]
-    internal class JoinMatchResponse : BasicResponse
-    {
-        /// <summary>
-        /// IP Address of Host. If self-hosting, ignore.
-        /// </summary>
-        public string address;
-
-        /// <summary>
-        /// Port to connect to at Host with specified IP. If self-hosting, ignore.
-        /// </summary>
-        public int port;
-
-        /// <summary>
-        /// Unity Multiplayer Domain this Response belongs to
-        /// </summary>
-        public int domain = 0;
-
-        /// <summary>
-        /// The match unique identifier for future commands
-        /// </summary>
-
-        // This should be a NetworkID, but our serialization system does not support 64-bit enums.
-        public ulong networkId;
-
-        /// <summary>
-        /// The access token for this client to interact with the match
-        /// </summary>
-        public string accessTokenString;
-
-        /// <summary>
-        /// The client id of the caller for this network
-        /// </summary>
-        public NodeID nodeId;
-
-        // Designation if a relay server is the destination (not self hosted)
-        public bool usingRelay;
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-address:{1},port:{2},networkId:0x{3},accessTokenString.IsEmpty:{4},nodeId:0x{5},usingRelay:{6}", base.ToString(), address, port, networkId.ToString("X"), string.IsNullOrEmpty(accessTokenString), nodeId.ToString("X"), usingRelay);
-        }
-    }
-
-    internal class DestroyMatchRequest : Request
-    {
-        public NetworkID networkId { get; set; }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-networkId:0x{1}", base.ToString(), networkId.ToString("X"));
-        }
-
-        public override bool IsValid()
-        {
-            return base.IsValid()
-                && networkId != NetworkID.Invalid;
-        }
-    }
-
-    internal class DropConnectionRequest : Request
-    {
-        public NetworkID networkId { get; set; }
-
-        public NodeID nodeId { get; set; }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-networkId:0x{1},nodeId:0x{2}", base.ToString(), networkId.ToString("X"), nodeId.ToString("X"));
-        }
-
-        public override bool IsValid()
-        {
-            return base.IsValid()
-                && networkId != NetworkID.Invalid
-                && nodeId != NodeID.Invalid;
-        }
-    }
-
-    [Serializable]
-    internal class DropConnectionResponse : Response
-    {
-        /// <summary>
-        /// The match unique identifier for the match that was requested dropped
-        /// </summary>
-
-        // This should be a NetworkID, but our serialization system does not support 64-bit enums.
-        public ulong networkId;
-
-        public NodeID nodeId;
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-networkId:{1}", base.ToString(), networkId.ToString("X"));
-        }
-    }
-
-    internal class ListMatchRequest : Request
-    {
-        /// <summary>
-        /// Number of matches showing per page
-        /// </summary>
-        public int pageSize { get; set; }
-        /// <summary>
-        /// Page number to fetch, 1 based. (1 will return the first page)
-        /// </summary>
-        public int pageNum { get; set; }
-
-        /// <summary>
-        /// Basic string filtering mechanism
-        /// </summary>
-        public string nameFilter { get; set; }
-
-        /// <summary>
-        /// Determines if passworded matches are included in results. False means return everything, True means return only matches with no password
-        /// </summary>
-        public bool filterOutPrivateMatches { get; set; }
-
-        /// <summary>
-        /// Determines the elo score target to order the returned list. Matches closer to the target score will appear first.
-        /// </summary>
-        public int eloScore { get; set; }
-
-        /// <summary>
-        /// Long list of attributes to match against.
-        /// Only matches containing values less than entries in this dictionary and like keys specified will be considered.
-        /// Leave this blank to not filter. Maximum of 10 toal filter entries across all dictionaries in this request.
-        /// Additional name wildcards will be ignored
-        /// </summary>
-        public Dictionary<string, long> matchAttributeFilterLessThan { get; set; }
-
-        /// <summary>
-        /// Long list of attributes to match against.
-        /// Only matches containing values equal to entries in this dictionary and like keys specified will be considered.
-        /// Leave this blank to not filter. Maximum of 10 toal filter entries across all dictionaries in this request.
-        /// Additional name wildcards will be ignored
-        /// </summary>
-        public Dictionary<string, long> matchAttributeFilterEqualTo { get; set; }
-
-        /// <summary>
-        /// Long list of attributes to match against.
-        /// Only matches containing values greater than entries in this dictionary and like keys specified will be considered.
-        /// Leave this blank to not filter. Maximum of 10 toal filter entries across all dictionaries in this request.
-        /// Additional name wildcards will be ignored
-        /// </summary>
-        public Dictionary<string, long> matchAttributeFilterGreaterThan { get; set; }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-pageSize:{1},pageNum:{2},nameFilter:{3}, filterOutPrivateMatches:{4}, eloScore:{5}, matchAttributeFilterLessThan.Count:{6}, matchAttributeFilterEqualTo.Count:{7}, matchAttributeFilterGreaterThan.Count:{8}", base.ToString(), pageSize, pageNum, nameFilter, filterOutPrivateMatches, eloScore, matchAttributeFilterLessThan == null ? 0 : matchAttributeFilterLessThan.Count, matchAttributeFilterEqualTo == null ? 0 : matchAttributeFilterEqualTo.Count, matchAttributeFilterGreaterThan == null ? 0 : matchAttributeFilterGreaterThan.Count);
-        }
-
-        public override bool IsValid()
-        {
-            int totalFilters = matchAttributeFilterLessThan == null ? 0 : matchAttributeFilterLessThan.Count;
-            totalFilters += matchAttributeFilterEqualTo == null ? 0 : matchAttributeFilterEqualTo.Count;
-            totalFilters += matchAttributeFilterGreaterThan == null ? 0 : matchAttributeFilterGreaterThan.Count;
-            return base.IsValid()
-                && pageSize >= 1 && pageSize <= 1000
-                && totalFilters <= 10;
-        }
-
-        [Obsolete("This bool is deprecated in favor of filterOutPrivateMatches")]
-        public bool includePasswordMatches;
-    }
-
-    [Serializable]
-    internal class MatchDirectConnectInfo
-    {
-        public NodeID nodeId;
-        public string publicAddress;
-        public string privateAddress;
-        public HostPriority hostPriority;
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-nodeId:{1},publicAddress:{2},privateAddress:{3},hostPriority:{4}", base.ToString(), nodeId, publicAddress, privateAddress, hostPriority);
-        }
-    }
-
-    [Serializable]
-    internal class MatchDesc
-    {
-        // This should be a NetworkID, but our serialization system does not support 64-bit enums.
-        public ulong networkId;
-        public string name;
-        public int averageEloScore;
-        public int maxSize;
-        public int currentSize;
-        public bool isPrivate;
-        public Dictionary<string, long> matchAttributes;
-        public NodeID hostNodeId;
-        public List<MatchDirectConnectInfo> directConnectInfos;
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-networkId:0x{1},name:{2},averageEloScore:{3},maxSize:{4},currentSize:{5},isPrivate:{6},matchAttributes.Count:{7},hostNodeId:{8},directConnectInfos.Count:{9}", base.ToString(), networkId.ToString("X"), name, averageEloScore, maxSize, currentSize, isPrivate, matchAttributes == null ? 0 : matchAttributes.Count, hostNodeId, directConnectInfos.Count);
-        }
-    }
-
-    [Serializable]
-    internal class ListMatchResponse : BasicResponse
-    {
-        public List<MatchDesc> matches;
-
-        public ListMatchResponse()
-        {
-            matches = new List<MatchDesc>();
-        }
-
-        public ListMatchResponse(List<MatchDesc> otherMatches)
-        {
-            matches = otherMatches;
-        }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-matches.Count:{1}", base.ToString(), (matches == null ? 0 : matches.Count));
-        }
-    }
-
-    internal class CreateOrJoinMatchRequest : CreateMatchRequest
-    {
-    }
-
-    internal class SetMatchAttributesRequest : Request
-    {
-        public NetworkID networkId { get; set; }
-        public bool isListed { get; set; }
-
-        override public string ToString()
-        {
-            return UnityString.Format("[{0}]-networkId:{1},isListed:{2}", base.ToString(), networkId.ToString("X"), isListed);
-        }
-
-        public override bool IsValid()
-        {
-            return base.IsValid()
-                && networkId != NetworkID.Invalid;
-        }
-    }
-}
diff --git a/Modules/UNET/Managed/UNETTypes.cs b/Modules/UNET/Managed/UNETTypes.cs
deleted file mode 100644
index 9d5018325e..0000000000
--- a/Modules/UNET/Managed/UNETTypes.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Text;
-using System.ComponentModel;
-using System.Collections.Generic;
-
-namespace UnityEngine.Networking
-{
-    namespace Types
-    {
-        [DefaultValue(NetworkAccessLevel.Invalid)]
-        public enum NetworkAccessLevel : ulong { Invalid = 0, User = 1 << 0, Owner = 1 << 1, Admin = 1 << 2 }
-
-        [DefaultValue(AppID.Invalid)]
-        public enum AppID : ulong { Invalid = ulong.MaxValue }
-
-        [DefaultValue(SourceID.Invalid)]
-        public enum SourceID : ulong { Invalid = ulong.MaxValue }
-
-        [DefaultValue(NetworkID.Invalid)]
-        public enum NetworkID : ulong { Invalid = ulong.MaxValue }
-
-        [DefaultValue(NodeID.Invalid)]
-        public enum NodeID : ushort { Invalid = 0 }
-
-        [DefaultValue(HostPriority.Invalid)]
-        public enum HostPriority : int { Invalid = int.MaxValue }
-
-        public class NetworkAccessToken
-        {
-            private const int NETWORK_ACCESS_TOKEN_SIZE = 64;
-
-            public NetworkAccessToken()
-            {
-                array = new byte[NETWORK_ACCESS_TOKEN_SIZE];
-            }
-
-            public NetworkAccessToken(byte[] array)
-            {
-                this.array = array;
-            }
-
-            public NetworkAccessToken(string strArray)
-            {
-                try
-                {
-                    array = Convert.FromBase64String(strArray);
-                }
-                catch (Exception)
-                {
-                    array = new byte[NETWORK_ACCESS_TOKEN_SIZE];
-                }
-            }
-
-            public string GetByteString()
-            {
-                return Convert.ToBase64String(array);
-            }
-
-            public bool IsValid()
-            {
-                // This contains a valid token if we have an array, it's size is correct, and it is not filled with 0
-                if (array == null || array.Length != NETWORK_ACCESS_TOKEN_SIZE)
-                    return false;
-
-                // Verify the array is not zeroed
-                bool bFoundNonZero = false;
-                foreach (byte element in array)
-                {
-                    if (element != 0)
-                    {
-                        bFoundNonZero = true;
-                        break;
-                    }
-                }
-
-                return bFoundNonZero;
-            }
-
-            // Numeric types default 0 which is important for non set tokens
-            public byte[] array;
-        }
-    }
-
-    // FIXME: Yank these when we can properly enumerate them from other sources like Cloud code
-    public partial class Utility
-    {
-        [Obsolete("This property is unused and should not be referenced in code.", true)]
-        public static bool useRandomSourceID { get { return false; } set {} }
-
-        private static Dictionary<Types.NetworkID, Types.NetworkAccessToken> s_dictTokens = new Dictionary<Types.NetworkID, Types.NetworkAccessToken>();
-
-        private Utility() {}
-
-        public static Types.SourceID GetSourceID()
-        {
-            return (Types.SourceID)(SystemInfo.deviceUniqueIdentifier).GetHashCode();
-        }
-
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        [Obsolete("This function is unused and should not be referenced in code. Please sign in and setup your project in the editor instead.", true)]
-        public static void SetAppID(Types.AppID newAppID)
-        {
-        }
-
-        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-        [Obsolete("This function is unused and should not be referenced in code. Please sign in and setup your project in the editor instead.", true)]
-        public static Types.AppID GetAppID()
-        {
-            return Types.AppID.Invalid;
-        }
-
-        public static void SetAccessTokenForNetwork(Types.NetworkID netId, Types.NetworkAccessToken accessToken)
-        {
-            // If we're updating an existing token we need to remove the stale one first
-            if (s_dictTokens.ContainsKey(netId))
-                s_dictTokens.Remove(netId);
-
-            s_dictTokens.Add(netId, accessToken);
-        }
-
-        public static Types.NetworkAccessToken GetAccessTokenForNetwork(Types.NetworkID netId)
-        {
-            Types.NetworkAccessToken ret;
-            if (s_dictTokens.TryGetValue(netId, out ret) == false)
-            {
-                ret = new Types.NetworkAccessToken();
-            }
-            return ret;
-        }
-    }
-}
diff --git a/Modules/UNET/Managed/UNETWebSocketLib.cs b/Modules/UNET/Managed/UNETWebSocketLib.cs
deleted file mode 100644
index 3afc7aa210..0000000000
--- a/Modules/UNET/Managed/UNETWebSocketLib.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Net;
-using UnityEngine.Networking;
-using UnityEngine.Networking.Types;
-using UnityEngine;
-using Debug = UnityEngine.Debug;
-
-
diff --git a/Modules/UNET/ScriptBindings/UNETTransportConfig.bindings.cs b/Modules/UNET/ScriptBindings/UNETTransportConfig.bindings.cs
deleted file mode 100644
index 0adaeb0a6b..0000000000
--- a/Modules/UNET/ScriptBindings/UNETTransportConfig.bindings.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Net;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using UnityEngineInternal;
-using UnityEngine.Networking.Types;
-using System.Collections.Generic;
-using UnityEngine.Bindings;
-
-namespace UnityEngine.Networking
-{
-#pragma warning disable 618
-
-    [NativeHeader("Modules/UNET/UNETManager.h")]
-    [NativeHeader("Modules/UNET/UNetTypes.h")]
-    [NativeHeader("Modules/UNET/UNETConfiguration.h")]
-    [NativeConditional("ENABLE_NETWORK && ENABLE_UNET", true)]
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal class ConnectionConfigInternal : IDisposable
-    {
-        public IntPtr m_Ptr;
-        public ConnectionConfigInternal(ConnectionConfig config)
-        {
-            if (config == null)
-                throw new NullReferenceException("config is not defined");
-            m_Ptr = InternalCreate();
-            if (!SetPacketSize(config.PacketSize))
-                throw new ArgumentOutOfRangeException("PacketSize is too small");
-            this.FragmentSize = config.FragmentSize;
-            this.ResendTimeout = config.ResendTimeout;
-            this.DisconnectTimeout = config.DisconnectTimeout;
-            this.ConnectTimeout = config.ConnectTimeout;
-            this.MinUpdateTimeout = config.MinUpdateTimeout;
-            this.PingTimeout = config.PingTimeout;
-            this.ReducedPingTimeout = config.ReducedPingTimeout;
-            this.AllCostTimeout = config.AllCostTimeout;
-            this.NetworkDropThreshold = config.NetworkDropThreshold;
-            this.OverflowDropThreshold = config.OverflowDropThreshold;
-            this.MaxConnectionAttempt = config.MaxConnectionAttempt;
-            this.AckDelay = config.AckDelay;
-            this.SendDelay = config.SendDelay;
-            this.MaxCombinedReliableMessageSize = config.MaxCombinedReliableMessageSize;
-            this.MaxCombinedReliableMessageCount = config.MaxCombinedReliableMessageCount;
-            this.MaxSentMessageQueueSize = config.MaxSentMessageQueueSize;
-            this.AcksType = (byte)config.AcksType;
-            this.UsePlatformSpecificProtocols = config.UsePlatformSpecificProtocols;
-            this.InitialBandwidth = config.InitialBandwidth;
-            this.BandwidthPeakFactor = config.BandwidthPeakFactor;
-            this.WebSocketReceiveBufferMaxSize = config.WebSocketReceiveBufferMaxSize;
-            this.UdpSocketReceiveBufferMaxSize = config.UdpSocketReceiveBufferMaxSize;
-            if (config.SSLCertFilePath != null)
-            {
-                int len = SetSSLCertFilePath(config.SSLCertFilePath);
-                if (len != 0)
-                    throw new ArgumentOutOfRangeException("SSLCertFilePath cannot be > than " + len);
-            }
-            if (config.SSLPrivateKeyFilePath != null)
-            {
-                int len = SetSSLPrivateKeyFilePath(config.SSLPrivateKeyFilePath);
-                if (len != 0)
-                    throw new ArgumentOutOfRangeException("SSLPrivateKeyFilePath cannot be > than " + len);
-            }
-            if (config.SSLCAFilePath != null)
-            {
-                int len = SetSSLCAFilePath(config.SSLCAFilePath);
-                if (len != 0)
-                    throw new ArgumentOutOfRangeException("SSLCAFilePath cannot be > than " + len);
-            }
-            for (byte i = 0; i < config.ChannelCount; ++i)
-            {
-                AddChannel((byte)config.GetChannel(i));
-            }
-            for (byte i = 0; i < config.SharedOrderChannelCount; ++i)
-            {
-                IList<byte> sharedOrderChannelsList = config.GetSharedOrderChannels(i);
-                byte[] sharedOrderChannelsArray = new byte[sharedOrderChannelsList.Count];
-                sharedOrderChannelsList.CopyTo(sharedOrderChannelsArray, 0);
-                MakeChannelsSharedOrder(sharedOrderChannelsArray);
-            }
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-        }
-
-        ~ConnectionConfigInternal()
-        {
-            Dispose(false);
-        }
-
-        public void Dispose()
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-        }
-
-        private static extern IntPtr InternalCreate();
-        [NativeMethod(IsThreadSafe = true)]
-        private static extern void InternalDestroy(IntPtr ptr);
-        public extern byte AddChannel(int value);
-        public extern bool SetPacketSize(ushort value);
-
-        [NativeProperty("m_ProtocolRequired.m_FragmentSize", TargetType.Field)] private extern ushort FragmentSize { set; }
-        [NativeProperty("m_ProtocolRequired.m_ResendTimeout", TargetType.Field)] private extern uint ResendTimeout { set; }
-        [NativeProperty("m_ProtocolRequired.m_DisconnectTimeout", TargetType.Field)] private extern uint DisconnectTimeout { set; }
-        [NativeProperty("m_ProtocolRequired.m_ConnectTimeout", TargetType.Field)] private extern uint ConnectTimeout { set; }
-        [NativeProperty("m_ProtocolOptional.m_MinUpdateTimeout", TargetType.Field)] private extern uint MinUpdateTimeout { set; }
-        [NativeProperty("m_ProtocolRequired.m_PingTimeout", TargetType.Field)] private extern uint PingTimeout { set; }
-        [NativeProperty("m_ProtocolRequired.m_ReducedPingTimeout", TargetType.Field)] private extern uint ReducedPingTimeout { set; }
-        [NativeProperty("m_ProtocolRequired.m_AllCostTimeout", TargetType.Field)] private extern uint AllCostTimeout { set; }
-        [NativeProperty("m_ProtocolOptional.m_NetworkDropThreshold", TargetType.Field)] private extern byte NetworkDropThreshold { set; }
-        [NativeProperty("m_ProtocolOptional.m_OverflowDropThreshold", TargetType.Field)] private extern byte OverflowDropThreshold { set; }
-        [NativeProperty("m_ProtocolOptional.m_MaxConnectionAttempt", TargetType.Field)] private extern byte MaxConnectionAttempt { set; }
-        [NativeProperty("m_ProtocolOptional.m_AckDelay", TargetType.Field)] private extern uint AckDelay { set; }
-        [NativeProperty("m_ProtocolOptional.m_SendDelay", TargetType.Field)] private extern uint SendDelay { set; }
-        [NativeProperty("m_ProtocolOptional.m_MaxCombinedReliableMessageSize", TargetType.Field)] private extern ushort MaxCombinedReliableMessageSize { set; }
-        [NativeProperty("m_ProtocolOptional.m_MaxCombinedReliableMessageAmount", TargetType.Field)] private extern ushort MaxCombinedReliableMessageCount { set; }
-        [NativeProperty("m_ProtocolOptional.m_MaxSentMessageQueueSize", TargetType.Field)] private extern ushort MaxSentMessageQueueSize { set; }
-        [NativeProperty("m_ProtocolRequired.m_AcksType", TargetType.Field)] private extern byte AcksType { set; }
-        [NativeProperty("m_ProtocolRequired.m_UsePlatformSpecificProtocols", TargetType.Field)] private extern bool UsePlatformSpecificProtocols { set; }
-        [NativeProperty("m_ProtocolOptional.m_InitialBandwidth", TargetType.Field)] private extern uint InitialBandwidth { set; }
-        [NativeProperty("m_ProtocolOptional.m_BandwidthPeakFactor", TargetType.Field)]  private extern float BandwidthPeakFactor { set; }
-        [NativeProperty("m_ProtocolOptional.m_WebSocketReceiveBufferMaxSize", TargetType.Field)] private extern ushort WebSocketReceiveBufferMaxSize { set; }
-        [NativeProperty("m_ProtocolOptional.m_UdpSocketReceiveBufferMaxSize", TargetType.Field)] private extern uint UdpSocketReceiveBufferMaxSize { set; }
-
-        [NativeMethod("SetSSLCertFilePath")]
-        public extern int SetSSLCertFilePath(string value);
-        [NativeMethod("SetSSLPrivateKeyFilePath")]
-        public extern int SetSSLPrivateKeyFilePath(string value);
-        [NativeMethod("SetSSLCAFilePath")]
-        public extern int SetSSLCAFilePath(string value);
-
-        [NativeMethod("MakeChannelsSharedOrder")]
-        private extern bool MakeChannelsSharedOrder(byte[] values);
-    }
-    [NativeHeader("Modules/UNET/UNETConfiguration.h")]
-    [NativeConditional("ENABLE_NETWORK && ENABLE_UNET", true)]
-    internal class HostTopologyInternal : IDisposable
-    {
-        public IntPtr m_Ptr;
-        public HostTopologyInternal(HostTopology topology)
-        {
-            ConnectionConfigInternal config = new ConnectionConfigInternal(topology.DefaultConfig);
-            m_Ptr = InternalCreate(config, topology.MaxDefaultConnections);
-            for (int i = 1; i <= topology.SpecialConnectionConfigsCount; ++i)
-            {
-                ConnectionConfig conf = topology.GetSpecialConnectionConfig(i);
-                ConnectionConfigInternal confInt = new ConnectionConfigInternal(conf);
-                AddSpecialConnectionConfig(confInt);
-            }
-            this.ReceivedMessagePoolSize = topology.ReceivedMessagePoolSize;
-            this.SentMessagePoolSize = topology.SentMessagePoolSize;
-            this.MessagePoolSizeGrowthFactor = topology.MessagePoolSizeGrowthFactor;
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-        }
-
-        ~HostTopologyInternal()
-        {
-            Dispose(false);
-        }
-
-        public void Dispose()
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-        }
-
-        private static extern IntPtr InternalCreate(ConnectionConfigInternal config, int maxDefaultConnections);
-        [NativeMethod(IsThreadSafe = true)]
-        private static extern void InternalDestroy(IntPtr ptr);
-        public extern ushort AddSpecialConnectionConfig(ConnectionConfigInternal config);
-        [NativeProperty("m_ReceivedMessagePoolSize", TargetType.Field)] private extern ushort ReceivedMessagePoolSize { set; }
-        [NativeProperty("m_SentMessagePoolSize", TargetType.Field)] private extern ushort SentMessagePoolSize { set; }
-        [NativeProperty("m_MessagePoolSizeGrowthFactor", TargetType.Field)] private extern float MessagePoolSizeGrowthFactor { set; }
-    }
-
-    [NativeHeader("Modules/UNET/UNETConfiguration.h")]
-    [NativeConditional("ENABLE_NETWORK && ENABLE_UNET", true)]
-    internal class ConnectionSimulatorConfigInternal : IDisposable
-    {
-        public IntPtr m_Ptr;
-        public ConnectionSimulatorConfigInternal(ConnectionSimulatorConfig config)
-        {
-            m_Ptr = InternalCreate(config.m_OutMinDelay, config.m_OutAvgDelay, config.m_InMinDelay, config.m_InAvgDelay, config.m_PacketLossPercentage);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-            GC.SuppressFinalize(this);
-        }
-
-        ~ConnectionSimulatorConfigInternal()
-        {
-            Dispose(false);
-        }
-
-        public void Dispose()
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-        }
-
-        private static extern IntPtr InternalCreate(int outMinDelay, int outAvgDelay, int inMinDelay, int inAvgDelay, float packetLossPercentage);
-        [NativeMethod(IsThreadSafe = true)]
-        private static extern void InternalDestroy(IntPtr ptr);
-    }
-
-    [NativeHeader("Modules/UNET/UNETConfiguration.h")]
-    [NativeConditional("ENABLE_NETWORK && ENABLE_UNET", true)]
-    internal class GlobalConfigInternal : IDisposable
-    {
-        public IntPtr m_Ptr;
-        public GlobalConfigInternal(GlobalConfig config)
-        {
-            if (config == null)
-                throw new NullReferenceException("config is not defined");
-            m_Ptr = InternalCreate();
-            this.ThreadAwakeTimeout = config.ThreadAwakeTimeout;
-            this.ReactorModel = (byte)config.ReactorModel;
-            this.ReactorMaximumReceivedMessages = config.ReactorMaximumReceivedMessages;
-            this.ReactorMaximumSentMessages = config.ReactorMaximumSentMessages;
-            this.MaxPacketSize = config.MaxPacketSize;
-            this.MaxHosts = config.MaxHosts;
-            if (config.ThreadPoolSize == 0 || config.ThreadPoolSize > 254)
-                throw new ArgumentOutOfRangeException("Worker thread pool size should be >= 1 && < 254 (for server only)");
-            byte threadPoolSize = config.ThreadPoolSize;
-            this.ThreadPoolSize = threadPoolSize;
-            this.MinTimerTimeout = config.MinTimerTimeout;
-            this.MaxTimerTimeout = config.MaxTimerTimeout;
-            this.MinNetSimulatorTimeout = config.MinNetSimulatorTimeout;
-            this.MaxNetSimulatorTimeout = config.MaxNetSimulatorTimeout;
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-        }
-
-        ~GlobalConfigInternal()
-        {
-            Dispose(false);
-        }
-
-        public void Dispose()
-        {
-            if (m_Ptr != IntPtr.Zero)
-            {
-                InternalDestroy(m_Ptr);
-                m_Ptr = IntPtr.Zero;
-            }
-        }
-
-        private static extern IntPtr InternalCreate();
-        [NativeMethod(IsThreadSafe = true)]
-        private static extern void InternalDestroy(IntPtr ptr);
-
-        [NativeProperty("m_ThreadAwakeTimeout", TargetType.Field)] private extern uint ThreadAwakeTimeout { set; }
-        [NativeProperty("m_ReactorModel", TargetType.Field)] private extern byte ReactorModel { set; }
-        [NativeProperty("m_ReactorMaximumReceivedMessages", TargetType.Field)] private extern ushort ReactorMaximumReceivedMessages { set; }
-        [NativeProperty("m_ReactorMaximumSentMessages", TargetType.Field)] private extern ushort ReactorMaximumSentMessages { set; }
-        [NativeProperty("m_MaxPacketSize", TargetType.Field)] private extern ushort MaxPacketSize { set; }
-        [NativeProperty("m_MaxHosts", TargetType.Field)] private extern ushort MaxHosts { set; }
-        [NativeProperty("m_ThreadPoolSize", TargetType.Field)] private extern byte ThreadPoolSize { set; }
-
-        [NativeProperty("m_MinTimerTimeout", TargetType.Field)] private extern uint MinTimerTimeout { set; }
-        [NativeProperty("m_MaxTimerTimeout", TargetType.Field)] private extern uint MaxTimerTimeout { set; }
-        [NativeProperty("m_MinNetSimulatorTimeout", TargetType.Field)] private extern uint MinNetSimulatorTimeout { set; }
-        [NativeProperty("m_MaxNetSimulatorTimeout", TargetType.Field)] private extern uint MaxNetSimulatorTimeout { set; }
-    }
-
-#pragma warning restore 618
-}
diff --git a/Modules/UNET/ScriptBindings/UNETworking.bindings.cs b/Modules/UNET/ScriptBindings/UNETworking.bindings.cs
deleted file mode 100644
index 49dcfef75e..0000000000
--- a/Modules/UNET/ScriptBindings/UNETworking.bindings.cs
+++ /dev/null
@@ -1,537 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Net;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using UnityEngineInternal;
-using UnityEngine.Networking.Types;
-using System.Collections.Generic;
-using UnityEngine.Bindings;
-using System.Net.Sockets;
-
-namespace UnityEngine.Networking
-{
-
-    [NativeHeader("Modules/UNET/UNETManager.h")]
-    [NativeHeader("Modules/UNET/UNetTypes.h")]
-    [NativeHeader("Modules/UNET/UNETConfiguration.h")]
-    [NativeConditional("ENABLE_NETWORK && ENABLE_UNET", true)]
-    [Obsolete("The UNET transport will be removed in the future as soon a replacement is ready.")]
-    public sealed partial class NetworkTransport
-    {
-        private NetworkTransport() {}
-        static public void Init()
-        {
-            InitializeClass();
-        }
-
-        static public void Init(GlobalConfig config)
-        {
-            if (config.NetworkEventAvailable != null)
-                SetNetworkEventAvailableCallback(config.NetworkEventAvailable);
-            if (config.ConnectionReadyForSend != null)
-                SetConnectionReadyForSendCallback(config.ConnectionReadyForSend);
-            InitializeClassWithConfig(new GlobalConfigInternal(config));
-        }
-
-        [FreeFunction("UNETManager::InitializeClass")]
-        extern private static void InitializeClass();
-
-        [FreeFunction("UNETManager::InitializeClassWithConfig")]
-        extern private static void InitializeClassWithConfig(GlobalConfigInternal config);
-
-        static public void Shutdown()
-        {
-            Cleanup();
-        }
-
-        [Obsolete("This function has been deprecated. Use AssetDatabase utilities instead.")]
-        static public string GetAssetId(GameObject go)
-        {
-            return "";
-        }
-
-        static int s_nextSceneId = 1;
-
-        static public void AddSceneId(int id)
-        {
-            if (id > s_nextSceneId)
-            {
-                s_nextSceneId = id + 1;
-            }
-        }
-
-        static public int GetNextSceneId()
-        {
-            return s_nextSceneId++;
-        }
-
-        static public int AddHostWithSimulator(HostTopology topology, int minTimeout, int maxTimeout, int port, string ip)
-        {
-            if (topology == null)
-                throw new NullReferenceException("topology is not defined");
-            CheckTopology(topology);
-            return AddHostInternal(new HostTopologyInternal(topology), ip, port, minTimeout, maxTimeout);
-        }
-
-        static public int AddHostWithSimulator(HostTopology topology, int minTimeout, int maxTimeout, int port)
-        {
-            return AddHostWithSimulator(topology, minTimeout, maxTimeout, port, null);
-        }
-
-        static public int AddHostWithSimulator(HostTopology topology, int minTimeout, int maxTimeout)
-        {
-            return AddHostWithSimulator(topology, minTimeout, maxTimeout, 0, null);
-        }
-
-        static public int AddHost(HostTopology topology, int port, string ip)
-        {
-            return AddHostWithSimulator(topology, 0, 0, port, ip);
-        }
-
-        static public int AddHost(HostTopology topology, int port)
-        {
-            return AddHost(topology, port, null);
-        }
-
-        static public int AddHost(HostTopology topology)
-        {
-            return AddHost(topology, 0, null);
-        }
-
-        [FreeFunction("UNETManager::Get()->AddHost", ThrowsException = true)]
-        extern private static int AddHostInternal(HostTopologyInternal topologyInt, string ip, int port, int minTimeout, int maxTimeout);
-
-        static public int AddWebsocketHost(HostTopology topology, int port, string ip)
-        {
-            if (port != 0)
-            {
-                if (IsPortOpen(ip, port))
-                    throw new InvalidOperationException("Cannot open web socket on port " + port + " It has been already occupied.");
-            }
-            if (topology == null)
-                throw new NullReferenceException("topology is not defined");
-            CheckTopology(topology);
-            return AddWsHostInternal(new HostTopologyInternal(topology), ip, port);
-        }
-
-        static public int AddWebsocketHost(HostTopology topology, int port)
-        {
-            return AddWebsocketHost(topology, port, null);
-        }
-
-        [FreeFunction("UNETManager::Get()->AddWsHost", ThrowsException = true)]
-        extern private static int AddWsHostInternal(HostTopologyInternal topologyInt, string ip, int port);
-
-        private static bool IsPortOpen(string ip, int port)
-        {
-            TimeSpan timeout = TimeSpan.FromMilliseconds(500);
-            string testedEndpoint = (ip == null) ? "127.0.0.1" : ip;
-            try
-            {
-                using (var client = new TcpClient())
-                {
-                    var result = client.BeginConnect(testedEndpoint, port, null, null);
-                    var success = result.AsyncWaitHandle.WaitOne(timeout);
-                    if (!success)
-                    {
-                        return false;
-                    }
-                    client.EndConnect(result);
-                }
-            }
-            catch
-            {
-                return false;
-            }
-            return true;
-        }
-
-        //Relay ----
-        static public void ConnectAsNetworkHost(int hostId, string address, int port, NetworkID network, SourceID source, NodeID node, out byte error)
-        {
-            ConnectAsNetworkHostInternal(hostId, address, port, (ulong)network, (ulong)source, (ushort)node, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->ConnectAsNetworkHost", ThrowsException = true)]
-        extern private static void ConnectAsNetworkHostInternal(int hostId, string address, int port, ulong network, ulong source, ushort node, out byte error);
-
-        [FreeFunction("UNETManager::Get()->DisconnectNetworkHost", ThrowsException = true)]
-        extern static public void DisconnectNetworkHost(int hostId, out byte error);
-
-        static public NetworkEventType ReceiveRelayEventFromHost(int hostId, out byte error)
-        {
-            return (NetworkEventType)ReceiveRelayEventFromHostInternal(hostId, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->PopRelayHostData", ThrowsException = true)]
-        extern static private int ReceiveRelayEventFromHostInternal(int hostId, out byte error);
-
-        static public int ConnectToNetworkPeer(int hostId, string address, int port, int exceptionConnectionId, int relaySlotId, NetworkID network, SourceID source, NodeID node, int bytesPerSec, float bucketSizeFactor, out byte error)
-        {
-            return ConnectToNetworkPeerInternal(hostId, address, port, exceptionConnectionId, relaySlotId, (ulong)network, (ulong)source, (ushort)node, bytesPerSec, bucketSizeFactor, out error);
-        }
-
-        static public int ConnectToNetworkPeer(int hostId, string address, int port, int exceptionConnectionId, int relaySlotId, NetworkID network, SourceID source, NodeID node, out byte error)
-        {
-            return ConnectToNetworkPeer(hostId, address, port, exceptionConnectionId, relaySlotId, network, source, node, 0, 0, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->ConnectToNetworkPeer", ThrowsException = true)]
-        extern private static int ConnectToNetworkPeerInternal(int hostId, string address, int port, int exceptionConnectionId, int relaySlotId, ulong network, ulong source, ushort node, int bytesPerSec, float bucketSizeFactor, out byte error);
-
-        //Statistics ----
-        [Obsolete("GetCurrentIncomingMessageAmount has been deprecated.")]
-        static public int GetCurrentIncomingMessageAmount()
-        {
-            return 0;
-        }
-
-        ///Function can be used to get total amount of messages waiting for reading
-        [Obsolete("GetCurrentOutgoingMessageAmount has been deprecated.")]
-        static public int GetCurrentOutgoingMessageAmount()
-        {
-            return 0;
-        }
-
-        [FreeFunction("UNETManager::Get()->GetIncomingMessageQueueSize", ThrowsException = true)]
-        extern static public int GetIncomingMessageQueueSize(int hostId, out byte error);
-
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingMessageQueueSize", ThrowsException = true)]
-        extern static public int GetOutgoingMessageQueueSize(int hostId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetCurrentRTT", ThrowsException = true)]
-        extern static public int GetCurrentRTT(int hostId, int connectionId, out byte error);
-
-
-        [Obsolete("GetCurrentRtt() has been deprecated.")]
-        static public int GetCurrentRtt(int hostId, int connectionId, out byte error)
-        {
-            return GetCurrentRTT(hostId, connectionId, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->GetIncomingPacketLossCount", ThrowsException = true)]
-        extern static public int GetIncomingPacketLossCount(int hostId, int connectionId, out byte error);
-
-        [Obsolete("GetNetworkLostPacketNum() has been deprecated.")]
-        static public int GetNetworkLostPacketNum(int hostId, int connectionId, out byte error)
-        {
-            return GetIncomingPacketLossCount(hostId, connectionId, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->GetIncomingPacketCount", ThrowsException = true)]
-        extern static public int GetIncomingPacketCount(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingPacketNetworkLossPercent", ThrowsException = true)]
-        extern static public int GetOutgoingPacketNetworkLossPercent(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingPacketOverflowLossPercent", ThrowsException = true)]
-        extern static public int GetOutgoingPacketOverflowLossPercent(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetMaxAllowedBandwidth", ThrowsException = true)]
-        extern static public int GetMaxAllowedBandwidth(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetAckBufferCount", ThrowsException = true)]
-        extern static public int GetAckBufferCount(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetIncomingPacketDropCountForAllHosts", ThrowsException = true)]
-        extern static public int GetIncomingPacketDropCountForAllHosts();
-
-        [FreeFunction("UNETManager::Get()->GetIncomingPacketCountForAllHosts", ThrowsException = true)]
-        extern static public int GetIncomingPacketCountForAllHosts();
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingPacketCount", ThrowsException = true)]
-        extern static public int GetOutgoingPacketCount();
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingPacketCount", ThrowsException = true)]
-        extern static public int GetOutgoingPacketCountForHost(int hostId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingPacketCount", ThrowsException = true)]
-        extern static public int GetOutgoingPacketCountForConnection(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingMessageCount", ThrowsException = true)]
-        extern static public int GetOutgoingMessageCount();
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingMessageCount", ThrowsException = true)]
-        extern static public int GetOutgoingMessageCountForHost(int hostId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingMessageCount", ThrowsException = true)]
-        extern static public int GetOutgoingMessageCountForConnection(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingUserBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingUserBytesCount();
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingUserBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingUserBytesCountForHost(int hostId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingUserBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingUserBytesCountForConnection(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingSystemBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingSystemBytesCount();
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingSystemBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingSystemBytesCountForHost(int hostId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingSystemBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingSystemBytesCountForConnection(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingFullBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingFullBytesCount();
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingFullBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingFullBytesCountForHost(int hostId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetOutgoingFullBytesCount", ThrowsException = true)]
-        extern static public int GetOutgoingFullBytesCountForConnection(int hostId, int connectionId, out byte error);
-
-        [Obsolete("GetPacketSentRate has been deprecated.")]
-        static public int GetPacketSentRate(int hostId, int connectionId, out byte error)
-        {
-            error = 0;
-            return 0;
-        }
-
-        [Obsolete("GetPacketReceivedRate has been deprecated.")]
-        static public int GetPacketReceivedRate(int hostId, int connectionId, out byte error)
-        {
-            error = 0;
-            return 0;
-        }
-
-        [Obsolete("GetRemotePacketReceivedRate has been deprecated.")]
-        static public int GetRemotePacketReceivedRate(int hostId, int connectionId, out byte error)
-        {
-            error = 0;
-            return 0;
-        }
-
-        [Obsolete("GetNetIOTimeuS has been deprecated.")]
-        static public int GetNetIOTimeuS()
-        {
-            return 0;
-        }
-
-        [FreeFunction("UNETManager::Get()->GetConnectionInfo", ThrowsException = true)]
-        extern static public string GetConnectionInfo(int hostId, int connectionId, out int port, out ulong network, out ushort dstNode, out byte error);
-        static public void GetConnectionInfo(int hostId, int connectionId, out string address, out int port, out NetworkID network, out NodeID dstNode, out byte error)
-        {
-            ulong netw;
-            ushort node;
-            address = GetConnectionInfo(hostId, connectionId, out port, out netw, out node, out error);
-            network = (NetworkID)netw;
-            dstNode = (NodeID)node;
-        }
-
-        //Timing service API
-        [FreeFunction("UNETManager::Get()->GetNetworkTimestamp", ThrowsException = true)]
-        extern static public int GetNetworkTimestamp();
-
-        [FreeFunction("UNETManager::Get()->GetRemoteDelayTimeMS", ThrowsException = true)]
-        extern static public int GetRemoteDelayTimeMS(int hostId, int connectionId, int remoteTime, out byte error);
-
-        static public bool StartSendMulticast(int hostId, int channelId, byte[] buffer, int size, out byte error)
-        {
-            return StartSendMulticastInternal(hostId, channelId, buffer, size, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->StartSendMulticast", ThrowsException = true)]
-        extern static private bool StartSendMulticastInternal(int hostId, int channelId, [Out] byte[] buffer, int size, out byte error);
-
-        [FreeFunction("UNETManager::Get()->SendMulticast", ThrowsException = true)]
-        extern static public bool SendMulticast(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->FinishSendMulticast", ThrowsException = true)]
-        extern static public bool FinishSendMulticast(int hostId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetMaxPacketSize", ThrowsException = true)]
-        extern static private int GetMaxPacketSize();
-
-        [FreeFunction("UNETManager::Get()->RemoveHost", ThrowsException = true)]
-        extern static public bool RemoveHost(int hostId);
-
-        static public bool IsStarted
-        {
-            get { return IsStartedInternal(); }
-        }
-        [FreeFunction("UNETManager::IsStarted")]
-        extern static private bool IsStartedInternal();
-
-        [FreeFunction("UNETManager::Get()->Connect", ThrowsException = true)]
-        extern static public int Connect(int hostId, string address, int port, int exeptionConnectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->ConnectWithSimulator", ThrowsException = true)]
-        extern static private int ConnectWithSimulatorInternal(int hostId, string address, int port, int exeptionConnectionId, out byte error, ConnectionSimulatorConfigInternal conf);
-        static public int ConnectWithSimulator(int hostId, string address, int port, int exeptionConnectionId, out byte error, ConnectionSimulatorConfig conf)
-        {
-            return ConnectWithSimulatorInternal(hostId, address, port, exeptionConnectionId, out error, new ConnectionSimulatorConfigInternal(conf));
-        }
-
-        [FreeFunction("UNETManager::Get()->Disconnect", ThrowsException = true)]
-        extern static public bool Disconnect(int hostId, int connectionId, out byte error);
-
-        [FreeFunction("UNETManager::Get()->ConnectSockAddr", ThrowsException = true)]
-        extern static private int Internal_ConnectEndPoint(int hostId, [Out] byte[] sockAddrStorage, int sockAddrStorageLen, int exceptionConnectionId, out byte error);
-        static public bool Send(int hostId, int connectionId, int channelId, byte[] buffer, int size, out byte error)
-        {
-            if (buffer == null)
-                throw new NullReferenceException("send buffer is not initialized");
-            return SendWrapper(hostId, connectionId, channelId, buffer, size, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->Send", ThrowsException = true)]
-        extern private static bool SendWrapper(int hostId, int connectionId, int channelId, [Out] byte[] buffer, int size, out byte error);
-        static public bool QueueMessageForSending(int hostId, int connectionId, int channelId, byte[] buffer, int size, out byte error)
-        {
-            if (buffer == null)
-                throw new NullReferenceException("send buffer is not initialized");
-            return QueueMessageForSendingWrapper(hostId, connectionId, channelId, buffer, size, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->QueueMessageForSending", ThrowsException = true)]
-        extern private static bool QueueMessageForSendingWrapper(int hostId, int connectionId, int channelId, [Out] byte[] buffer, int size, out byte error);
-
-        [FreeFunction("UNETManager::Get()->SendQueuedMessages", ThrowsException = true)]
-        extern static public bool SendQueuedMessages(int hostId, int connectionId, out byte error);
-
-        static public NetworkEventType Receive(out int hostId, out int connectionId, out int channelId, byte[] buffer, int bufferSize, out int receivedSize, out byte error)
-        {
-            return (NetworkEventType)PopData(out hostId, out connectionId, out channelId, buffer, bufferSize, out receivedSize, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->PopData", ThrowsException = true)]
-        private static extern int PopData(out int hostId, out int connectionId, out int channelId, [Out] byte[] buffer, int bufferSize, out int receivedSize, out byte error);
-
-        static public NetworkEventType ReceiveFromHost(int hostId, out int connectionId, out int channelId, byte[] buffer, int bufferSize, out int receivedSize, out byte error)
-        {
-            return (NetworkEventType)PopDataFromHost(hostId, out connectionId, out channelId, buffer, bufferSize, out receivedSize, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->PopDataFromHost", ThrowsException = true)]
-        private static extern int PopDataFromHost(int hostId, out int connectionId, out int channelId, [Out] byte[] buffer, int bufferSize, out int receivedSize, out byte error);
-
-        [FreeFunction("UNETManager::Get()->SetPacketStat", ThrowsException = true)]
-        extern static public void SetPacketStat(int direction, int packetStatId, int numMsgs, int numBytes);
-
-
-        [NativeThrows]
-        [FreeFunction("UNETManager::SetNetworkEventAvailableCallback")]
-        extern static void SetNetworkEventAvailableCallback(Action<int> callback);
-
-        [FreeFunction("UNETManager::Cleanup")]
-        extern static void Cleanup();
-
-        [NativeThrows]
-        [FreeFunction("UNETManager::SetConnectionReadyForSendCallback")]
-        extern static void SetConnectionReadyForSendCallback(Action<int, int> callback);
-
-        [FreeFunction("UNETManager::Get()->NotifyWhenConnectionReadyForSend", ThrowsException = true)]
-        extern static public bool NotifyWhenConnectionReadyForSend(int hostId, int connectionId, int notificationLevel, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetHostPort", ThrowsException = true)]
-        extern static public int GetHostPort(int hostId);
-
-
-        //broadcast
-        [FreeFunction("UNETManager::Get()->StartBroadcastDiscoveryWithData", ThrowsException = true)]
-        extern static private bool StartBroadcastDiscoveryWithData(int hostId, int broadcastPort, int key, int version, int subversion, [Out] byte[] buffer, int size, int timeout, out byte error);
-
-        [FreeFunction("UNETManager::Get()->StartBroadcastDiscoveryWithoutData", ThrowsException = true)]
-        extern private static bool StartBroadcastDiscoveryWithoutData(int hostId, int broadcastPort, int key, int version, int subversion, int timeout, out byte error);
-        static public bool StartBroadcastDiscovery(int hostId, int broadcastPort, int key, int version, int subversion, byte[] buffer, int size, int timeout, out byte error)
-        {
-            if (buffer != null)
-            {
-                if (buffer.Length < size)
-                    throw new ArgumentOutOfRangeException("Size: " + size + " > buffer.Length " + buffer.Length);
-                if (size == 0)
-                    throw new ArgumentOutOfRangeException("Size is zero while buffer exists, please pass null and 0 as buffer and size parameters");
-            }
-            if (buffer == null)
-                return StartBroadcastDiscoveryWithoutData(hostId, broadcastPort, key, version, subversion, timeout, out error);
-            else
-                return StartBroadcastDiscoveryWithData(hostId, broadcastPort, key, version, subversion, buffer, size, timeout, out error);
-        }
-
-        [FreeFunction("UNETManager::Get()->StopBroadcastDiscovery", ThrowsException = true)]
-        extern static public void StopBroadcastDiscovery();
-
-        [FreeFunction("UNETManager::Get()->IsBroadcastDiscoveryRunning", ThrowsException = true)]
-        extern static public bool IsBroadcastDiscoveryRunning();
-
-        [FreeFunction("UNETManager::Get()->SetBroadcastCredentials", ThrowsException = true)]
-        extern static public void SetBroadcastCredentials(int hostId, int key, int version, int subversion, out byte error);
-
-        [FreeFunction("UNETManager::Get()->GetBroadcastConnectionInfoInternal", ThrowsException = true)]
-        extern public static string GetBroadcastConnectionInfo(int hostId, out int port, out byte error);
-
-        static public void GetBroadcastConnectionInfo(int hostId, out string address, out int port, out byte error)
-        {
-            address = GetBroadcastConnectionInfo(hostId, out port, out error);
-        }
-
-        static public void GetBroadcastConnectionMessage(int hostId, byte[] buffer, int bufferSize, out int receivedSize, out byte error)
-        {
-            GetBroadcastConnectionMessageInternal(hostId, buffer, bufferSize, out  receivedSize, out  error);
-        }
-
-        [FreeFunction("UNETManager::SetMulticastLock")]
-        extern public static void SetMulticastLock(bool enabled);
-
-        [FreeFunction("UNETManager::Get()->GetBroadcastConnectionMessage", ThrowsException = true)]
-        extern static private void GetBroadcastConnectionMessageInternal(int hostId, [Out] byte[] buffer, int bufferSize, out int receivedSize, out byte error);
-
-
-        //utils
-        private static void CheckTopology(HostTopology topology)
-        {
-            int maxPacketSize = GetMaxPacketSize();
-            if (topology.DefaultConfig.PacketSize > maxPacketSize)
-                throw new ArgumentOutOfRangeException("Default config: packet size should be less than packet size defined in global config: " + maxPacketSize);
-            for (int i = 0; i < topology.SpecialConnectionConfigs.Count; ++i)
-            {
-                if (topology.SpecialConnectionConfigs[i].PacketSize > maxPacketSize)
-                {
-                    throw new ArgumentOutOfRangeException("Special config " + i + ": packet size should be less than packet size defined in global config: " + maxPacketSize);
-                }
-            }
-        }
-
-        [FreeFunction("UNETManager::Get()->LoadEncryptionLibrary", ThrowsException = true)]
-        extern static private bool LoadEncryptionLibraryInternal(string libraryName);
-
-        public static bool LoadEncryptionLibrary(string libraryName)
-        {
-            return LoadEncryptionLibraryInternal(libraryName);
-        }
-
-        [FreeFunction("UNETManager::Get()->UnloadEncryptionLibrary", ThrowsException = true)]
-        extern static private void UnloadEncryptionLibraryInternal();
-
-        public static void UnloadEncryptionLibrary()
-        {
-            UnloadEncryptionLibraryInternal();
-        }
-
-        [FreeFunction("UNETManager::Get()->IsEncryptionActive", ThrowsException = true)]
-        extern static private bool IsEncryptionActiveInternal();
-
-        public static bool IsEncryptionActive()
-        {
-            return IsEncryptionActiveInternal();
-        }
-
-        [FreeFunction("UNETManager::Get()->GetEncryptionSafeMaxPacketSize", ThrowsException = true)]
-        extern static private short GetEncryptionSafeMaxPacketSizeInternal(short maxPacketSize);
-
-        public static short GetEncryptionSafeMaxPacketSize(short maxPacketSize)
-        {
-            return GetEncryptionSafeMaxPacketSizeInternal(maxPacketSize);
-        }
-    }
-}
-
diff --git a/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs b/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs
index e4f5bb63d8..c861b860ef 100644
--- a/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs
+++ b/Modules/UnityConnectEditor/Common/ServicesConfiguration.cs
@@ -156,7 +156,7 @@ void BuildPaths()
             m_CloudDiagCrashesDashboardUrl = m_ServicesUrlsConfig["build"] + "/diagnostics/orgs/{0}/projects/{1}/crashes";
             m_CollabDashboardUrl = m_ServicesUrlsConfig["build"] + "/collab/orgs/{0}/projects/{1}/assets/";
             m_PurchasingDashboardUrl = m_ServicesUrlsConfig["analytics"] + "/projects/{0}/purchasing/";
-            m_AnalyticsDashboardUrl = UnityEditor.Analytics.AnalyticsSettings.dashboardUrl + "/organizations/{0}/projects/{1}/analytics/events/";
+            m_AnalyticsDashboardUrl = UnityEditor.Analytics.AnalyticsSettings.dashboardUrl + "/organizations/{0}/projects/{1}/analytics/about";
 
             pathsReady = true;
             loadingConfigurations = false;
diff --git a/Modules/UnityConnectEditor/ProjectSettings/AdsProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/AdsProjectSettings.cs
index ca8585d417..0250ba91c6 100644
--- a/Modules/UnityConnectEditor/ProjectSettings/AdsProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ProjectSettings/AdsProjectSettings.cs
@@ -64,14 +64,6 @@ public static SettingsProvider CreateServicesProvider()
         {
             SettingsProvider projectSettings = null;
 
-            if (ShouldShowBuiltInProjectSettings(AdsService.instance))
-            {
-                projectSettings = new AdsProjectSettings(AdsService.instance.projectSettingsPath, SettingsScope.Project);
-            }
-            else if (ShouldShowFallbackProjectSettings(AdsService.instance))
-            {
-                projectSettings = new FallbackProjectSettings(AdsService.instance, SettingsScope.Project);
-            }
 
             return projectSettings;
         }
diff --git a/Modules/UnityConnectEditor/ProjectSettings/AnalyticsProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/AnalyticsProjectSettings.cs
index ec227a3c99..da35598f4b 100644
--- a/Modules/UnityConnectEditor/ProjectSettings/AnalyticsProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ProjectSettings/AnalyticsProjectSettings.cs
@@ -18,7 +18,7 @@ class AnalyticsProjectSettings : ServicesProjectSettings
     {
         //Resources
         const string k_ServiceName = "Analytics";
-        const string k_ProjectSettingsPath = "Project/Services/Analytics";
+        const string k_ProjectSettingsPath = "Project/Services/Legacy Analytics";
 
         const string k_AnalyticsServicesTemplatePath = "UXML/ServicesWindow/AnalyticsProjectSettings.uxml";
 
@@ -74,22 +74,6 @@ public static SettingsProvider CreateServicesProvider()
         {
             SettingsProvider projectSettings = null;
 
-            if (ShouldShowBuiltInProjectSettings(AnalyticsService.instance))
-            {
-                projectSettings = new AnalyticsProjectSettings(k_ProjectSettingsPath, SettingsScope.Project, new List<string>()
-                    {
-                        L10n.Tr(k_KeywordAnalytics),
-                        L10n.Tr(k_KeywordInsights),
-                        L10n.Tr(k_KeywordEvents),
-                        L10n.Tr(k_KeywordMonetization),
-                        L10n.Tr(k_KeywordDashboard),
-                        L10n.Tr(k_KeywordValidator),
-                    });
-            }
-            else if (ShouldShowFallbackProjectSettings(AnalyticsService.instance))
-            {
-                projectSettings = new FallbackProjectSettings(AnalyticsService.instance, SettingsScope.Project);
-            }
 
             return projectSettings;
         }
diff --git a/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs
index 6e1584826c..9a6a9ac944 100644
--- a/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ProjectSettings/CloudBuildProjectSettings.cs
@@ -126,14 +126,6 @@ public static SettingsProvider CreateServicesProvider()
         {
             SettingsProvider projectSettings = null;
 
-            if (ShouldShowBuiltInProjectSettings(BuildService.instance))
-            {
-                projectSettings = new CloudBuildProjectSettings(BuildService.instance.projectSettingsPath, SettingsScope.Project);
-            }
-            else if (ShouldShowFallbackProjectSettings(BuildService.instance))
-            {
-                projectSettings = new FallbackProjectSettings(BuildService.instance, SettingsScope.Project);
-            }
 
             return projectSettings;
         }
diff --git a/Modules/UnityConnectEditor/ProjectSettings/CloudDiagProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/CloudDiagProjectSettings.cs
index 925a00af39..98db82a5b7 100644
--- a/Modules/UnityConnectEditor/ProjectSettings/CloudDiagProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ProjectSettings/CloudDiagProjectSettings.cs
@@ -67,14 +67,6 @@ public static SettingsProvider CreateServicesProvider()
         {
             SettingsProvider projectSettings = null;
 
-            if (ShouldShowBuiltInProjectSettings(CrashService.instance))
-            {
-                projectSettings = new CloudDiagProjectSettings(CrashService.instance.projectSettingsPath, SettingsScope.Project);
-            }
-            else if (ShouldShowFallbackProjectSettings(CrashService.instance))
-            {
-                projectSettings = new FallbackProjectSettings(CrashService.instance, SettingsScope.Project);
-            }
 
             return projectSettings;
         }
diff --git a/Modules/UnityConnectEditor/ProjectSettings/CollabProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/CollabProjectSettings.cs
index 556ad5a95b..e52f471598 100644
--- a/Modules/UnityConnectEditor/ProjectSettings/CollabProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ProjectSettings/CollabProjectSettings.cs
@@ -56,14 +56,6 @@ public static SettingsProvider CreateServicesProvider()
         {
             SettingsProvider projectSettings = null;
 
-            if (ShouldShowBuiltInProjectSettings(CollabService.instance))
-            {
-                projectSettings = new CollabProjectSettings(CollabService.instance.projectSettingsPath, SettingsScope.Project);
-            }
-            else if (ShouldShowFallbackProjectSettings(CollabService.instance))
-            {
-                projectSettings = new FallbackProjectSettings(CollabService.instance, SettingsScope.Project);
-            }
 
             return projectSettings;
         }
diff --git a/Modules/UnityConnectEditor/ProjectSettings/Fallback/FallbackProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/Fallback/FallbackProjectSettings.cs
deleted file mode 100644
index 18cb45e582..0000000000
--- a/Modules/UnityConnectEditor/ProjectSettings/Fallback/FallbackProjectSettings.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Unity C# reference source
-// Copyright (c) Unity Technologies. For terms of use, see
-// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
-
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UIElements;
-
-namespace UnityEditor.Connect.Fallback
-{
-    class FallbackProjectSettings : SettingsProvider
-    {
-        InstallPackageSection m_InstallPackageSection;
-
-        public FallbackProjectSettings(SingleService service, SettingsScope scopes, IEnumerable<string> keywords = null)
-            : base(service.projectSettingsPath, scopes, keywords)
-        {
-            activateHandler += Initialize;
-
-            void Initialize(string s, VisualElement element)
-            {
-                AddStyleSheets(element);
-                AddGeneralTemplate(element, service.title);
-
-                var scrollView = new ScrollView();
-                var scrollContainer = element.Q(className: VisualElementConstants.ClassNames.ScrollContainer);
-                if (scrollContainer != null)
-                {
-                    scrollContainer.Add(scrollView);
-                }
-
-                AddInstallPackageSection(scrollView, service);
-
-                TranslateStringsInTree(element);
-            }
-        }
-
-        static void TranslateStringsInTree(VisualElement rootElement)
-        {
-            rootElement.Query<TextElement>().ForEach((label) => label.text = L10n.Tr(label.text));
-        }
-
-        static void AddStyleSheets(VisualElement styleSheetElement)
-        {
-            styleSheetElement.AddStyleSheetPath(ServicesUtils.StylesheetPath.servicesWindowCommon);
-            styleSheetElement.AddStyleSheetPath(EditorGUIUtility.isProSkin ? ServicesUtils.StylesheetPath.servicesWindowDark : ServicesUtils.StylesheetPath.servicesWindowLight);
-            styleSheetElement.AddStyleSheetPath(ServicesUtils.StylesheetPath.servicesCommon);
-            styleSheetElement.AddStyleSheetPath(EditorGUIUtility.isProSkin ? ServicesUtils.StylesheetPath.servicesDark : ServicesUtils.StylesheetPath.servicesLight);
-            styleSheetElement.AddStyleSheetPath(VisualElementConstants.StyleSheetPaths.PackageInstallation);
-        }
-
-        static void AddGeneralTemplate(VisualElement templateContainer, string serviceTitle)
-        {
-            VisualElementUtils.AddUxmlToVisualElement(templateContainer, VisualElementConstants.UxmlPaths.GeneralServicesTemplate);
-            SetupTitle(templateContainer, serviceTitle);
-        }
-
-        static void SetupTitle(VisualElement labelsContainer, string serviceTitle)
-        {
-            var titleTextElement = labelsContainer.Q<TextElement>(className: VisualElementConstants.ClassNames.ServiceTitle);
-            if (titleTextElement != null)
-            {
-                titleTextElement.text = serviceTitle;
-            }
-        }
-
-        void AddInstallPackageSection(VisualElement installPackageContainer, SingleService service)
-        {
-            m_InstallPackageSection = new InstallPackageSection(installPackageContainer, service);
-            m_InstallPackageSection.packageInstalled += Repaint;
-        }
-    }
-}
diff --git a/Modules/UnityConnectEditor/ProjectSettings/PurchasingProjectSettings.cs b/Modules/UnityConnectEditor/ProjectSettings/PurchasingProjectSettings.cs
index 4b5b6e23e4..4091071dd2 100644
--- a/Modules/UnityConnectEditor/ProjectSettings/PurchasingProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ProjectSettings/PurchasingProjectSettings.cs
@@ -60,23 +60,6 @@ public static SettingsProvider CreateServicesProvider()
         {
             SettingsProvider projectSettings = null;
 
-            if (ShouldShowBuiltInProjectSettings(PurchasingService.instance))
-            {
-                projectSettings = new PurchasingProjectSettings(k_ProjectSettingsPath, SettingsScope.Project, new List<string>()
-                    {
-                        L10n.Tr(k_KeywordPurchasing),
-                        L10n.Tr(k_KeywordInApp),
-                        L10n.Tr(k_KeywordPurchase),
-                        L10n.Tr(k_KeywordRevenue),
-                        L10n.Tr(k_KeywordPlatforms),
-                        L10n.Tr(k_KeywordGooglePlay),
-                        L10n.Tr(k_KeywordPublicKey)
-                    });
-            }
-            else if (ShouldShowFallbackProjectSettings(PurchasingService.instance))
-            {
-                projectSettings = new FallbackProjectSettings(PurchasingService.instance, SettingsScope.Project);
-            }
 
             return projectSettings;
         }
diff --git a/Modules/UnityConnectEditor/Services/AdsService.cs b/Modules/UnityConnectEditor/Services/AdsService.cs
index c53f699522..3095510ac1 100644
--- a/Modules/UnityConnectEditor/Services/AdsService.cs
+++ b/Modules/UnityConnectEditor/Services/AdsService.cs
@@ -37,9 +37,6 @@ internal class AdsService : SingleService
         public override string packageName { get; }
 
         public override string editorGamePackageName { get; } = "com.unity.ads";
-        public override bool canShowFallbackProjectSettings { get; } = true;
-        public override bool canShowBuiltInProjectSettings { get; } = true;
-        public override string minimumEditorGamePackageVersion { get; } = "3.7.5";
 
         public override string serviceFlagName { get; }
         public override bool shouldSyncOnProjectRebind => true;
diff --git a/Modules/UnityConnectEditor/Services/AnalyticsService.cs b/Modules/UnityConnectEditor/Services/AnalyticsService.cs
index 1b5dcc7f32..9ccd5aa4f9 100644
--- a/Modules/UnityConnectEditor/Services/AnalyticsService.cs
+++ b/Modules/UnityConnectEditor/Services/AnalyticsService.cs
@@ -23,9 +23,6 @@ internal class AnalyticsService : SingleService
         public override string packageName { get; }
 
         public override string editorGamePackageName { get; } = "com.unity.services.analytics";
-        public override bool canShowFallbackProjectSettings { get; } = true;
-        public override bool canShowBuiltInProjectSettings { get; } = false;
-        public override string minimumEditorGamePackageVersion { get; } = "1.0.0";
 
         public override string serviceFlagName { get; }
         public override bool shouldEnableOnProjectCreation => false;
@@ -44,7 +41,7 @@ static AnalyticsService()
 
         AnalyticsService()
         {
-            const string serviceName = "Analytics";
+            const string serviceName = "Legacy Analytics";
             name = serviceName;
             title = L10n.Tr(serviceName);
             description = L10n.Tr("Discover player insights");
diff --git a/Modules/UnityConnectEditor/Services/BuildService.cs b/Modules/UnityConnectEditor/Services/BuildService.cs
index 344bcf04a5..75dc8856f2 100644
--- a/Modules/UnityConnectEditor/Services/BuildService.cs
+++ b/Modules/UnityConnectEditor/Services/BuildService.cs
@@ -18,9 +18,6 @@ internal class BuildService : SingleService
         public override string packageName { get; }
 
         public override string editorGamePackageName { get; } = "com.unity.services.cloud-build";
-        public override bool canShowFallbackProjectSettings { get; } = true;
-        public override bool canShowBuiltInProjectSettings { get; } = false;
-        public override string minimumEditorGamePackageVersion { get; } = "1.0.0";
 
         public override string serviceFlagName { get; }
         public override bool shouldSyncOnProjectRebind => true;
diff --git a/Modules/UnityConnectEditor/Services/CollabService.cs b/Modules/UnityConnectEditor/Services/CollabService.cs
index a203307729..b51674c036 100644
--- a/Modules/UnityConnectEditor/Services/CollabService.cs
+++ b/Modules/UnityConnectEditor/Services/CollabService.cs
@@ -20,9 +20,6 @@ internal class CollabService : SingleService
         public override string packageName { get; }
 
         public override string editorGamePackageName { get; } = "com.unity.collab-proxy";
-        public override bool canShowFallbackProjectSettings { get; } = true;
-        public override bool canShowBuiltInProjectSettings { get; } = false;
-        public override string minimumEditorGamePackageVersion { get; } = "1.0.0";
 
         public override string serviceFlagName { get; }
         public override bool shouldSyncOnProjectRebind => true;
diff --git a/Modules/UnityConnectEditor/Services/CrashService.cs b/Modules/UnityConnectEditor/Services/CrashService.cs
index 6433885651..a030634f88 100644
--- a/Modules/UnityConnectEditor/Services/CrashService.cs
+++ b/Modules/UnityConnectEditor/Services/CrashService.cs
@@ -20,9 +20,6 @@ internal class CrashService : SingleService
         public override string packageName { get; }
 
         public override string editorGamePackageName { get; } = "com.unity.services.cloud-diagnostics";
-        public override bool canShowFallbackProjectSettings { get; } = true;
-        public override bool canShowBuiltInProjectSettings { get; } = false;
-        public override string minimumEditorGamePackageVersion { get; } = "1.0.0";
 
         public override string serviceFlagName { get; }
         public override bool shouldSyncOnProjectRebind => true;
diff --git a/Modules/UnityConnectEditor/Services/PurchasingService.cs b/Modules/UnityConnectEditor/Services/PurchasingService.cs
index 8ad213da4d..3451cdae8b 100644
--- a/Modules/UnityConnectEditor/Services/PurchasingService.cs
+++ b/Modules/UnityConnectEditor/Services/PurchasingService.cs
@@ -52,9 +52,6 @@ private struct ImportPackageInfo
         public override string packageName { get; }
 
         public override string editorGamePackageName { get; } = "com.unity.purchasing";
-        public override bool canShowFallbackProjectSettings { get; } = true;
-        public override bool canShowBuiltInProjectSettings { get; } = false;
-        public override string minimumEditorGamePackageVersion { get; } = "1.0.0";
 
         public override string serviceFlagName { get; }
         public override bool shouldSyncOnProjectRebind => true;
diff --git a/Modules/UnityConnectEditor/Services/SingleService.cs b/Modules/UnityConnectEditor/Services/SingleService.cs
index 6e93197f3d..23d02ee313 100644
--- a/Modules/UnityConnectEditor/Services/SingleService.cs
+++ b/Modules/UnityConnectEditor/Services/SingleService.cs
@@ -68,9 +68,6 @@ internal abstract class SingleService
         public abstract string packageName { get; }
 
         public abstract string editorGamePackageName { get; }
-        public abstract bool canShowFallbackProjectSettings { get; }
-        public abstract bool canShowBuiltInProjectSettings { get; }
-        public abstract string minimumEditorGamePackageVersion { get; }
 
         public virtual string serviceFlagName { get; }
 
diff --git a/Modules/UnityConnectEditor/Services/UDPServices.cs b/Modules/UnityConnectEditor/Services/UDPServices.cs
index 20d8be97e6..96087320b1 100644
--- a/Modules/UnityConnectEditor/Services/UDPServices.cs
+++ b/Modules/UnityConnectEditor/Services/UDPServices.cs
@@ -18,9 +18,6 @@ internal class UDPService : SingleService
         public override string packageName { get; }
 
         public override string editorGamePackageName { get; } = "com.unity.purchasing.udp";
-        public override bool canShowFallbackProjectSettings { get; } = true;
-        public override bool canShowBuiltInProjectSettings { get; } = false;
-        public override string minimumEditorGamePackageVersion { get; } = "1.0.0";
 
         public override Notification.Topic notificationTopic => Notification.Topic.UDPService;
         static readonly UDPService k_Instance;
diff --git a/Modules/UnityConnectEditor/ServicesProjectSettings.cs b/Modules/UnityConnectEditor/ServicesProjectSettings.cs
index ccb89b2d35..49942f3d81 100644
--- a/Modules/UnityConnectEditor/ServicesProjectSettings.cs
+++ b/Modules/UnityConnectEditor/ServicesProjectSettings.cs
@@ -218,19 +218,6 @@ protected ServicesProjectSettings(string path, SettingsScope scopes, string labe
             };
         }
 
-        protected static bool ShouldShowFallbackProjectSettings(SingleService singleService)
-        {
-            return singleService.canShowFallbackProjectSettings &&
-                !PackageHelper.IsPackageInstalled(singleService.editorGamePackageName);
-        }
-
-        protected static bool ShouldShowBuiltInProjectSettings(SingleService singleService)
-        {
-            return singleService.canShowBuiltInProjectSettings &&
-                (!PackageHelper.IsCorePackageInstalled() ||
-                !PackageHelper.IsInstalledPackageAtMinimumVersionOrHigher(singleService.packageName, singleService.minimumEditorGamePackageVersion));
-        }
-
         bool IsProjectInfoChanged()
         {
             // All struct fields are private, we check the public interface...
diff --git a/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs b/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs
index f801fcee54..21edf6fda3 100644
--- a/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs
+++ b/Modules/UnityEditorAnalyticsEditor/EditorAnalytics.bindings.cs
@@ -154,6 +154,7 @@ internal static bool SendAssetPostprocessorsUsage(object parameters)
         public extern static bool enabled
         {
             get;
+            set;
         }
 
         extern private static bool SendEvent(string eventName, object parameters, SendEventOptions sendEventOptions = SendEventOptions.kAppendNone);
diff --git a/Modules/UnityWebRequest/Public/WebRequestExtensions.cs b/Modules/UnityWebRequest/Public/WebRequestExtensions.cs
index 77a5fbca1e..2ca430782b 100644
--- a/Modules/UnityWebRequest/Public/WebRequestExtensions.cs
+++ b/Modules/UnityWebRequest/Public/WebRequestExtensions.cs
@@ -154,21 +154,35 @@ public static UnityWebRequest Put(Uri uri, string bodyData)
             return request;
         }
 
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [Obsolete("UnityWebRequest.Post with only a string data is obsolete. Use UnityWebRequest.Post with content type argument or UnityWebRequest.PostWwwForm instead (UnityUpgradable) -> [UnityEngine] UnityWebRequest.PostWwwForm(*)", false)]
         public static UnityWebRequest Post(string uri, string postData)
+        {
+            return PostWwwForm(uri, postData);
+        }
+
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        [Obsolete("UnityWebRequest.Post with only a string data is obsolete. Use UnityWebRequest.Post with content type argument or UnityWebRequest.PostWwwForm instead (UnityUpgradable) -> [UnityEngine] UnityWebRequest.PostWwwForm(*)", false)]
+        public static UnityWebRequest Post(Uri uri, string postData)
+        {
+            return PostWwwForm(uri, postData);
+        }
+
+        public static UnityWebRequest PostWwwForm(string uri, string form)
         {
             UnityWebRequest request = new UnityWebRequest(uri, kHttpVerbPOST);
-            SetupPost(request, postData);
+            SetupPostWwwForm(request, form);
             return request;
         }
 
-        public static UnityWebRequest Post(Uri uri, string postData)
+        public static UnityWebRequest PostWwwForm(Uri uri, string form)
         {
             UnityWebRequest request = new UnityWebRequest(uri, kHttpVerbPOST);
-            SetupPost(request, postData);
+            SetupPostWwwForm(request, form);
             return request;
         }
 
-        private static void SetupPost(UnityWebRequest request, string postData)
+        private static void SetupPostWwwForm(UnityWebRequest request, string postData)
         {
             request.downloadHandler = new DownloadHandlerBuffer();
             if (string.IsNullOrEmpty(postData))
@@ -180,6 +194,33 @@ private static void SetupPost(UnityWebRequest request, string postData)
             request.uploadHandler.contentType = "application/x-www-form-urlencoded";
         }
 
+        public static UnityWebRequest Post(string uri, string postData, string contentType)
+        {
+            UnityWebRequest request = new UnityWebRequest(uri, kHttpVerbPOST);
+            SetupPost(request, postData, contentType);
+            return request;
+        }
+
+        public static UnityWebRequest Post(Uri uri, string postData, string contentType)
+        {
+            UnityWebRequest request = new UnityWebRequest(uri, kHttpVerbPOST);
+            SetupPost(request, postData, contentType);
+            return request;
+        }
+
+        private static void SetupPost(UnityWebRequest request, string postData, string contentType)
+        {
+            request.downloadHandler = new DownloadHandlerBuffer();
+            if (string.IsNullOrEmpty(postData))
+            {
+                request.SetRequestHeader("Content-Type", contentType);
+                return;  // no data to send, nothing more to setup
+            }
+            byte[] payload = System.Text.Encoding.UTF8.GetBytes(postData);
+            request.uploadHandler = new UploadHandlerRaw(payload);
+            request.uploadHandler.contentType = contentType;
+        }
+
         // Provides a shim for sending a multipart form as declared by the legacy WWWForm class.
         public static UnityWebRequest Post(string uri, WWWForm formData)
         {
diff --git a/Modules/UnityWebRequest/Public/WebRequestUtils.cs b/Modules/UnityWebRequest/Public/WebRequestUtils.cs
index aa309a57b0..bf717d6426 100644
--- a/Modules/UnityWebRequest/Public/WebRequestUtils.cs
+++ b/Modules/UnityWebRequest/Public/WebRequestUtils.cs
@@ -562,7 +562,20 @@ internal static string MakeUriString(Uri targetUri, string targetUrl, bool prepe
                     return targetUri.OriginalString;
                 string path = targetUri.AbsolutePath;
                 if (path.Contains("%"))
+                {
+                    if (path.Contains('+'))
+                    {
+                        // if URI has both % and +, we don't know if + mean itself or is an escape for space
+                        // what we want is for correct absolute path passed to Uri constructor to work
+                        // otherwise it's users responsibility to ensure proper escaping
+                        var original = targetUri.OriginalString;
+                        if (!original.StartsWith("file:"))
+                        {
+                            return "file://" + original;
+                        }
+                    }
                     path = URLDecode(path);
+                }
                 if (path.Length > 0 && path[0] != '/')
                     path = '/' + path;
                 return "file://" + path;
diff --git a/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs b/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs
index 26b55476c1..e47e0380e3 100644
--- a/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs
+++ b/Modules/VFX/Public/ScriptBindings/VFXEnums.bindings.cs
@@ -302,7 +302,8 @@ internal enum VFXSystemFlag
         SystemNeedsComputeBounds = 1 << 4,
         SystemAutomaticBounds = 1 << 5,
         SystemInWorldSpace = 1 << 6,
-        SystemHasDirectLink = 1 << 7
+        SystemHasDirectLink = 1 << 7,
+        SystemHasAttributeBuffer = 1 << 8
     }
 
     [Flags]
diff --git a/Modules/VFX/Public/ScriptBindings/VFXManager.bindings.cs b/Modules/VFX/Public/ScriptBindings/VFXManager.bindings.cs
index 0836b3ead8..2f630d342c 100644
--- a/Modules/VFX/Public/ScriptBindings/VFXManager.bindings.cs
+++ b/Modules/VFX/Public/ScriptBindings/VFXManager.bindings.cs
@@ -36,6 +36,7 @@ public static class VFXManager
         extern public static float fixedTimeStep { get; set; }
         extern public static float maxDeltaTime { get; set; }
 
+        extern internal static float maxScrubTime { get; set; }
         extern internal static string renderPipeSettingsPath { get; }
 
         extern internal static void ResyncMaterials([NotNull("NullExceptionObject")] VisualEffectAsset asset);
diff --git a/Projects/CSharp/UnityEditor.csproj b/Projects/CSharp/UnityEditor.csproj
index ef372acfab..1d25652a77 100644
--- a/Projects/CSharp/UnityEditor.csproj
+++ b/Projects/CSharp/UnityEditor.csproj
@@ -5,7 +5,7 @@
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <DefineConstants>$(DefineConstants);COMBINED_ASSEMBLIES;DEBUG;DEBUGGER_LISTENS_FIXED_PORT;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_ALTERNATIVE_LISTEN_PORT;ENABLE_AR;ENABLE_AUDIO;ENABLE_AUDIO_MANAGER_BASED_SCHEDULING;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_CLOUD_LICENSE;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_COLLAB_TESTING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_CLUSTER_SYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_EDITOR_GAME_SERVICES;ENABLE_EDITOR_HUB_LICENSE;ENABLE_ETC_COMPRESSION;ENABLE_EVENT_QUEUE;ENABLE_GAMECENTER_API;ENABLE_HOLOLENS_MODULE_API;ENABLE_LZMA;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_UNITYTLS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NETWORK;ENABLE_NVIDIA;ENABLE_PHYSICS;ENABLE_RUNTIME_GI;ENABLE_SCRIPTING_GC_WBARRIERS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_UNITYWEBREQUEST;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_VERSION_CONTROL_INTEGRATION;ENABLE_VIDEO;ENABLE_VIRTUALTEXTURING;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WEBSOCKET_CLIENT;ENABLE_WEBSOCKET_HOST;ENABLE_WWW;INCLUDE_DYNAMIC_GI;PLATFORM_SUPPORTS_GAMEPAD_AUDIO;PLATFORM_SUPPORTS_MONO;PLAYERCONNECTION_LISTENS_FIXED_PORT;RENDER_SOFTWARE_CURSOR;TEXTCORE_1_0_OR_NEWER;TRACE;UNITY_ANDROID_API;UNITY_ASSEMBLIES_API;UNITY_ASSERTIONS;UNITY_BJM_API;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_EDITOR;UNITY_EDITOR_API;UNITY_EDITOR_LINUX;UNITY_GAMECORE_API;UNITY_GAMECORE_SCARLETT_API;UNITY_GAMECORE_XBOXONE_API;UNITY_IPHONE_API;UNITY_LUMIN_API;UNITY_METRO_API;UNITY_PS4_API;UNITY_PS5_API;UNITY_STANDALONE_GGP_API;UNITY_STANDALONE_LINUX_API;UNITY_STANDALONE_OSX_API;UNITY_STANDALONE_WIN_API;UNITY_SWITCH_API;UNITY_TINYPROFILING_INTERNAL;UNITY_TVOS_API;UNITY_UNITYADS_API;UNITY_WEBGL_API;UNITY_XBOXONE_API;USE_PROPERTY_DATABASE;USE_QUERY_BUILDER;USE_SEARCH_MODULE</DefineConstants>
+    <DefineConstants>$(DefineConstants);COMBINED_ASSEMBLIES;DEBUG;DEBUGGER_LISTENS_FIXED_PORT;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_ALTERNATIVE_LISTEN_PORT;ENABLE_AR;ENABLE_AUDIO;ENABLE_AUDIO_MANAGER_BASED_SCHEDULING;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_CLOUD_LICENSE;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_COLLAB_TESTING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLUSTERINPUT;ENABLE_CLUSTER_SYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_EDITOR_GAME_SERVICES;ENABLE_EDITOR_HUB_LICENSE;ENABLE_ETC_COMPRESSION;ENABLE_EVENT_QUEUE;ENABLE_GAMECENTER_API;ENABLE_HOLOLENS_MODULE_API;ENABLE_LZMA;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_UNITYTLS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NETWORK;ENABLE_NVIDIA;ENABLE_PHYSICS;ENABLE_RUNTIME_GI;ENABLE_SCRIPTING_GC_WBARRIERS;ENABLE_TEXTURE_STREAMING;ENABLE_UNITYEVENTS;ENABLE_UNITYWEBREQUEST;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_VERSION_CONTROL_INTEGRATION;ENABLE_VIDEO;ENABLE_VIRTUALTEXTURING;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WEBSOCKET_CLIENT;ENABLE_WEBSOCKET_HOST;ENABLE_WWW;INCLUDE_DYNAMIC_GI;PLATFORM_SUPPORTS_GAMEPAD_AUDIO;PLATFORM_SUPPORTS_MONO;PLAYERCONNECTION_LISTENS_FIXED_PORT;RENDER_SOFTWARE_CURSOR;TEXTCORE_1_0_OR_NEWER;TRACE;UNITY_ANDROID_API;UNITY_ASSEMBLIES_API;UNITY_ASSERTIONS;UNITY_BJM_API;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_EDITOR;UNITY_EDITOR_API;UNITY_EDITOR_LINUX;UNITY_GAMECORE_API;UNITY_GAMECORE_SCARLETT_API;UNITY_GAMECORE_XBOXONE_API;UNITY_IPHONE_API;UNITY_METRO_API;UNITY_PS4_API;UNITY_PS5_API;UNITY_STANDALONE_GGP_API;UNITY_STANDALONE_LINUX_API;UNITY_STANDALONE_OSX_API;UNITY_STANDALONE_WIN_API;UNITY_SWITCH_API;UNITY_TINYPROFILING_INTERNAL;UNITY_TVOS_API;UNITY_UNITYADS_API;UNITY_WEBGL_API;UNITY_XBOXONE_API;USE_PROPERTY_DATABASE;USE_QUERY_BUILDER;USE_SEARCH_MODULE</DefineConstants>
     <LangVersion>latest</LangVersion>
     <NoWarn>1071;0169;0649;0626</NoWarn>
   </PropertyGroup>
@@ -742,6 +742,9 @@
     <Compile Include="..\..\Editor\Mono\ChangeTrackerHandle.bindings.cs">
       <Link>Editor\Mono\ChangeTrackerHandle.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\ClipboardUtility.cs">
+      <Link>Editor\Mono\ClipboardUtility.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Clipboard\Clipboard.cs">
       <Link>Editor\Mono\Clipboard\Clipboard.cs</Link>
     </Compile>
@@ -883,9 +886,6 @@
     <Compile Include="..\..\Editor\Mono\CutBoard.cs">
       <Link>Editor\Mono\CutBoard.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\CutCopyPasteUtility.cs">
-      <Link>Editor\Mono\CutCopyPasteUtility.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\DataWatchService.cs">
       <Link>Editor\Mono\DataWatchService.cs</Link>
     </Compile>
@@ -1084,6 +1084,9 @@
     <Compile Include="..\..\Editor\Mono\EditorSceneManager.bindings.cs">
       <Link>Editor\Mono\EditorSceneManager.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\EditorSceneManager.bindings.deprecated.cs">
+      <Link>Editor\Mono\EditorSceneManager.bindings.deprecated.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\EditorSceneManager.cs">
       <Link>Editor\Mono\EditorSceneManager.cs</Link>
     </Compile>
@@ -1093,9 +1096,6 @@
     <Compile Include="..\..\Editor\Mono\EditorSettings.bindings.cs">
       <Link>Editor\Mono\EditorSettings.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\EditorUIService.cs">
-      <Link>Editor\Mono\EditorUIService.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\EditorUserBuildSettings.bindings.cs">
       <Link>Editor\Mono\EditorUserBuildSettings.bindings.cs</Link>
     </Compile>
@@ -1411,9 +1411,6 @@
     <Compile Include="..\..\Editor\Mono\GUI\PopupWindowWithoutFocus.cs">
       <Link>Editor\Mono\GUI\PopupWindowWithoutFocus.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\GUI\PragmaFixingWindow.cs">
-      <Link>Editor\Mono\GUI\PragmaFixingWindow.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\GUI\PreviewResizer.cs">
       <Link>Editor\Mono\GUI\PreviewResizer.cs</Link>
     </Compile>
@@ -1747,6 +1744,9 @@
     <Compile Include="..\..\Editor\Mono\ICleanuppable.cs">
       <Link>Editor\Mono\ICleanuppable.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\IDataModeHandler.cs">
+      <Link>Editor\Mono\IDataModeHandler.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\IDropArea.cs">
       <Link>Editor\Mono\IDropArea.cs</Link>
     </Compile>
@@ -1798,6 +1798,9 @@
     <Compile Include="..\..\Editor\Mono\ImportSettings\TrueTypeFontImporterInspector.cs">
       <Link>Editor\Mono\ImportSettings\TrueTypeFontImporterInspector.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\InspectorUtility.cs">
+      <Link>Editor\Mono\InspectorUtility.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Inspector\AddComponent\AddComponentDataSource.cs">
       <Link>Editor\Mono\Inspector\AddComponent\AddComponentDataSource.cs</Link>
     </Compile>
@@ -2476,6 +2479,9 @@
     <Compile Include="..\..\Editor\Mono\Inspector\WindInspector.cs">
       <Link>Editor\Mono\Inspector\WindInspector.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\InteractionContext.bindings.cs">
+      <Link>Editor\Mono\InteractionContext.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\InternalEditorUtility.bindings.cs">
       <Link>Editor\Mono\InternalEditorUtility.bindings.cs</Link>
     </Compile>
@@ -2500,6 +2506,9 @@
     <Compile Include="..\..\Editor\Mono\Macros\MethodEvaluator.cs">
       <Link>Editor\Mono\Macros\MethodEvaluator.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\MainToolbarImguiContainer.cs">
+      <Link>Editor\Mono\MainToolbarImguiContainer.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\MaterialProperty.cs">
       <Link>Editor\Mono\MaterialProperty.cs</Link>
     </Compile>
@@ -2614,6 +2623,9 @@
     <Compile Include="..\..\Editor\Mono\ObjectTreeForSelector.cs">
       <Link>Editor\Mono\ObjectTreeForSelector.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\OrderedCallbackCollection.cs">
+      <Link>Editor\Mono\OrderedCallbackCollection.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Overlays\ICreateToolbar.cs">
       <Link>Editor\Mono\Overlays\ICreateToolbar.cs</Link>
     </Compile>
@@ -2659,6 +2671,9 @@
     <Compile Include="..\..\Editor\Mono\Overlays\OverlayPresetManager.cs">
       <Link>Editor\Mono\Overlays\OverlayPresetManager.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Overlays\OverlayResizer.cs">
+      <Link>Editor\Mono\Overlays\OverlayResizer.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Overlays\OverlayToolbar.cs">
       <Link>Editor\Mono\Overlays\OverlayToolbar.cs</Link>
     </Compile>
@@ -2686,6 +2701,21 @@
     <Compile Include="..\..\Editor\Mono\PerformanceTools\FrameDebugger.cs">
       <Link>Editor\Mono\PerformanceTools\FrameDebugger.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\PerformanceTools\FrameDebuggerData.cs">
+      <Link>Editor\Mono\PerformanceTools\FrameDebuggerData.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\PerformanceTools\FrameDebuggerEventDetailsView.cs">
+      <Link>Editor\Mono\PerformanceTools\FrameDebuggerEventDetailsView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\PerformanceTools\FrameDebuggerHelper.cs">
+      <Link>Editor\Mono\PerformanceTools\FrameDebuggerHelper.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\PerformanceTools\FrameDebuggerStyles.cs">
+      <Link>Editor\Mono\PerformanceTools\FrameDebuggerStyles.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\PerformanceTools\FrameDebuggerToolbarView.cs">
+      <Link>Editor\Mono\PerformanceTools\FrameDebuggerToolbarView.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\PerformanceTools\FrameDebuggerTreeView.cs">
       <Link>Editor\Mono\PerformanceTools\FrameDebuggerTreeView.cs</Link>
     </Compile>
@@ -2710,6 +2740,9 @@
     <Compile Include="..\..\Editor\Mono\PlayModeView\PlayModeView.cs">
       <Link>Editor\Mono\PlayModeView\PlayModeView.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\PlayModeView\PlayModeWindow.cs">
+      <Link>Editor\Mono\PlayModeView\PlayModeWindow.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Playables\PlayableOutputEditorExtensions.cs">
       <Link>Editor\Mono\Playables\PlayableOutputEditorExtensions.cs</Link>
     </Compile>
@@ -2794,6 +2827,9 @@
     <Compile Include="..\..\Editor\Mono\PostprocessScene.cs">
       <Link>Editor\Mono\PostprocessScene.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Prefabs\PrefabFamilyPopup.cs">
+      <Link>Editor\Mono\Prefabs\PrefabFamilyPopup.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Prefabs\PrefabImporter.bindings.cs">
       <Link>Editor\Mono\Prefabs\PrefabImporter.bindings.cs</Link>
     </Compile>
@@ -3196,12 +3232,6 @@
     <Compile Include="..\..\Editor\Mono\Scripting\NativeClassExtensionUtilities.cs">
       <Link>Editor\Mono\Scripting\NativeClassExtensionUtilities.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Scripting\PragmaFixing30.cs">
-      <Link>Editor\Mono\Scripting\PragmaFixing30.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\ArrayHelper.cs">
-      <Link>Editor\Mono\Scripting\ScriptCompilation\ArrayHelper.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\AssemblyBuilder.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\AssemblyBuilder.cs</Link>
     </Compile>
@@ -3211,6 +3241,12 @@
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\AssemblyFlags.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\AssemblyFlags.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\AssemblyGraphBuilder.cs">
+      <Link>Editor\Mono\Scripting\ScriptCompilation\AssemblyGraphBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\AssemblyGraphBuilderFactory.cs">
+      <Link>Editor\Mono\Scripting\ScriptCompilation\AssemblyGraphBuilderFactory.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\AssetPath.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\AssetPath.cs</Link>
     </Compile>
@@ -3295,6 +3331,9 @@
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\GUIDReference.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\GUIDReference.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\ILPostProcessingProgram.cs">
+      <Link>Editor\Mono\Scripting\ScriptCompilation\ILPostProcessingProgram.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\IVersion.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\IVersion.cs</Link>
     </Compile>
@@ -3304,6 +3343,9 @@
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\MonoLibraryHelpers.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\MonoLibraryHelpers.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\PathMultidimensionalDivisionTree.cs">
+      <Link>Editor\Mono\Scripting\ScriptCompilation\PathMultidimensionalDivisionTree.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\PlatformSupportModuleHelpers.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\PlatformSupportModuleHelpers.cs</Link>
     </Compile>
@@ -3313,6 +3355,9 @@
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\PrecompiledAssembly.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\PrecompiledAssembly.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\RoslynAnalyzers.cs">
+      <Link>Editor\Mono\Scripting\ScriptCompilation\RoslynAnalyzers.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Scripting\ScriptCompilation\SafeMode.cs">
       <Link>Editor\Mono\Scripting\ScriptCompilation\SafeMode.cs</Link>
     </Compile>
@@ -3460,6 +3505,9 @@
     <Compile Include="..\..\Editor\Mono\ShaderUtil.cs">
       <Link>Editor\Mono\ShaderUtil.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\Shaders\MaterialHierarchyPopup.cs">
+      <Link>Editor\Mono\Shaders\MaterialHierarchyPopup.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\SpeedTreeMaterialFixer.cs">
       <Link>Editor\Mono\SpeedTreeMaterialFixer.cs</Link>
     </Compile>
@@ -3472,27 +3520,12 @@
     <Compile Include="..\..\Editor\Mono\SpritesEditor.bindings.cs">
       <Link>Editor\Mono\SpritesEditor.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Sprites\DefaultSpritePackerPolicy.cs">
-      <Link>Editor\Mono\Sprites\DefaultSpritePackerPolicy.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Sprites\SpritePacker.cs">
-      <Link>Editor\Mono\Sprites\SpritePacker.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Sprites\SpritePackerWindow.cs">
-      <Link>Editor\Mono\Sprites\SpritePackerWindow.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\Sprites\SpriteUtility.cs">
       <Link>Editor\Mono\Sprites\SpriteUtility.cs</Link>
     </Compile>
     <Compile Include="..\..\Editor\Mono\Sprites\SpriteUtilityWindow.cs">
       <Link>Editor\Mono\Sprites\SpriteUtilityWindow.cs</Link>
     </Compile>
-    <Compile Include="..\..\Editor\Mono\Sprites\TightRotateEnabledSpritePackerPolicy.cs">
-      <Link>Editor\Mono\Sprites\TightRotateEnabledSpritePackerPolicy.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Editor\Mono\Sprites\TightSpritePackerPolicy.cs">
-      <Link>Editor\Mono\Sprites\TightSpritePackerPolicy.cs</Link>
-    </Compile>
     <Compile Include="..\..\Editor\Mono\StateMachine.bindings.cs">
       <Link>Editor\Mono\StateMachine.bindings.cs</Link>
     </Compile>
@@ -3535,15 +3568,138 @@
     <Compile Include="..\..\Editor\Mono\TypeSystem\UnityType.cs">
       <Link>Editor\Mono\TypeSystem\UnityType.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\BaseLiveReloadAssetTracker.cs">
+      <Link>Editor\Mono\UIElements\BaseLiveReloadAssetTracker.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Bindings\BindingsInterface.cs">
+      <Link>Editor\Mono\UIElements\Bindings\BindingsInterface.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Bindings\SerializedPropertyBindingEvents.cs">
+      <Link>Editor\Mono\UIElements\Bindings\SerializedPropertyBindingEvents.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\ColorField.cs">
+      <Link>Editor\Mono\UIElements\Controls\ColorField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\CurveField.cs">
+      <Link>Editor\Mono\UIElements\Controls\CurveField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\EnumFlagsField.cs">
+      <Link>Editor\Mono\UIElements\Controls\EnumFlagsField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\GradientField.cs">
+      <Link>Editor\Mono\UIElements\Controls\GradientField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\LayerField.cs">
+      <Link>Editor\Mono\UIElements\Controls\LayerField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\LayerMaskField.cs">
+      <Link>Editor\Mono\UIElements\Controls\LayerMaskField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\MaskField.cs">
+      <Link>Editor\Mono\UIElements\Controls\MaskField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\ObjectField.cs">
+      <Link>Editor\Mono\UIElements\Controls\ObjectField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\PropertyControl.cs">
+      <Link>Editor\Mono\UIElements\Controls\PropertyControl.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\PropertyField.cs">
+      <Link>Editor\Mono\UIElements\Controls\PropertyField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\TagField.cs">
+      <Link>Editor\Mono\UIElements\Controls\TagField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\IToolbarMenuElement.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\IToolbarMenuElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\SearchFieldBase.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\SearchFieldBase.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\Toolbar.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\Toolbar.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\ToolbarBreadcrumbs.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\ToolbarBreadcrumbs.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\ToolbarButton.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\ToolbarButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\ToolbarMenu.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\ToolbarMenu.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\ToolbarPopupSearchField.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\ToolbarPopupSearchField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\ToolbarSearchField.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\ToolbarSearchField.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\ToolbarSpacer.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\ToolbarSpacer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Controls\Toolbar\ToolbarToggle.cs">
+      <Link>Editor\Mono\UIElements\Controls\Toolbar\ToolbarToggle.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\UIElements\Controls\VisualSplitter.cs">
       <Link>Editor\Mono\UIElements\Controls\VisualSplitter.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\DefaultMainToolbar.cs">
+      <Link>Editor\Mono\UIElements\DefaultMainToolbar.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Drawers\Internal\UnityEventItem.cs">
+      <Link>Editor\Mono\UIElements\Drawers\Internal\UnityEventItem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\EditorMenuExtensions.cs">
+      <Link>Editor\Mono\UIElements\EditorMenuExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\UIElements\EditorWindowPersistentViewData.cs">
       <Link>Editor\Mono\UIElements\EditorWindowPersistentViewData.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Inspector\EditorElement.cs">
+      <Link>Editor\Mono\UIElements\Inspector\EditorElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\Inspector\InspectorElement.cs">
+      <Link>Editor\Mono\UIElements\Inspector\InspectorElement.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\UIElements\SerializableJsonDictionary.cs">
       <Link>Editor\Mono\UIElements\SerializableJsonDictionary.cs</Link>
     </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\StyleSheetEditor.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\StyleSheetEditor.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\StyleSheetImportErrors.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\StyleSheetImportErrors.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\StyleSheetImportGlossary.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\StyleSheetImportGlossary.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\StyleSheetImporter.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\StyleSheetImporter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\StyleSheetImporterImpl.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\StyleSheetImporterImpl.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\StyleSheetResourceUtil.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\StyleSheetResourceUtil.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\ThemeAssetDefinitionState.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\ThemeAssetDefinitionState.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\ThemeRegistry.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\ThemeRegistry.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\ThemeStyleSheetImporter.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\ThemeStyleSheetImporter.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\ThemeStyleSheetImporterEditor.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\ThemeStyleSheetImporterEditor.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\StyleSheets\URIHelpers.cs">
+      <Link>Editor\Mono\UIElements\StyleSheets\URIHelpers.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Editor\Mono\UIElements\UIElementsEditorUtility.cs">
+      <Link>Editor\Mono\UIElements\UIElementsEditorUtility.cs</Link>
+    </Compile>
     <Compile Include="..\..\Editor\Mono\Undo.cs">
       <Link>Editor\Mono\Undo.cs</Link>
     </Compile>
@@ -4336,63 +4492,21 @@
     <Compile Include="..\..\External\il2cpp\builds\LinkerEditorIntegration\SharedWithEditor.cs">
       <Link>External\il2cpp\builds\LinkerEditorIntegration\SharedWithEditor.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\BaseLiveReloadAssetTracker.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\BaseLiveReloadAssetTracker.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Bindings\BindingExtensions.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Bindings\BindingExtensions.cs</Link>
     </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Bindings\BindingStyleHelpers.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Bindings\BindingStyleHelpers.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Bindings\BindingsInterface.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Bindings\BindingsInterface.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Bindings\EditorListViewController.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Bindings\EditorListViewController.cs</Link>
     </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Bindings\ListViewBindings.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Bindings\ListViewBindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Bindings\SerializedPropertyBindingEvents.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Bindings\SerializedPropertyBindingEvents.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Bindings\SerializedPropertyHelper.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Bindings\SerializedPropertyHelper.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\ColorField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\ColorField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\CurveField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\CurveField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\EnumFlagsField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\EnumFlagsField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\GradientField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\GradientField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\LayerField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\LayerField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\LayerMaskField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\LayerMaskField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\MaskField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\MaskField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\ObjectField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\ObjectField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\PropertyControl.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\PropertyControl.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\PropertyField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\PropertyField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Controls\TagField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Controls\TagField.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Debugger\BoxModelView.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Debugger\BoxModelView.cs</Link>
     </Compile>
@@ -4471,9 +4585,6 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Delegates\SerializedPropertyDelegates.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Delegates\SerializedPropertyDelegates.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Drawers\Internal\UnityEventItem.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Drawers\Internal\UnityEventItem.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\EditorContextualMenuManager.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\EditorContextualMenuManager.cs</Link>
     </Compile>
@@ -4483,9 +4594,6 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\EditorDragAndDrop.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\EditorDragAndDrop.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\EditorMenuExtensions.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\EditorMenuExtensions.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\EditorMonitor.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\EditorMonitor.cs</Link>
     </Compile>
@@ -4528,12 +4636,6 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\GameObjects\UIDocumentHierarchyWatcher.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\GameObjects\UIDocumentHierarchyWatcher.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Inspector\EditorElement.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Inspector\EditorElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Inspector\InspectorElement.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Inspector\InspectorElement.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Legacy\ProgressBar.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Legacy\ProgressBar.cs</Link>
     </Compile>
@@ -4543,39 +4645,6 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\RetainedMode.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\RetainedMode.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetEditor.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetEditor.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImportErrors.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImportErrors.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImportGlossary.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImportGlossary.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImporter.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImporter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImporterImpl.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetImporterImpl.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetResourceUtil.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\StyleSheetResourceUtil.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeAssetDefinitionState.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeAssetDefinitionState.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeRegistry.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeRegistry.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeStyleSheetImporter.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeStyleSheetImporter.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeStyleSheetImporterEditor.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\ThemeStyleSheetImporterEditor.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\StyleSheets\URIHelpers.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\StyleSheets\URIHelpers.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Text\PanelTextSettingsCreationMenu.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Text\PanelTextSettingsCreationMenu.cs</Link>
     </Compile>
@@ -4585,41 +4654,11 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Text\PanelTextSettingsImporter.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Text\PanelTextSettingsImporter.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\IToolbarMenuElement.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\IToolbarMenuElement.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\SearchFieldBase.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\SearchFieldBase.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\Toolbar.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\Toolbar.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarBreadcrumbs.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarBreadcrumbs.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarButton.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarMenu.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarMenu.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarPopupSearchField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarPopupSearchField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarSearchField.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarSearchField.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarSpacer.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarSpacer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarToggle.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\Toolbar\ToolbarToggle.cs</Link>
-    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\Tooltip.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\Tooltip.cs</Link>
     </Compile>
-    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\UIElementsEditorUtility.cs">
-      <Link>ModuleOverrides\com.unity.ui\Editor\UIElementsEditorUtility.cs</Link>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\UIElementsEditorRuntimeUtility.cs">
+      <Link>ModuleOverrides\com.unity.ui\Editor\UIElementsEditorRuntimeUtility.cs</Link>
     </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Editor\UIElementsEditorWindowCreator\CSharpTemplateCreator.cs">
       <Link>ModuleOverrides\com.unity.ui\Editor\UIElementsEditorWindowCreator\CSharpTemplateCreator.cs</Link>
@@ -4768,6 +4807,12 @@
     <Compile Include="..\..\Modules\AssetPipelineEditor\Public\PluginImporter.bindings.cs">
       <Link>Modules\AssetPipelineEditor\Public\PluginImporter.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\AssetPipelineEditor\Public\RoslynAdditionalFiles.binding.cs">
+      <Link>Modules\AssetPipelineEditor\Public\RoslynAdditionalFiles.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\AssetPipelineEditor\Public\RoslynAnalyzerConfig.binding.cs">
+      <Link>Modules\AssetPipelineEditor\Public\RoslynAnalyzerConfig.binding.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\AssetPipelineEditor\Public\RuleSetCache.bindings.cs">
       <Link>Modules\AssetPipelineEditor\Public\RuleSetCache.bindings.cs</Link>
     </Compile>
@@ -4942,6 +4987,9 @@
     <Compile Include="..\..\Modules\DeviceSimulatorEditor\DeviceListPopup.cs">
       <Link>Modules\DeviceSimulatorEditor\DeviceListPopup.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\DeviceSimulatorEditor\DevicePackage.cs">
+      <Link>Modules\DeviceSimulatorEditor\DevicePackage.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\DeviceSimulatorEditor\DeviceSimulatorMain.cs">
       <Link>Modules\DeviceSimulatorEditor\DeviceSimulatorMain.cs</Link>
     </Compile>
@@ -4996,6 +5044,75 @@
     <Compile Include="..\..\Modules\DiagnosticsEditor\DiagnosticsPreferences.cs">
       <Link>Modules\DiagnosticsEditor\DiagnosticsPreferences.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\ComponentToolButton.cs">
+      <Link>Modules\EditorToolbar\Controls\ComponentToolButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\ComponentToolContextButton.cs">
+      <Link>Modules\EditorToolbar\Controls\ComponentToolContextButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\EditorToolbarButton.cs">
+      <Link>Modules\EditorToolbar\Controls\EditorToolbarButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\EditorToolbarDropdown.cs">
+      <Link>Modules\EditorToolbar\Controls\EditorToolbarDropdown.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\EditorToolbarDropdownToggle.cs">
+      <Link>Modules\EditorToolbar\Controls\EditorToolbarDropdownToggle.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\EditorToolbarToggle.cs">
+      <Link>Modules\EditorToolbar\Controls\EditorToolbarToggle.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\LastCustomToolButton.cs">
+      <Link>Modules\EditorToolbar\Controls\LastCustomToolButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\ToolButton.cs">
+      <Link>Modules\EditorToolbar\Controls\ToolButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\Controls\ToolContextButton.cs">
+      <Link>Modules\EditorToolbar\Controls\ToolContextButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\AccountDropdown.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\AccountDropdown.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\BuiltinToolSettings.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\BuiltinToolSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\BuiltinTools.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\BuiltinTools.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\CloudButton.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\CloudButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\ComponentTools.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\ComponentTools.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\LayersDropdown.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\LayersDropdown.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\LayoutDropdown.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\LayoutDropdown.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\ModesDropdown.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\ModesDropdown.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\PlayModeButtons.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\PlayModeButtons.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\PreviewPackagesInUseDropdown.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\PreviewPackagesInUseDropdown.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\SearchButton.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\SearchButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\SnapSettings.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\SnapSettings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\EditorToolbar\ToolbarElements\UndoButton.cs">
+      <Link>Modules\EditorToolbar\ToolbarElements\UndoButton.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\GenericRemoteEditor\Public\GenericRemote.bindings.cs">
+      <Link>Modules\GenericRemoteEditor\Public\GenericRemote.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GraphViewEditor\AssemblyInfo.cs">
       <Link>Modules\GraphViewEditor\AssemblyInfo.cs</Link>
     </Compile>
@@ -5194,18 +5311,21 @@
     <Compile Include="..\..\Modules\GraphViewEditor\Windows\GraphViewToolWindow.cs">
       <Link>Modules\GraphViewEditor\Windows\GraphViewToolWindow.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\GridAndSnap\GridSettingsWindow.cs">
+      <Link>Modules\GridAndSnap\GridSettingsWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\GridAndSnap\LinkedVector3Field.cs">
+      <Link>Modules\GridAndSnap\LinkedVector3Field.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\GridAndSnap\SnapSettingsWindow.cs">
+      <Link>Modules\GridAndSnap\SnapSettingsWindow.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\GridEditor\Managed\GridEditor.cs">
       <Link>Modules\GridEditor\Managed\GridEditor.cs</Link>
     </Compile>
     <Compile Include="..\..\Modules\JSONSerializeEditor\EditorJsonUtility.bindings.cs">
       <Link>Modules\JSONSerializeEditor\EditorJsonUtility.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\LicensingLegacy\LicenseManagementWindow.bindings.cs">
-      <Link>Modules\LicensingLegacy\LicenseManagementWindow.bindings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\LicensingLegacy\LicenseManagementWindow.cs">
-      <Link>Modules\LicensingLegacy\LicenseManagementWindow.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\Licensing\Public\LicensingUtility.bindings.cs">
       <Link>Modules\Licensing\Public\LicensingUtility.bindings.cs</Link>
     </Compile>
@@ -5293,6 +5413,18 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\External\ServicesTab\ServicesTabConfiguration.cs">
       <Link>Modules\PackageManagerUI\Editor\External\ServicesTab\ServicesTabConfiguration.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Analytics\PackageCacheManagementAnalytics.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\Analytics\PackageCacheManagementAnalytics.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerDialogAnalytics.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerDialogAnalytics.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerFiltersAnalytics.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerFiltersAnalytics.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerOperationErrorAnalytics.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerOperationErrorAnalytics.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerWindowAnalytics.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\Analytics\PackageManagerWindowAnalytics.cs</Link>
     </Compile>
@@ -5467,6 +5599,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Proxies\ClientProxy.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\Proxies\ClientProxy.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Proxies\EditorAnalyticsProxy.cs">
+      <Link>Modules\PackageManagerUI\Editor\Services\Proxies\EditorAnalyticsProxy.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\Services\Proxies\HttpClientFactory.cs">
       <Link>Modules\PackageManagerUI\Editor\Services\Proxies\HttpClientFactory.cs</Link>
     </Compile>
@@ -5575,6 +5710,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\IOUtils.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\Common\IOUtils.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\IncorrectFieldTypeException.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\Common\IncorrectFieldTypeException.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\LoadingSpinner.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\Common\LoadingSpinner.cs</Link>
     </Compile>
@@ -5608,6 +5746,21 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\SubPage.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\Common\SubPage.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\Tabs\BaseTabElement.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\Common\Tabs\BaseTabElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\Tabs\BaseTabView.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\Common\Tabs\BaseTabView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\Tabs\ITabElement.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\Common\Tabs\ITabElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\Tabs\ITabView.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\Common\Tabs\ITabView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\TagLabelList.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\Common\TagLabelList.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Common\TextFieldPlaceholder.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\Common\TextFieldPlaceholder.cs</Link>
     </Compile>
@@ -5632,15 +5785,6 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\DropdownElement.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\DropdownElement.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Features\FeatureDependencies.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\Features\FeatureDependencies.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Features\FeatureDependencyItem.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\Features\FeatureDependencyItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Features\FeatureState.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\Features\FeatureState.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\Filters\AssetStoreFiltersWindow.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\Filters\AssetStoreFiltersWindow.cs</Link>
     </Compile>
@@ -5710,9 +5854,6 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\MultiSelect\UpdateFoldoutGroup.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\MultiSelect\UpdateFoldoutGroup.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDependencies.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\PackageDependencies.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDependencySampleItemLowWidth.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageDependencySampleItemLowWidth.cs</Link>
     </Compile>
@@ -5725,12 +5866,45 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsHeader.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsHeader.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsImages.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsImages.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsLinks.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsLinks.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsDependenciesTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsDependenciesTab.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsDescriptionTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsDescriptionTab.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsFeatureDependenciesTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsFeatureDependenciesTab.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsImagesTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsImagesTab.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsOverviewTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsOverviewTab.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsReleasesTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsReleasesTab.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsSampleItem.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsSampleItem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsSamplesTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsSamplesTab.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsTabElement.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsTabElement.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsTabView.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsTabView.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsVersionHistoryItem.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsVersionHistoryItem.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsVersionsTab.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\PackageDetailsTabs\PackageDetailsVersionsTab.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageGroup.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageGroup.cs</Link>
     </Compile>
@@ -5779,12 +5953,6 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageReleaseDetailsItem.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageReleaseDetailsItem.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageSampleItem.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\PackageSampleItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageSampleList.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\PackageSampleList.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageSelectionEditor.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageSelectionEditor.cs</Link>
     </Compile>
@@ -5800,9 +5968,6 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageTagLabel.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\PackageTagLabel.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\PackageVersionItem.cs">
-      <Link>Modules\PackageManagerUI\Editor\UI\PackageVersionItem.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ScopedRegistriesSettings.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ScopedRegistriesSettings.cs</Link>
     </Compile>
@@ -5818,6 +5983,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageDeselectButton.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageDeselectButton.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageDowngradeButton.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageDowngradeButton.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageDownloadButton.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageDownloadButton.cs</Link>
     </Compile>
@@ -5839,6 +6007,9 @@
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageRemoveButton.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageRemoveButton.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageRemoveCustomButton.cs">
+      <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageRemoveCustomButton.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\PackageManagerUI\Editor\UI\ToolBar\PackageResetButton.cs">
       <Link>Modules\PackageManagerUI\Editor\UI\ToolBar\PackageResetButton.cs</Link>
     </Compile>
@@ -6310,6 +6481,9 @@
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\IProfilerWindowController.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\IProfilerWindowController.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\LegacyProfilerAreaUtility.cs">
+      <Link>Modules\ProfilerEditor\ProfilerWindow\LegacyProfilerAreaUtility.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ModuleEditor\Data\CounterCollector.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\ModuleEditor\Data\CounterCollector.cs</Link>
     </Compile>
@@ -6331,8 +6505,8 @@
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ModuleEditor\Views\DragIndicator.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\ModuleEditor\Views\DragIndicator.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerAreaReferenceCounter.cs">
-      <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerAreaReferenceCounter.cs</Link>
+    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerCategoryActivator.cs">
+      <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerCategoryActivator.cs</Link>
     </Compile>
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerChart.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerChart.cs</Link>
@@ -6511,15 +6685,6 @@
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uGui\UISystemProfilerTreeView.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uGui\UISystemProfilerTreeView.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uNet\NetworkDetailStats.cs">
-      <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uNet\NetworkDetailStats.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uNet\NetworkingMessagesProfilerModule.cs">
-      <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uNet\NetworkingMessagesProfilerModule.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uNet\NetworkingOperationsProfilerModule.cs">
-      <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerModules\uNet\NetworkingOperationsProfilerModule.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\ProfilerEditor\ProfilerWindow\ProfilerWindow.cs">
       <Link>Modules\ProfilerEditor\ProfilerWindow\ProfilerWindow.cs</Link>
     </Compile>
@@ -6565,6 +6730,12 @@
     <Compile Include="..\..\Modules\ProfilerEditor\Public\RawFrameDataView.bindings.cs">
       <Link>Modules\ProfilerEditor\Public\RawFrameDataView.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Progress\ProgressWindow.cs">
+      <Link>Modules\Progress\ProgressWindow.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\Progress\VisualProgressItem.cs">
+      <Link>Modules\Progress\VisualProgressItem.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\FuzzySearch.cs">
       <Link>Modules\QuickSearch\Editor\FuzzySearch.cs</Link>
     </Compile>
@@ -6670,9 +6841,6 @@
     <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\SceneQueryEngine.cs">
       <Link>Modules\QuickSearch\Editor\Providers\SceneQueryEngine.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\SearchQueryProvider.cs">
-      <Link>Modules\QuickSearch\Editor\Providers\SearchQueryProvider.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\Providers\SearchServiceProvider.cs">
       <Link>Modules\QuickSearch\Editor\Providers\SearchServiceProvider.cs</Link>
     </Compile>
@@ -6724,6 +6892,9 @@
     <Compile Include="..\..\Modules\QuickSearch\Editor\QueryBuilder\QueryContent.cs">
       <Link>Modules\QuickSearch\Editor\QueryBuilder\QueryContent.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\QueryBuilder\QueryEnginePropositionsExtensions.cs">
+      <Link>Modules\QuickSearch\Editor\QueryBuilder\QueryEnginePropositionsExtensions.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\QueryBuilder\QueryHelperWidget.cs">
       <Link>Modules\QuickSearch\Editor\QueryBuilder\QueryHelperWidget.cs</Link>
     </Compile>
@@ -6757,8 +6928,14 @@
     <Compile Include="..\..\Modules\QuickSearch\Editor\QueryEngine\NestedQueryHandler.cs">
       <Link>Modules\QuickSearch\Editor\QueryEngine\NestedQueryHandler.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\QuickSearch\Editor\QueryEngine\Query.cs">
-      <Link>Modules\QuickSearch\Editor\QueryEngine\Query.cs</Link>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\QueryEngine\ParsedQuery.cs">
+      <Link>Modules\QuickSearch\Editor\QueryEngine\ParsedQuery.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\QueryEngine\Query.Deprecated.cs">
+      <Link>Modules\QuickSearch\Editor\QueryEngine\Query.Deprecated.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\QueryEngine\QueryEngine.Deprecated.cs">
+      <Link>Modules\QuickSearch\Editor\QueryEngine\QueryEngine.Deprecated.cs</Link>
     </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\QueryEngine\QueryEngine.cs">
       <Link>Modules\QuickSearch\Editor\QueryEngine\QueryEngine.cs</Link>
@@ -6817,6 +6994,9 @@
     <Compile Include="..\..\Modules\QuickSearch\Editor\SearchEnumerator.cs">
       <Link>Modules\QuickSearch\Editor\SearchEnumerator.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\SearchExpression\Evaluators\AggregateEvaluator.cs">
+      <Link>Modules\QuickSearch\Editor\SearchExpression\Evaluators\AggregateEvaluator.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\SearchExpression\Evaluators\AliasEvaluators.cs">
       <Link>Modules\QuickSearch\Editor\SearchExpression\Evaluators\AliasEvaluators.cs</Link>
     </Compile>
@@ -6919,6 +7099,9 @@
     <Compile Include="..\..\Modules\QuickSearch\Editor\SearchExpression\TaskEvaluatorManager.cs">
       <Link>Modules\QuickSearch\Editor\SearchExpression\TaskEvaluatorManager.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\QuickSearch\Editor\SearchFilterEnumTypes.cs">
+      <Link>Modules\QuickSearch\Editor\SearchFilterEnumTypes.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\QuickSearch\Editor\SearchFlags.cs">
       <Link>Modules\QuickSearch\Editor\SearchFlags.cs</Link>
     </Compile>
@@ -7129,6 +7312,9 @@
     <Compile Include="..\..\Modules\RestService\ScriptBindings\RestService.bindings.cs">
       <Link>Modules\RestService\ScriptBindings\RestService.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\SafeMode\SafeModeToolbarWindow.cs">
+      <Link>Modules\SafeMode\SafeModeToolbarWindow.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\SceneTemplateEditor\DependencyListView.cs">
       <Link>Modules\SceneTemplateEditor\DependencyListView.cs</Link>
     </Compile>
@@ -7183,6 +7369,111 @@
     <Compile Include="..\..\Modules\SceneTemplateEditor\VisualSplitter.cs">
       <Link>Modules\SceneTemplateEditor\VisualSplitter.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\SceneView\DropdownToggle.cs">
+      <Link>Modules\SceneView\DropdownToggle.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\SceneView\SceneViewLightingOverlays.cs">
+      <Link>Modules\SceneView\SceneViewLightingOverlays.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\SceneView\SceneViewToolbarElements.cs">
+      <Link>Modules\SceneView\SceneViewToolbarElements.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\AssemblyInfo.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\AssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\Block.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\Block.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\BlockInstance.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\BlockInstance.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\BlockVariable.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\BlockVariable.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\CommandDescriptor.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\CommandDescriptor.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\CustomizationPoint.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\CustomizationPoint.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\CustomizationPointInstance.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\CustomizationPointInstance.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\DefaultContainer.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\DefaultContainer.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\DefineDescriptor.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\DefineDescriptor.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\EqualityChecks.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\EqualityChecks.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\FixedHandleList.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\FixedHandleList.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\FixedIntList.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\FixedIntList.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\FoundryAPIAttribute.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\FoundryAPIAttribute.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\FoundryHandle.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\FoundryHandle.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\FunctionParameter.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\FunctionParameter.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ITemplateLinker.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\ITemplateLinker.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ITemplateProvider.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\ITemplateProvider.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\IncludeDescriptor.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\IncludeDescriptor.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\KeywordDescriptor.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\KeywordDescriptor.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\PassIdentifier.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\PassIdentifier.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\PragmaDescriptor.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\PragmaDescriptor.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ShaderAttribute.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\ShaderAttribute.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ShaderBuilder.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\ShaderBuilder.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ShaderContainer.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\ShaderContainer.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ShaderFunction.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\ShaderFunction.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\ShaderType.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\ShaderType.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\StructField.bindings.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\StructField.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\TagDescriptor.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\TagDescriptor.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\Template.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\Template.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\TemplateInstance.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\TemplateInstance.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\TemplatePass.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\TemplatePass.binding.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Modules\ShaderFoundry\ScriptBindings\TemplatePassStageElement.binding.cs">
+      <Link>Modules\ShaderFoundry\ScriptBindings\TemplatePassStageElement.binding.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\ShortcutManagerEditor\BindingValidator.cs">
       <Link>Modules\ShortcutManagerEditor\BindingValidator.cs</Link>
     </Compile>
@@ -7270,6 +7561,9 @@
     <Compile Include="..\..\Modules\ShortcutManagerEditor\Trigger.cs">
       <Link>Modules\ShortcutManagerEditor\Trigger.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\ShortcutManager\ShortcutManagerWindowView.cs">
+      <Link>Modules\ShortcutManager\ShortcutManagerWindowView.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\SketchUpEditor\Mono\SketchUp.bindings.cs">
       <Link>Modules\SketchUpEditor\Mono\SketchUp.bindings.cs</Link>
     </Compile>
@@ -7420,6 +7714,9 @@
     <Compile Include="..\..\Modules\TextCoreTextEngineEditor\Managed\FontAssetEditor.cs">
       <Link>Modules\TextCoreTextEngineEditor\Managed\FontAssetEditor.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\TextCoreTextEngineEditor\Managed\FontAssetEditorUtilities.cs">
+      <Link>Modules\TextCoreTextEngineEditor\Managed\FontAssetEditorUtilities.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\TextCoreTextEngineEditor\Managed\GlyphMetricsPropertyDrawer.cs">
       <Link>Modules\TextCoreTextEngineEditor\Managed\GlyphMetricsPropertyDrawer.cs</Link>
     </Compile>
@@ -7432,6 +7729,9 @@
     <Compile Include="..\..\Modules\TextCoreTextEngineEditor\Managed\GlyphRectPropertyDrawer.cs">
       <Link>Modules\TextCoreTextEngineEditor\Managed\GlyphRectPropertyDrawer.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\TextCoreTextEngineEditor\Managed\LigatureSubstitutionRecordPropertyDrawer.cs">
+      <Link>Modules\TextCoreTextEngineEditor\Managed\LigatureSubstitutionRecordPropertyDrawer.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\TextCoreTextEngineEditor\Managed\MarkToBaseAdjustmentRecordPropertyDrawer.cs">
       <Link>Modules\TextCoreTextEngineEditor\Managed\MarkToBaseAdjustmentRecordPropertyDrawer.cs</Link>
     </Compile>
@@ -7699,6 +7999,9 @@
     <Compile Include="..\..\Modules\UIElementsSamplesEditor\Snippets\ToggleSnippet.cs">
       <Link>Modules\UIElementsSamplesEditor\Snippets\ToggleSnippet.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\UIElementsSamplesEditor\Snippets\TreeViewSnippet.cs">
+      <Link>Modules\UIElementsSamplesEditor\Snippets\TreeViewSnippet.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\UIElementsSamplesEditor\Snippets\Vector2FieldSnippet.cs">
       <Link>Modules\UIElementsSamplesEditor\Snippets\Vector2FieldSnippet.cs</Link>
     </Compile>
@@ -7723,111 +8026,6 @@
     <Compile Include="..\..\Modules\UIElementsSamplesEditor\UIElementsSnippetAsset.cs">
       <Link>Modules\UIElementsSamplesEditor\UIElementsSnippetAsset.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\ComponentToolButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\ComponentToolButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\ComponentToolContextButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\ComponentToolContextButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarDropdown.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarDropdown.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarDropdownToggle.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarDropdownToggle.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarToggle.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\EditorToolbarToggle.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\LastCustomToolButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\LastCustomToolButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\ToolButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\ToolButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\Controls\ToolContextButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\Controls\ToolContextButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\DefaultMainToolbar.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\DefaultMainToolbar.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\AccountDropdown.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\AccountDropdown.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\BuiltinToolSettings.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\BuiltinToolSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\BuiltinTools.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\BuiltinTools.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\CloudButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\CloudButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\ComponentTools.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\ComponentTools.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\LayersDropdown.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\LayersDropdown.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\LayoutDropdown.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\LayoutDropdown.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\MainToolbarImguiContainer.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\MainToolbarImguiContainer.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\ModesDropdown.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\ModesDropdown.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\PlayModeButtons.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\PlayModeButtons.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\PreviewPackagesInUseDropdown.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\PreviewPackagesInUseDropdown.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\SearchButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\SearchButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\SnapSettings.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\SnapSettings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorToolbar\ToolbarElements\UndoButton.cs">
-      <Link>Modules\UIServiceEditor\EditorToolbar\ToolbarElements\UndoButton.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\EditorUIService.cs">
-      <Link>Modules\UIServiceEditor\EditorUIService.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\GridAndSnap\GridSettingsWindow.cs">
-      <Link>Modules\UIServiceEditor\GridAndSnap\GridSettingsWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\GridAndSnap\LinkedVector3Field.cs">
-      <Link>Modules\UIServiceEditor\GridAndSnap\LinkedVector3Field.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\GridAndSnap\SnapSettingsWindow.cs">
-      <Link>Modules\UIServiceEditor\GridAndSnap\SnapSettingsWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\Progress\ProgressWindow.cs">
-      <Link>Modules\UIServiceEditor\Progress\ProgressWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\Progress\VisualProgressItem.cs">
-      <Link>Modules\UIServiceEditor\Progress\VisualProgressItem.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\SafeMode\SafeModeToolbarWindow.cs">
-      <Link>Modules\UIServiceEditor\SafeMode\SafeModeToolbarWindow.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\SceneView\DropdownToggle.cs">
-      <Link>Modules\UIServiceEditor\SceneView\DropdownToggle.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\SceneView\SceneViewLightingOverlays.cs">
-      <Link>Modules\UIServiceEditor\SceneView\SceneViewLightingOverlays.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\SceneView\SceneViewToolbarElements.cs">
-      <Link>Modules\UIServiceEditor\SceneView\SceneViewToolbarElements.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UIServiceEditor\ShortcutManager\ShortcutManagerWindowView.cs">
-      <Link>Modules\UIServiceEditor\ShortcutManager\ShortcutManagerWindowView.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\UMPE\Editor\ChannelClient.cs">
       <Link>Modules\UMPE\Editor\ChannelClient.cs</Link>
     </Compile>
@@ -7906,9 +8104,6 @@
     <Compile Include="..\..\Modules\UnityConnectEditor\ProjectSettings\CollabProjectSettings.cs">
       <Link>Modules\UnityConnectEditor\ProjectSettings\CollabProjectSettings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\UnityConnectEditor\ProjectSettings\Fallback\FallbackProjectSettings.cs">
-      <Link>Modules\UnityConnectEditor\ProjectSettings\Fallback\FallbackProjectSettings.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\UnityConnectEditor\ProjectSettings\Fallback\InstallPackageSection.cs">
       <Link>Modules\UnityConnectEditor\ProjectSettings\Fallback\InstallPackageSection.cs</Link>
     </Compile>
@@ -8041,7 +8236,7 @@
     <Reference Include="../../External/Unity.Compiler.Client/Unity.CompilationPipeline.Common.dll" />
     <Reference Include="../../External/Unity.Cecil/builds/lib/net40/Unity.Cecil.dll" />
     <Reference Include="../../External/ExCSS/builds/builds/lib/net35/ExCSS.Unity.dll" />
-    <Reference Include="../../artifacts/Stevedore/bee_bcfb/BeeAsALibrary/Bee.BeeDriver.dll" />
+    <Reference Include="../../External/Bee/BeeAsALibrary/Bee.BeeDriver.dll" />
     <Reference Include="../../External/NetStandardExtensions/System.CodeDom.dll" />
     <ProjectReference Include="UnityEngine.csproj" />
     <ProjectReference Include="../../Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj" />
@@ -8050,4 +8245,6 @@
     <ProjectReference Include="../../Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj" />
     <ProjectReference Include="../../Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj" />
   </ItemGroup>
+  <PropertyGroup>
+  </PropertyGroup>
 </Project>
diff --git a/Projects/CSharp/UnityEngine.csproj b/Projects/CSharp/UnityEngine.csproj
index 17571644e3..b043c7ae45 100644
--- a/Projects/CSharp/UnityEngine.csproj
+++ b/Projects/CSharp/UnityEngine.csproj
@@ -5,7 +5,7 @@
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <DefineConstants>$(DefineConstants);COMBINED_ASSEMBLIES;DEBUG;DEBUGGER_LISTENS_FIXED_PORT;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_ALTERNATIVE_LISTEN_PORT;ENABLE_AR;ENABLE_AUDIO;ENABLE_AUDIO_MANAGER_BASED_SCHEDULING;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_CLOUD_LICENSE;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_COLLAB_TESTING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_EDITOR_GAME_SERVICES;ENABLE_EDITOR_HUB_LICENSE;ENABLE_HOLOLENS_MODULE_API;ENABLE_LZMA;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_UNITYTLS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_SCRIPTING_GC_WBARRIERS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_UNITYWEBREQUEST;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_VERSION_CONTROL_INTEGRATION;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WEBSOCKET_CLIENT;ENABLE_WWW;INCLUDE_DYNAMIC_GI;PLATFORM_SUPPORTS_MONO;PLAYERCONNECTION_LISTENS_FIXED_PORT;RENDER_SOFTWARE_CURSOR;TEXTCORE_1_0_OR_NEWER;TRACE;UNITY_ANDROID_API;UNITY_ASSEMBLIES_API;UNITY_ASSERTIONS;UNITY_BJM_API;UNITY_EDITOR;UNITY_EDITOR_API;UNITY_GAMECORE_API;UNITY_GAMECORE_SCARLETT_API;UNITY_GAMECORE_XBOXONE_API;UNITY_IPHONE_API;UNITY_LUMIN_API;UNITY_METRO_API;UNITY_PS4_API;UNITY_PS5_API;UNITY_STANDALONE_LINUX_API;UNITY_STANDALONE_OSX_API;UNITY_STANDALONE_WIN_API;UNITY_SWITCH_API;UNITY_TVOS_API;UNITY_WEBGL_API;UNITY_XBOXONE_API</DefineConstants>
+    <DefineConstants>$(DefineConstants);COMBINED_ASSEMBLIES;DEBUG;DEBUGGER_LISTENS_FIXED_PORT;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_ALTERNATIVE_LISTEN_PORT;ENABLE_AR;ENABLE_AUDIO;ENABLE_AUDIO_MANAGER_BASED_SCHEDULING;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_CLOUD_LICENSE;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_COLLAB_TESTING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_EDITOR_GAME_SERVICES;ENABLE_EDITOR_HUB_LICENSE;ENABLE_HOLOLENS_MODULE_API;ENABLE_LZMA;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_UNITYTLS;ENABLE_MICROPHONE;ENABLE_MONO;ENABLE_MOVIES;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NAVIGATION_HEIGHTMESH_RUNTIME_SUPPORT;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_SCRIPTING_GC_WBARRIERS;ENABLE_TEXTURE_STREAMING;ENABLE_UNITYEVENTS;ENABLE_UNITYWEBREQUEST;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_VERSION_CONTROL_INTEGRATION;ENABLE_VIDEO;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WEBSOCKET_CLIENT;ENABLE_WWW;INCLUDE_DYNAMIC_GI;PLATFORM_SUPPORTS_MONO;PLAYERCONNECTION_LISTENS_FIXED_PORT;RENDER_SOFTWARE_CURSOR;TEXTCORE_1_0_OR_NEWER;TRACE;UNITY_ANDROID_API;UNITY_ASSEMBLIES_API;UNITY_ASSERTIONS;UNITY_BJM_API;UNITY_EDITOR;UNITY_EDITOR_API;UNITY_GAMECORE_API;UNITY_GAMECORE_SCARLETT_API;UNITY_GAMECORE_XBOXONE_API;UNITY_IPHONE_API;UNITY_METRO_API;UNITY_PS4_API;UNITY_PS5_API;UNITY_STANDALONE_LINUX_API;UNITY_STANDALONE_OSX_API;UNITY_STANDALONE_WIN_API;UNITY_SWITCH_API;UNITY_TVOS_API;UNITY_WEBGL_API;UNITY_XBOXONE_API</DefineConstants>
     <LangVersion>latest</LangVersion>
     <NoWarn>1071;0626</NoWarn>
   </PropertyGroup>
@@ -682,6 +682,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\ProjectionUtils.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\ProjectionUtils.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Renderer\SafeHandleAccess.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\Renderer\SafeHandleAccess.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\Renderer\UIRAllocator2D.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\Renderer\UIRAllocator2D.cs</Link>
     </Compile>
@@ -1093,6 +1096,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UXML\TemplateAsset.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\UXML\TemplateAsset.cs</Link>
     </Compile>
+    <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UXML\UxmlAssetAttributeDescription.cs">
+      <Link>ModuleOverrides\com.unity.ui\Core\UXML\UxmlAssetAttributeDescription.cs</Link>
+    </Compile>
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\UXML\UxmlAttributeDescription.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\UXML\UxmlAttributeDescription.cs</Link>
     </Compile>
@@ -1186,6 +1192,9 @@
     <Compile Include="..\..\ModuleOverrides\com.unity.ui\Core\VisualTreeViewDataUpdater.cs">
       <Link>ModuleOverrides\com.unity.ui\Core\VisualTreeViewDataUpdater.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\AI\AssemblyInfo.cs">
+      <Link>Modules\AI\AssemblyInfo.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\AI\Builder\NavMeshBuilder.bindings.cs">
       <Link>Modules\AI\Builder\NavMeshBuilder.bindings.cs</Link>
     </Compile>
@@ -1411,9 +1420,6 @@
     <Compile Include="..\..\Modules\AssetBundle\Managed\AssetBundleUtility.bindings.cs">
       <Link>Modules\AssetBundle\Managed\AssetBundleUtility.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\AssetBundle\Managed\BuildCompression.cs">
-      <Link>Modules\AssetBundle\Managed\BuildCompression.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\Audio\Public\Managed\Audio.deprecated.cs">
       <Link>Modules\Audio\Public\Managed\Audio.deprecated.cs</Link>
     </Compile>
@@ -1483,6 +1489,9 @@
     <Compile Include="..\..\Modules\ClusterRenderer\ClusterSerialization.bindings.cs">
       <Link>Modules\ClusterRenderer\ClusterSerialization.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\ContentLoad\Public\ContentLoad.bindings.cs">
+      <Link>Modules\ContentLoad\Public\ContentLoad.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\CrashReporting\CrashReporter.bindings.cs">
       <Link>Modules\CrashReporting\CrashReporter.bindings.cs</Link>
     </Compile>
@@ -1714,6 +1723,9 @@
     <Compile Include="..\..\Modules\Physics\ScriptBindings\Articulations.bindings.cs">
       <Link>Modules\Physics\ScriptBindings\Articulations.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Physics\ScriptBindings\Articulations.deprecated.cs">
+      <Link>Modules\Physics\ScriptBindings\Articulations.deprecated.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\Physics\ScriptBindings\ContactModification.bindings.cs">
       <Link>Modules\Physics\ScriptBindings\ContactModification.bindings.cs</Link>
     </Compile>
@@ -1726,6 +1738,9 @@
     <Compile Include="..\..\Modules\Physics\ScriptBindings\QueryCommand.bindings.cs">
       <Link>Modules\Physics\ScriptBindings\QueryCommand.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\Physics\ScriptBindings\QueryCommand.deprecated.cs">
+      <Link>Modules\Physics\ScriptBindings\QueryCommand.deprecated.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\ScreenCapture\ScriptBindings\ScreenCapture.bindings.cs">
       <Link>Modules\ScreenCapture\ScriptBindings\ScreenCapture.bindings.cs</Link>
     </Compile>
@@ -2011,6 +2026,9 @@
     <Compile Include="..\..\Modules\UIElementsNative\ImmediateStylePainter.bindings.cs">
       <Link>Modules\UIElementsNative\ImmediateStylePainter.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Modules\UIElementsNative\Renderer\UIPainter2D.bindings.cs">
+      <Link>Modules\UIElementsNative\Renderer\UIPainter2D.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Modules\UIElementsNative\Renderer\UIRenderer.bindings.cs">
       <Link>Modules\UIElementsNative\Renderer\UIRenderer.bindings.cs</Link>
     </Compile>
@@ -2023,9 +2041,6 @@
     <Compile Include="..\..\Modules\UIElementsNative\UIElementsUtility.bindings.cs">
       <Link>Modules\UIElementsNative\UIElementsUtility.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\UIElementsNative\UITessellation.bindings.cs">
-      <Link>Modules\UIElementsNative\UITessellation.bindings.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\UI\ScriptBindings\CanvasGroup.bindings.cs">
       <Link>Modules\UI\ScriptBindings\CanvasGroup.bindings.cs</Link>
     </Compile>
@@ -2041,30 +2056,6 @@
     <Compile Include="..\..\Modules\UI\ScriptBindings\UICanvas.bindings.cs">
       <Link>Modules\UI\ScriptBindings\UICanvas.bindings.cs</Link>
     </Compile>
-    <Compile Include="..\..\Modules\UNET\Managed\MatchMakingClient.cs">
-      <Link>Modules\UNET\Managed\MatchMakingClient.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UNET\Managed\NetworkTransport.cs">
-      <Link>Modules\UNET\Managed\NetworkTransport.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UNET\Managed\NetworkTransportConfig.cs">
-      <Link>Modules\UNET\Managed\NetworkTransportConfig.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UNET\Managed\UNETInterface.cs">
-      <Link>Modules\UNET\Managed\UNETInterface.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UNET\Managed\UNETTypes.cs">
-      <Link>Modules\UNET\Managed\UNETTypes.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UNET\Managed\UNETWebSocketLib.cs">
-      <Link>Modules\UNET\Managed\UNETWebSocketLib.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UNET\ScriptBindings\UNETTransportConfig.bindings.cs">
-      <Link>Modules\UNET\ScriptBindings\UNETTransportConfig.bindings.cs</Link>
-    </Compile>
-    <Compile Include="..\..\Modules\UNET\ScriptBindings\UNETworking.bindings.cs">
-      <Link>Modules\UNET\ScriptBindings\UNETworking.bindings.cs</Link>
-    </Compile>
     <Compile Include="..\..\Modules\UnityAnalytics\ContinuousEvent\ContinuousEvent.bindings.cs">
       <Link>Modules\UnityAnalytics\ContinuousEvent\ContinuousEvent.bindings.cs</Link>
     </Compile>
@@ -2335,6 +2326,12 @@
     <Compile Include="..\..\Runtime\Export\Bootstrap\BootConfig.bindings.cs">
       <Link>Runtime\Export\Bootstrap\BootConfig.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\BurstLike\BurstLike.bindings.cs">
+      <Link>Runtime\Export\BurstLike\BurstLike.bindings.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Runtime\Export\Burst\BurstAuthorizedExternalMethodAttribute.cs">
+      <Link>Runtime\Export\Burst\BurstAuthorizedExternalMethodAttribute.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Burst\BurstCompilerService.bindings.cs">
       <Link>Runtime\Export\Burst\BurstCompilerService.bindings.cs</Link>
     </Compile>
@@ -2389,6 +2386,9 @@
     <Compile Include="..\..\Runtime\Export\Collections\NativeCollectionEnums.bindings.cs">
       <Link>Runtime\Export\Collections\NativeCollectionEnums.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\ContentNamespace\ContentNamespace.bindings.cs">
+      <Link>Runtime\Export\ContentNamespace\ContentNamespace.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Coverage.bindings.cs">
       <Link>Runtime\Export\Coverage.bindings.cs</Link>
     </Compile>
@@ -2515,9 +2515,15 @@
     <Compile Include="..\..\Runtime\Export\ExpressionEvaluator.cs">
       <Link>Runtime\Export\ExpressionEvaluator.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\File\ArchiveFile.bindings.cs">
+      <Link>Runtime\Export\File\ArchiveFile.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\File\AsyncReadManager.bindings.cs">
       <Link>Runtime\Export\File\AsyncReadManager.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\File\BuildCompression.cs">
+      <Link>Runtime\Export\File\BuildCompression.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\File\File.bindings.cs">
       <Link>Runtime\Export\File\File.bindings.cs</Link>
     </Compile>
@@ -2854,6 +2860,9 @@
     <Compile Include="..\..\Runtime\Export\PlayerPrefs\PlayerPrefs.bindings.cs">
       <Link>Runtime\Export\PlayerPrefs\PlayerPrefs.bindings.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\Profiler\IgnoredByDeepProfilerAttribute.cs">
+      <Link>Runtime\Export\Profiler\IgnoredByDeepProfilerAttribute.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Properties\DrivenPropertyManager.bindings.cs">
       <Link>Runtime\Export\Properties\DrivenPropertyManager.bindings.cs</Link>
     </Compile>
@@ -3196,6 +3205,9 @@
     <Compile Include="..\..\Runtime\Export\Serialization\FormerlySerializedAsAttribute.cs">
       <Link>Runtime\Export\Serialization\FormerlySerializedAsAttribute.cs</Link>
     </Compile>
+    <Compile Include="..\..\Runtime\Export\Serialization\ManagedReferenceUtility.bindings.cs">
+      <Link>Runtime\Export\Serialization\ManagedReferenceUtility.bindings.cs</Link>
+    </Compile>
     <Compile Include="..\..\Runtime\Export\Serialization\Serialization.cs">
       <Link>Runtime\Export\Serialization\Serialization.cs</Link>
     </Compile>
@@ -3509,4 +3521,6 @@
       <Link>artifacts\generated\UnityEvent\UnityEvent_4.cs</Link>
     </Compile>
   </ItemGroup>
+  <PropertyGroup>
+  </PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
index ec21f7c6f8..da32c7ec24 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Unity 2022.1.0a16 C# reference source code
+## Unity 2022.2.0a10 C# reference source code
 
 The C# part of the Unity engine and editor source code.
 May be used for reference purposes only.
diff --git a/Runtime/2D/Common/ScriptBindings/SpriteDataAccess.bindings.cs b/Runtime/2D/Common/ScriptBindings/SpriteDataAccess.bindings.cs
index 675c38262f..8d8a3e9d8b 100644
--- a/Runtime/2D/Common/ScriptBindings/SpriteDataAccess.bindings.cs
+++ b/Runtime/2D/Common/ScriptBindings/SpriteDataAccess.bindings.cs
@@ -225,10 +225,17 @@ internal unsafe static void SetBatchDeformableBufferAndLocalAABBArray(SpriteRend
             SetBatchDeformableBufferAndLocalAABBArray(spriteRenderers, buffers.GetUnsafeReadOnlyPtr(), bufferSizes.GetUnsafeReadOnlyPtr(), bounds.GetUnsafeReadOnlyPtr(), count);
         }
 
+        internal unsafe static bool IsUsingDeformableBuffer(this SpriteRenderer spriteRenderer, IntPtr buffer)
+        {
+            return IsUsingDeformableBuffer(spriteRenderer, (void*)buffer);
+        }
+
         extern public static void DeactivateDeformableBuffer([NotNull] this SpriteRenderer renderer);
         extern internal static void SetLocalAABB([NotNull] this SpriteRenderer renderer, Bounds aabb);
         extern private unsafe static void SetDeformableBuffer([NotNull] SpriteRenderer spriteRenderer, void* src, int count);
 
         extern private unsafe static void SetBatchDeformableBufferAndLocalAABBArray(SpriteRenderer[] spriteRenderers, void* buffers, void* bufferSizes, void* bounds, int count);
+
+        extern private unsafe static bool IsUsingDeformableBuffer([NotNull] SpriteRenderer spriteRenderer, void* buffer);
     }
 }
diff --git a/Runtime/2D/Common/ScriptBindings/SpriteRenderer.bindings.cs b/Runtime/2D/Common/ScriptBindings/SpriteRenderer.bindings.cs
index b78c68f7ad..74eb78fd3b 100644
--- a/Runtime/2D/Common/ScriptBindings/SpriteRenderer.bindings.cs
+++ b/Runtime/2D/Common/ScriptBindings/SpriteRenderer.bindings.cs
@@ -130,6 +130,7 @@ public extern SpriteSortPoint spriteSortPoint
 
         [NativeMethod(Name = "GetSpriteBounds")]
         internal extern Bounds Internal_GetSpriteBounds(SpriteDrawMode mode);
+        extern internal void GetSecondaryTextureProperties([NotNull]MaterialPropertyBlock mbp);
         internal Bounds GetSpriteBounds()
         {
             return Internal_GetSpriteBounds(drawMode);
diff --git a/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs b/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs
index e4462ba921..be876e2882 100644
--- a/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs
+++ b/Runtime/2D/Common/ScriptBindings/Sprites.bindings.cs
@@ -81,8 +81,8 @@ private Sprite() {}
         [FreeFunction("SpritesBindings::CreateSpriteWithoutTextureScripting")]
         internal extern static Sprite CreateSpriteWithoutTextureScripting(Rect rect, Vector2 pivot, float pixelsToUnits, Texture2D texture);
 
-        [FreeFunction("SpritesBindings::CreateSprite")]
-        internal extern static Sprite CreateSprite(Texture2D texture, Rect rect, Vector2 pivot, float pixelsPerUnit, uint extrude, SpriteMeshType meshType, Vector4 border, bool generateFallbackPhysicsShape);
+        [FreeFunction("SpritesBindings::CreateSprite", ThrowsException = true)]
+        internal extern static Sprite CreateSprite(Texture2D texture, Rect rect, Vector2 pivot, float pixelsPerUnit, uint extrude, SpriteMeshType meshType, Vector4 border, bool generateFallbackPhysicsShape, SecondarySpriteTexture[] secondaryTexture);
 
         public extern Bounds bounds
         {
@@ -106,6 +106,10 @@ public extern Texture2D texture
 
         // Get Secondary Textures.
         internal extern Texture2D GetSecondaryTexture(int index);
+        // Get Secondary Texture count
+        public extern int GetSecondaryTextureCount();
+        [FreeFunction("SpritesBindings::GetSecondaryTextures", ThrowsException = true, HasExplicitThis = true)]
+        public extern int GetSecondaryTextures([NotNull] SecondarySpriteTexture[] secondaryTexture);
 
         // The number of pixels in one unit. Note: The C++ side still uses the name pixelsToUnits which is misleading,
         // but has not been changed yet to minimize merge conflicts.
@@ -161,8 +165,6 @@ public Rect textureRect
         {
             get
             {
-                if (packed && (SpritePackingMode)packingMode != SpritePackingMode.Rectangle)
-                    return Rect.zero;
                 return GetTextureRect();
             }
         }
@@ -171,8 +173,6 @@ public Vector2 textureRectOffset
         {
             get
             {
-                if (packed && (SpritePackingMode)packingMode != SpritePackingMode.Rectangle)
-                    return Vector2.zero;
                 return GetTextureRectOffset();
             }
         }
@@ -266,6 +266,11 @@ internal static Sprite Create(Rect rect, Vector2 pivot, float pixelsToUnits)
         }
 
         public static Sprite Create(Texture2D texture, Rect rect, Vector2 pivot, float pixelsPerUnit, uint extrude, SpriteMeshType meshType, Vector4 border, bool generateFallbackPhysicsShape)
+        {
+            return Create(texture, rect, pivot, pixelsPerUnit, extrude, meshType, border, generateFallbackPhysicsShape, null);
+        }
+
+        public static Sprite Create(Texture2D texture, Rect rect, Vector2 pivot, float pixelsPerUnit, uint extrude, SpriteMeshType meshType, Vector4 border, bool generateFallbackPhysicsShape, SecondarySpriteTexture[] secondaryTextures)
         {
             if (texture == null)
                 return null;
@@ -278,7 +283,16 @@ public static Sprite Create(Texture2D texture, Rect rect, Vector2 pivot, float p
             if (pixelsPerUnit <= 0)
                 throw new ArgumentException("pixelsPerUnit must be set to a positive non-zero value.");
 
-            return CreateSprite(texture, rect, pivot, pixelsPerUnit, extrude, meshType, border, generateFallbackPhysicsShape);
+            if (secondaryTextures != null)
+            {
+                foreach(var st in secondaryTextures)
+                {
+                    if(st.texture == texture)
+                        throw new ArgumentException(string.Format("{0} is using source Texture as Secondary Texture.", st.name));
+                }
+            }
+            return CreateSprite(texture, rect, pivot, pixelsPerUnit, extrude, meshType, border, generateFallbackPhysicsShape, secondaryTextures);
+
         }
 
         public static Sprite Create(Texture2D texture, Rect rect, Vector2 pivot, float pixelsPerUnit, uint extrude, SpriteMeshType meshType, Vector4 border)
diff --git a/Runtime/Export/Application/Application.cs b/Runtime/Export/Application/Application.cs
index 6e0df26db4..46972df42e 100644
--- a/Runtime/Export/Application/Application.cs
+++ b/Runtime/Export/Application/Application.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Threading;
 using UnityEngine.Events;
 using UnityEngine.SceneManagement;
 using UnityEngine.Scripting;
@@ -81,6 +82,12 @@ internal static void CallLowMemory()
                 handler();
         }
 
+        [RequiredByNativeCode]
+        internal static bool HasLogCallback()
+        {
+            return s_LogCallbackHandler != null || s_LogCallbackHandlerThreaded != null;
+        }
+
         // Use this delegate type with RegisterLogCallback to monitor what gets logged.
         public delegate void LogCallback(string condition, string stackTrace, LogType type);
 
@@ -298,9 +305,15 @@ static bool Internal_ApplicationWantsToQuit()
             return true;
         }
 
+        private static CancellationTokenSource s_currentCancellationTokenSource = new CancellationTokenSource();
+        public static CancellationToken CancellationToken => s_currentCancellationTokenSource.Token;
+
         [RequiredByNativeCode]
         static void Internal_ApplicationQuit()
         {
+            s_currentCancellationTokenSource.Cancel();
+            // when running in editor without domain reload, we prepare the cts for next enter play mode.
+            s_currentCancellationTokenSource = new CancellationTokenSource();
             if (quitting != null)
                 quitting();
         }
diff --git a/Runtime/Export/AssemblyInfo.cs b/Runtime/Export/AssemblyInfo.cs
index fdd5c4f5c0..c649b8c6dc 100644
--- a/Runtime/Export/AssemblyInfo.cs
+++ b/Runtime/Export/AssemblyInfo.cs
@@ -91,6 +91,7 @@
 // Needed for Baselib CSharp binding access.
 [assembly: InternalsVisibleTo("Unity.Networking.Transport")]
 [assembly: InternalsVisibleTo("Unity.ucg.QoS")] // TODO(andrews): Remove this when we fix transport
+[assembly: InternalsVisibleTo("Unity.Services.QoS")] // TODO: Remove this when we fix transport
 [assembly: InternalsVisibleTo("Unity.Logging")]
 [assembly: InternalsVisibleTo("Unity.Entities")]
 [assembly: InternalsVisibleTo("Unity.Entities.Tests")]
diff --git a/Runtime/Export/BaseClass.cs b/Runtime/Export/BaseClass.cs
index f1fd71c9bb..5806b5c971 100644
--- a/Runtime/Export/BaseClass.cs
+++ b/Runtime/Export/BaseClass.cs
@@ -128,9 +128,9 @@ public enum RuntimePlatform
         [System.Obsolete("Use LinuxPlayer instead")]
         CloudRendering = 35,
         // Game Core
-        GameCoreXboxSeries = 36, // GameCoreXboxSeries intentionally set to the same as GameCoreScarlett
         [System.Obsolete("GameCoreScarlett is deprecated, please use GameCoreXboxSeries (UnityUpgradable) -> GameCoreXboxSeries", false)]
-        GameCoreScarlett = 36,
+        GameCoreScarlett = -1, // GameCoreScarlett renumbered here so it's destinct from GameCoreXboxSeries.
+        GameCoreXboxSeries = 36,
         GameCoreXboxOne = 37,
         // PS5
         PS5 = 38,
@@ -240,8 +240,10 @@ public enum SystemLanguage
         ChineseSimplified = 40,
         //Chinese-Traditional
         ChineseTraditional = 41,
+        //Hindi
+        Hindi = 42,
         //Unknown
-        Unknown = 42,
+        Unknown = 43,
         //Hungarian
         Hungarian = 18
     }
diff --git a/Runtime/Export/Burst/BurstAuthorizedExternalMethodAttribute.cs b/Runtime/Export/Burst/BurstAuthorizedExternalMethodAttribute.cs
new file mode 100644
index 0000000000..d0d2a0f727
--- /dev/null
+++ b/Runtime/Export/Burst/BurstAuthorizedExternalMethodAttribute.cs
@@ -0,0 +1,14 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+
+namespace Unity.Burst
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public class BurstAuthorizedExternalMethodAttribute : Attribute
+    {
+        // Attribute used to signify that an external method may be called from a Burst-compiled cctor
+    }
+}
diff --git a/Runtime/Export/BurstLike/BurstLike.bindings.cs b/Runtime/Export/BurstLike/BurstLike.bindings.cs
new file mode 100644
index 0000000000..05a5f5a4c6
--- /dev/null
+++ b/Runtime/Export/BurstLike/BurstLike.bindings.cs
@@ -0,0 +1,112 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine.Bindings;
+using System.Diagnostics;
+using UnityEngine;
+using UnityEngine.Scripting;
+using Unity.Burst;
+using Unity.Burst.LowLevel;
+
+namespace Unity.Collections.LowLevel.Unsafe
+{
+    [NativeHeader("Runtime/Export/BurstLike/BurstLike.bindings.h")]
+    [StaticAccessor("BurstLike", StaticAccessorType.DoubleColon)]
+    internal static partial class BurstLike
+    {
+        [ThreadSafe(ThrowsException = false)]
+        [BurstAuthorizedExternalMethod]
+        internal static extern int NativeFunctionCall_Int_IntPtr_IntPtr(IntPtr function, IntPtr p0, IntPtr p1, out int error);
+
+        // NOTE this is an inferior and internal-only placeholder for SharedStatic
+        // We expect to remove the BurstLike functionality once burst can be used in the Unity Editor build pipeline.
+        internal readonly unsafe struct SharedStatic<T> where T : unmanaged
+        {
+            private readonly void* _buffer;
+
+            private SharedStatic(void* buffer) => _buffer = buffer;
+
+            public ref T Data => ref UnsafeUtility.AsRef<T>(_buffer);
+
+            public void* UnsafeDataPointer => _buffer;
+
+            public static SharedStatic<T> GetOrCreate<TContext>(uint alignment = 0) =>
+                new SharedStatic<T>(SharedStatic.GetOrCreateSharedStaticInternal(
+                    BurstRuntime.GetHashCode64<TContext>(),
+                    0,
+                    (uint)UnsafeUtility.SizeOf<T>(),
+                    alignment));
+
+            public static SharedStatic<T> GetOrCreate<TContext, TSubContext>(uint alignment = 0) =>
+                new SharedStatic<T>(SharedStatic.GetOrCreateSharedStaticInternal(
+                    BurstRuntime.GetHashCode64<TContext>(),
+                    BurstRuntime.GetHashCode64<TSubContext>(),
+                    (uint)UnsafeUtility.SizeOf<T>(),
+                    alignment));
+        }
+
+        internal static class SharedStatic
+        {
+            [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+            private static void CheckSizeOf(uint sizeOf)
+            {
+                if (sizeOf == 0) throw new ArgumentException("sizeOf must be > 0", nameof(sizeOf));
+            }
+
+            [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+            private static unsafe void CheckResult(void* result)
+            {
+                if (result == null)
+                    throw new InvalidOperationException("Unable to create a SharedStatic for this key. This is most likely due to the size of the struct inside of the SharedStatic having changed or the same key being reused for differently sized values. To fix this the editor needs to be restarted.");
+            }
+
+            [RequiredMember]
+            public static unsafe void* GetOrCreateSharedStaticInternal(long getHashCode64, long getSubHashCode64, uint sizeOf, uint alignment)
+            {
+                CheckSizeOf(sizeOf);
+                var hash128 = new Hash128((ulong)getHashCode64, (ulong)getSubHashCode64);
+                var result = BurstCompilerService.GetOrCreateSharedMemory(ref hash128, sizeOf, alignment == 0 ? 4 : alignment);
+                CheckResult(result);
+                return result;
+            }
+        }
+    }
+
+    // ** Must be in this namespace for burst intrinsic support **
+    internal static class BurstRuntime
+    {
+        // ** Must be in this namespace and class **
+        // This is considered an intrinsic in burst, as long as it is in this exact namespace and class name.
+        // That makes it burst compilable even though the implementation uses typeof(T)
+        public static long GetHashCode64<T>()
+        {
+            return HashCode64<T>.Value;
+        }
+
+        private struct HashCode64<T>
+        {
+            public static readonly long Value = HashStringWithFNV1A64(typeof(T).AssemblyQualifiedName);
+        }
+
+        // ** Must match implementation in Burst **
+        internal static long HashStringWithFNV1A64(string text)
+        {
+            // Using http://www.isthe.com/chongo/tech/comp/fnv/index.html#FNV-1a
+            // with basis and prime:
+            const ulong offsetBasis = 14695981039346656037;
+            const ulong prime = 1099511628211;
+
+            ulong result = offsetBasis;
+
+            foreach (var c in text)
+            {
+                result = prime * (result ^ (byte)(c & 255));
+                result = prime * (result ^ (byte)(c >> 8));
+            }
+
+            return (long)result;
+        }
+    }
+}
diff --git a/Runtime/Export/Camera/Camera.bindings.cs b/Runtime/Export/Camera/Camera.bindings.cs
index 03dfe707ef..5d8fc0d4e1 100644
--- a/Runtime/Export/Camera/Camera.bindings.cs
+++ b/Runtime/Export/Camera/Camera.bindings.cs
@@ -29,6 +29,26 @@ namespace UnityEngine
     [RequireComponent(typeof(Transform))]
     public sealed partial class Camera : Behaviour
     {
+        /// <summary>
+        /// The minimum allowed aperture.
+        /// </summary>
+        public const float kMinAperture = 0.7f;
+
+        /// <summary>
+        /// The maximum allowed aperture.
+        /// </summary>
+        public const float kMaxAperture = 32f;
+
+        /// <summary>
+        /// The minimum blade count for the aperture diaphragm.
+        /// </summary>
+        public const int kMinBladeCount = 3;
+
+        /// <summary>
+        /// The maximum blade count for the aperture diaphragm.
+        /// </summary>
+        public const int kMaxBladeCount = 11;
+
         public Camera() {}
 
         [NativeProperty("Near")] extern public float nearClipPlane { get; set; }
@@ -107,9 +127,19 @@ internal enum ProjectionMatrixMode{ Explicit, Implicit, PhysicalPropertiesBased
 
         public enum GateFitMode{ Vertical = 1 , Horizontal = 2, Fill = 3, Overscan = 4, None = 0 }
         extern public bool usePhysicalProperties { get; set; }
+
+
+        extern public int iso  { get; set; }
+        extern public float shutterSpeed  { get; set; }
+        extern public float aperture  { get; set; }
+        extern public float focusDistance  { get; set; }
+        extern public float focalLength  { get; set; }
+        extern public int bladeCount  { get; set; }
+        extern public Vector2 curvature  { get; set; }
+        extern public float barrelClipping  { get; set; }
+        extern public float anamorphism  { get; set; }
         extern public Vector2 sensorSize  { get; set; }
         extern public Vector2 lensShift  { get; set; }
-        extern public float focalLength  { get; set; }
         extern public GateFitMode gateFit  { get; set; }
         public enum FieldOfViewAxis { Vertical, Horizontal }
         extern public float GetGateFittedFieldOfView();
diff --git a/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs b/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs
index 0612407822..166d9a61b5 100644
--- a/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs
+++ b/Runtime/Export/Collections/NativeCollectionEnums.bindings.cs
@@ -19,5 +19,6 @@ public enum Allocator
         TempJob = 3,
         Persistent = 4,
         AudioKernel = 5,
+        FirstUserIndex = 64,
     }
 }
diff --git a/Runtime/Export/ContentNamespace/ContentNamespace.bindings.cs b/Runtime/Export/ContentNamespace/ContentNamespace.bindings.cs
new file mode 100644
index 0000000000..00813cd41b
--- /dev/null
+++ b/Runtime/Export/ContentNamespace/ContentNamespace.bindings.cs
@@ -0,0 +1,75 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+using UnityEngine.Bindings;
+
+namespace Unity.Content
+{
+    [StructLayout(LayoutKind.Sequential)]
+    [NativeHeader("Runtime/Misc/ContentNamespace.h")]
+    [StaticAccessor("GetContentNamespaceManager()", StaticAccessorType.Dot)]
+    public struct ContentNamespace
+    {
+        internal UInt64 Id;
+
+        public string GetName()
+        {
+            ThrowIfInvalidNamespace();
+            return GetNamespaceName(this);
+        }
+
+        public bool IsValid { get { return IsNamespaceHandleValid(this); } }
+
+        public void Delete()
+        {
+            if (Id == s_Default.Id)
+                throw new InvalidOperationException("Cannot delete the default namespace.");
+            else
+            {
+                ThrowIfInvalidNamespace();
+                RemoveNamespace(this);
+            }
+        }
+
+        void ThrowIfInvalidNamespace()
+        {
+            if (!IsValid)
+                throw new InvalidOperationException("The provided namespace is invalid. Did you already delete it?");
+        }
+
+        static bool s_defaultInitialized = false;
+        static ContentNamespace s_Default;
+        public static ContentNamespace Default
+        {
+            get
+            {
+                if (!s_defaultInitialized)
+                {
+                    s_defaultInitialized = true;
+                    s_Default = GetOrCreateNamespace("default");
+                }
+                return s_Default;
+            }
+        }
+
+        static Regex s_ValidName = new Regex(@"^[a-zA-Z0-9]{1,16}$", RegexOptions.Compiled);
+        public static ContentNamespace GetOrCreateNamespace(string name)
+        {
+            if (s_ValidName.IsMatch(name))
+                return GetOrCreate(name);
+            throw new InvalidOperationException("Namespace name can only contain alphanumeric characters and a maximum length of 16 characters.");
+        }
+
+        // Namespace Functions
+        public static extern ContentNamespace[] GetAll();
+        internal static extern ContentNamespace GetOrCreate(string name);
+
+        internal static extern void RemoveNamespace(ContentNamespace ns);
+        internal static extern string GetNamespaceName(ContentNamespace ns);
+        internal static extern bool IsNamespaceHandleValid(ContentNamespace ns);
+    }
+}
diff --git a/Runtime/Export/Device/Application.cs b/Runtime/Export/Device/Application.cs
index 9abbc9c098..9d49571fd3 100644
--- a/Runtime/Export/Device/Application.cs
+++ b/Runtime/Export/Device/Application.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Threading;
 using UnityEngine.Events;
 
 namespace UnityEngine.Device
@@ -181,5 +182,7 @@ public static void Unload()
             ShimManager.applicationShim.Unload();
         }
 
+        public static CancellationToken CancellationToken => ShimManager.applicationShim.CancellationToken;
+
     }
 }
diff --git a/Runtime/Export/Diagnostics/DiagnosticsUtils.bindings.cs b/Runtime/Export/Diagnostics/DiagnosticsUtils.bindings.cs
index ce7eb37d94..c718a575da 100644
--- a/Runtime/Export/Diagnostics/DiagnosticsUtils.bindings.cs
+++ b/Runtime/Export/Diagnostics/DiagnosticsUtils.bindings.cs
@@ -19,6 +19,7 @@ public enum ForcedCrashCategory
     }
 
     [NativeHeader("Runtime/Export/Diagnostics/DiagnosticsUtils.bindings.h")]
+    [NativeHeader("Runtime/Misc/GarbageCollectSharedAssets.h")]
     public static class Utils
     {
         [FreeFunction("DiagnosticsUtils_Bindings::ForceCrash", ThrowsException = true)]
@@ -32,5 +33,8 @@ public static class Utils
 
         [FreeFunction("DiagnosticsUtils_Bindings::NativeWarning")]
         extern public static void NativeWarning(string message);
+
+        [FreeFunction("ValidateHeap")]
+        extern public static void ValidateHeap();
     }
 }
diff --git a/Runtime/Export/File/ArchiveFile.bindings.cs b/Runtime/Export/File/ArchiveFile.bindings.cs
new file mode 100644
index 0000000000..1c25bb58b4
--- /dev/null
+++ b/Runtime/Export/File/ArchiveFile.bindings.cs
@@ -0,0 +1,113 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using Unity.Content;
+using Unity.Jobs;
+using UnityEngine.Bindings;
+using UnityEngine.Scripting;
+
+namespace Unity.IO.Archive
+{
+    [RequiredByNativeCode]
+    public enum ArchiveStatus
+    {
+        InProgress,
+        Complete,
+        Failed
+    }
+
+    [NativeHeader("Runtime/VirtualFileSystem/ArchiveFileSystem/ArchiveFileHandle.h")]
+    [RequiredByNativeCode]
+    public struct ArchiveFileInfo
+    {
+        public string Filename;
+        public ulong FileSize;
+    }
+
+    [NativeHeader("Runtime/VirtualFileSystem/ArchiveFileSystem/ArchiveFileHandle.h")]
+    [RequiredByNativeCode]
+    public struct ArchiveHandle
+    {
+        internal UInt64 Handle;
+
+        public ArchiveStatus Status
+        {
+            get
+            {
+                ThrowIfInvalid();
+                return ArchiveFileInterface.Archive_GetStatus(this);
+            }
+        }
+
+        public JobHandle JobHandle
+        {
+            get
+            {
+                ThrowIfInvalid();
+                return ArchiveFileInterface.Archive_GetJobHandle(this);
+            }
+        }
+
+        public JobHandle Unmount()
+        {
+            ThrowIfInvalid();
+            return ArchiveFileInterface.Archive_UnmountAsync(this);
+        }
+
+        void ThrowIfInvalid()
+        {
+            if (!ArchiveFileInterface.Archive_IsValid(this))
+                throw new InvalidOperationException("The archive has already been unmounted.");
+        }
+
+        public string GetMountPath()
+        {
+            ThrowIfInvalid();
+            return ArchiveFileInterface.Archive_GetMountPath(this);
+        }
+
+        public UnityEngine.CompressionType Compression
+        {
+            get
+            {
+                ThrowIfInvalid();
+                return ArchiveFileInterface.Archive_GetCompression(this);
+            }
+        }
+
+        public bool IsStreamed
+        {
+            get
+            {
+                ThrowIfInvalid();
+                return ArchiveFileInterface.Archive_IsStreamed(this);
+            }
+        }
+
+        public ArchiveFileInfo[] GetFileInfo()
+        {
+            ThrowIfInvalid();
+            return ArchiveFileInterface.Archive_GetFileInfo(this);
+        }
+    }
+
+    [RequiredByNativeCode]
+    [NativeHeader("Runtime/VirtualFileSystem/ArchiveFileSystem/ArchiveFileHandle.h")]
+    [StaticAccessor("GetManagedArchiveSystem()", StaticAccessorType.Dot)]
+    public static class ArchiveFileInterface
+    {
+        public static extern ArchiveHandle MountAsync(ContentNamespace namespaceId, string filePath, string prefix);
+        public static extern ArchiveHandle[] GetMountedArchives(ContentNamespace namespaceId);
+
+        internal static extern ArchiveStatus Archive_GetStatus(ArchiveHandle handle);
+        internal static extern JobHandle Archive_GetJobHandle(ArchiveHandle handle);
+        internal static extern bool Archive_IsValid(ArchiveHandle handle);
+        internal static extern JobHandle Archive_UnmountAsync(ArchiveHandle handle);
+        internal static extern string Archive_GetMountPath(ArchiveHandle handle);
+        internal static extern UnityEngine.CompressionType Archive_GetCompression(ArchiveHandle handle);
+        internal static extern bool Archive_IsStreamed(ArchiveHandle handle);
+        internal static extern ArchiveFileInfo[] Archive_GetFileInfo(ArchiveHandle handle);
+    }
+}
diff --git a/Runtime/Export/File/AsyncReadManager.bindings.cs b/Runtime/Export/File/AsyncReadManager.bindings.cs
index 72b99a5c97..8a3d15d454 100644
--- a/Runtime/Export/File/AsyncReadManager.bindings.cs
+++ b/Runtime/Export/File/AsyncReadManager.bindings.cs
@@ -64,7 +64,8 @@ public enum AssetLoadingSubsystem
         Scripts,
         EntitiesScene,
         EntitiesStreamBinaryReader,
-        FileInfo
+        FileInfo,
+        ContentLoading
     }
 
     public enum ReadStatus
diff --git a/Modules/AssetBundle/Managed/BuildCompression.cs b/Runtime/Export/File/BuildCompression.cs
similarity index 100%
rename from Modules/AssetBundle/Managed/BuildCompression.cs
rename to Runtime/Export/File/BuildCompression.cs
diff --git a/Runtime/Export/GI/Lightmapping.cs b/Runtime/Export/GI/Lightmapping.cs
index dc87aeece5..1b68f36047 100644
--- a/Runtime/Export/GI/Lightmapping.cs
+++ b/Runtime/Export/GI/Lightmapping.cs
@@ -486,8 +486,10 @@ public static float ExtractInnerCone(Light l)
             private static Color ExtractColorTemperature(Light l)
             {
                 Color cct = new Color(1.0f, 1.0f, 1.0f);
+
                 if (l.useColorTemperature && GraphicsSettings.lightsUseLinearIntensity)
                     cct = Mathf.CorrelatedColorTemperatureToRGB(l.colorTemperature);
+
                 return cct;
             }
 
diff --git a/Runtime/Export/Geometry/Bounds.cs b/Runtime/Export/Geometry/Bounds.cs
index bf791f6f4a..32f60e18a7 100644
--- a/Runtime/Export/Geometry/Bounds.cs
+++ b/Runtime/Export/Geometry/Bounds.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using UnityEngine.Scripting;
 using scm = System.ComponentModel;
@@ -24,6 +25,7 @@ public partial struct Bounds : IEquatable<Bounds>, IFormattable
         private Vector3 m_Extents;
 
         // Creates new Bounds with a given /center/ and total /size/. Bound ::ref::extents will be half the given size.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Bounds(Vector3 center, Vector3 size)
         {
             m_Center = center;
@@ -31,12 +33,14 @@ public Bounds(Vector3 center, Vector3 size)
         }
 
         // used to allow Bounds to be used as keys in hash tables
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override int GetHashCode()
         {
             return center.GetHashCode() ^ (extents.GetHashCode() << 2);
         }
 
         // also required for being able to use Vector4s as keys in hash tables
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override bool Equals(object other)
         {
             if (!(other is Bounds)) return false;
@@ -44,27 +48,49 @@ public override bool Equals(object other)
             return Equals((Bounds)other);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Equals(Bounds other)
         {
             return center.Equals(other.center) && extents.Equals(other.extents);
         }
 
         // The center of the bounding box.
-        public Vector3 center { get { return m_Center; } set { m_Center = value; } }
+        public Vector3 center
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Center; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Center = value; }
+        }
 
         // The total size of the box. This is always twice as large as the ::ref::extents.
-        public Vector3 size { get { return m_Extents * 2.0F; } set { m_Extents = value * 0.5F; } }
+        public Vector3 size
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Extents * 2.0F; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Extents = value * 0.5F; }
+        }
 
         // The extents of the box. This is always half of the ::ref::size.
-        public Vector3 extents { get { return m_Extents; } set { m_Extents = value; } }
+        public Vector3 extents
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Extents; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Extents = value; }
+        }
 
         // The minimal point of the box. This is always equal to ''center-extents''.
-        public Vector3 min { get { return center - extents; } set { SetMinMax(value, max); } }
+        public Vector3 min
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return center - extents; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { SetMinMax(value, max); }
+        }
 
         // The maximal point of the box. This is always equal to ''center+extents''.
-        public Vector3 max { get { return center + extents; } set { SetMinMax(min, value); } }
+        public Vector3 max
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return center + extents; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { SetMinMax(min, value); }
+        }
 
         //*undoc*
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static bool operator==(Bounds lhs, Bounds rhs)
         {
             // Returns false in the presence of NaN values.
@@ -72,6 +98,7 @@ public bool Equals(Bounds other)
         }
 
         //*undoc*
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static bool operator!=(Bounds lhs, Bounds rhs)
         {
             // Returns true in the presence of NaN values.
@@ -79,6 +106,7 @@ public bool Equals(Bounds other)
         }
 
         // Sets the bounds to the /min/ and /max/ value of the box.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void SetMinMax(Vector3 min, Vector3 max)
         {
             extents = (max - min) * 0.5F;
@@ -86,12 +114,14 @@ public void SetMinMax(Vector3 min, Vector3 max)
         }
 
         // Grows the Bounds to include the /point/.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void Encapsulate(Vector3 point)
         {
             SetMinMax(Vector3.Min(min, point), Vector3.Max(max, point));
         }
 
         // Grows the Bounds to include the /Bounds/.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void Encapsulate(Bounds bounds)
         {
             Encapsulate(bounds.center - bounds.extents);
@@ -106,12 +136,14 @@ public void Expand(float amount)
         }
 
         // Expand the bounds by increasing its /size/ by /amount/ along each side.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void Expand(Vector3 amount)
         {
             extents += amount * .5f;
         }
 
         // Does another bounding box intersect with this bounding box?
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Intersects(Bounds bounds)
         {
             return (min.x <= bounds.max.x) && (max.x >= bounds.min.x) &&
@@ -119,22 +151,27 @@ public bool Intersects(Bounds bounds)
                 (min.z <= bounds.max.z) && (max.z >= bounds.min.z);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool IntersectRay(Ray ray) { float dist; return IntersectRayAABB(ray, this, out dist); }
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool IntersectRay(Ray ray, out float distance) { return IntersectRayAABB(ray, this, out distance); }
 
 
         /// *listonly*
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         override public string ToString()
         {
             return ToString(null, null);
         }
 
         // Returns a nicely formatted string for the bounds.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Geometry/BoundsInt.cs b/Runtime/Export/Geometry/BoundsInt.cs
index 2cde796efb..f6b006e3de 100644
--- a/Runtime/Export/Geometry/BoundsInt.cs
+++ b/Runtime/Export/Geometry/BoundsInt.cs
@@ -6,6 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using UnityEngine.Scripting;
 
@@ -18,42 +19,101 @@ public struct BoundsInt : IEquatable<BoundsInt>, IFormattable
         private Vector3Int m_Position;
         private Vector3Int m_Size;
 
-        public int x { get { return m_Position.x; } set { m_Position.x = value; } }
-        public int y { get { return m_Position.y; } set { m_Position.y = value; } }
-        public int z { get { return m_Position.z; } set { m_Position.z = value; } }
+        public int x
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Position.x; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Position.x = value; }
+        }
+        public int y
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Position.y; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Position.y = value; }
+        }
+        public int z
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Position.z; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Position.z = value; }
+        }
 
-        public Vector3 center { get { return new Vector3(x + m_Size.x / 2f, y + m_Size.y / 2f, z + m_Size.z / 2f); } }
-        public Vector3Int min { get { return new Vector3Int(xMin, yMin, zMin); } set { xMin = value.x; yMin = value.y; zMin = value.z; } }
-        public Vector3Int max { get { return new Vector3Int(xMax, yMax, zMax); } set { xMax = value.x; yMax = value.y; zMax = value.z; } }
+        public Vector3 center
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector3(x + m_Size.x / 2f, y + m_Size.y / 2f, z + m_Size.z / 2f); }
+        }
+        public Vector3Int min
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector3Int(xMin, yMin, zMin); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { xMin = value.x; yMin = value.y; zMin = value.z; }
+        }
+        public Vector3Int max
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector3Int(xMax, yMax, zMax); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { xMax = value.x; yMax = value.y; zMax = value.z; }
+        }
 
-        public int xMin { get { return Math.Min(m_Position.x, m_Position.x + m_Size.x); } set { int oldxmax = xMax; m_Position.x = value; m_Size.x = oldxmax - m_Position.x; } }
-        public int yMin { get { return Math.Min(m_Position.y, m_Position.y + m_Size.y); } set { int oldymax = yMax; m_Position.y = value; m_Size.y = oldymax - m_Position.y; } }
-        public int zMin { get { return Math.Min(m_Position.z, m_Position.z + m_Size.z); } set { int oldzmax = zMax; m_Position.z = value; m_Size.z = oldzmax - m_Position.z; } }
-        public int xMax { get { return Math.Max(m_Position.x, m_Position.x + m_Size.x); } set { m_Size.x = value - m_Position.x; } }
-        public int yMax { get { return Math.Max(m_Position.y, m_Position.y + m_Size.y); } set { m_Size.y = value - m_Position.y; } }
-        public int zMax { get { return Math.Max(m_Position.z, m_Position.z + m_Size.z); } set { m_Size.z = value - m_Position.z; } }
+        public int xMin
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Min(m_Position.x, m_Position.x + m_Size.x); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { int oldxmax = xMax; m_Position.x = value; m_Size.x = oldxmax - m_Position.x; }
+        }
+        public int yMin
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Min(m_Position.y, m_Position.y + m_Size.y); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { int oldymax = yMax; m_Position.y = value; m_Size.y = oldymax - m_Position.y; }
+        }
+        public int zMin
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Min(m_Position.z, m_Position.z + m_Size.z); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { int oldzmax = zMax; m_Position.z = value; m_Size.z = oldzmax - m_Position.z; }
+        }
+        public int xMax
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Max(m_Position.x, m_Position.x + m_Size.x); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Size.x = value - m_Position.x; }
+        }
+        public int yMax
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Max(m_Position.y, m_Position.y + m_Size.y); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Size.y = value - m_Position.y; }
+        }
+        public int zMax
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Max(m_Position.z, m_Position.z + m_Size.z); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Size.z = value - m_Position.z; }
+        }
 
-        public Vector3Int position { get { return m_Position; } set { m_Position = value; } }
-        public Vector3Int size { get { return m_Size; } set { m_Size = value; } }
+        public Vector3Int position
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Position; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Position = value; }
+        }
+        public Vector3Int size
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Size; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Size = value; }
+        }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public BoundsInt(int xMin, int yMin, int zMin, int sizeX, int sizeY, int sizeZ)
         {
             m_Position = new Vector3Int(xMin, yMin, zMin);
             m_Size = new Vector3Int(sizeX, sizeY, sizeZ);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public BoundsInt(Vector3Int position, Vector3Int size)
         {
             m_Position = position;
             m_Size = size;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void SetMinMax(Vector3Int minPosition, Vector3Int maxPosition)
         {
             min = minPosition;
             max = maxPosition;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void ClampToBounds(BoundsInt bounds)
         {
             position = new Vector3Int(
@@ -68,6 +128,7 @@ public void ClampToBounds(BoundsInt bounds)
             );
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Contains(Vector3Int position)
         {
             return position.x >= xMin
@@ -78,16 +139,19 @@ public bool Contains(Vector3Int position)
                 && position.z < zMax;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (formatProvider == null)
@@ -95,16 +159,19 @@ public string ToString(string format, IFormatProvider formatProvider)
             return UnityString.Format("Position: {0}, Size: {1}", m_Position.ToString(format, formatProvider), m_Size.ToString(format, formatProvider));
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static bool operator==(BoundsInt lhs, BoundsInt rhs)
         {
             return lhs.m_Position == rhs.m_Position && lhs.m_Size == rhs.m_Size;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static bool operator!=(BoundsInt lhs, BoundsInt rhs)
         {
             return !(lhs == rhs);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override bool Equals(object other)
         {
             if (!(other is BoundsInt)) return false;
@@ -112,6 +179,7 @@ public override bool Equals(object other)
             return Equals((BoundsInt)other);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Equals(BoundsInt other)
         {
             return m_Position.Equals(other.m_Position) && m_Size.Equals(other.m_Size);
@@ -124,6 +192,7 @@ public override int GetHashCode()
 
         public PositionEnumerator allPositionsWithin
         {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             get { return new PositionEnumerator(min, max); }
         }
 
@@ -132,6 +201,7 @@ public struct PositionEnumerator : IEnumerator<Vector3Int>
             private readonly Vector3Int _min, _max;
             private Vector3Int _current;
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public PositionEnumerator(Vector3Int min, Vector3Int max)
             {
                 _min = _current = min;
@@ -139,11 +209,13 @@ public PositionEnumerator(Vector3Int min, Vector3Int max)
                 Reset();
             }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public PositionEnumerator GetEnumerator()
             {
                 return this;
             }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public bool MoveNext()
             {
                 if (_current.z >= _max.z || _current.y >= _max.y)
@@ -170,16 +242,18 @@ public bool MoveNext()
                 return true;
             }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public void Reset()
             {
                 _current = _min;
                 _current.x--;
             }
 
-            public Vector3Int Current { get { return _current; } }
+            public Vector3Int Current { [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return _current; } }
 
-            object IEnumerator.Current { get { return Current; } }
+            object IEnumerator.Current { [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Current; } }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             void IDisposable.Dispose() {}
         }
     }
diff --git a/Runtime/Export/Geometry/Plane.cs b/Runtime/Export/Geometry/Plane.cs
index e2c8976696..e87c0b6a65 100644
--- a/Runtime/Export/Geometry/Plane.cs
+++ b/Runtime/Export/Geometry/Plane.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using UnityEngine.Scripting;
 
@@ -23,17 +24,18 @@ public partial struct Plane : IFormattable
         // Normal vector of the plane.
         public Vector3 normal
         {
-            get { return m_Normal; }
-            set { m_Normal = value; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Normal; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Normal = value; }
         }
         // Distance from the origin to the plane.
         public float distance
         {
-            get { return m_Distance; }
-            set { m_Distance = value; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Distance; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Distance = value; }
         }
 
         // Creates a plane.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Plane(Vector3 inNormal, Vector3 inPoint)
         {
             m_Normal = Vector3.Normalize(inNormal);
@@ -41,6 +43,7 @@ public Plane(Vector3 inNormal, Vector3 inPoint)
         }
 
         // Creates a plane.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Plane(Vector3 inNormal, float d)
         {
             m_Normal = Vector3.Normalize(inNormal);
@@ -48,6 +51,7 @@ public Plane(Vector3 inNormal, float d)
         }
 
         // Creates a plane.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Plane(Vector3 a, Vector3 b, Vector3 c)
         {
             m_Normal = Vector3.Normalize(Vector3.Cross(b - a, c - a));
@@ -55,6 +59,7 @@ public Plane(Vector3 a, Vector3 b, Vector3 c)
         }
 
         // Sets a plane using a point that lies within it plus a normal to orient it
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void SetNormalAndPosition(Vector3 inNormal, Vector3 inPoint)
         {
             m_Normal = Vector3.Normalize(inNormal);
@@ -62,6 +67,7 @@ public void SetNormalAndPosition(Vector3 inNormal, Vector3 inPoint)
         }
 
         // Sets a plane using three points that lie within it.  The points go around clockwise as you look down on the top surface of the plane.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void Set3Points(Vector3 a, Vector3 b, Vector3 c)
         {
             m_Normal = Vector3.Normalize(Vector3.Cross(b - a, c - a));
@@ -69,18 +75,26 @@ public void Set3Points(Vector3 a, Vector3 b, Vector3 c)
         }
 
         // Make the plane face the opposite direction
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void Flip() { m_Normal = -m_Normal; m_Distance = -m_Distance; }
 
         // Return a version of the plane that faces the opposite direction
-        public Plane flipped { get { return new Plane(-m_Normal, -m_Distance); } }
+        public Plane flipped
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
+            get { return new Plane(-m_Normal, -m_Distance); }
+        }
 
         // Translates the plane into a given direction
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void Translate(Vector3 translation) { m_Distance += Vector3.Dot(m_Normal, translation); }
 
         // Creates a plane that's translated into a given direction
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static Plane Translate(Plane plane, Vector3 translation) { return new Plane(plane.m_Normal, plane.m_Distance += Vector3.Dot(plane.m_Normal, translation)); }
 
         // Calculates the closest point on the plane.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Vector3 ClosestPointOnPlane(Vector3 point)
         {
             var pointToPlaneDistance = Vector3.Dot(m_Normal, point) + m_Distance;
@@ -88,12 +102,15 @@ public Vector3 ClosestPointOnPlane(Vector3 point)
         }
 
         // Returns a signed distance from plane to point.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public float GetDistanceToPoint(Vector3 point) { return Vector3.Dot(m_Normal, point) + m_Distance; }
 
         // Is a point on the positive side of the plane?
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool GetSide(Vector3 point) { return Vector3.Dot(m_Normal, point) + m_Distance > 0.0F; }
 
         // Are two points on the same side of the plane?
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool SameSide(Vector3 inPt0, Vector3 inPt1)
         {
             float d0 = GetDistanceToPoint(inPt0);
@@ -103,6 +120,7 @@ public bool SameSide(Vector3 inPt0, Vector3 inPt1)
         }
 
         // Intersects a ray with the plane.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Raycast(Ray ray, out float enter)
         {
             float vdot = Vector3.Dot(ray.direction, m_Normal);
@@ -119,16 +137,19 @@ public bool Raycast(Ray ray, out float enter)
             return enter > 0.0F;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Geometry/Ray.cs b/Runtime/Export/Geometry/Ray.cs
index 71f3618f28..7beca17fda 100644
--- a/Runtime/Export/Geometry/Ray.cs
+++ b/Runtime/Export/Geometry/Ray.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 
 namespace UnityEngine
 {
@@ -14,6 +15,7 @@ public partial struct Ray : IFormattable
         private Vector3 m_Direction;
 
         // Creates a ray starting at /origin/ along /direction/.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Ray(Vector3 origin, Vector3 direction)
         {
             m_Origin = origin;
@@ -23,15 +25,15 @@ public Ray(Vector3 origin, Vector3 direction)
         // The origin point of the ray.
         public Vector3 origin
         {
-            get { return m_Origin; }
-            set { m_Origin = value; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Origin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Origin = value; }
         }
 
         // The direction of the ray.
         public Vector3 direction
         {
-            get { return m_Direction; }
-            set { m_Direction = value.normalized; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Direction; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Direction = value.normalized; }
         }
 
         // Returns a point at /distance/ units along the ray.
@@ -40,16 +42,19 @@ public Vector3 GetPoint(float distance)
             return m_Origin + m_Direction * distance;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Geometry/Ray2D.cs b/Runtime/Export/Geometry/Ray2D.cs
index 0225545225..f9f3376ed7 100644
--- a/Runtime/Export/Geometry/Ray2D.cs
+++ b/Runtime/Export/Geometry/Ray2D.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 
 namespace UnityEngine
 {
@@ -14,20 +15,21 @@ public partial struct Ray2D : IFormattable
         private Vector2 m_Direction;
 
         // Creates a ray starting at /origin/ along /direction/.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Ray2D(Vector2 origin, Vector2 direction) { m_Origin = origin; m_Direction = direction.normalized; }
 
         // The origin point of the ray.
         public Vector2 origin
         {
-            get { return m_Origin; }
-            set { m_Origin = value; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Origin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Origin = value; }
         }
 
         // The direction of the ray.
         public Vector2 direction
         {
-            get { return m_Direction; }
-            set { m_Direction = value.normalized; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Direction; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Direction = value.normalized; }
         }
 
         // Returns a point at /distance/ units along the ray.
@@ -36,16 +38,19 @@ public Vector2 GetPoint(float distance)
             return m_Origin + m_Direction * distance;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Geometry/Rect.cs b/Runtime/Export/Geometry/Rect.cs
index d2a6717056..c1e87dbc65 100644
--- a/Runtime/Export/Geometry/Rect.cs
+++ b/Runtime/Export/Geometry/Rect.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
@@ -26,6 +27,7 @@ public partial struct Rect : IEquatable<Rect>, IFormattable
         [NativeName("height")]
         private float m_Height;
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Rect(float x, float y, float width, float height)
         {
             m_XMin = x;
@@ -34,6 +36,7 @@ public Rect(float x, float y, float width, float height)
             m_Height = height;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Rect(Vector2 position, Vector2 size)
         {
             m_XMin = position.x;
@@ -42,6 +45,7 @@ public Rect(Vector2 position, Vector2 size)
             m_Height = size.y;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public Rect(Rect source)
         {
             m_XMin = source.m_XMin;
@@ -52,11 +56,13 @@ public Rect(Rect source)
 
         static public Rect zero => new Rect(0.0f, 0.0f, 0.0f, 0.0f);
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         static public Rect MinMaxRect(float xmin, float ymin, float xmax, float ymax)
         {
             return new Rect(xmin, ymin, xmax - xmin, ymax - ymin);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void Set(float x, float y, float width, float height)
         {
             m_XMin = x;
@@ -65,48 +71,95 @@ public void Set(float x, float y, float width, float height)
             m_Height = height;
         }
 
-        public float x { get { return m_XMin; } set { m_XMin = value; } }
+        public float x
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_XMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_XMin = value; }
+        }
 
-        public float y { get { return m_YMin; } set { m_YMin = value; } }
+        public float y
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_YMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_YMin = value; }
+        }
 
         public Vector2 position
         {
-            get { return new Vector2(m_XMin, m_YMin); }
-            set { m_XMin = value.x; m_YMin = value.y; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2(m_XMin, m_YMin); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_XMin = value.x; m_YMin = value.y; }
         }
 
         public Vector2 center
         {
-            get { return new Vector2(x + m_Width / 2f, y + m_Height / 2f); }
-            set { m_XMin = value.x - m_Width / 2f; m_YMin = value.y - m_Height / 2f; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2(x + m_Width / 2f, y + m_Height / 2f); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_XMin = value.x - m_Width / 2f; m_YMin = value.y - m_Height / 2f; }
         }
 
-        public Vector2 min { get { return new Vector2(xMin, yMin); } set { xMin = value.x; yMin = value.y; } }
+        public Vector2 min
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2(xMin, yMin); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { xMin = value.x; yMin = value.y; }
+        }
 
-        public Vector2 max { get { return new Vector2(xMax, yMax); } set { xMax = value.x; yMax = value.y; } }
+        public Vector2 max
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2(xMax, yMax); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { xMax = value.x; yMax = value.y; }
+        }
 
-        public float width { get { return m_Width; } set { m_Width = value; } }
+        public float width
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Width; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Width = value; }
+        }
 
-        public float height { get { return m_Height; } set { m_Height = value; } }
+        public float height
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Height; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Height = value; }
+        }
 
-        public Vector2 size { get { return new Vector2(m_Width, m_Height); } set { m_Width = value.x; m_Height = value.y; } }
+        public Vector2 size
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2(m_Width, m_Height); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Width = value.x; m_Height = value.y; }
+        }
 
-        public float xMin { get { return m_XMin; } set { float oldxmax = xMax; m_XMin = value; m_Width = oldxmax - m_XMin; } }
-        public float yMin { get { return m_YMin; } set { float oldymax = yMax; m_YMin = value; m_Height = oldymax - m_YMin; } }
-        public float xMax { get { return m_Width + m_XMin; } set { m_Width = value - m_XMin; } }
-        public float yMax { get { return m_Height + m_YMin; } set { m_Height = value - m_YMin; } }
+        public float xMin
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_XMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { float oldxmax = xMax; m_XMin = value; m_Width = oldxmax - m_XMin; }
+        }
+        public float yMin
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_YMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { float oldymax = yMax; m_YMin = value; m_Height = oldymax - m_YMin; }
+        }
+        public float xMax
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Width + m_XMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Width = value - m_XMin; }
+        }
+        public float yMax
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Height + m_YMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Height = value - m_YMin; }
+        }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Contains(Vector2 point)
         {
             return (point.x >= xMin) && (point.x < xMax) && (point.y >= yMin) && (point.y < yMax);
         }
 
         // Returns true if the /x/ and /y/ components of /point/ is a point inside this rectangle.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Contains(Vector3 point)
         {
             return (point.x >= xMin) && (point.x < xMax) && (point.y >= yMin) && (point.y < yMax);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Contains(Vector3 point, bool allowInverse)
         {
             if (!allowInverse)
@@ -121,6 +174,7 @@ public bool Contains(Vector3 point, bool allowInverse)
         }
 
         // Swaps min and max if min was greater than max.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         private static Rect OrderMinMax(Rect rect)
         {
             if (rect.xMin > rect.xMax)
@@ -138,6 +192,7 @@ private static Rect OrderMinMax(Rect rect)
             return rect;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Overlaps(Rect other)
         {
             return (other.xMax > xMin &&
@@ -146,6 +201,7 @@ public bool Overlaps(Rect other)
                 other.yMin < yMax);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Overlaps(Rect other, bool allowInverse)
         {
             Rect self = this;
@@ -157,6 +213,7 @@ public bool Overlaps(Rect other, bool allowInverse)
             return self.Overlaps(other);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static Vector2 NormalizedToPoint(Rect rectangle, Vector2 normalizedRectCoordinates)
         {
             return new Vector2(
@@ -165,6 +222,7 @@ public static Vector2 NormalizedToPoint(Rect rectangle, Vector2 normalizedRectCo
             );
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static Vector2 PointToNormalized(Rect rectangle, Vector2 point)
         {
             return new Vector2(
@@ -174,6 +232,7 @@ public static Vector2 PointToNormalized(Rect rectangle, Vector2 point)
         }
 
         // Returns true if the rectangles are different.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static bool operator!=(Rect lhs, Rect rhs)
         {
             // Returns true in the presence of NaN values.
@@ -181,6 +240,7 @@ public static Vector2 PointToNormalized(Rect rectangle, Vector2 point)
         }
 
         // Returns true if the rectangles are the same.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public static bool operator==(Rect lhs, Rect rhs)
         {
             // Returns false in the presence of NaN values.
@@ -192,6 +252,7 @@ public override int GetHashCode()
             return x.GetHashCode() ^ (width.GetHashCode() << 2) ^ (y.GetHashCode() >> 2) ^ (height.GetHashCode() >> 1);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override bool Equals(object other)
         {
             if (!(other is Rect)) return false;
@@ -199,16 +260,19 @@ public override bool Equals(object other)
             return Equals((Rect)other);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Equals(Rect other)
         {
             return x.Equals(other.x) && y.Equals(other.y) && width.Equals(other.width) && height.Equals(other.height);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
diff --git a/Runtime/Export/Geometry/RectInt.cs b/Runtime/Export/Geometry/RectInt.cs
index 5911ce59ea..5e956fc7af 100644
--- a/Runtime/Export/Geometry/RectInt.cs
+++ b/Runtime/Export/Geometry/RectInt.cs
@@ -6,6 +6,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using UnityEngine.Scripting;
 
@@ -18,40 +19,93 @@ public struct RectInt : IEquatable<RectInt>, IFormattable
         private int m_XMin, m_YMin, m_Width, m_Height;
 
         // Left coordinate of the rectangle.
-        public int x { get { return m_XMin; } set { m_XMin = value; } }
+        public int x
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_XMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_XMin = value; }
+        }
 
         // Top coordinate of the rectangle.
-        public int y { get { return m_YMin; } set { m_YMin = value; } }
+        public int y
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_YMin; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_YMin = value; }
+        }
 
         // Center coordinate of the rectangle.
-        public Vector2 center { get { return new Vector2(x + m_Width / 2f, y + m_Height / 2f); } }
+        public Vector2 center
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2(x + m_Width / 2f, y + m_Height / 2f); }
+        }
 
         // Top left corner of the rectangle.
-        public Vector2Int min { get { return new Vector2Int(xMin, yMin); } set { xMin = value.x; yMin = value.y; } }
+        public Vector2Int min
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2Int(xMin, yMin); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { xMin = value.x; yMin = value.y; }
+        }
 
         // Bottom right corner of the rectangle.
-        public Vector2Int max { get { return new Vector2Int(xMax, yMax); } set { xMax = value.x; yMax = value.y; } }
+        public Vector2Int max
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2Int(xMax, yMax); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { xMax = value.x; yMax = value.y; }
+        }
 
         // Width of the rectangle.
-        public int width { get { return m_Width; } set { m_Width = value; } }
+        public int width
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Width; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Width = value; }
+        }
 
         // Height of the rectangle.
-        public int height { get { return m_Height; } set { m_Height = value; } }
+        public int height
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return m_Height; }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Height = value; }
+        }
 
-        public int xMin { get { return Math.Min(m_XMin, m_XMin + m_Width); } set { int oldxmax = xMax; m_XMin = value; m_Width = oldxmax - m_XMin; } }
-        public int yMin { get { return Math.Min(m_YMin, m_YMin + m_Height); } set { int oldymax = yMax; m_YMin = value; m_Height = oldymax - m_YMin; } }
-        public int xMax { get { return Math.Max(m_XMin, m_XMin + m_Width); } set { m_Width = value - m_XMin; } }
-        public int yMax { get { return Math.Max(m_YMin, m_YMin + m_Height); } set { m_Height = value - m_YMin; } }
+        public int xMin
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Min(m_XMin, m_XMin + m_Width); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { int oldxmax = xMax; m_XMin = value; m_Width = oldxmax - m_XMin; }
+        }
+        public int yMin
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Min(m_YMin, m_YMin + m_Height); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { int oldymax = yMax; m_YMin = value; m_Height = oldymax - m_YMin; }
+        }
+        public int xMax
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Max(m_XMin, m_XMin + m_Width); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Width = value - m_XMin; }
+        }
+        public int yMax
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Math.Max(m_YMin, m_YMin + m_Height); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Height = value - m_YMin; }
+        }
 
-        public Vector2Int position { get { return new Vector2Int(m_XMin, m_YMin); } set { m_XMin = value.x; m_YMin = value.y; } }
-        public Vector2Int size { get { return new Vector2Int(m_Width, m_Height); } set { m_Width = value.x; m_Height = value.y; } }
+        public Vector2Int position
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2Int(m_XMin, m_YMin); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_XMin = value.x; m_YMin = value.y; }
+        }
+        public Vector2Int size
+        {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return new Vector2Int(m_Width, m_Height); }
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] set { m_Width = value.x; m_Height = value.y; }
+        }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void SetMinMax(Vector2Int minPosition, Vector2Int maxPosition)
         {
             min = minPosition;
             max = maxPosition;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public RectInt(int xMin, int yMin, int width, int height)
         {
             m_XMin = xMin;
@@ -60,6 +114,7 @@ public RectInt(int xMin, int yMin, int width, int height)
             m_Height = height;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public RectInt(Vector2Int position, Vector2Int size)
         {
             m_XMin = position.x;
@@ -68,6 +123,7 @@ public RectInt(Vector2Int position, Vector2Int size)
             m_Height = size.y;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public void ClampToBounds(RectInt bounds)
         {
             position = new Vector2Int(
@@ -80,6 +136,7 @@ public void ClampToBounds(RectInt bounds)
             );
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Contains(Vector2Int position)
         {
             return position.x >= xMin
@@ -88,6 +145,7 @@ public bool Contains(Vector2Int position)
                 && position.y < yMax;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Overlaps(RectInt other)
         {
             return other.xMin < xMax
@@ -96,16 +154,19 @@ public bool Overlaps(RectInt other)
                 && other.yMax > yMin;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (formatProvider == null)
@@ -113,6 +174,7 @@ public string ToString(string format, IFormatProvider formatProvider)
             return UnityString.Format("(x:{0}, y:{1}, width:{2}, height:{3})", x.ToString(format, formatProvider), y.ToString(format, formatProvider), width.ToString(format, formatProvider), height.ToString(format, formatProvider));
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public bool Equals(RectInt other)
         {
             return m_XMin == other.m_XMin &&
@@ -123,6 +185,7 @@ public bool Equals(RectInt other)
 
         public PositionEnumerator allPositionsWithin
         {
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             get { return new PositionEnumerator(min, max); }
         }
 
@@ -131,6 +194,7 @@ public struct PositionEnumerator : IEnumerator<Vector2Int>
             private readonly Vector2Int _min, _max;
             private Vector2Int _current;
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public PositionEnumerator(Vector2Int min, Vector2Int max)
             {
                 _min = _current = min;
@@ -138,11 +202,13 @@ public PositionEnumerator(Vector2Int min, Vector2Int max)
                 Reset();
             }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public PositionEnumerator GetEnumerator()
             {
                 return this;
             }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public bool MoveNext()
             {
                 if (_current.y >= _max.y)
@@ -165,16 +231,18 @@ public bool MoveNext()
                 return true;
             }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             public void Reset()
             {
                 _current = _min;
                 _current.x--;
             }
 
-            public Vector2Int Current { get { return _current; } }
+            public Vector2Int Current { [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return _current; } }
 
-            object IEnumerator.Current { get { return Current; } }
+            object IEnumerator.Current { [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return Current; } }
 
+            [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
             void IDisposable.Dispose() {}
         }
     }
diff --git a/Runtime/Export/Geometry/RectOffset.cs b/Runtime/Export/Geometry/RectOffset.cs
index 7efcb7f534..8f6fa2bc22 100644
--- a/Runtime/Export/Geometry/RectOffset.cs
+++ b/Runtime/Export/Geometry/RectOffset.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 
@@ -52,16 +53,19 @@ public RectOffset(int left, int right, int top, int bottom)
             this.bottom = bottom;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (formatProvider == null)
diff --git a/Runtime/Export/Graphics/Display.bindings.cs b/Runtime/Export/Graphics/Display.bindings.cs
index 8ea3c6cc96..78eeab7e31 100644
--- a/Runtime/Export/Graphics/Display.bindings.cs
+++ b/Runtime/Export/Graphics/Display.bindings.cs
@@ -152,7 +152,8 @@ public static Vector3 RelativeMouseAt(Vector3 inputMouseCoordinates)
         private static Display _mainDisplay = displays[0];
         public static Display   main        { get {return _mainDisplay; } }
 
-        private static int m_ActiveEditorGameViewTarget = -1;
+        private static int m_ActiveEditorGameViewTarget = 0;
+
         public static int activeEditorGameViewTarget  { get { return m_ActiveEditorGameViewTarget; } internal set { m_ActiveEditorGameViewTarget = value; } }
 
         [RequiredByNativeCode]
diff --git a/Runtime/Export/Graphics/Graphics.bindings.cs b/Runtime/Export/Graphics/Graphics.bindings.cs
index b9035f632a..3ad027405c 100644
--- a/Runtime/Export/Graphics/Graphics.bindings.cs
+++ b/Runtime/Export/Graphics/Graphics.bindings.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Unity.Collections.LowLevel.Unsafe;
 using UnityEditor;
 using UnityEngine.Bindings;
 using UnityEngine.Rendering;
@@ -13,9 +14,153 @@
 using uei = UnityEngine.Internal;
 using UnityEngine;
 using UnityEngine.Experimental.Rendering;
+using Unity.Collections;
+using Unity.Jobs;
 
 namespace UnityEngine
 {
+    [NativeContainer]
+    [StructLayout(LayoutKind.Sequential)]
+    [NativeHeader("Runtime/Camera/RenderLoops/LightProbeContext.h")]
+    [StaticAccessor("LightProbeContextWrapper", StaticAccessorType.DoubleColon)]
+    public struct LightProbesQuery : IDisposable
+    {
+        [NativeDisableUnsafePtrRestriction]
+        internal IntPtr m_LightProbeContextWrapper;
+
+        internal Allocator m_AllocatorLabel;
+
+        internal AtomicSafetyHandle m_Safety;
+        [NativeSetClassTypeToNullOnSchedule]
+        internal DisposeSentinel m_DisposeSentinel;
+
+        public LightProbesQuery(Allocator allocator)
+        {
+            m_LightProbeContextWrapper = Create();
+
+            m_AllocatorLabel = allocator;
+
+            DisposeSentinel.Create(out m_Safety, out m_DisposeSentinel, 0, allocator);
+        }
+
+        public void Dispose()
+        {
+            if (m_LightProbeContextWrapper == IntPtr.Zero)
+            {
+                throw new ObjectDisposedException("The LightProbesQuery is already disposed.");
+            }
+
+            if (m_AllocatorLabel == Allocator.Invalid)
+            {
+                throw new InvalidOperationException("The LightProbesQuery can not be Disposed because it was not allocated with a valid allocator.");
+            }
+
+            if (m_AllocatorLabel > Allocator.None)
+            {
+                DisposeSentinel.Dispose(ref m_Safety, ref m_DisposeSentinel);
+                Destroy(m_LightProbeContextWrapper);
+                m_AllocatorLabel = Allocator.Invalid;
+            }
+            m_LightProbeContextWrapper = IntPtr.Zero;
+        }
+
+        [NativeContainer]
+        internal unsafe struct LightProbesQueryDispose
+        {
+            [NativeDisableUnsafePtrRestriction]
+            internal IntPtr    m_LightProbeContextWrapper;
+
+            internal AtomicSafetyHandle m_Safety;
+
+            public void Dispose()
+            {
+                Destroy(m_LightProbeContextWrapper);
+            }
+        }
+
+        internal struct LightProbesQueryDisposeJob : IJob
+        {
+            internal LightProbesQueryDispose Data;
+
+            public void Execute()
+            {
+                Data.Dispose();
+            }
+        }
+
+        public JobHandle Dispose(JobHandle inputDeps)
+        {
+            if (m_AllocatorLabel == Allocator.Invalid)
+            {
+                throw new InvalidOperationException("The LightProbesQuery can not be Disposed because it was not allocated with a valid allocator.");
+            }
+
+            if (m_LightProbeContextWrapper == IntPtr.Zero)
+            {
+                throw new InvalidOperationException("The LightProbesQuery is already disposed.");
+            }
+
+            if (m_AllocatorLabel > Allocator.None)
+            {
+                // [DeallocateOnJobCompletion] is not supported on the m_LightProbeContextWrapper,
+                // but we want the deallocation to happen on a thread. DisposeSentinel needs to be cleared on main thread.
+                // AtomicSafetyHandle can be destroyed after the job was scheduled (Job scheduling
+                // will check that no jobs are writing to the container).
+                DisposeSentinel.Clear(ref m_DisposeSentinel);
+
+                var jobHandle = new LightProbesQueryDisposeJob { Data = new LightProbesQueryDispose { m_LightProbeContextWrapper = m_LightProbeContextWrapper, m_Safety = m_Safety } }.Schedule(inputDeps);
+
+                AtomicSafetyHandle.Release(m_Safety);
+                m_AllocatorLabel = Allocator.Invalid;
+                m_LightProbeContextWrapper = IntPtr.Zero;
+                return jobHandle;
+            }
+
+            m_LightProbeContextWrapper = IntPtr.Zero;
+            return inputDeps;
+        }
+
+        public bool IsCreated
+        {
+            get { return m_LightProbeContextWrapper != IntPtr.Zero; }
+        }
+
+        static extern IntPtr Create();
+
+        [ThreadSafe]
+        static extern void Destroy(IntPtr lightProbeContextWrapper);
+
+        public void CalculateInterpolatedLightAndOcclusionProbe(Vector3 position, ref int tetrahedronIndex, out SphericalHarmonicsL2 lightProbe, out Vector4 occlusionProbe)
+        {
+            AtomicSafetyHandle.CheckReadAndThrow(m_Safety);
+            CalculateInterpolatedLightAndOcclusionProbe(m_LightProbeContextWrapper, position, ref tetrahedronIndex, out lightProbe, out occlusionProbe);
+        }
+
+        public void CalculateInterpolatedLightAndOcclusionProbes(NativeArray<Vector3> positions, NativeArray<int> tetrahedronIndices, NativeArray<SphericalHarmonicsL2> lightProbes, NativeArray<Vector4> occlusionProbes)
+        {
+            AtomicSafetyHandle.CheckReadAndThrow(m_Safety);
+            if (positions == null)
+                throw new ArgumentException("positions", "Argument positions has not been specified");
+            if (tetrahedronIndices == null || tetrahedronIndices.Length < positions.Length)
+                throw new ArgumentException("tetrahedronIndices", "Argument tetrahedronIndices is null or has fewer elements than positions.");
+            else if (lightProbes == null || lightProbes.Length < positions.Length)
+                throw new ArgumentException("lightProbes", "Argument lightProbes is null or has fewer elements than positions.");
+            else if (occlusionProbes == null || occlusionProbes.Length < positions.Length)
+                throw new ArgumentException("occlusionProbes", "Argument occlusionProbes is null or has fewer elements than positions.");
+
+            unsafe
+            {
+                CalculateInterpolatedLightAndOcclusionProbes(m_LightProbeContextWrapper, (IntPtr)positions.GetUnsafeReadOnlyPtr(), (IntPtr)tetrahedronIndices.GetUnsafeReadOnlyPtr(), (IntPtr)lightProbes.GetUnsafePtr(), (IntPtr)occlusionProbes.GetUnsafePtr(), positions.Length);
+            }
+        }
+
+        [ThreadSafe]
+        static extern void CalculateInterpolatedLightAndOcclusionProbe(IntPtr lightProbeContextWrapper, Vector3 position, ref int tetrahedronIndex, out SphericalHarmonicsL2 lightProbe, out Vector4 occlusionProbe);
+
+        [ThreadSafe]
+        static extern void CalculateInterpolatedLightAndOcclusionProbes(IntPtr lightProbeContextWrapper, IntPtr positions, IntPtr tetrahedronIndices, IntPtr lightProbes, IntPtr occlusionProbes, int count);
+    }
+
     internal enum EnabledOrientation
     {
         kAutorotateToPortrait           = 1,
@@ -382,7 +527,7 @@ namespace UnityEngine
     [NativeHeader("Runtime/Misc/PlayerSettings.h")]
     public partial class Graphics
     {
-        [FreeFunction("GraphicsScripting::GetMaxDrawMeshInstanceCount")] extern private static int Internal_GetMaxDrawMeshInstanceCount();
+        [FreeFunction("GraphicsScripting::GetMaxDrawMeshInstanceCount", IsThreadSafe = true)] extern private static int Internal_GetMaxDrawMeshInstanceCount();
         internal static readonly int kMaxDrawMeshInstanceCount = Internal_GetMaxDrawMeshInstanceCount();
 
         [FreeFunction] extern private static ColorGamut GetActiveColorGamut();
@@ -768,6 +913,14 @@ public sealed partial class LightProbes : Object
     {
         private LightProbes() {}
 
+        public static event Action lightProbesUpdated;
+        [RequiredByNativeCode]
+        private static void Internal_CallLightProbesUpdatedFunction()
+        {
+            if (lightProbesUpdated != null)
+                lightProbesUpdated();
+        }
+
         public static event Action tetrahedralizationCompleted;
         [RequiredByNativeCode]
         private static void Internal_CallTetrahedralizationCompletedFunction()
diff --git a/Runtime/Export/Graphics/Graphics.cs b/Runtime/Export/Graphics/Graphics.cs
index 008024e928..f40e9b60e4 100644
--- a/Runtime/Export/Graphics/Graphics.cs
+++ b/Runtime/Export/Graphics/Graphics.cs
@@ -903,6 +903,18 @@ namespace UnityEngine
 {
     public sealed partial class QualitySettings
     {
+        /// <summary>
+        /// Callback raised when the current active quality level is being changed
+        /// It passes to the callback the previous quality level and the current quality level
+        /// </summary>
+        public static event Action<int,int> activeQualityLevelChanged;
+
+        [RequiredByNativeCode]
+        internal static void OnActiveQualityLevelChanged(int previousQualityLevel, int currentQualityLevel)
+        {
+            activeQualityLevelChanged?.Invoke(previousQualityLevel, currentQualityLevel);
+        }
+
         public static void IncreaseLevel([uei.DefaultValue("false")] bool applyExpensiveChanges)
         {
             SetQualityLevel(GetQualityLevel() + 1, applyExpensiveChanges);
diff --git a/Runtime/Export/Graphics/GraphicsBuffer.bindings.cs b/Runtime/Export/Graphics/GraphicsBuffer.bindings.cs
index 9b124411fa..562e60ff58 100644
--- a/Runtime/Export/Graphics/GraphicsBuffer.bindings.cs
+++ b/Runtime/Export/Graphics/GraphicsBuffer.bindings.cs
@@ -213,6 +213,11 @@ private void InternalInitialization(Target target, UsageFlags usageFlags, int co
                 throw new ArgumentException($"The total size of the graphics buffer ({bufferSize} bytes) exceeds the maximum buffer size. Maximum supported buffer size: {maxBufferSize} bytes.");
             }
 
+            if((usageFlags & UsageFlags.LockBufferForWrite) != 0 && (target & Target.CopyDestination) != 0)
+            {
+                throw new ArgumentException("Attempting to create a LockBufferForWrite capable buffer that can be copied into. LockBufferForWrite buffers are read-only on the GPU.");
+            }
+
             m_Ptr = InitBuffer(target, usageFlags, count, stride);
 
         }
diff --git a/Runtime/Export/Graphics/GraphicsEnums.cs b/Runtime/Export/Graphics/GraphicsEnums.cs
index 1ef52ff28b..55706ba1d4 100644
--- a/Runtime/Export/Graphics/GraphicsEnums.cs
+++ b/Runtime/Export/Graphics/GraphicsEnums.cs
@@ -14,7 +14,7 @@ public enum RenderingPath
         UsePlayerSettings = -1,
         VertexLit = 0,
         Forward = 1,
-        DeferredLighting = 2,
+        [Obsolete("DeferredLighting has been removed. Use DeferredShading, Forward or HDRP/URP instead.", false)] DeferredLighting = 2,
         DeferredShading = 3
     }
 
@@ -238,6 +238,7 @@ public enum BlendWeights
     }
     public enum SkinWeights
     {
+        None = 0,
         OneBone = 1,
         TwoBones = 2,
         FourBones = 4,
@@ -283,16 +284,13 @@ public enum ColorGamut
 
     public enum ScreenOrientation
     {
-        [System.Obsolete("Enum member Unknown has been deprecated.", false)]
-        Unknown = 0,
-        [System.Obsolete("Use LandscapeLeft instead (UnityUpgradable) -> LandscapeLeft", true)]
-        Landscape = 3,
-
         Portrait = 1,
         PortraitUpsideDown = 2,
         LandscapeLeft = 3,
         LandscapeRight = 4,
         AutoRotation = 5,
+        [System.Obsolete("Enum member Unknown has been deprecated.", false)] Unknown = 0,
+        [System.Obsolete("Use LandscapeLeft instead (UnityUpgradable) -> LandscapeLeft", true)] Landscape = 3,
     }
 
     public enum FilterMode
@@ -551,6 +549,15 @@ public enum HDRDisplaySupportFlags
         AutomaticTonemapping = 1 << 2
     }
 
+    namespace Rendering
+    {
+        public enum BlendShapeBufferLayout
+        {
+            PerShape,
+            PerVertex,
+        }
+    }
+
     namespace Experimental
     {
         namespace Rendering
@@ -820,6 +827,16 @@ public enum MaterialGlobalIlluminationFlags
         AnyEmissive = RealtimeEmissive | BakedEmissive
     }
 
+    // Match MaterialSerializedProperty on C++ side
+    internal enum MaterialSerializedProperty
+    {
+        None = 0,
+        LightmapFlags = 1 << 1,
+        EnableInstancingVariants = 1 << 2,
+        DoubleSidedGI = 1 << 3,
+        CustomRenderQueue = 1 << 4,
+    }
+
     // Match the enums from LightProbeProxyVolume class on C++ side
     public partial class LightProbeProxyVolume
     {
@@ -1236,10 +1253,9 @@ public enum BuiltinRenderTextureType
         Depth = 3,      // camera's depth texture
         DepthNormals = 4,   // camera's depth+normals texture
         ResolvedDepth = 5, // resolved depth buffer from deferred
-        //SeparatePassDepth = 6, // "separate pass workaround" depth buffer from deferred
-        PrepassNormalsSpec = 7,
-        PrepassLight = 8,
-        PrepassLightSpec = 9,
+        [Obsolete("Deferred Lighting has been removed, so PrepassNormalsSpec built-in render texture type is never used now.", false)] PrepassNormalsSpec = 7,
+        [Obsolete("Deferred Lighting has been removed, so PrepassLight built-in render texture type is never used now.", false)] PrepassLight = 8,
+        [Obsolete("Deferred Lighting has been removed, so PrepassLightSpec built-in render texture type is never used now.", false)] PrepassLightSpec = 9,
         GBuffer0 = 10,
         GBuffer1 = 11,
         GBuffer2 = 12,
@@ -1259,15 +1275,15 @@ public enum PassType
         Vertex = 1,
         VertexLM = 2,
 
-        [System.Obsolete("VertexLMRGBM PassType is obsolete. Please use VertexLM PassType together with DecodeLightmap shader function.")]
+        [Obsolete("VertexLMRGBM PassType is obsolete. Please use VertexLM PassType together with DecodeLightmap shader function.")]
         VertexLMRGBM = 3,
 
         ForwardBase = 4,
         ForwardAdd = 5,
-        LightPrePassBase = 6,
-        LightPrePassFinal = 7,
+        [Obsolete("Deferred Lighting was removed, so LightPrePassBase pass type is never used anymore.")] LightPrePassBase = 6,
+        [Obsolete("Deferred Lighting was removed, so LightPrePassFinal pass type is never used anymore.")] LightPrePassFinal = 7,
         ShadowCaster = 8,
-        // ShadowCollector = 9 -- not needed starting with 5.0
+        // ShadowCollector = 9 -- removed in Unity 5.0
         Deferred = 10,
         Meta = 11,
         MotionVectors = 12,
@@ -1326,8 +1342,8 @@ public enum GraphicsDeviceType
         XboxOneD3D12 = 23,
         GameCoreXboxOne = 24,
         [System.Obsolete("GameCoreScarlett is deprecated, please use GameCoreXboxSeries (UnityUpgradable) -> GameCoreXboxSeries", false)]
-        GameCoreScarlett = 25,
-        GameCoreXboxSeries = 25, // GameCoreXboxSeries intentionally set to the same as GameCoreScarlett
+        GameCoreScarlett = -1,
+        GameCoreXboxSeries = 25, // GameCoreXboxSeries intentionally _NOT_ set to the same as GameCoreScarlett
         PlayStation5 = 26,
         PlayStation5NGGC = 27
     }
@@ -1800,7 +1816,7 @@ public enum BuiltinShaderType
     {
         DeferredShading = 0,
         DeferredReflections = 1,
-        LegacyDeferredLighting = 2,
+        [System.Obsolete("LegacyDeferredLighting has been removed.", false)] LegacyDeferredLighting = 2,
         ScreenSpaceShadows = 3,
         DepthNormals = 4,
         MotionVectors = 5,
@@ -1822,7 +1838,7 @@ public enum BuiltinShaderDefine
     {
         UNITY_NO_DXT5nm,
         UNITY_NO_RGBM,
-        UNITY_USE_NATIVE_HDR,
+        [Obsolete("Shaders unconditionally support HDR decoding.")] UNITY_USE_NATIVE_HDR,
         UNITY_ENABLE_REFLECTION_BUFFERS,
         UNITY_FRAMEBUFFER_FETCH_AVAILABLE,
         UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS,
@@ -1902,6 +1918,12 @@ public enum RealtimeGICPUUsage
         Unlimited = 100
     }
 
+    public enum LightProbeOutsideHullStrategy // Defines behaviour of a Light Probe lit Renderer placed outside of the bounds of the Light Probe tetrahedral hull.
+    {
+        kLightProbeSearchTetrahedralHull,   // Slow path, search the tetrahedral hull to find the closest Light Probe.
+        kLightProbeUseAmbientProbe,         // Fast path, don't spend time searching the hull to find the closest probe, use the global Ambient Probe.
+    };
+
     //Needs to line up with the common elements of the c++ version of this enum found GfxDeviceTypes.h
     public enum ComputeQueueType
     {
diff --git a/Runtime/Export/Graphics/GraphicsManagers.bindings.cs b/Runtime/Export/Graphics/GraphicsManagers.bindings.cs
index 328dc793bd..783fb86993 100644
--- a/Runtime/Export/Graphics/GraphicsManagers.bindings.cs
+++ b/Runtime/Export/Graphics/GraphicsManagers.bindings.cs
@@ -93,6 +93,7 @@ private QualitySettings() {}
 
         extern public static int   masterTextureLimit    { get; set; }
         extern public static int   maximumLODLevel       { get; set; }
+        extern public static bool  enableLODCrossFade    { get; set; }
         extern public static int   particleRaycastBudget { get; set; }
         extern public static bool  softParticles         { get; set; }
         extern public static bool  softVegetation        { get; set; }
diff --git a/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs b/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs
index cef17cc688..2606661736 100644
--- a/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs
+++ b/Runtime/Export/Graphics/GraphicsRenderers.bindings.cs
@@ -171,6 +171,22 @@ public void GetMaterials(List<Material> m)
             CopyMaterialArray(NoAllocHelpers.ExtractArrayFromListT(m));
         }
 
+        public void SetSharedMaterials(List<Material> materials)
+        {
+            if (materials == null)
+                throw new ArgumentNullException("The material list to set cannot be null.", "materials");
+
+            SetMaterialArray(NoAllocHelpers.ExtractArrayFromListT(materials));
+        }
+
+        public void SetMaterials(List<Material> materials)
+        {
+            if (materials == null)
+                throw new ArgumentNullException("The material list to set cannot be null.", "materials");
+
+            SetMaterialArray(NoAllocHelpers.ExtractArrayFromListT(materials));
+        }
+
         public void GetSharedMaterials(List<Material> m)
         {
             if (m == null)
@@ -190,6 +206,7 @@ public void GetClosestReflectionProbes(List<ReflectionProbeBlendInfo> result)
     public sealed partial class TrailRenderer : Renderer
     {
         extern public float time                { get; set; }
+        extern internal float previewTimeScale  { get; set; }
         extern public float startWidth          { get; set; }
         extern public float endWidth            { get; set; }
         extern public float widthMultiplier     { get; set; }
diff --git a/Runtime/Export/Graphics/GraphicsSettings.bindings.cs b/Runtime/Export/Graphics/GraphicsSettings.bindings.cs
index 55788bc26a..605612c979 100644
--- a/Runtime/Export/Graphics/GraphicsSettings.bindings.cs
+++ b/Runtime/Export/Graphics/GraphicsSettings.bindings.cs
@@ -32,6 +32,7 @@ extern public static VideoShadersIncludeMode videoShadersIncludeMode
             get;
             set;
         }
+        extern public static LightProbeOutsideHullStrategy lightProbeOutsideHullStrategy { get; set; }
 
         extern public static bool HasShaderDefine(GraphicsTier tier, BuiltinShaderDefine defineHash);
         public static bool HasShaderDefine(BuiltinShaderDefine defineHash)
diff --git a/Runtime/Export/Graphics/Mesh.bindings.cs b/Runtime/Export/Graphics/Mesh.bindings.cs
index 1810621e23..2573b7b82f 100644
--- a/Runtime/Export/Graphics/Mesh.bindings.cs
+++ b/Runtime/Export/Graphics/Mesh.bindings.cs
@@ -147,6 +147,11 @@ extern public int vertexBufferCount
         extern GraphicsBuffer GetVertexBufferImpl(int index);
         [FreeFunction(Name = "MeshScripting::GetIndexBufferPtr", HasExplicitThis = true, ThrowsException = true)]
         extern GraphicsBuffer GetIndexBufferImpl();
+        [FreeFunction(Name = "MeshScripting::GetBoneWeightBufferPtr", HasExplicitThis = true, ThrowsException = true)]
+        extern GraphicsBuffer GetBoneWeightBufferImpl(int bonesPerVertex);
+
+        [FreeFunction(Name = "MeshScripting::GetBlendShapeBufferPtr", HasExplicitThis = true, ThrowsException = true)]
+        extern GraphicsBuffer GetBlendShapeBufferImpl(int layout);
 
         public extern GraphicsBuffer.Target vertexBufferTarget { get; set; }
         public extern GraphicsBuffer.Target indexBufferTarget { get; set; }
@@ -176,6 +181,9 @@ extern public int vertexBufferCount
         [FreeFunction(Name = "AddBlendShapeFrameFromScript", HasExplicitThis = true, ThrowsException = true)]
         extern public void AddBlendShapeFrame(string shapeName, float frameWeight, Vector3[] deltaVertices, Vector3[] deltaNormals, Vector3[] deltaTangents);
 
+        [FreeFunction(Name = "MeshScripting::GetBlendShapeOffset", HasExplicitThis = true)]
+        extern private BlendShape GetBlendShapeOffsetInternal(int index);
+
         // skinning
 
         [NativeMethod("HasBoneWeights")]
@@ -212,6 +220,9 @@ public unsafe NativeArray<byte> GetBonesPerVertex()
         [FreeFunction(Name = "MeshScripting::GetAllBoneWeightsArraySize", HasExplicitThis = true)]
         extern private int GetAllBoneWeightsArraySize();
 
+        [NativeMethod("GetBoneWeightBufferDimension")]
+        extern int GetBoneWeightBufferLayoutInternal();
+
         [System.Security.SecurityCritical] // to prevent accidentally making this public in the future
         [FreeFunction(Name = "MeshScripting::GetAllBoneWeightsArray", HasExplicitThis = true)]
         extern private IntPtr GetAllBoneWeightsArray();
@@ -220,9 +231,20 @@ public unsafe NativeArray<byte> GetBonesPerVertex()
         [FreeFunction(Name = "MeshScripting::GetBonesPerVertexArray", HasExplicitThis = true)]
         extern private IntPtr GetBonesPerVertexArray();
 
-        extern private int GetBindposeCount();
+        extern public int bindposeCount { get; }
         [NativeName("BindPosesFromScript")] extern public Matrix4x4[] bindposes { get; set; }
 
+        public unsafe NativeArray<Matrix4x4> GetBindposes()
+        {
+            var array = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<Matrix4x4>((void*)GetBindposesArray(), bindposeCount, Allocator.None);
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref array, GetReadOnlySafetyHandle(SafetyHandleIndex.BindposeArray));
+            return array;
+        }
+
+        [System.Security.SecurityCritical] // to prevent accidentally making this public in the future
+        [FreeFunction(Name = "MeshScripting::GetBindposesArray", HasExplicitThis = true)]
+        extern private IntPtr GetBindposesArray();
+
         [FreeFunction(Name = "MeshScripting::ExtractBoneWeightsIntoArray", HasExplicitThis = true)]
         extern private void GetBoneWeightsNonAllocImpl([Out] BoneWeight[] values);
 
@@ -234,6 +256,7 @@ private enum SafetyHandleIndex
             // Keep in sync with C++ Mesh::SafetyHandleIndex class
             BonesPerVertexArray,
             BonesWeightsArray,
+            BindposeArray,
         }
 
         [FreeFunction(Name = "MeshScripting::GetReadOnlySafetyHandle", HasExplicitThis = true)]
diff --git a/Runtime/Export/Graphics/Mesh.cs b/Runtime/Export/Graphics/Mesh.cs
index dfa3200c92..24139f3c7c 100644
--- a/Runtime/Export/Graphics/Mesh.cs
+++ b/Runtime/Export/Graphics/Mesh.cs
@@ -761,6 +761,72 @@ public GraphicsBuffer GetIndexBuffer()
             return buf;
         }
 
+        public GraphicsBuffer GetBoneWeightBuffer(SkinWeights layout)
+        {
+            if (this == null)
+                throw new NullReferenceException();
+
+            if(layout == SkinWeights.None)
+            {
+                Debug.LogError($"Only possible to access bone weights buffer for values: {SkinWeights.OneBone}, {SkinWeights.TwoBones}, {SkinWeights.FourBones} and {SkinWeights.Unlimited}.");
+                return null;
+            }
+
+            var buf = GetBoneWeightBufferImpl((int)layout);
+            if (buf != null)
+                buf.SaveCallstack(2);
+            return buf;
+        }
+
+        public GraphicsBuffer GetBlendShapeBuffer(BlendShapeBufferLayout layout)
+        {
+            if (this == null)
+                throw new NullReferenceException();
+
+            if (!SystemInfo.supportsComputeShaders)
+            {
+                Debug.LogError("Only possible to access Blend Shape buffer on platforms that supports compute shaders.");
+                return null;
+            }
+
+            var buf = GetBlendShapeBufferImpl((int)layout);
+            if (buf != null)
+                buf.SaveCallstack(2);
+            return buf;
+        }
+
+        public GraphicsBuffer GetBlendShapeBuffer()
+        {
+            if (this == null)
+                throw new NullReferenceException();
+
+            if (!SystemInfo.supportsComputeShaders)
+            {
+                Debug.LogError("Only possible to access Blend Shape buffer on platforms that supports compute shaders.");
+                return null;
+            }
+
+            var buf = GetBlendShapeBufferImpl((int)BlendShapeBufferLayout.PerShape);
+            if (buf != null)
+                buf.SaveCallstack(2);
+            return buf;
+        }
+
+        public BlendShapeBufferRange GetBlendShapeBufferRange(int blendShapeIndex)
+        {
+            if (blendShapeIndex >= blendShapeCount || blendShapeIndex < 0)
+            {
+                Debug.LogError($"Incorrect index used to get blend shape buffer range");
+                return new BlendShapeBufferRange();
+            }
+
+            BlendShape blendShape = GetBlendShapeOffsetInternal(blendShapeIndex);
+            BlendShapeBufferRange blendShapeRange = new BlendShapeBufferRange();
+            blendShapeRange.startIndex = blendShape.firstVertex;
+            blendShapeRange.endIndex = blendShape.firstVertex + blendShape.vertexCount - 1;
+            return blendShapeRange;
+        }
+
         //
         // triangles/indices
         //
@@ -1189,7 +1255,7 @@ public void GetBindposes(List<Matrix4x4> bindposes)
             if (bindposes == null)
                 throw new ArgumentNullException(nameof(bindposes), "The result bindposes list cannot be null.");
 
-            NoAllocHelpers.EnsureListElemCount(bindposes, GetBindposeCount());
+            NoAllocHelpers.EnsureListElemCount(bindposes, bindposeCount);
             GetBindposesNonAllocImpl(NoAllocHelpers.ExtractArrayFromListT(bindposes));
         }
 
@@ -1215,6 +1281,14 @@ public BoneWeight[] boneWeights
             }
         }
 
+        public SkinWeights skinWeightBufferLayout
+        {
+            get
+            {
+                return (SkinWeights)GetBoneWeightBufferLayoutInternal();
+            }
+        }
+
         //
         //
         //
@@ -1335,6 +1409,39 @@ public void CombineMeshes(CombineInstance[] combine)
         }
     }
 
+    [Serializable]
+    [UsedByNativeCode]
+    internal struct BlendShape
+    {
+        [SerializeField]
+        UInt32 m_FirstVertex;
+        [SerializeField]
+        UInt32 m_VertexCount;
+
+        public UInt32 firstVertex { get { return m_FirstVertex; } set { m_FirstVertex = value; } }
+        public UInt32 vertexCount { get { return m_VertexCount; } set { m_VertexCount = value; } }
+
+
+        [SerializeField]
+        bool m_HasNormals;
+        [SerializeField]
+        bool m_HasTangents;
+        public bool hasNormals { get { return m_HasNormals; } set { m_HasNormals = value; } }
+        public bool hasTangents { get { return m_HasTangents; } set { m_HasTangents = value; } }
+    }
+
+    [Serializable]
+    public struct BlendShapeBufferRange
+    {
+        [SerializeField]
+        UInt32 m_StartIndex;
+        [SerializeField]
+        UInt32 m_EndIndex;
+
+        public UInt32 startIndex { get { return m_StartIndex; } internal set { m_StartIndex = value; } }
+        public UInt32 endIndex { get { return m_EndIndex; } internal set { m_EndIndex = value; } }
+    }
+
     [Serializable]
     [UsedByNativeCode]
     public struct BoneWeight : IEquatable<BoneWeight>
diff --git a/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs b/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
index bcc230affa..966ace39fa 100644
--- a/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
+++ b/Runtime/Export/Graphics/RayTracingAccelerationStructure.bindings.cs
@@ -209,45 +209,81 @@ public void Build()
             Build(Vector3.zero);
         }
 
+        public void AddInstance(Renderer targetRenderer, RayTracingSubMeshFlags[] subMeshFlags, bool enableTriangleCulling = true, bool frontTriangleCounterClockwise = false, uint mask = 0xFF, uint id = 0xFFFFFFFF)
+        {
+            AddInstanceSubMeshFlagsArray(targetRenderer, subMeshFlags, enableTriangleCulling, frontTriangleCounterClockwise, mask, id);
+        }
+
+        public int AddInstance(GraphicsBuffer aabbBuffer, uint aabbCount, bool dynamicData, Matrix4x4 matrix, Material material, bool opaqueMaterial, MaterialPropertyBlock properties, uint mask = 0xFF, uint id = 0xFFFFFFFF)
+        {
+            return AddInstance_Procedural(aabbBuffer, aabbCount, dynamicData, matrix, material, opaqueMaterial, properties, mask, id);
+        }
+
+        public void RemoveInstance(Renderer targetRenderer)
+        {
+            RemoveInstance_Renderer(targetRenderer);
+        }
+
+        public void RemoveInstance(int handle)
+        {
+            RemoveInstance_InstanceID(handle);
+        }
+
+        public void UpdateInstanceTransform(Renderer renderer)
+        {
+            UpdateInstanceTransform_Renderer(renderer);
+        }
+        public void UpdateInstanceTransform(int handle, Matrix4x4 matrix)
+        {
+            UpdateInstanceTransform_InstanceID(handle, matrix);
+        }
+
         [Obsolete("Method Update has been deprecated. Use Build instead (UnityUpgradable) -> Build()", true)]
         public void Update()
         {
             Build(Vector3.zero);
         }
 
-        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::Build", HasExplicitThis = true)]
-        extern public void Build(Vector3 relativeOrigin);
-
         [Obsolete("Method Update has been deprecated. Use Build instead (UnityUpgradable) -> Build(*)", true)]
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::Update", HasExplicitThis = true)]
         extern public void Update(Vector3 relativeOrigin);
 
+        [Obsolete("This AddInstance method has been deprecated and will be removed in a future version. Please use the alternate method for adding Renderers to the acceleration structure.", false)]
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::AddInstanceDeprecated", HasExplicitThis = true)]
         extern public void AddInstance([NotNull] Renderer targetRenderer, bool[] subMeshMask = null, bool[] subMeshTransparencyFlags = null, bool enableTriangleCulling = true, bool frontTriangleCounterClockwise = false, uint mask = 0xFF, uint id = 0xFFFFFFFF);
 
-        public void AddInstance(Renderer targetRenderer, RayTracingSubMeshFlags[] subMeshFlags, bool enableTriangleCulling = true, bool frontTriangleCounterClockwise = false, uint mask = 0xFF, uint id = 0xFFFFFFFF)
-        {
-            AddInstanceSubMeshFlagsArray(targetRenderer, subMeshFlags, enableTriangleCulling, frontTriangleCounterClockwise, mask, id);
-        }
-
-        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::RemoveInstance", HasExplicitThis = true)]
-        extern public void RemoveInstance([NotNull] Renderer targetRenderer);
-
+        [Obsolete("This AddInstance method has been deprecated and will be removed in a future version. Please use the alternate method for adding procedural geometry (AABBs) to the acceleration structure.", false)]
         public void AddInstance(GraphicsBuffer aabbBuffer, uint numElements, Material material, bool isCutOff, bool enableTriangleCulling = true, bool frontTriangleCounterClockwise = false, uint mask = 0xFF, bool reuseBounds = false, uint id = 0xFFFFFFFF)
         {
-            AddInstance_Procedural(aabbBuffer, numElements, material, Matrix4x4.identity, isCutOff, enableTriangleCulling, frontTriangleCounterClockwise, mask, reuseBounds, id);
+            AddInstance_Procedural_Deprecated(aabbBuffer, numElements, material, Matrix4x4.identity, isCutOff, enableTriangleCulling, frontTriangleCounterClockwise, mask, reuseBounds, id);
         }
 
+        [Obsolete("This AddInstance method has been deprecated and will be removed in a future version. Please use the alternate method for adding procedural geometry (AABBs) to the acceleration structure.", false)]
         public void AddInstance(GraphicsBuffer aabbBuffer, uint numElements, Material material, Matrix4x4 instanceTransform, bool isCutOff, bool enableTriangleCulling = true, bool frontTriangleCounterClockwise = false, uint mask = 0xFF, bool reuseBounds = false, uint id = 0xFFFFFFFF)
         {
-            AddInstance_Procedural(aabbBuffer, numElements, material, instanceTransform, isCutOff, enableTriangleCulling, frontTriangleCounterClockwise, mask, reuseBounds, id);
+            AddInstance_Procedural_Deprecated(aabbBuffer, numElements, material, instanceTransform, isCutOff, enableTriangleCulling, frontTriangleCounterClockwise, mask, reuseBounds, id);
         }
 
+        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::Build", HasExplicitThis = true)]
+        extern public void Build(Vector3 relativeOrigin);
+
+        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::AddInstanceDeprecated", HasExplicitThis = true)]
+        extern private void AddInstance_Procedural_Deprecated([NotNull] GraphicsBuffer aabbBuffer, uint numElements, [NotNull] Material material, Matrix4x4 instanceTransform, bool isCutOff, bool enableTriangleCulling = true, bool frontTriangleCounterClockwise = false, uint mask = 0xFF, bool reuseBounds = false, uint id = 0xFFFFFFFF);
+
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::AddInstance", HasExplicitThis = true)]
-        extern private void AddInstance_Procedural([NotNull] GraphicsBuffer aabbBuffer, uint numElements, [NotNull] Material material, Matrix4x4 instanceTransform, bool isCutOff, bool enableTriangleCulling = true, bool frontTriangleCounterClockwise = false, uint mask = 0xFF, bool reuseBounds = false, uint id = 0xFFFFFFFF);
+        extern private int AddInstance_Procedural([NotNull] GraphicsBuffer aabbBuffer, uint aabbCount, bool dynamicData, Matrix4x4 matrix, [NotNull] Material material, bool opaqueMaterial, MaterialPropertyBlock properties, uint mask = 0xFF, uint id = 0xFFFFFFFF);
+
+        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::RemoveInstance", HasExplicitThis = true)]
+        extern private void RemoveInstance_Renderer([NotNull] Renderer targetRenderer);
+
+        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::RemoveInstance", HasExplicitThis = true)]
+        extern private void RemoveInstance_InstanceID(int instanceID);
 
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::UpdateInstanceTransform", HasExplicitThis = true)]
-        extern public void UpdateInstanceTransform([NotNull] Renderer renderer);
+        extern private void UpdateInstanceTransform_Renderer([NotNull] Renderer renderer);
+
+        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::UpdateInstanceTransform", HasExplicitThis = true)]
+        extern private void UpdateInstanceTransform_InstanceID(int instanceID, Matrix4x4 matrix);
 
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::UpdateInstanceMask", HasExplicitThis = true)]
         extern public void UpdateInstanceMask([NotNull] Renderer renderer, uint mask);
@@ -255,6 +291,9 @@ public void AddInstance(GraphicsBuffer aabbBuffer, uint numElements, Material ma
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::UpdateInstanceID", HasExplicitThis = true)]
         extern public void UpdateInstanceID([NotNull] Renderer renderer, uint instanceID);
 
+        [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::UpdateInstancePropertyBlock", HasExplicitThis = true)]
+        extern public void UpdateInstancePropertyBlock(int handle, MaterialPropertyBlock properties);
+
         [FreeFunction(Name = "RayTracingAccelerationStructure_Bindings::GetSize", HasExplicitThis = true)]
         extern public UInt64 GetSize();
 
diff --git a/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs b/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs
index 12fb3784cb..d3089d442a 100644
--- a/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs
+++ b/Runtime/Export/Graphics/RenderingCommandBuffer.bindings.cs
@@ -5,15 +5,16 @@
 using System;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
-using UnityEngine.Rendering;
 using UnityEngine.Experimental.Rendering;
-using UnityEngine;
-using UnityEngine.Experimental;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using UnityEngine.Profiling;
+using Unity.Profiling;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+using System.Diagnostics.Contracts;
 
 namespace UnityEngine.Rendering
 {
@@ -520,7 +521,7 @@ public void RequestAsyncReadbackIntoNativeSlice<T>(ref NativeSlice<T> output, Te
         extern private void Internal_DrawRenderer([NotNull] Renderer renderer, Material material, int submeshIndex, int shaderPass);
 
         [NativeMethod("AddDrawRendererList")]
-        extern private void Internal_DrawRendererList(RendererUtils.RendererList rendererList);
+        extern private void Internal_DrawRendererList(RendererList rendererList);
 
         private void Internal_DrawRenderer(Renderer renderer, Material material, int submeshIndex)
         {
@@ -880,6 +881,21 @@ public void ClearRenderTarget(bool clearDepth, bool clearColor, Color background
         [FreeFunction("RenderingCommandBuffer_Bindings::EndSample_CustomSampler", HasExplicitThis = true)]
         extern private void EndSample_CustomSampler([NotNull] CustomSampler sampler);
 
+        [Pure]
+        [MethodImpl(256)]
+        [Conditional("ENABLE_PROFILER")]
+        public void BeginSample(ProfilerMarker marker) { BeginSample_ProfilerMarker(marker.Handle); }
+
+        [Pure]
+        [MethodImpl(256)]
+        [Conditional("ENABLE_PROFILER")]
+        public void EndSample(ProfilerMarker marker) { EndSample_ProfilerMarker(marker.Handle); }
+
+        [FreeFunction("RenderingCommandBuffer_Bindings::BeginSample_ProfilerMarker", HasExplicitThis = true, ThrowsException = true)]
+        extern private void BeginSample_ProfilerMarker(IntPtr markerHandle);
+        [FreeFunction("RenderingCommandBuffer_Bindings::EndSample_ProfilerMarker", HasExplicitThis = true, ThrowsException = true)]
+        extern private void EndSample_ProfilerMarker(IntPtr markerHandle);
+
         [FreeFunction("RenderingCommandBuffer_Bindings::IssuePluginEventAndDataInternal", HasExplicitThis = true)]
         extern private void IssuePluginEventAndDataInternal(IntPtr callback, int eventID, IntPtr data);
 
diff --git a/Runtime/Export/Graphics/RenderingCommandBuffer.cs b/Runtime/Export/Graphics/RenderingCommandBuffer.cs
index 16b2ea9345..8ea2eb8a8e 100644
--- a/Runtime/Export/Graphics/RenderingCommandBuffer.cs
+++ b/Runtime/Export/Graphics/RenderingCommandBuffer.cs
@@ -498,7 +498,7 @@ public void DrawRenderer(Renderer renderer, Material material)
             DrawRenderer(renderer, material, 0);
         }
 
-        public void DrawRendererList(RendererUtils.RendererList rendererList)
+        public void DrawRendererList(RendererList rendererList)
         {
             Internal_DrawRendererList(rendererList);
         }
diff --git a/Runtime/Export/Graphics/RenderingCommandBuffer.deprecated.cs b/Runtime/Export/Graphics/RenderingCommandBuffer.deprecated.cs
index 9d0818c0e4..1125919734 100644
--- a/Runtime/Export/Graphics/RenderingCommandBuffer.deprecated.cs
+++ b/Runtime/Export/Graphics/RenderingCommandBuffer.deprecated.cs
@@ -28,13 +28,13 @@ public void SetComputeBufferData(ComputeBuffer buffer, Array data)
             SetBufferData(buffer, data);
         }
 
-        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData(*)", false)]
+        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData<T>(*)", false)]
         public void SetComputeBufferData<T>(ComputeBuffer buffer, List<T> data) where T : struct
         {
             SetBufferData(buffer, data);
         }
 
-        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData(*)", false)]
+        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData<T>(*)", false)]
         public void SetComputeBufferData<T>(ComputeBuffer buffer, NativeArray<T> data) where T : struct
         {
             SetBufferData(buffer, data);
@@ -46,13 +46,13 @@ public void SetComputeBufferData(ComputeBuffer buffer, Array data, int managedBu
             SetBufferData(buffer, data, managedBufferStartIndex, graphicsBufferStartIndex, count);
         }
 
-        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData(*)", false)]
+        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData<T>(*)", false)]
         public void SetComputeBufferData<T>(ComputeBuffer buffer, List<T> data, int managedBufferStartIndex, int graphicsBufferStartIndex, int count) where T : struct
         {
             SetBufferData(buffer, data, managedBufferStartIndex, graphicsBufferStartIndex, count);
         }
 
-        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData(*)", false)]
+        [Obsolete("CommandBuffer.SetComputeBufferData has been deprecated. Use SetBufferData instead (UnityUpgradable) -> SetBufferData<T>(*)", false)]
         public void SetComputeBufferData<T>(ComputeBuffer buffer, NativeArray<T> data, int nativeBufferStartIndex, int graphicsBufferStartIndex, int count) where T : struct
         {
             SetBufferData(buffer, data, nativeBufferStartIndex, graphicsBufferStartIndex, count);
diff --git a/Runtime/Export/Graphics/Texture.cs b/Runtime/Export/Graphics/Texture.cs
index 3b396cf4fb..43f4c7fc62 100644
--- a/Runtime/Export/Graphics/Texture.cs
+++ b/Runtime/Export/Graphics/Texture.cs
@@ -9,6 +9,7 @@
 using UnityEngine.Scripting;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
+using UnityEngine.Rendering;
 
 namespace UnityEngine
 {
@@ -363,6 +364,8 @@ private static void ValidateRenderTextureDesc(RenderTextureDescriptor desc)
                 throw new ArgumentException("RenderTextureDesc volumeDepth must be greater than zero.", "desc.volumeDepth");
             if (desc.msaaSamples != 1 && desc.msaaSamples != 2 && desc.msaaSamples != 4 && desc.msaaSamples != 8)
                 throw new ArgumentException("RenderTextureDesc msaaSamples must be 1, 2, 4, or 8.", "desc.msaaSamples");
+            if (desc.dimension == TextureDimension.CubeArray && desc.volumeDepth % 6 != 0)
+                throw new ArgumentException("RenderTextureDesc volumeDepth must be a multiple of 6 when dimension is CubeArray", "desc.volumeDepth");
 
 // Disable deprecation warnings on the ShadowAuto and DepthAuto formats
 #pragma warning disable 618
@@ -892,19 +895,19 @@ public bool Reinitialize(int width, int height, GraphicsFormat format, bool hasM
             return ReinitializeWithFormatImpl(width, height, format, hasMipMap);
         }
 
-        [Obsolete("Texture2D.Resize(int, int) has been deprecated because it actually reinitializes the texture. Use Texture2D.Reinitialize(int, int) instead (UnityUpgradable) -> Reinitialize(System.Int32, System.Int32)", false)]
+        [Obsolete("Texture2D.Resize(int, int) has been deprecated because it actually reinitializes the texture. Use Texture2D.Reinitialize(int, int) instead (UnityUpgradable) -> Reinitialize([*] System.Int32, [*] System.Int32)", false)]
         public bool Resize(int width, int height)
         {
             return Reinitialize(width, height);
         }
 
-        [Obsolete("Texture2D.Resize(int, int, TextureFormat, bool) has been deprecated because it actually reinitializes the texture. Use Texture2D.Reinitialize(int, int, TextureFormat, bool) instead (UnityUpgradable) -> Reinitialize(System.Int32, System.Int32, UnityEngine.TextureFormat, System.Boolean)", false)]
+        [Obsolete("Texture2D.Resize(int, int, TextureFormat, bool) has been deprecated because it actually reinitializes the texture. Use Texture2D.Reinitialize(int, int, TextureFormat, bool) instead (UnityUpgradable) -> Reinitialize([*] System.Int32, [*] System.Int32, UnityEngine.TextureFormat, [*] System.Boolean)", false)]
         public bool Resize(int width, int height, TextureFormat format, bool hasMipMap)
         {
             return Reinitialize(width, height, format, hasMipMap);
         }
 
-        [Obsolete("Texture2D.Resize(int, int, GraphicsFormat, bool) has been deprecated because it actually reinitializes the texture. Use Texture2D.Reinitialize(int, int, GraphicsFormat, bool) instead (UnityUpgradable) -> Reinitialize(System.Int32, System.Int32, UnityEngine.Experimental.Rendering.GraphicsFormat, System.Boolean)", false)]
+        [Obsolete("Texture2D.Resize(int, int, GraphicsFormat, bool) has been deprecated because it actually reinitializes the texture. Use Texture2D.Reinitialize(int, int, GraphicsFormat, bool) instead (UnityUpgradable) -> Reinitialize([*] System.Int32, [*] System.Int32, UnityEngine.Experimental.Rendering.GraphicsFormat, [*] System.Boolean)", false)]
         public bool Resize(int width, int height, GraphicsFormat format, bool hasMipMap)
         {
             return Reinitialize(width, height, format, hasMipMap);
@@ -1605,6 +1608,30 @@ private static void ValidateIsNotCrunched(TextureCreationFlags flags)
 
     public sealed partial class SparseTexture : Texture
     {
+        internal bool ValidateFormat(TextureFormat format, int width, int height)
+        {
+            bool isValid = ValidateFormat(format);
+            if (isValid)
+            {
+                bool requireSquarePOT = (TextureFormat.PVRTC_RGB2 <= format && format <= TextureFormat.PVRTC_RGBA4);
+                if (requireSquarePOT && !(width == height && Mathf.IsPowerOfTwo(width)))
+                    throw new UnityException(String.Format("'{0}' demands texture to be square and have power-of-two dimensions", format.ToString()));
+            }
+            return isValid;
+        }
+
+        internal bool ValidateFormat(GraphicsFormat format, int width, int height)
+        {
+            bool isValid = ValidateFormat(format, FormatUsage.Sparse);
+            if (isValid)
+            {
+                bool requireSquarePOT = GraphicsFormatUtility.IsPVRTCFormat(format);
+                if (requireSquarePOT && !(width == height && Mathf.IsPowerOfTwo(width)))
+                    throw new UnityException(String.Format("'{0}' demands texture to be square and have power-of-two dimensions", format.ToString()));
+            }
+            return isValid;
+        }
+
         internal bool ValidateSize(int width, int height, GraphicsFormat format)
         {
             if (GraphicsFormatUtility.GetBlockSize(format) * (width / GraphicsFormatUtility.GetBlockWidth(format)) * (height / GraphicsFormatUtility.GetBlockHeight(format)) < 65536)
@@ -1630,7 +1657,7 @@ public SparseTexture(int width, int height, DefaultFormat format, int mipCount)
         [uei.ExcludeFromDocs]
         public SparseTexture(int width, int height, GraphicsFormat format, int mipCount)
         {
-            if (!ValidateFormat(format, FormatUsage.Sparse))
+            if (!ValidateFormat(format, width, height))
                 return;
 
             if (!ValidateSize(width, height, format))
@@ -1647,12 +1674,29 @@ public SparseTexture(int width, int height, TextureFormat textureFormat, int mip
 
         public SparseTexture(int width, int height, TextureFormat textureFormat, int mipCount, [uei.DefaultValue("false")] bool linear)
         {
-            if (!ValidateFormat(textureFormat))
+            if (!ValidateFormat(textureFormat, width, height))
                 return;
 
             ValidateIsNotCrunched(textureFormat);
 
             GraphicsFormat format = GraphicsFormatUtility.GetGraphicsFormat(textureFormat, !linear);
+            if (!SystemInfo.IsFormatSupported(format, FormatUsage.Sparse))
+            {
+                // Special case: SystemInfo.SupportsTextureFormat(textureFormat) tells us whether we
+                // can use the format for a more "regular" texture type, but not necessarily whether
+                // we can use that same format for a SparseTexture. This is because the function
+                // checks the Sample FormatUsage, hence the extra FormatUsage.Sparse check here
+                // to prevent various crashes, errors, ...
+                Debug.LogError($"Creation of a SparseTexture with '{textureFormat}' is not supported on this platform.");
+                // Note about the usage of LogError above (versus an exception): according to
+                // https://confluence.unity3d.com/pages/viewpage.action?spaceKey=DEV&title=Error+Handling
+                // : exceptions should only be thrown if the user invokes a method with bad data (example: null)
+                // or when the program is not in a valid state anymore. (example: disk failure/disconnected)
+                // Additionally, according to the scripting team: throwing an exception for an unsupported
+                // format sounds wrong in general.
+                return;
+            }
+
             if (!ValidateSize(width, height, format))
                 return;
 
diff --git a/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs b/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs
index 7c1e5946c4..1c50764c98 100644
--- a/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs
+++ b/Runtime/Export/Jobs/AtomicSafetyHandle.bindings.cs
@@ -92,6 +92,11 @@ public struct AtomicSafetyHandle
         [NativeMethod(IsThreadSafe = true, IsFreeFunction = true)]
         public static extern bool GetAllowReadOrWriteAccess(AtomicSafetyHandle handle);
 
+        [NativeMethod(IsThreadSafe = true, IsFreeFunction = true)]
+        public static extern void SetNestedContainer(AtomicSafetyHandle handle, bool isNestedContainer);
+
+        [NativeMethod(IsThreadSafe = true, IsFreeFunction = true)]
+        public static extern bool GetNestedContainer(AtomicSafetyHandle handle);
 
         // Performs CheckWriteAndThrow and then bumps the secondary version.
         // This allows for example a NativeArray that becomes invalid if the Length of a List
diff --git a/Runtime/Export/Math/Color.cs b/Runtime/Export/Math/Color.cs
index 7adae1c524..e8dba39513 100644
--- a/Runtime/Export/Math/Color.cs
+++ b/Runtime/Export/Math/Color.cs
@@ -45,17 +45,20 @@ public Color(float r, float g, float b)
         }
 
         /// *listonly*
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
         // Returns a nicely formatted string of this color.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Math/Color32.cs b/Runtime/Export/Math/Color32.cs
index 03d350b657..0156db734d 100644
--- a/Runtime/Export/Math/Color32.cs
+++ b/Runtime/Export/Math/Color32.cs
@@ -114,16 +114,19 @@ internal bool InternalEquals(Color32 other)
             return rgba == other.rgba;
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (formatProvider == null)
diff --git a/Runtime/Export/Math/Gradient.bindings.cs b/Runtime/Export/Math/Gradient.bindings.cs
index fab383ebcb..60c98163af 100644
--- a/Runtime/Export/Math/Gradient.bindings.cs
+++ b/Runtime/Export/Math/Gradient.bindings.cs
@@ -48,8 +48,9 @@ public GradientAlphaKey(float alpha, float time)
 
     public enum GradientMode
     {
-        Blend = 0,  // Keys will blend smoothly when the gradient is evaluated. (Default)
-        Fixed = 1   // An exact key color will be returned when the gradient is evaluated.
+        Blend = 0,              // Keys will blend smoothly when the gradient is evaluated. (Default)
+        Fixed = 1,              // An exact key color will be returned when the gradient is evaluated.
+        PerceptualBlend = 2     // Keys will blend smoothly when the gradient is evaluated, using Oklab blending (https://bottosson.github.io/posts/oklab/)
     }
 
     // Gradient used for animating colors
@@ -98,6 +99,7 @@ extern public GradientAlphaKey[] alphaKeys
 
 
         extern public GradientMode mode { get; set; }
+        public extern ColorSpace colorSpace { get; set; }
 
         extern internal Color constantColor { get; set; }
 
diff --git a/Runtime/Export/Math/Math.bindings.cs b/Runtime/Export/Math/Math.bindings.cs
index 9afa6aebe9..fcc0af31db 100644
--- a/Runtime/Export/Math/Math.bindings.cs
+++ b/Runtime/Export/Math/Math.bindings.cs
@@ -127,5 +127,6 @@ public partial struct Mathf
         [FreeFunction(IsThreadSafe = true)] extern public static float HalfToFloat(ushort val);
 
         [FreeFunction("PerlinNoise::NoiseNormalized", IsThreadSafe = true)] extern public static float PerlinNoise(float x, float y);
+        [FreeFunction("PerlinNoise::NoiseNormalized", IsThreadSafe = true)] extern public static float PerlinNoise1D(float x);
     }
 }
diff --git a/Runtime/Export/Math/Mathf.cs b/Runtime/Export/Math/Mathf.cs
index ef74020ee0..4882011a38 100644
--- a/Runtime/Export/Math/Mathf.cs
+++ b/Runtime/Export/Math/Mathf.cs
@@ -50,7 +50,7 @@ public partial struct Mathf
         public static float Sqrt(float f) { return (float)Math.Sqrt(f); }
 
         // Returns the absolute value of /f/.
-        public static float Abs(float f) { return (float)Math.Abs(f); }
+        public static float Abs(float f) { return Math.Abs(f); }
 
         // Returns the absolute value of /value/.
         public static int Abs(int value) { return Math.Abs(value); }
diff --git a/Runtime/Export/Math/Matrix4x4.cs b/Runtime/Export/Math/Matrix4x4.cs
index 593fe83d66..362d262a8b 100644
--- a/Runtime/Export/Math/Matrix4x4.cs
+++ b/Runtime/Export/Math/Matrix4x4.cs
@@ -412,16 +412,19 @@ public static Matrix4x4 Rotate(Quaternion q)
         // Returns the identity matrix (RO).
         public static Matrix4x4 identity    { [MethodImpl(MethodImplOptionsEx.AggressiveInlining)] get { return identityMatrix; } }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Math/Quaternion.cs b/Runtime/Export/Math/Quaternion.cs
index 9c72cb44d8..b322606fd9 100644
--- a/Runtime/Export/Math/Quaternion.cs
+++ b/Runtime/Export/Math/Quaternion.cs
@@ -265,16 +265,19 @@ public bool Equals(Quaternion other)
             return x.Equals(other.x) && y.Equals(other.y) && z.Equals(other.z) && w.Equals(other.w);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Math/Vector2.cs b/Runtime/Export/Math/Vector2.cs
index 425fd3a801..2b60abcd5e 100644
--- a/Runtime/Export/Math/Vector2.cs
+++ b/Runtime/Export/Math/Vector2.cs
@@ -136,17 +136,20 @@ public Vector2 normalized
         }
 
         /// *listonly*
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
         // Returns a nicely formatted string for this vector.
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Math/Vector2Int.cs b/Runtime/Export/Math/Vector2Int.cs
index 40a581f147..852e1c6a3e 100644
--- a/Runtime/Export/Math/Vector2Int.cs
+++ b/Runtime/Export/Math/Vector2Int.cs
@@ -239,16 +239,19 @@ public override int GetHashCode()
         }
 
         /// *listonly*
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (formatProvider == null)
diff --git a/Runtime/Export/Math/Vector3.cs b/Runtime/Export/Math/Vector3.cs
index 1fc49f8fd2..8c07e87e1d 100644
--- a/Runtime/Export/Math/Vector3.cs
+++ b/Runtime/Export/Math/Vector3.cs
@@ -478,16 +478,19 @@ public static Vector3 Max(Vector3 lhs, Vector3 rhs)
             return !(lhs == rhs);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/Math/Vector3Int.cs b/Runtime/Export/Math/Vector3Int.cs
index 72c4b2c5fc..aa79d9fc6a 100644
--- a/Runtime/Export/Math/Vector3Int.cs
+++ b/Runtime/Export/Math/Vector3Int.cs
@@ -235,16 +235,19 @@ public override int GetHashCode()
             return x.GetHashCode() ^ (yHash << 4) ^ (yHash >> 28) ^ (zHash >> 4) ^ (zHash << 28);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (formatProvider == null)
diff --git a/Runtime/Export/Math/Vector4.cs b/Runtime/Export/Math/Vector4.cs
index 23d4c40c16..b9c9d2dea8 100644
--- a/Runtime/Export/Math/Vector4.cs
+++ b/Runtime/Export/Math/Vector4.cs
@@ -325,16 +325,19 @@ public static implicit operator Vector2(Vector4 v)
             return new Vector2(v.x, v.y);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public override string ToString()
         {
             return ToString(null, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format)
         {
             return ToString(format, null);
         }
 
+        [MethodImpl(MethodImplOptionsEx.AggressiveInlining)]
         public string ToString(string format, IFormatProvider formatProvider)
         {
             if (string.IsNullOrEmpty(format))
diff --git a/Runtime/Export/NativeArray/NativeArray.cs b/Runtime/Export/NativeArray/NativeArray.cs
index 0967cd843f..e6b2528759 100644
--- a/Runtime/Export/NativeArray/NativeArray.cs
+++ b/Runtime/Export/NativeArray/NativeArray.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
 using Unity.Burst;
 using Unity.Jobs;
 using Unity.Collections.LowLevel.Unsafe;
@@ -39,10 +40,9 @@ public unsafe struct NativeArray<T> : IDisposable, IEnumerable<T>, IEquatable<Na
         [NativeSetClassTypeToNullOnSchedule]
         internal DisposeSentinel          m_DisposeSentinel;
 
-        // TODO: Once Burst supports internal/external functions in static initializers, this can become
-        //   static readonly int s_staticSafetyId = AtomicSafetyHandle.NewStaticSafetyId<NativeArray<T>>();
-        // and InitStaticSafetyId() can be replaced with a call to AtomicSafetyHandle.SetStaticSafetyId();
+        // TODO: Use SharedStatic for burst compatible static id once we have typehash intrinsic for unity in burst 1.6.5 and 1.7.0
         static int                        s_staticSafetyId;
+
         [BurstDiscard]
         static void InitStaticSafetyId(ref AtomicSafetyHandle handle)
         {
@@ -78,23 +78,29 @@ public NativeArray(NativeArray<T> array, Allocator allocator)
         }
 
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
-        static void CheckAllocateArguments(int length, Allocator allocator, long totalSize)
+        static void CheckAllocateArguments(int length, Allocator allocator)
         {
             // Native allocation is only valid for Temp, Job and Persistent.
             if (allocator <= Allocator.None)
                 throw new ArgumentException("Allocator must be Temp, TempJob or Persistent", nameof(allocator));
+
+            // NativeArray constructor does not support custom allocator
+            if (allocator >= Allocator.FirstUserIndex)
+                throw new ArgumentException("Use CollectionHelper.CreateNativeArray for custom allocator", nameof(allocator));
+
             if (length < 0)
                 throw new ArgumentOutOfRangeException(nameof(length), "Length must be >= 0");
-
-            IsUnmanagedAndThrow();
         }
 
         static void Allocate(int length, Allocator allocator, out NativeArray<T> array)
         {
             long totalSize = UnsafeUtility.SizeOf<T>() * (long)length;
-            CheckAllocateArguments(length, allocator, totalSize);
+            CheckAllocateArguments(length, allocator);
 
             array = default(NativeArray<T>);
+
+            IsUnmanagedAndThrow();
+
             array.m_Buffer = UnsafeUtility.Malloc(totalSize, UnsafeUtility.AlignOf<T>(), allocator);
             array.m_Length = length;
             array.m_AllocatorLabel = allocator;
@@ -103,6 +109,7 @@ static void Allocate(int length, Allocator allocator, out NativeArray<T> array)
             array.m_MaxIndex = length - 1;
             DisposeSentinel.Create(out array.m_Safety, out array.m_DisposeSentinel, 1, allocator);
             InitStaticSafetyId(ref array.m_Safety);
+            InitNestedNativeContainer(array.m_Safety);
         }
 
         public int Length
@@ -115,13 +122,23 @@ public int Length
             }
         }
 
+        internal static void InitNestedNativeContainer(AtomicSafetyHandle handle)
+        {
+            if (UnsafeUtility.IsNativeContainerType<T>())
+            {
+                AtomicSafetyHandle.SetNestedContainer(handle, true);
+            }
+        }
+
+        // NativeArray is not constrained to unmanaged so it must be checked
+        [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
         [BurstDiscard]
         internal static void IsUnmanagedAndThrow()
         {
-            if (!UnsafeUtility.IsValidNativeContainerElementType<T>())
+            if (!UnsafeUtility.IsUnmanaged<T>())
             {
                 throw new InvalidOperationException(
-                    $"{typeof(T)} used in NativeArray<{typeof(T)}> must be unmanaged (contain no managed types) and cannot itself be a native container type.");
+                    $"{typeof(T)} used in NativeArray<{typeof(T)}> must be unmanaged (contain no managed types).");
             }
         }
 
@@ -680,7 +697,7 @@ void CheckGetSubArrayArguments(int start, int length)
         public NativeArray<T> GetSubArray(int start, int length)
         {
             CheckGetSubArrayArguments(start, length);
-            var result = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>(((byte*)m_Buffer) + ((long)UnsafeUtility.SizeOf<T>()) * start, length, Allocator.Invalid);
+            var result = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<T>(((byte*)m_Buffer) + ((long)UnsafeUtility.SizeOf<T>()) * start, length, Allocator.None);
 
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref result, m_Safety);
             result.m_DisposeSentinel = null;
@@ -885,9 +902,8 @@ public static void SetAtomicSafetyHandle<T>(ref NativeArray<T> array, AtomicSafe
             array.m_Safety = safety;
         }
 
-
         [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
-        private static void CheckConvertArguments<T>(int length, Allocator allocator) where T : struct
+        private static void CheckConvertArguments<T>(int length) where T : struct
         {
             if (length < 0)
                 throw new ArgumentOutOfRangeException(nameof(length), "Length must be >= 0");
@@ -899,7 +915,7 @@ private static void CheckConvertArguments<T>(int length, Allocator allocator) wh
         /// The caller is still the owner of the data.
         public static unsafe NativeArray<T> ConvertExistingDataToNativeArray<T>(void* dataPointer, int length, Allocator allocator) where T : struct
         {
-            CheckConvertArguments<T>(length, allocator);
+            CheckConvertArguments<T>(length);
 
             var newArray = new NativeArray<T>
             {
diff --git a/Runtime/Export/NumericFieldDraggerUtility.cs b/Runtime/Export/NumericFieldDraggerUtility.cs
index 9bebf022b1..f2e4638fe5 100644
--- a/Runtime/Export/NumericFieldDraggerUtility.cs
+++ b/Runtime/Export/NumericFieldDraggerUtility.cs
@@ -46,9 +46,26 @@ internal static double CalculateFloatDragSensitivity(double value)
             return Math.Max(1, Math.Pow(Math.Abs(value), 0.5)) * kDragSensitivity;
         }
 
+        internal static double CalculateFloatDragSensitivity(double value, double minValue, double maxValue)
+        {
+            if (double.IsInfinity(value) || double.IsNaN(value))
+            {
+                return 0.0;
+            }
+
+            double range = Math.Abs(maxValue - minValue);
+            return range / 100.0f * kDragSensitivity;
+        }
+
         internal static long CalculateIntDragSensitivity(long value)
         {
             return (long)Math.Max(1, Math.Pow(Math.Abs((double)value), 0.5) * kDragSensitivity);
         }
+
+        internal static long CalculateIntDragSensitivity(long value, long minValue, long maxValue)
+        {
+            long range = Math.Abs(maxValue - minValue);
+            return Math.Max(1, (long)(kDragSensitivity * range / 100));
+        }
     }
 }
diff --git a/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs b/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs
index f17b7f300d..b4aed18c8a 100644
--- a/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs
+++ b/Runtime/Export/PlayerLoop/PlayerLoop.bindings.cs
@@ -78,6 +78,8 @@ public struct UpdateTextureStreamingManager {}
         [RequiredByNativeCode]
         public struct UpdatePreloading {}
         [RequiredByNativeCode]
+        public struct UpdateContentLoading{ }
+        [RequiredByNativeCode]
         public struct RendererNotifyInvisible {}
         [RequiredByNativeCode]
         public struct PlayerCleanupCachedData {}
@@ -100,6 +102,8 @@ public struct DeliverIosPlatformEvents {}
         [RequiredByNativeCode]
         public struct DispatchEventQueueEvents {}
         [RequiredByNativeCode]
+        public struct Physics2DEarlyUpdate {}
+        [RequiredByNativeCode]
         public struct PhysicsResetInterpolatedTransformPosition {}
         [RequiredByNativeCode]
         public struct SpriteAtlasManagerUpdate {}
@@ -151,6 +155,8 @@ public struct PhysicsUpdate {}
         [RequiredByNativeCode]
         public struct Physics2DUpdate {}
         [RequiredByNativeCode]
+        internal struct PhysicsClothUpdate {}
+        [RequiredByNativeCode]
         public struct CheckTexFieldInput {}
         [RequiredByNativeCode]
         public struct IMGUISendQueuedEvents {}
@@ -201,8 +207,6 @@ public struct UpdateNetworkManager {}
         [RequiredByNativeCode]
         public struct UpdateMasterServerInterface {}
         [RequiredByNativeCode]
-        public struct UNetUpdate {}
-        [RequiredByNativeCode]
         public struct EndGraphicsJobsAfterScriptUpdate {}
         [RequiredByNativeCode]
         public struct ParticleSystemBeginUpdateAll {}
diff --git a/Runtime/Export/Profiler/IgnoredByDeepProfilerAttribute.cs b/Runtime/Export/Profiler/IgnoredByDeepProfilerAttribute.cs
new file mode 100644
index 0000000000..22dde32c7b
--- /dev/null
+++ b/Runtime/Export/Profiler/IgnoredByDeepProfilerAttribute.cs
@@ -0,0 +1,16 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine;
+using UnityEngine.Scripting;
+
+namespace Unity.Profiling
+{
+    [RequiredByNativeCode]
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Struct, AllowMultiple = false)]
+    public sealed class IgnoredByDeepProfilerAttribute : Attribute
+    {
+    }
+}
diff --git a/Runtime/Export/PropertyDrawer/PropertyAttribute.cs b/Runtime/Export/PropertyDrawer/PropertyAttribute.cs
index 96f8885cb1..ebca6acaa6 100644
--- a/Runtime/Export/PropertyDrawer/PropertyAttribute.cs
+++ b/Runtime/Export/PropertyDrawer/PropertyAttribute.cs
@@ -8,6 +8,7 @@ namespace UnityEngine
 {
     // Base class to derive custom property attributes from. Use this to create custom attributes for script variables.
     [System.AttributeUsage(AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+    [UnityEngine.Scripting.UsedByNativeCode]
     public abstract class PropertyAttribute : Attribute
     {
         public int order { get; set; }
@@ -27,6 +28,7 @@ public ContextMenuItemAttribute(string name, string function)
     }
 
     [System.AttributeUsage(AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+    [UnityEngine.Scripting.UsedByNativeCode]
     public class InspectorNameAttribute : PropertyAttribute
     {
         public readonly string displayName;
diff --git a/Runtime/Export/PropertyName/PropertyName.bindings.cs b/Runtime/Export/PropertyName/PropertyName.bindings.cs
index 9eb6869f2a..a1647c9e9c 100644
--- a/Runtime/Export/PropertyName/PropertyName.bindings.cs
+++ b/Runtime/Export/PropertyName/PropertyName.bindings.cs
@@ -9,16 +9,16 @@ namespace UnityEngine
     [NativeHeader("Runtime/Utilities/PropertyName.h")]
     class PropertyNameUtils
     {
-        [FreeFunction]
+        [FreeFunction(IsThreadSafe = true)]
         public extern static PropertyName PropertyNameFromString([Unmarshalled] string name);
-        [FreeFunction]
+        [FreeFunction(IsThreadSafe = true)]
         public extern static string StringFromPropertyName(PropertyName propertyName);
         /// <summary>
         /// Returns the number of conflicts for the given id.
         /// Returns 0 if the id is unregistered or it has been mapped to only a single string.
         /// Otherwise returns the number of unique strings mapped to the given id.
         /// </summary>
-        [FreeFunction]
+        [FreeFunction(IsThreadSafe = true)]
         public extern static int ConflictCountForID(int id);
     }
 }
diff --git a/Runtime/Export/RenderPipeline/DrawingSettings.cs b/Runtime/Export/RenderPipeline/DrawingSettings.cs
index eb9571719e..0a24311bbb 100644
--- a/Runtime/Export/RenderPipeline/DrawingSettings.cs
+++ b/Runtime/Export/RenderPipeline/DrawingSettings.cs
@@ -53,9 +53,6 @@ public DrawingSettings(ShaderTagId shaderPassName, SortingSettings sortingSettin
                 }
             }
 
-            m_PerObjectData = PerObjectData.None;
-            m_Flags = DrawRendererFlags.EnableInstancing;
-
             m_UseSrpBatcher = 0;
         }
 
diff --git a/Runtime/Export/RenderPipeline/RendererList.bindings.cs b/Runtime/Export/RenderPipeline/RendererList.bindings.cs
index 5e88669d71..fb596c2e2b 100644
--- a/Runtime/Export/RenderPipeline/RendererList.bindings.cs
+++ b/Runtime/Export/RenderPipeline/RendererList.bindings.cs
@@ -7,24 +7,20 @@
 using UnityEngine.Scripting;
 using UnityEngine.Bindings;
 using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+using UnityEngine.Scripting.APIUpdating;
 
-namespace UnityEngine.Rendering.RendererUtils
+namespace UnityEngine.Rendering
 {
-    public enum RendererListStatus
-    {
-        kRendererListInvalid = -2,
-        kRendererListProcessing = -1,
-        kRendererListEmpty = 0,
-        kRendererListPopulated = 1,
-    };
-
     [NativeHeader("Runtime/Graphics/ScriptableRenderLoop/RendererList.h")]
     [StructLayout(LayoutKind.Sequential)]
+    [MovedFrom("UnityEngine.Rendering.RendererUtils")]
     public struct RendererList
     {
         internal UIntPtr context;
-        internal UInt32  index;
-        internal UInt32  frame;
+        internal UInt32 index;
+        internal UInt32 frame;
+        internal UInt32 type;
 
         extern public bool isValid { get; }
 
@@ -35,9 +31,142 @@ internal RendererList(UIntPtr ctx, UInt32 indx)
             context = ctx;
             index = indx;
             frame = 0;
+            type = 0;
+        }
+    }
+
+    [MovedFrom("UnityEngine.Rendering.RendererUtils")]
+    public enum RendererListStatus
+    {
+        kRendererListInvalid = -2,
+        kRendererListProcessing = -1,
+        kRendererListEmpty = 0,
+        kRendererListPopulated = 1,
+    };
+
+    public struct RendererListParams : IEquatable<RendererListParams>
+    {
+        public static readonly RendererListParams Invalid = new RendererListParams();
+
+        public CullingResults cullingResults;
+        public DrawingSettings drawSettings;
+        public FilteringSettings filteringSettings;
+        public ShaderTagId tagName;
+        public bool isPassTagName;
+        public NativeArray<ShaderTagId>? tagValues;
+        public NativeArray<RenderStateBlock>? stateBlocks;
+
+        public RendererListParams(CullingResults cullingResults, DrawingSettings drawSettings, FilteringSettings filteringSettings)
+        {
+            this.cullingResults = cullingResults;
+            this.drawSettings = drawSettings;
+            this.filteringSettings = filteringSettings;
+            tagName = ShaderTagId.none;
+            isPassTagName = false;
+            tagValues = null;
+            stateBlocks = null;
+        }
+
+        internal int numStateBlocks
+        {
+            get
+            {
+                if (tagValues != null)
+                    return tagValues.Value.Length;
+                return 0;
+            }
+        }
+        internal unsafe IntPtr stateBlocksPtr
+        {
+            get
+            {
+                if (stateBlocks == null) return IntPtr.Zero;
+                return (IntPtr)stateBlocks.Value.GetUnsafeReadOnlyPtr();
+            }
+        }
+        internal unsafe IntPtr tagsValuePtr
+        {
+            get
+            {
+                if (tagValues == null) return IntPtr.Zero;
+                return (IntPtr)tagValues.Value.GetUnsafeReadOnlyPtr();
+            }
+        }
+        internal void Dispose()
+        {
+            if (stateBlocks != null)
+            {
+                stateBlocks.Value.Dispose();
+                stateBlocks = null;
+            }
+            if (tagValues != null)
+            {
+                tagValues.Value.Dispose();
+                tagValues = null;
+            }
+        }
+
+        internal void Validate()
+        {
+            cullingResults.Validate();
+            if (tagValues.HasValue && stateBlocks.HasValue)
+            {
+                if (tagValues.Value.Length != stateBlocks.Value.Length)
+                    throw new ArgumentException($"Arrays {nameof(tagValues)} and {nameof(stateBlocks)} should have same length, but {nameof(tagValues)} had length {tagValues.Value.Length} while {nameof(stateBlocks)} had length {stateBlocks.Value.Length}.");
+            }
+            else if ( (tagValues.HasValue && !stateBlocks.HasValue) || (!tagValues.HasValue && stateBlocks.HasValue))
+            {
+                throw new ArgumentException($"Arrays {nameof(tagValues)} and {nameof(stateBlocks)} should have same length, but one of them is null ({nameof(tagValues)} : {tagValues.HasValue}, {nameof(stateBlocks)} : {stateBlocks.HasValue}).");
+            }
+        }
+
+        public bool Equals(RendererListParams other)
+        {
+            return cullingResults == other.cullingResults &&
+                   drawSettings == other.drawSettings &&
+                   filteringSettings == other.filteringSettings &&
+                   tagName == other.tagName &&
+                   isPassTagName == other.isPassTagName &&
+                   tagValues == other.tagValues &&
+                   stateBlocks == other.stateBlocks;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            return obj is RendererListParams && Equals((RendererListParams)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = cullingResults.GetHashCode();
+                hashCode = (hashCode * 397) ^ drawSettings.GetHashCode();
+                hashCode = (hashCode * 397) ^ filteringSettings.GetHashCode();
+                hashCode = (hashCode * 397) ^ tagName.GetHashCode();
+                hashCode = (hashCode * 397) ^ (isPassTagName ? 0 : 1);
+                hashCode = (hashCode * 397) ^ tagValues.GetHashCode();
+                hashCode = (hashCode * 397) ^ stateBlocks.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(RendererListParams left, RendererListParams right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(RendererListParams left, RendererListParams right)
+        {
+            return !left.Equals(right);
         }
     }
+}
+
 
+namespace UnityEngine.Rendering.RendererUtils
+{
     /// <summary>
     /// Renderer list creation descriptor.
     /// </summary>
@@ -68,10 +197,14 @@ public struct RendererListDesc
         /// </summary>
         public bool excludeObjectMotionVectors;
         /// <summary>
-        /// Rendering layer mask used for filtering this renderer list.
+        /// The layer mask to use for filtering this RendererList.
         /// </summary>
         public int layerMask;
         /// <summary>
+        /// The rendering layer mask to use for filtering this RendererList.
+        /// </summary>
+        public uint renderingLayerMask;
+        /// <summary>
         /// Pass index for the override material.
         /// </summary>
         public int overrideMaterialPassIndex;
@@ -96,6 +229,7 @@ public RendererListDesc(ShaderTagId passName, CullingResults cullingResult, Came
             this.cullingResult = cullingResult;
             this.camera = camera;
             this.layerMask = -1;
+            this.renderingLayerMask = uint.MaxValue;
             this.overrideMaterialPassIndex = 0;
         }
 
@@ -113,6 +247,7 @@ public RendererListDesc(ShaderTagId[] passNames, CullingResults cullingResult, C
             this.cullingResult = cullingResult;
             this.camera = camera;
             this.layerMask = -1;
+            this.renderingLayerMask = uint.MaxValue;
             this.overrideMaterialPassIndex = 0;
         }
 
@@ -127,51 +262,16 @@ public bool IsValid()
 
             return true;
         }
-    }
 
-    internal struct RendererListParams
-    {
         static readonly ShaderTagId s_EmptyName = new ShaderTagId("");
-
-        /// <summary>
-        /// Default null renderer list.
-        /// </summary>
-        public static readonly RendererListParams nullRendererList = new RendererListParams();
-
-        /// <summary>
-        /// True if the renderer list is valid.
-        /// </summary>
-        public bool isValid { get; private set; }
-        /// <summary>
-        /// CullingResults associated with the renderer list.
-        /// </summary>
-        internal CullingResults cullingResult;
-        /// <summary>
-        /// DrawingSettings associated with the renderer list.
-        /// </summary>
-        internal DrawingSettings drawSettings;
-        /// <summary>
-        /// FilteringSettings associated with the renderer list.
-        /// </summary>
-        internal FilteringSettings filteringSettings;
-        /// <summary>
-        /// Optional RenderStateBlock associated with the renderer list.
-        /// </summary>
-        internal RenderStateBlock? stateBlock;
-
-        /// <summary>
-        /// Creates a new renderer list.
-        /// </summary>
-        /// <param name="desc">Parameters for renderer list creation.</param>
-        /// <returns>A new renderer list.</returns>
-        internal static RendererListParams Create(in RendererListDesc desc)
+        public static RendererListParams ConvertToParameters(in RendererListDesc desc)
         {
-            RendererListParams newRenderList = new RendererListParams();
-
             // At this point the RendererList is invalid and will be caught when using it.
             // It's fine because to simplify setup code you might not always have a valid desc. The important part is to catch it if used.
             if (!desc.IsValid())
-                return newRenderList;
+                return RendererListParams.Invalid;
+
+            RendererListParams rlParams = new RendererListParams();
 
             var sortingSettings = new SortingSettings(desc.camera)
             {
@@ -180,7 +280,10 @@ internal static RendererListParams Create(in RendererListDesc desc)
 
             var drawSettings = new DrawingSettings(s_EmptyName, sortingSettings)
             {
-                perObjectData = desc.rendererConfiguration
+                perObjectData = desc.rendererConfiguration,
+                //enableDynamicBatching
+                //enableInstancing
+                //mainLightIndex
             };
 
             if (desc.passName != ShaderTagId.none)
@@ -202,18 +305,33 @@ internal static RendererListParams Create(in RendererListDesc desc)
                 drawSettings.overrideMaterialPassIndex = desc.overrideMaterialPassIndex;
             }
 
-            var filterSettings = new FilteringSettings(desc.renderQueueRange, desc.layerMask)
+            //drawSettings.fallbackMaterial
+
+            var filterSettings = new FilteringSettings(desc.renderQueueRange, desc.layerMask, desc.renderingLayerMask)
             {
-                excludeMotionVectorObjects = desc.excludeObjectMotionVectors
+                excludeMotionVectorObjects = desc.excludeObjectMotionVectors,
+               // sortingLayerRange
             };
 
-            newRenderList.isValid = true;
-            newRenderList.cullingResult = desc.cullingResult;
-            newRenderList.drawSettings = drawSettings;
-            newRenderList.filteringSettings = filterSettings;
-            newRenderList.stateBlock = desc.stateBlock;
+            rlParams.cullingResults = desc.cullingResult;
+            rlParams.drawSettings = drawSettings;
+            rlParams.filteringSettings = filterSettings;
+
+            rlParams.tagName = ShaderTagId.none;
+            rlParams.isPassTagName = false;
+
+            if (desc.stateBlock != null && desc.stateBlock.HasValue)
+            {
+                rlParams.stateBlocks = new NativeArray<RenderStateBlock>(1, Allocator.Temp) {
+                    [0] = desc.stateBlock.Value
+                };
+                rlParams.tagValues = new NativeArray<ShaderTagId>(1, Allocator.Temp) {
+                    [0] = ShaderTagId.none
+                };
+            }
 
-            return newRenderList;
+            return rlParams;
         }
     }
+
 }
diff --git a/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs b/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs
index bbec6fffa6..d75fec912c 100644
--- a/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs
+++ b/Runtime/Export/RenderPipeline/ScriptableRenderContext.bindings.cs
@@ -19,7 +19,7 @@ namespace UnityEngine.Rendering
     public partial struct ScriptableRenderContext
     {
         [FreeFunction("ScriptableRenderContext::BeginRenderPass")]
-        static extern unsafe void BeginRenderPass_Internal(IntPtr self, int width, int height, int samples, IntPtr colors, int colorCount, int depthAttachmentIndex);
+        static extern unsafe void BeginRenderPass_Internal(IntPtr self, int width, int height, int volumeDepth, int samples, IntPtr colors, int colorCount, int depthAttachmentIndex);
 
         [FreeFunction("ScriptableRenderContext::BeginSubPass")]
         static extern unsafe void BeginSubPass_Internal(IntPtr self, IntPtr colors, int colorCount, IntPtr inputs, int inputCount, bool isDepthReadOnly, bool isStencilReadOnly);
@@ -80,9 +80,18 @@ internal IntPtr Internal_GetPtr()
             return m_Ptr;
         }
 
-        extern private unsafe RendererUtils.RendererList CreateRendererList_Internal(IntPtr cullResults, ref DrawingSettings drawingSettings, ref FilteringSettings filteringSettings, ShaderTagId tagName, bool isPassTagName, IntPtr tagValues, IntPtr stateBlocks, int stateCount);
+        extern private unsafe RendererList CreateRendererList_Internal(IntPtr cullResults, ref DrawingSettings drawingSettings, ref FilteringSettings filteringSettings, ShaderTagId tagName, bool isPassTagName, IntPtr tagValues, IntPtr stateBlocks, int stateCount);
+        extern private unsafe RendererList CreateShadowRendererList_Internal(IntPtr shadowDrawinSettings);
+
+        internal enum SkyboxXRMode //keep in sync with SkyboxRendererListXRMode (ScriptableDrawRenderers.h)
+        {
+            Off,
+            Enabled,
+            LegacySinglePass
+        }
+        extern private unsafe RendererList CreateSkyboxRendererList_Internal([NotNull("NullExceptionObject")] Camera camera, int mode, Matrix4x4 proj, Matrix4x4 view, Matrix4x4 projR, Matrix4x4 viewR);
 
         extern private unsafe void PrepareRendererListsAsync_Internal(object rendererLists);
-        extern private RendererUtils.RendererListStatus QueryRendererListStatus_Internal(RendererUtils.RendererList handle);
+        extern private RendererListStatus QueryRendererListStatus_Internal(RendererList handle);
     }
 }
diff --git a/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs b/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs
index 9da7100fb8..f2008d5007 100644
--- a/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs
+++ b/Runtime/Export/RenderPipeline/ScriptableRenderContext.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
@@ -28,10 +29,16 @@ internal ScriptableRenderContext(IntPtr ptr, AtomicSafetyHandle safety)
         }
 
 
+        public unsafe void BeginRenderPass(int width, int height, int volumeDepth, int samples, NativeArray<AttachmentDescriptor> attachments, int depthAttachmentIndex = -1)
+        {
+            Validate();
+            BeginRenderPass_Internal(m_Ptr, width, height, volumeDepth, samples, (IntPtr)attachments.GetUnsafeReadOnlyPtr(), attachments.Length, depthAttachmentIndex);
+        }
+
         public unsafe void BeginRenderPass(int width, int height, int samples, NativeArray<AttachmentDescriptor> attachments, int depthAttachmentIndex = -1)
         {
             Validate();
-            BeginRenderPass_Internal(m_Ptr, width, height, samples, (IntPtr)attachments.GetUnsafeReadOnlyPtr(), attachments.Length, depthAttachmentIndex);
+            BeginRenderPass_Internal(m_Ptr, width, height, 1, samples, (IntPtr)attachments.GetUnsafeReadOnlyPtr(), attachments.Length, depthAttachmentIndex);
         }
 
         public ScopedRenderPass BeginScopedRenderPass(int width, int height, int samples, NativeArray<AttachmentDescriptor> attachments, int depthAttachmentIndex = -1)
@@ -118,13 +125,17 @@ internal void GetCameras(List<Camera> results)
             GetCameras_Internal(typeof(Camera), results);
         }
 
+        //TODO(ddebaets) temporary disable the obsoletion of the DrawX functions untill SRP2Core is done.
+        //const bool deprecateDrawXmethods = false;
+
+        //[Obsolete("DrawRenderers is obsolete and replaced with the RendererList API.", deprecateDrawXmethods)]
         public void DrawRenderers(CullingResults cullingResults, ref DrawingSettings drawingSettings, ref FilteringSettings filteringSettings)
         {
             Validate();
             cullingResults.Validate();
             DrawRenderers_Internal(cullingResults.ptr, ref drawingSettings, ref filteringSettings, ShaderTagId.none, false, IntPtr.Zero, IntPtr.Zero, 0);
         }
-
+        //[Obsolete("DrawRenderers is obsolete and replaced with the RendererList API.", deprecateDrawXmethods)]
         public unsafe void DrawRenderers(CullingResults cullingResults, ref DrawingSettings drawingSettings, ref FilteringSettings filteringSettings, ref RenderStateBlock stateBlock)
         {
             Validate();
@@ -135,7 +146,7 @@ public unsafe void DrawRenderers(CullingResults cullingResults, ref DrawingSetti
                 DrawRenderers_Internal(cullingResults.ptr, ref drawingSettings, ref filteringSettings, ShaderTagId.none, false, (IntPtr)(&renderType), (IntPtr)stateBlockPtr, 1);
             }
         }
-
+        //[Obsolete("DrawRenderers is obsolete and replaced with the RendererList API.", deprecateDrawXmethods)]
         public unsafe void DrawRenderers(CullingResults cullingResults, ref DrawingSettings drawingSettings, ref FilteringSettings filteringSettings, NativeArray<ShaderTagId> renderTypes, NativeArray<RenderStateBlock> stateBlocks)
         {
             Validate();
@@ -144,7 +155,7 @@ public unsafe void DrawRenderers(CullingResults cullingResults, ref DrawingSetti
                 throw new ArgumentException($"Arrays {nameof(renderTypes)} and {nameof(stateBlocks)} should have same length, but {nameof(renderTypes)} had length {renderTypes.Length} while {nameof(stateBlocks)} had length {stateBlocks.Length}.");
             DrawRenderers_Internal(cullingResults.ptr, ref drawingSettings, ref filteringSettings, kRenderTypeTag, false, (IntPtr)renderTypes.GetUnsafeReadOnlyPtr(), (IntPtr)stateBlocks.GetUnsafeReadOnlyPtr(), renderTypes.Length);
         }
-
+        //[Obsolete("DrawRenderers is obsolete and replaced with the RendererList API.", deprecateDrawXmethods)]
         public unsafe void DrawRenderers(CullingResults cullingResults, ref DrawingSettings drawingSettings, ref FilteringSettings filteringSettings, ShaderTagId tagName, bool isPassTagName, NativeArray<ShaderTagId> tagValues, NativeArray<RenderStateBlock> stateBlocks)
         {
             Validate();
@@ -153,7 +164,7 @@ public unsafe void DrawRenderers(CullingResults cullingResults, ref DrawingSetti
                 throw new ArgumentException($"Arrays {nameof(tagValues)} and {nameof(stateBlocks)} should have same length, but {nameof(tagValues)} had length {tagValues.Length} while {nameof(stateBlocks)} had length {stateBlocks.Length}.");
             DrawRenderers_Internal(cullingResults.ptr, ref drawingSettings, ref filteringSettings, tagName, isPassTagName, (IntPtr)tagValues.GetUnsafeReadOnlyPtr(), (IntPtr)stateBlocks.GetUnsafeReadOnlyPtr(), tagValues.Length);
         }
-
+        //[Obsolete("DrawRenderers is obsolete and replaced with the RendererList API.", deprecateDrawXmethods)]
         public unsafe void DrawShadows(ref ShadowDrawingSettings settings)
         {
             Validate();
@@ -229,7 +240,7 @@ public void StopMultiEye(Camera camera)
             Validate();
             StopMultiEye_Internal(camera);
         }
-
+        //[Obsolete("DrawRenderers is obsolete and replaced with the RendererList API.", deprecateDrawXmethods)]
         public void DrawSkybox(Camera camera)
         {
             Validate();
@@ -309,32 +320,58 @@ public override int GetHashCode()
             return !left.Equals(right);
         }
 
-        // RendererList public API
-        public unsafe RendererUtils.RendererList CreateRendererList(RendererUtils.RendererListDesc desc)
+        public unsafe RendererList CreateRendererList(RendererUtils.RendererListDesc desc)
         {
             Validate();
-            RendererUtils.RendererListParams param = RendererUtils.RendererListParams.Create(desc);
+            RendererListParams param = RendererUtils.RendererListDesc.ConvertToParameters(desc);
+            var list = CreateRendererList(ref param);
+            param.Dispose();
+            return list;
+        }
 
-            if (param.stateBlock == null)
-                return CreateRendererList_Internal(param.cullingResult.ptr, ref param.drawSettings, ref param.filteringSettings, ShaderTagId.none, false, IntPtr.Zero, IntPtr.Zero, 0);
-            else
+        public unsafe RendererList CreateRendererList(ref RendererListParams param)
+        {
+            Validate();
+            param.Validate();
+
+            var list = CreateRendererList_Internal(param.cullingResults.ptr, ref param.drawSettings, ref param.filteringSettings, param.tagName, param.isPassTagName,
+                param.tagsValuePtr, param.stateBlocksPtr, param.numStateBlocks);
+            return list;
+        }
+
+        public unsafe RendererList CreateShadowRendererList(ref ShadowDrawingSettings settings)
+        {
+            Validate();
+            settings.cullingResults.Validate();
+            fixed (ShadowDrawingSettings* settingsPtr = &settings)
             {
-                var renderType = new ShaderTagId();
-                var renderStateBlock = param.stateBlock.Value;
-                RenderStateBlock* stateBlockPtr = &renderStateBlock;
-                {
-                    return CreateRendererList_Internal(param.cullingResult.ptr, ref param.drawSettings, ref param.filteringSettings, ShaderTagId.none, false, (IntPtr)(&renderType), (IntPtr)stateBlockPtr, 1);
-                }
+                return CreateShadowRendererList_Internal((IntPtr)settingsPtr);
             }
         }
 
-        public unsafe void PrepareRendererListsAsync(List<RendererUtils.RendererList> rendererLists)
+        public unsafe RendererList CreateSkyboxRendererList(Camera camera, Matrix4x4 projectionMatrixL, Matrix4x4 viewMatrixL, Matrix4x4 projectionMatrixR, Matrix4x4 viewMatrixR)
+        {
+            Validate();
+            return CreateSkyboxRendererList_Internal(camera, (int)SkyboxXRMode.LegacySinglePass, projectionMatrixL, viewMatrixL, projectionMatrixR, viewMatrixR);
+        }
+        public RendererList CreateSkyboxRendererList(Camera camera, Matrix4x4 projectionMatrix, Matrix4x4 viewMatrix)
+        {
+            Validate();
+            return CreateSkyboxRendererList_Internal(camera, (int)SkyboxXRMode.Enabled, projectionMatrix, viewMatrix, Matrix4x4.identity, Matrix4x4.identity);
+        }
+        public RendererList CreateSkyboxRendererList(Camera camera)
+        {
+            Validate();
+            return CreateSkyboxRendererList_Internal(camera, (int)SkyboxXRMode.Off, Matrix4x4.identity, Matrix4x4.identity, Matrix4x4.identity, Matrix4x4.identity);
+        }
+
+        public unsafe void PrepareRendererListsAsync(List<RendererList> rendererLists)
         {
             Validate();
             PrepareRendererListsAsync_Internal(rendererLists);
         }
 
-        public RendererUtils.RendererListStatus QueryRendererListStatus(RendererUtils.RendererList rendererList)
+        public RendererListStatus QueryRendererListStatus(RendererList rendererList)
         {
             Validate();
             return QueryRendererListStatus_Internal(rendererList);
diff --git a/Runtime/Export/RenderPipeline/ShadowSplitData.cs b/Runtime/Export/RenderPipeline/ShadowSplitData.cs
index fb205d1f7d..4570bdbd26 100644
--- a/Runtime/Export/RenderPipeline/ShadowSplitData.cs
+++ b/Runtime/Export/RenderPipeline/ShadowSplitData.cs
@@ -21,6 +21,7 @@ unsafe public struct ShadowSplitData : IEquatable<ShadowSplitData>
         Vector4 m_CullingSphere;
         float m_ShadowCascadeBlendCullingFactor;
         private float m_CullingNearPlane;
+        Matrix4x4 m_CullingMatrix;
 
         public int cullingPlaneCount
         {
@@ -39,6 +40,18 @@ public Vector4 cullingSphere
             set { m_CullingSphere = value; }
         }
 
+        public Matrix4x4 cullingMatrix
+        {
+            get { return m_CullingMatrix; }
+            set { m_CullingMatrix = value; }
+        }
+        public float cullingNearPlane
+        {
+            get { return m_CullingNearPlane; }
+            set { m_CullingNearPlane = value; }
+        }
+
+
         public float shadowCascadeBlendCullingFactor
         {
             get { return m_ShadowCascadeBlendCullingFactor; }
diff --git a/Runtime/Export/RenderPipeline/SortingSettings.cs b/Runtime/Export/RenderPipeline/SortingSettings.cs
index 82ad1cd525..499bf4a69c 100644
--- a/Runtime/Export/RenderPipeline/SortingSettings.cs
+++ b/Runtime/Export/RenderPipeline/SortingSettings.cs
@@ -24,8 +24,6 @@ public struct SortingSettings : IEquatable<SortingSettings>
         Vector3 m_CustomAxis;
         SortingCriteria m_Criteria;
         DistanceMetric m_DistanceMetric;
-        Matrix4x4 m_PreviousVPMatrix;
-        Matrix4x4 m_NonJitteredVPMatrix;
 
         public SortingSettings(Camera camera)
         {
@@ -65,7 +63,7 @@ public DistanceMetric distanceMetric
 
         public bool Equals(SortingSettings other)
         {
-            return m_WorldToCameraMatrix.Equals(other.m_WorldToCameraMatrix) && m_CameraPosition.Equals(other.m_CameraPosition) && m_CustomAxis.Equals(other.m_CustomAxis) && m_Criteria == other.m_Criteria && m_DistanceMetric == other.m_DistanceMetric && m_PreviousVPMatrix.Equals(other.m_PreviousVPMatrix) && m_NonJitteredVPMatrix.Equals(other.m_NonJitteredVPMatrix);
+            return m_WorldToCameraMatrix.Equals(other.m_WorldToCameraMatrix) && m_CameraPosition.Equals(other.m_CameraPosition) && m_CustomAxis.Equals(other.m_CustomAxis) && m_Criteria == other.m_Criteria && m_DistanceMetric == other.m_DistanceMetric;
         }
 
         public override bool Equals(object obj)
@@ -83,8 +81,6 @@ public override int GetHashCode()
                 hashCode = (hashCode * 397) ^ m_CustomAxis.GetHashCode();
                 hashCode = (hashCode * 397) ^ (int)m_Criteria;
                 hashCode = (hashCode * 397) ^ (int)m_DistanceMetric;
-                hashCode = (hashCode * 397) ^ m_PreviousVPMatrix.GetHashCode();
-                hashCode = (hashCode * 397) ^ m_NonJitteredVPMatrix.GetHashCode();
                 return hashCode;
             }
         }
diff --git a/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs b/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs
index 012cdb65ef..2ca00ebb99 100644
--- a/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs
+++ b/Runtime/Export/RenderPipeline/SupportedRenderingFeatures.cs
@@ -66,28 +66,15 @@ public enum LightmapMixedBakeModes
         public bool editableMaterialRenderQueue { get; set; } = true;
         public bool overridesLODBias { get; set; } = false;
         public bool overridesMaximumLODLevel { get; set; } = false;
+        public bool overridesEnableLODCrossFade { get; set; } = false;
         public bool rendererProbes { get; set; } = true;
         public bool particleSystemInstancing { get; set; } = true;
         public bool autoAmbientProbeBaking { get; set; } = true;
         public bool autoDefaultReflectionProbeBaking { get; set; } = true;
-
-        // if this is overridden, please provide a message telling the user where to find it, otherwise it will be an empty string (to prevent confusion)
         public bool overridesShadowmask { get; set; } = false;
-        public string overrideShadowmaskMessage { get; set; } = "";
-
         public bool overridesLightProbeSystem { get; set; } = false;
         public string overridesLightProbeSystemWarningMessage { get; set; } = "The rendering pipeline used has an alternative method to handle light probes. Please consult the documentation for the used SRP to setup the alternative.";
 
-        public string shadowmaskMessage
-        {
-            get
-            {
-                if (!overridesShadowmask)
-                    return "The Shadowmask Mode used at run time can be set in the Quality Settings panel.";
-                return overrideShadowmaskMessage;
-            }
-        }
-
         internal static unsafe MixedLightingMode FallbackMixedLightingMode()
         {
             MixedLightingMode fallbackMode;
diff --git a/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs b/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs
index d1795178d4..f2a09f21f1 100644
--- a/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs
+++ b/Runtime/Export/Rendering/BatchRendererGroup.bindings.cs
@@ -172,8 +172,7 @@ public enum BatchCullingViewType : int
         Unknown = 0,
         Camera = 1,
         Light = 2,
-        ShadowMap = 3,
-        Picking = 4,
+        Picking = 3,
     }
 
     [StructLayout(LayoutKind.Sequential)]
@@ -234,7 +233,8 @@ public struct BatchDrawCommand
         public BatchID batchID;
         public BatchMaterialID materialID;
         public BatchMeshID meshID;
-        public uint submeshIndex;
+        public ushort submeshIndex;
+        public ushort splitVisibilityMask;
         public BatchDrawCommandFlags flags; // includes flipWinding and other dynamic flags
         public int sortingPosition; // If HasSortingPosition is set, this points to a float3 in instanceSortingPositions. If not, it will be directly casted into float and used as the distance.
     }
@@ -319,6 +319,20 @@ public struct MetadataValue
         public uint Value;
     }
 
+    [StructLayout(LayoutKind.Sequential)]
+    [NativeHeader("Runtime/Camera/BatchRendererGroup.h")]
+    [UsedByNativeCode]
+    unsafe public struct CullingSplit
+    {
+        public Vector3 sphereCenter;
+        public float sphereRadius;
+        public int cullingPlaneOffset;
+        public int cullingPlaneCount;
+        public float cascadeBlendCullingFactor;
+        public float nearPlane;
+        public Matrix4x4 cullingMatrix;
+    }
+
     [StructLayout(LayoutKind.Sequential)]
     [NativeHeader("Runtime/Camera/BatchRendererGroup.h")]
     [UsedByNativeCode]
@@ -326,32 +340,38 @@ unsafe public struct BatchCullingContext
     {
         internal BatchCullingContext(
             NativeArray<Plane> inCullingPlanes,
+            NativeArray<CullingSplit> inCullingSplits,
             LODParameters inLodParameters,
-            Matrix4x4 inCullingMatrix,
-            float inNearPlane,
+            Matrix4x4 inLocalToWorldMatrix,
             BatchCullingViewType inViewType,
             ulong inViewID,
             uint inCullingLayerMask,
-            ulong inSceneCullingMask)
+            ulong inSceneCullingMask,
+            int inReceiverPlaneOffset,
+            int inReceiverPlaneCount)
         {
             cullingPlanes = inCullingPlanes;
+            cullingSplits = inCullingSplits;
             lodParameters = inLodParameters;
-            cullingMatrix = inCullingMatrix;
-            nearPlane = inNearPlane;
+            localToWorldMatrix = inLocalToWorldMatrix;
             viewType = inViewType;
             viewID = new BatchPackedCullingViewID { handle = inViewID };
             cullingLayerMask = inCullingLayerMask;
             sceneCullingMask = inSceneCullingMask;
+            receiverPlaneOffset = inReceiverPlaneOffset;
+            receiverPlaneCount = inReceiverPlaneCount;
         }
 
         readonly public NativeArray<Plane> cullingPlanes;
+        readonly public NativeArray<CullingSplit> cullingSplits;
         readonly public LODParameters lodParameters;
-        readonly public Matrix4x4 cullingMatrix;
-        readonly public float nearPlane;
+        readonly public Matrix4x4 localToWorldMatrix;
         readonly public BatchCullingViewType viewType;
         readonly public BatchPackedCullingViewID viewID;
         readonly public uint cullingLayerMask;
         readonly public ulong sceneCullingMask;
+        readonly public int receiverPlaneOffset;
+        readonly public int receiverPlaneCount;
     }
 
     [StructLayout(LayoutKind.Sequential)]
@@ -361,17 +381,19 @@ public struct BatchCullingOutput
         public NativeArray<BatchCullingOutputDrawCommands> drawCommands;
     }
 
-
     [StructLayout(LayoutKind.Sequential)]
     [NativeHeader("Runtime/Camera/BatchRendererGroup.h")]
     [UsedByNativeCode]
     unsafe struct BatchRendererCullingOutput
     {
         public JobHandle cullingJobsFence;
-        public Matrix4x4 cullingMatrix;
+        public Matrix4x4 localToWorldMatrix;
         public Plane* cullingPlanes;
-        public int cullingPlanesCount;
-        public float nearPlane;
+        public int cullingPlaneCount;
+        public int receiverPlaneOffset;
+        public int receiverPlaneCount;
+        public CullingSplit* cullingSplits;
+        public int cullingSplitCount;
         public BatchCullingViewType viewType;
         public ulong viewID;
         public uint  cullingLayerMask;
@@ -388,6 +410,9 @@ public struct ThreadedBatchContext
         [FreeFunction("BatchRendererGroup::AddDrawCommandBatch_Threaded", IsThreadSafe = true)]
         private extern static BatchID AddDrawCommandBatch(IntPtr brg, IntPtr values, int count, GraphicsBufferHandle buffer);
 
+        [FreeFunction("BatchRendererGroup::SetDrawCommandBatchBuffer_Threaded", IsThreadSafe = true)]
+        private extern static void SetDrawCommandBatchBuffer(IntPtr brg, BatchID batchID, GraphicsBufferHandle buffer);
+
         [FreeFunction("BatchRendererGroup::RemoveDrawCommandBatch_Threaded", IsThreadSafe = true)]
         private extern static void RemoveDrawCommandBatch(IntPtr brg, BatchID batchID);
 
@@ -397,6 +422,11 @@ unsafe public BatchID AddBatch(NativeArray<MetadataValue> batchMetadata, Graphic
             return AddDrawCommandBatch(batchRendererGroup, (IntPtr)batchMetadata.GetUnsafeReadOnlyPtr(), batchMetadata.Length, buffer);
         }
 
+        public void SetBatchBuffer(BatchID batchID, GraphicsBufferHandle buffer)
+        {
+            SetDrawCommandBatchBuffer(batchRendererGroup, batchID, buffer);
+        }
+
         public void RemoveBatch(BatchID batchID)
         {
             RemoveDrawCommandBatch(batchRendererGroup, batchID);
@@ -440,6 +470,9 @@ unsafe public BatchID AddBatch(NativeArray<MetadataValue> batchMetadata, Graphic
         private extern void RemoveDrawCommandBatch(BatchID batchID);
         public void RemoveBatch(BatchID batchID) { RemoveDrawCommandBatch(batchID); }
 
+        private extern void SetDrawCommandBatchBuffer(BatchID batchID, GraphicsBufferHandle buffer);
+        public void SetBatchBuffer(BatchID batchID, GraphicsBufferHandle buffer) { SetDrawCommandBatchBuffer(batchID, buffer); }
+
         public extern BatchMaterialID RegisterMaterial(Material material);
         public extern void UnregisterMaterial(BatchMaterialID material);
         public extern Material GetRegisteredMaterial(BatchMaterialID material);
@@ -451,6 +484,8 @@ unsafe public BatchID AddBatch(NativeArray<MetadataValue> batchMetadata, Graphic
         public extern void SetGlobalBounds(Bounds bounds);
 
         public extern void SetPickingMaterial(Material material);
+        public extern void SetErrorMaterial(Material material);
+        public extern void SetLoadingMaterial(Material material);
 
         static extern unsafe IntPtr Create(BatchRendererGroup group, void* userContext);
         static extern void Destroy(IntPtr groupHandle);
@@ -458,11 +493,13 @@ unsafe public BatchID AddBatch(NativeArray<MetadataValue> batchMetadata, Graphic
         [RequiredByNativeCode]
         unsafe static void InvokeOnPerformCulling(BatchRendererGroup group, ref BatchRendererCullingOutput context, ref LODParameters lodParameters, IntPtr userContext)
         {
-            NativeArray<Plane> cullingPlanes = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<Plane>(context.cullingPlanes, context.cullingPlanesCount, Allocator.Invalid);
+            NativeArray<Plane> cullingPlanes = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<Plane>(context.cullingPlanes, context.cullingPlaneCount, Allocator.Invalid);
+            NativeArray<CullingSplit> cullingSplits = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<CullingSplit>(context.cullingSplits, context.cullingSplitCount, Allocator.Invalid);
             NativeArray<BatchCullingOutputDrawCommands> drawCommands = NativeArrayUnsafeUtility.ConvertExistingDataToNativeArray<BatchCullingOutputDrawCommands>(
                 context.drawCommands, 1, Allocator.Invalid);
 
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref cullingPlanes, AtomicSafetyHandle.Create());
+            NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref cullingSplits, AtomicSafetyHandle.Create());
             NativeArrayUnsafeUtility.SetAtomicSafetyHandle(ref drawCommands, AtomicSafetyHandle.Create());
 
             try
@@ -474,13 +511,15 @@ unsafe static void InvokeOnPerformCulling(BatchRendererGroup group, ref BatchRen
                 context.cullingJobsFence = group.m_PerformCulling(
                     group, new BatchCullingContext(
                         cullingPlanes,
+                        cullingSplits,
                         lodParameters,
-                        context.cullingMatrix,
-                        context.nearPlane,
+                        context.localToWorldMatrix,
                         context.viewType,
                         context.viewID,
                         context.cullingLayerMask,
-                        context.sceneCullingMask
+                        context.sceneCullingMask,
+                        context.receiverPlaneOffset,
+                        context.receiverPlaneCount
                     ),
                     cullingOutput,
                     userContext
@@ -492,6 +531,7 @@ unsafe static void InvokeOnPerformCulling(BatchRendererGroup group, ref BatchRen
 
                 //@TODO: Check that the no jobs using the buffers have been scheduled that are not returned here...
                 AtomicSafetyHandle.Release(NativeArrayUnsafeUtility.GetAtomicSafetyHandle(cullingPlanes));
+                AtomicSafetyHandle.Release(NativeArrayUnsafeUtility.GetAtomicSafetyHandle(cullingSplits));
                 AtomicSafetyHandle.Release(NativeArrayUnsafeUtility.GetAtomicSafetyHandle(drawCommands));
             }
         }
diff --git a/Runtime/Export/SceneManager/SceneManager.bindings.cs b/Runtime/Export/SceneManager/SceneManager.bindings.cs
index 02dfce55fb..45c30456f3 100644
--- a/Runtime/Export/SceneManager/SceneManager.bindings.cs
+++ b/Runtime/Export/SceneManager/SceneManager.bindings.cs
@@ -57,6 +57,14 @@ public static extern int sceneCount
             get;
         }
 
+        public extern static int loadedSceneCount
+        {
+            [NativeHeader("Runtime/SceneManager/SceneManager.h")]
+            [StaticAccessor("GetSceneManager()", StaticAccessorType.Dot)]
+            [NativeMethod("GetLoadedSceneCount")]
+            get;
+        }
+
         public static int sceneCountInBuildSettings
         {
             get { return SceneManagerAPI.ActiveAPI.GetNumScenesInBuildSettings(); }
diff --git a/Runtime/Export/Scripting/ClassLibraryInitializer.cs b/Runtime/Export/Scripting/ClassLibraryInitializer.cs
index 02ea3aff0f..d1b932c6cb 100644
--- a/Runtime/Export/Scripting/ClassLibraryInitializer.cs
+++ b/Runtime/Export/Scripting/ClassLibraryInitializer.cs
@@ -4,7 +4,13 @@
 
 using Microsoft.Win32.SafeHandles;
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using UnityEngine.Bindings;
 using UnityEngine.Scripting;
 
 namespace UnityEngine
@@ -23,9 +29,139 @@ static void InitStdErrWithHandle(IntPtr fileHandle)
             var sfh = new SafeFileHandle(fileHandle, false);
             if (!sfh.IsInvalid)
             {
-                var writer = new StreamWriter(new FileStream(sfh, FileAccess.Write)){ AutoFlush = true };
+                var writer = new StreamWriter(new FileStream(sfh, FileAccess.Write)) { AutoFlush = true };
                 Console.SetError(writer);
             }
         }
+
+        [RequiredByNativeCode]
+        static void InitAssemblyRedirections()
+        {
+            AppDomain.CurrentDomain.AssemblyResolve += (object _, ResolveEventArgs args) =>
+            {
+                var sourceAsmName = new AssemblyName(args.Name);
+                try
+                {
+                    var loadedAssembly = AppDomain.CurrentDomain.Load(sourceAsmName.Name);
+                    return loadedAssembly;
+                }
+                catch
+                {
+                    // Default if we fail to load for any reason
+                    return null;
+                }
+            };
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [NativeHeader("Runtime/Mono/AssemblyFullName.h")]
+    [RequiredByNativeCode(GenerateProxy = true)]
+    struct AssemblyVersion
+    {
+        public ushort major;
+        public ushort minor;
+        public ushort build;
+        public ushort revision;
+
+        public AssemblyVersion(ushort major, ushort minor, ushort build, ushort revision)
+        {
+            this.major = major;
+            this.minor = minor;
+            this.build = build;
+            this.revision = revision;
+        }
+
+        public static bool operator ==(AssemblyVersion lhs, AssemblyVersion rhs)
+        {
+            return lhs.major == rhs.major
+                && lhs.minor == rhs.minor
+                && lhs.build == rhs.build
+                && lhs.revision == rhs.revision;
+        }
+
+        public static bool operator !=(AssemblyVersion lhs, AssemblyVersion rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        public static bool operator <(AssemblyVersion lhs, AssemblyVersion rhs)
+        {
+            if (lhs.major != rhs.major)
+                return lhs.major < rhs.major;
+            if (lhs.minor != rhs.minor)
+                return lhs.minor < rhs.minor;
+            if (lhs.build != rhs.build)
+                return lhs.build < rhs.build;
+            if (lhs.revision != rhs.revision)
+                return lhs.revision < rhs.revision;
+            return false;
+        }
+
+        public static bool operator >(AssemblyVersion lhs, AssemblyVersion rhs)
+        {
+            if (lhs.major != rhs.major)
+                return lhs.major > rhs.major;
+            if (lhs.minor != rhs.minor)
+                return lhs.minor > rhs.minor;
+            if (lhs.build != rhs.build)
+                return lhs.build > rhs.build;
+            if (lhs.revision != rhs.revision)
+                return lhs.revision > rhs.revision;
+            return false;
+        }
+
+        public override string ToString()
+        {
+            return $"{major}.{minor}.{build}.{revision}";
+        }
+
+        public override bool Equals(object other)
+        {
+            return other is AssemblyVersion otherVersion
+                && major == otherVersion.major
+                && minor == otherVersion.minor
+                && build == otherVersion.build
+                && revision == otherVersion.revision;
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(major, minor, build, revision);
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [NativeHeader("Runtime/Mono/AssemblyFullName.h")]
+    [RequiredByNativeCode(GenerateProxy = true)]
+    struct AssemblyFullName
+    {
+        [NativeName("name")]
+        public string Name;
+        [NativeName("version")]
+        public AssemblyVersion Version;
+        [NativeName("publicKeyToken")]
+        public string PublicKeyToken;
+        [NativeName("culture")]
+        public string Culture;
+
+        public override bool Equals(object other)
+        {
+            return other is AssemblyFullName otherVersion
+                && Name == otherVersion.Name
+                && Version == otherVersion.Version
+                && PublicKeyToken == otherVersion.PublicKeyToken
+                && Culture == otherVersion.Culture;
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(Name, Version, PublicKeyToken, Culture);
+        }
+
+        public override string ToString()
+        {
+            return $"{Name}, Version={Version}, Culture={(string.IsNullOrEmpty(Culture) ? "neutral" : Culture)}, PublicKeyToken={PublicKeyToken}";
+        }
     }
 }
diff --git a/Runtime/Export/Scripting/EnumDataUtility.cs b/Runtime/Export/Scripting/EnumDataUtility.cs
index ddb7bb66c6..00c06e2836 100644
--- a/Runtime/Export/Scripting/EnumDataUtility.cs
+++ b/Runtime/Export/Scripting/EnumDataUtility.cs
@@ -14,6 +14,7 @@ internal struct EnumData
         public Enum[] values;
         public int[] flagValues;
         public string[] displayNames;
+        public string[] names;
         public string[] tooltip;
         public bool flags;
         public Type underlyingType;
@@ -63,6 +64,7 @@ internal static EnumData GetCachedEnumData(Type enumType, bool excludeObsolete =
                 enumData.values = defaultenum;
                 enumData.flagValues = defaultarr;
                 enumData.displayNames = defaultstr;
+                enumData.names = defaultstr;
                 enumData.tooltip = defaultstr;
                 enumData.flags = true;
                 enumData.serializable = true;
@@ -96,6 +98,14 @@ internal static EnumData GetCachedEnumData(Type enumType, bool excludeObsolete =
                 ? enumData.values.Select(v => unchecked((int)Convert.ToUInt64(v))).ToArray()
                 : enumData.values.Select(v => unchecked((int)Convert.ToInt64(v))).ToArray();
 
+            // We use the actual names of the enums for ordering options in the UI, so we cache the values with the rest
+            // of its data to avoid doing it repeatedly.
+            enumData.names = new string[enumData.values.Length];
+            for (int i = 0; i < enumData.values.Length; ++i)
+            {
+                enumData.names[i] = enumData.values[i].ToString();
+            }
+
             // convert "everything" values to ~0 for unsigned 8- and 16-bit types
             if (enumData.underlyingType == typeof(ushort))
             {
@@ -211,6 +221,7 @@ internal static void HandleInspectorOrderAttribute(Type enumType, ref EnumData e
             Enum[] values = new Enum[size];
             int[] flagValues = new int[size];
             string[] displayNames = new string[size];
+            string[] names = new string[size];
             string[] tooltip = new string[size];
 
             for (int i = 0; i < size; i++)
@@ -219,12 +230,14 @@ internal static void HandleInspectorOrderAttribute(Type enumType, ref EnumData e
                 values[i] = enumData.values[index];
                 flagValues[i] = enumData.flagValues[index];
                 displayNames[i] = enumData.displayNames[index];
+                names[i] = enumData.names[index];
                 tooltip[i] = enumData.tooltip[index];
             }
 
             enumData.values = values;
             enumData.flagValues = flagValues;
             enumData.displayNames = displayNames;
+            enumData.names = names;
             enumData.tooltip = tooltip;
         }
 
diff --git a/Runtime/Export/Scripting/MonoBehaviour.bindings.cs b/Runtime/Export/Scripting/MonoBehaviour.bindings.cs
index 61cc3b1463..90e6384f9f 100644
--- a/Runtime/Export/Scripting/MonoBehaviour.bindings.cs
+++ b/Runtime/Export/Scripting/MonoBehaviour.bindings.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections;
+using System.Threading;
 using UnityEngine.Bindings;
 using UnityEngine.Scripting;
 using UnityEngineInternal;
@@ -24,6 +25,26 @@ public MonoBehaviour()
         }
 
 
+        private CancellationTokenSource m_CancellationTokenSource;
+        public CancellationToken CancellationToken
+        {
+            get
+            {
+                if(m_CancellationTokenSource == null)
+                {
+                    m_CancellationTokenSource = new CancellationTokenSource();
+                    OnCancellationTokenCreated();
+                }
+                return m_CancellationTokenSource.Token;
+            }
+        }
+
+        [RequiredByNativeCode]
+        private void RaiseCancellation()
+        {
+            m_CancellationTokenSource?.Cancel();
+        }
+
         // Is any invoke pending on this MonoBehaviour?
         public bool IsInvoking()
         {
@@ -172,5 +193,7 @@ public static void print(object message)
         extern void StopCoroutineFromEnumeratorManaged(IEnumerator routine);
 
         extern internal string GetScriptClassName();
+
+        extern void OnCancellationTokenCreated();
     }
 }
diff --git a/Runtime/Export/Scripting/TextAsset.cs b/Runtime/Export/Scripting/TextAsset.cs
index 76734e38f5..056355af4b 100644
--- a/Runtime/Export/Scripting/TextAsset.cs
+++ b/Runtime/Export/Scripting/TextAsset.cs
@@ -24,7 +24,8 @@ public string text
         {
             get
             {
-                return DecodeString(bytes);
+                var localBytes = bytes;
+                return localBytes.Length == 0 ? string.Empty : DecodeString(localBytes);
             }
         }
 
diff --git a/Runtime/Export/SearchService/SearchContextAttribute.cs b/Runtime/Export/SearchService/SearchContextAttribute.cs
index 7bb7319d4d..dcefedb195 100644
--- a/Runtime/Export/SearchService/SearchContextAttribute.cs
+++ b/Runtime/Export/SearchService/SearchContextAttribute.cs
@@ -30,7 +30,8 @@ public enum SearchViewFlags
         DisableSavedSearchQuery = 1 << 21,
         OpenInBuilderMode = 1 << 22,
         OpenInTextMode = 1 << 23,
-        DisableBuilderModeToggle = 1 << 24
+        DisableBuilderModeToggle = 1 << 24,
+        Borderless = 1 << 25
     }
 
     [AttributeUsage(AttributeTargets.Field)]
diff --git a/Runtime/Export/Serialization/ManagedReferenceUtility.bindings.cs b/Runtime/Export/Serialization/ManagedReferenceUtility.bindings.cs
new file mode 100644
index 0000000000..eb586ab9b0
--- /dev/null
+++ b/Runtime/Export/Serialization/ManagedReferenceUtility.bindings.cs
@@ -0,0 +1,61 @@
+// Unity C# reference source
+// Copyright (c) Unity Technologies. For terms of use, see
+// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
+
+using System;
+using UnityEngine.Bindings;
+using UnityObject = UnityEngine.Object;
+using RefId = System.Int64;
+
+namespace UnityEngine.Serialization
+{
+    [NativeHeader("Runtime/Serialize/ManagedReferenceUtility.h")]
+    public sealed class ManagedReferenceUtility
+    {
+        // Must match the same declarations in "Runtime/Serialize/ReferenceId.h"
+        public const RefId RefIdUnknown = -1;
+        public const RefId RefIdNull = -2;
+
+        [NativeMethod("SetManagedReferenceIdForObject")]
+        static extern bool SetManagedReferenceIdForObjectInternal(UnityObject obj, object scriptObj, RefId refId);
+
+        public static bool SetManagedReferenceIdForObject(UnityObject obj, object scriptObj, RefId refId)
+        {
+            if (scriptObj == null)
+                return refId == RefIdNull; // There is no need to explicitly register RefIdNull
+
+            var valueType = scriptObj.GetType();
+            if (valueType == typeof(UnityObject) || valueType.IsSubclassOf(typeof(UnityObject)))
+            {
+                throw new System.InvalidOperationException(
+                    $"Cannot assign an object deriving from UnityEngine.Object to a managed reference. This is not supported.");
+            }
+
+            return SetManagedReferenceIdForObjectInternal(obj, scriptObj, refId);
+        }
+
+        [NativeMethod("GetManagedReferenceIdForObject")]
+        static extern RefId GetManagedReferenceIdForObjectInternal(UnityObject obj, object scriptObj);
+
+        public static  RefId GetManagedReferenceIdForObject(UnityObject obj, object scriptObj)
+        {
+            return GetManagedReferenceIdForObjectInternal(obj, scriptObj);
+        }
+
+        [NativeMethod("GetManagedReference")]
+        static extern object GetManagedReferenceInternal(UnityObject obj, RefId id);
+
+        public static object GetManagedReference(UnityObject obj, RefId id)
+        {
+            return GetManagedReferenceInternal(obj, id);
+        }
+
+        [NativeMethod("GetManagedReferenceIds")]
+        static extern RefId[] GetManagedReferenceIdsForObjectInternal(UnityObject obj);
+
+        public static RefId[] GetManagedReferenceIds(UnityObject obj)
+        {
+            return GetManagedReferenceIdsForObjectInternal(obj);
+        }
+    };
+}
diff --git a/Runtime/Export/Shaders/Material.bindings.cs b/Runtime/Export/Shaders/Material.bindings.cs
index 0ee677e449..8b7a9afd87 100644
--- a/Runtime/Export/Shaders/Material.bindings.cs
+++ b/Runtime/Export/Shaders/Material.bindings.cs
@@ -269,5 +269,57 @@ public void GetTexturePropertyNameIDs(List<int> outNames)
         [NativeName("GetTextureScaleAndOffsetFromScript")] extern private Vector4 GetTextureScaleAndOffsetImpl(int name);
         [NativeName("SetTextureOffsetFromScript")] extern private void SetTextureOffsetImpl(int name, Vector2 offset);
         [NativeName("SetTextureScaleFromScript")]  extern private void SetTextureScaleImpl(int name, Vector2 scale);
+
+        extern public Material parent { get; set; }
+        extern public bool isVariant { [NativeName("IsVariant")] get; }
+
+        extern internal int overrideCount { get; }
+        extern internal int lockCount { get; }
+
+        [NativeName("IsChildOf")]          extern public bool IsChildOf([NotNull] Material ancestor);
+        [NativeName("RevertAllOverrides")] extern public void RevertAllPropertyOverrides();
+
+        public bool IsPropertyOverriden(int nameID)
+        {
+            GetPropertyState(nameID, out bool isOverriden, out _, out _);
+            return isOverriden;
+        }
+        public bool IsPropertyLocked(int nameID)
+        {
+            GetPropertyState(nameID, out _, out bool isLockedInChildren, out _);
+            return isLockedInChildren;
+        }
+        public bool IsPropertyLockedByAncestor(int nameID)
+        {
+            GetPropertyState(nameID, out _, out _, out bool isLockedByAncestor);
+            return isLockedByAncestor;
+        }
+
+        public bool IsPropertyOverriden(string name)        => IsPropertyOverriden(Shader.PropertyToID(name));
+        public bool IsPropertyLocked(string name)           => IsPropertyLocked(Shader.PropertyToID(name));
+        public bool IsPropertyLockedByAncestor(string name) => IsPropertyLockedByAncestor(Shader.PropertyToID(name));
+
+        // For MaterialProperty
+        [NativeName("SetPropertyLock")]  extern public void SetPropertyLock(int nameID, bool value);
+        [NativeName("ApplyOverride")]    extern public void ApplyPropertyOverride([NotNull] Material destination, int nameID, bool recordUndo = true);
+        [NativeName("RevertOverride")]   extern public void RevertPropertyOverride(int nameID);
+        [NativeName("GetPropertyState")] extern internal void GetPropertyState(int nameID, out bool isOverriden, out bool isLockedInChildren, out bool isLockedByAncestor);
+
+        public void SetPropertyLock(string name, bool value)                                         => SetPropertyLock(Shader.PropertyToID(name), value);
+        public void ApplyPropertyOverride(Material destination, string name, bool recordUndo = true) => ApplyPropertyOverride(destination, Shader.PropertyToID(name), recordUndo);
+        public void RevertPropertyOverride(string name)                                              => RevertPropertyOverride(Shader.PropertyToID(name));
+
+        // For MaterialSerializedProperty - bindings don't support overloads, so rename and use intermediate functions
+        [NativeName("SetPropertyLock")]  extern private void SetPropertyLock_Serialized(MaterialSerializedProperty property, bool value);
+        [NativeName("ApplyOverride")]    extern private void ApplyPropertyOverride_Serialized([NotNull] Material destination, MaterialSerializedProperty property, bool recordUndo = true);
+        [NativeName("RevertOverride")]   extern private void RevertPropertyOverride_Serialized(MaterialSerializedProperty property);
+        [NativeName("GetPropertyState")] extern private void GetPropertyState_Serialized(MaterialSerializedProperty property, out bool isOverriden, out bool isLockedInChildren, out bool isLockedByAncestor);
+
+        internal void SetPropertyLock(MaterialSerializedProperty property, bool value) => SetPropertyLock_Serialized(property, value);
+        internal void ApplyPropertyOverride(Material destination, MaterialSerializedProperty property, bool recordUndo = true) => ApplyPropertyOverride_Serialized(destination, property, recordUndo);
+        internal void RevertPropertyOverride(MaterialSerializedProperty property) => RevertPropertyOverride_Serialized(property);
+        internal void GetPropertyState(MaterialSerializedProperty propertyName, out bool isOverriden, out bool isLockedInChildren, out bool isLockedByAncestor)
+            => GetPropertyState_Serialized(propertyName, out isOverriden, out isLockedInChildren, out isLockedByAncestor);
+
     }
 }
diff --git a/Runtime/Export/Shaders/ShaderProperties.cs b/Runtime/Export/Shaders/ShaderProperties.cs
index 39170a362d..c619af8021 100644
--- a/Runtime/Export/Shaders/ShaderProperties.cs
+++ b/Runtime/Export/Shaders/ShaderProperties.cs
@@ -140,6 +140,14 @@ public Vector2 GetPropertyRangeLimits(int propertyIndex)
             return new Vector2(defValues[1], defValues[2]);
         }
 
+        public int GetPropertyDefaultIntValue(int propertyIndex)
+        {
+            CheckPropertyIndex(this, propertyIndex);
+            if (GetPropertyType(propertyIndex) != ShaderPropertyType.Int)
+                throw new ArgumentException("Property type is not Int.");
+            return GetPropertyDefaultIntValue(this, propertyIndex);
+        }
+
         public TextureDimension GetPropertyTextureDimension(int propertyIndex)
         {
             CheckPropertyIndex(this, propertyIndex);
diff --git a/Runtime/Export/StaticShim/ApplicationShimBase.cs b/Runtime/Export/StaticShim/ApplicationShimBase.cs
index eaed98f2ac..1aca00e0c2 100644
--- a/Runtime/Export/StaticShim/ApplicationShimBase.cs
+++ b/Runtime/Export/StaticShim/ApplicationShimBase.cs
@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Threading;
 using UnityEngine.Events;
 
 namespace UnityEngine
@@ -193,6 +194,8 @@ public virtual void Unload()
         {
             UnityEngine.Application.Unload();
         }
+
+        public virtual CancellationToken CancellationToken => UnityEngine.Application.CancellationToken;
     }
 }
 
diff --git a/Runtime/Export/StaticShim/ShimManager.cs b/Runtime/Export/StaticShim/ShimManager.cs
index b216de99bb..27904d8a77 100644
--- a/Runtime/Export/StaticShim/ShimManager.cs
+++ b/Runtime/Export/StaticShim/ShimManager.cs
@@ -3,6 +3,8 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace UnityEngine
 {
@@ -10,92 +12,106 @@ internal class ShimManager
     {
         internal static Action ActiveShimChanged;
 
-        private static ScreenShimBase s_ActiveScreenShim;
-        private static readonly ScreenShimBase s_DefaultScreenShim = new ScreenShimBase();
+        private static List<ScreenShimBase> s_ActiveScreenShim = new List<ScreenShimBase>(new [] { new ScreenShimBase() } );
+        private static List<SystemInfoShimBase> s_ActiveSystemInfoShim = new List<SystemInfoShimBase>(new [] { new SystemInfoShimBase() } );
+        private static List<ApplicationShimBase> s_ActiveApplicationShim = new List<ApplicationShimBase>(new [] { new ApplicationShimBase() } );
 
-        private static SystemInfoShimBase s_ActiveSystemInfoShim;
-        private static readonly SystemInfoShimBase s_DefaultSystemInfoShim = new SystemInfoShimBase();
-
-        private static ApplicationShimBase s_ActiveApplicationShim;
-        private static readonly ApplicationShimBase s_DefaultApplicationShim = new ApplicationShimBase();
-
-        internal static ScreenShimBase screenShim => s_ActiveScreenShim ?? s_DefaultScreenShim;
-        internal static SystemInfoShimBase systemInfoShim => s_ActiveSystemInfoShim ?? s_DefaultSystemInfoShim;
-        internal static ApplicationShimBase applicationShim => s_ActiveApplicationShim ?? s_DefaultApplicationShim;
+        internal static ScreenShimBase screenShim => s_ActiveScreenShim.Last();
+        internal static SystemInfoShimBase systemInfoShim => s_ActiveSystemInfoShim.Last();
+        internal static ApplicationShimBase applicationShim => s_ActiveApplicationShim.Last();
 
         internal static void UseShim(ScreenShimBase shim)
         {
-            s_ActiveScreenShim = shim;
+            if (s_ActiveScreenShim.Last() == shim)
+            {
+                return;
+            }
+
+            RemoveShim(shim);
+            s_ActiveScreenShim.Add(shim);
             ActiveShimChanged?.Invoke();
         }
 
         internal static void UseShim(SystemInfoShimBase shim)
         {
-            s_ActiveSystemInfoShim = shim;
+            if (s_ActiveSystemInfoShim.Last() == shim)
+            {
+                return;
+            }
+
+            RemoveShim(shim);
+            s_ActiveSystemInfoShim.Add(shim);
             ActiveShimChanged?.Invoke();
         }
 
         internal static void UseShim(ApplicationShimBase shim)
         {
-            s_ActiveApplicationShim = shim;
+            if (s_ActiveApplicationShim.Last() == shim)
+            {
+                return;
+            }
+
+            RemoveShim(shim);
+            s_ActiveApplicationShim.Add(shim);
             ActiveShimChanged?.Invoke();
         }
 
         internal static void RemoveShim(ScreenShimBase shim)
         {
-            if (s_ActiveScreenShim == shim)
+            if (s_ActiveScreenShim.Contains(shim))
             {
-                s_ActiveScreenShim = null;
+                s_ActiveScreenShim.Remove(shim);
                 ActiveShimChanged?.Invoke();
             }
         }
 
         internal static void RemoveShim(SystemInfoShimBase shim)
         {
-            if (s_ActiveSystemInfoShim == shim)
+            if (s_ActiveSystemInfoShim.Contains(shim))
             {
-                s_ActiveSystemInfoShim = null;
+                s_ActiveSystemInfoShim.Remove(shim);
                 ActiveShimChanged?.Invoke();
             }
         }
 
         internal static void RemoveShim(ApplicationShimBase shim)
         {
-            if (s_ActiveApplicationShim == shim)
+            if (s_ActiveApplicationShim.Contains(shim))
             {
-                s_ActiveApplicationShim = null;
+                s_ActiveApplicationShim.Remove(shim);
                 ActiveShimChanged?.Invoke();
             }
         }
 
         internal static bool IsShimActive(ScreenShimBase shim)
         {
-            return s_ActiveScreenShim == shim;
+            return s_ActiveScreenShim.Last() == shim;
         }
 
         internal static bool IsShimActive(SystemInfoShimBase shim)
         {
-            return s_ActiveSystemInfoShim == shim;
+            return s_ActiveSystemInfoShim.Last() == shim;
         }
 
         internal static bool IsShimActive(ApplicationShimBase shim)
         {
-            return s_ActiveApplicationShim == shim;
+            return s_ActiveApplicationShim.Last() == shim;
         }
 
+        // For the following functions, only return true if shims besides the default are in the collection
         internal static bool IsScreenShimActive()
         {
-            return s_ActiveScreenShim != null;
+            return s_ActiveScreenShim.Count > 1;
         }
 
         internal static bool IsSystemInfoShimActive()
         {
-            return s_ActiveSystemInfoShim != null;
+            return s_ActiveSystemInfoShim.Count > 1;
         }
 
         internal static bool IsApplicationShimActive()
         {
-            return s_ActiveApplicationShim != null;
+            return s_ActiveApplicationShim.Count > 1;
         }
     }
 }
diff --git a/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs b/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs
index 1c2e0ea91a..88d54adeae 100644
--- a/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs
+++ b/Runtime/Export/TouchScreenKeyboard/TouchScreenKeyboard.bindings.cs
@@ -95,6 +95,8 @@ public static bool isSupported
                     case RuntimePlatform.PS5:
                     case RuntimePlatform.Stadia:
                     case RuntimePlatform.WebGLPlayer:
+                    case RuntimePlatform.GameCoreXboxSeries:
+                    case RuntimePlatform.GameCoreXboxOne:
 
                     // The OnScreen keyboard is ALWAYS supported in UWP
                     // Whether or not it can be used is determined automatically by the OS at runtime
@@ -340,25 +342,40 @@ public static extern bool visible
 
         public class Android
         {
+
+            [Obsolete("TouchScreenKeyboard.Android.closeKeyboardOnOutsideTap is obsolete. Use TouchScreenKeyboard.Android.consumesOutsideTouches instead (UnityUpgradable) -> UnityEngine.TouchScreenKeyboard/Android.consumesOutsideTouches")]
             public static bool closeKeyboardOnOutsideTap
+            {
+                get
+                {
+                    return TouchScreenKeyboard.Android.consumesOutsideTouches;
+                }
+
+                set
+                {
+                    TouchScreenKeyboard.Android.consumesOutsideTouches = value;
+                }
+            }
+
+            public static bool consumesOutsideTouches
             {
                 set
                 {
-                    TouchScreenKeyboard_SetAndroidCloseKeyboardOnOutsideTap(value);
+                    TouchScreenKeyboard_SetAndroidKeyboardConsumesOutsideTouches(value);
                 }
                 get
                 {
-                    return TouchScreenKeyboard_GetAndroidCloseKeyboardOnOutsideTap();
+                    return TouchScreenKeyboard_GetAndroidKeyboardConsumesOutsideTouches();
                 }
             }
 
             [NativeConditional("PLATFORM_ANDROID")]
-            [FreeFunction("TouchScreenKeyboard_SetAndroidCloseKeyboardOnOutsideTap")]
-            private static extern void TouchScreenKeyboard_SetAndroidCloseKeyboardOnOutsideTap(bool enable);
+            [FreeFunction("TouchScreenKeyboard_SetAndroidKeyboardConsumesOutsideTouches")]
+            private static extern void TouchScreenKeyboard_SetAndroidKeyboardConsumesOutsideTouches(bool enable);
 
             [NativeConditional("PLATFORM_ANDROID")]
-            [FreeFunction("TouchScreenKeyboard_GetAndroidCloseKeyboardOnOutsideTap")]
-            private static extern bool TouchScreenKeyboard_GetAndroidCloseKeyboardOnOutsideTap();
+            [FreeFunction("TouchScreenKeyboard_GetAndroidKeyboardConsumesOutsideTouches")]
+            private static extern bool TouchScreenKeyboard_GetAndroidKeyboardConsumesOutsideTouches();
         }
     }
 }
diff --git a/Runtime/Export/UnityEvent/UnityEvent.cs b/Runtime/Export/UnityEvent/UnityEvent.cs
index 13dda0715e..36f97d48e7 100644
--- a/Runtime/Export/UnityEvent/UnityEvent.cs
+++ b/Runtime/Export/UnityEvent/UnityEvent.cs
@@ -450,7 +450,7 @@ public bool IsValid()
 
         public BaseInvokableCall GetRuntimeCall(UnityEventBase theEvent)
         {
-            if (m_CallState == UnityEventCallState.RuntimeOnly && !Application.isPlaying)
+            if (m_CallState == UnityEventCallState.RuntimeOnly && (target != null ? !Application.IsPlaying(target) : !Application.isPlaying))
                 return null;
             if (m_CallState == UnityEventCallState.Off || theEvent == null)
                 return null;
diff --git a/Runtime/Export/Unsafe/UnsafeUtility.bindings.cs b/Runtime/Export/Unsafe/UnsafeUtility.bindings.cs
index 4b1e21b896..93422551c4 100644
--- a/Runtime/Export/Unsafe/UnsafeUtility.bindings.cs
+++ b/Runtime/Export/Unsafe/UnsafeUtility.bindings.cs
@@ -7,6 +7,7 @@
 using System.Runtime.InteropServices;
 using UnityEngine.Bindings;
 using System.Runtime.CompilerServices;
+using Unity.Burst;
 
 namespace Unity.Collections.LowLevel.Unsafe
 {
@@ -67,6 +68,26 @@ public static unsafe bool IsBlittable<T>() where T : struct
             return IsBlittable(typeof(T));
         }
 
+        [ThreadSafe(ThrowsException = false)]
+        public static extern int CheckForLeaks();
+
+        [ThreadSafe(ThrowsException = false)]
+        public static extern int ForgiveLeaks();
+
+        [ThreadSafe(ThrowsException = false)]
+        [BurstAuthorizedExternalMethod]
+        public static extern NativeLeakDetectionMode GetLeakDetectionMode();
+
+        [ThreadSafe(ThrowsException = false)]
+        [BurstAuthorizedExternalMethod]
+        public static extern void SetLeakDetectionMode(NativeLeakDetectionMode value);
+
+        [ThreadSafe(ThrowsException = true)]
+        unsafe public static extern void* MallocTracked(long size, int alignment, Allocator allocator, int callstacksToSkip);
+
+        [ThreadSafe(ThrowsException = true)]
+        unsafe public static extern void FreeTracked(void* memory, Allocator allocator);
+
         [ThreadSafe(ThrowsException = true)]
         unsafe public static extern void* Malloc(long size, int alignment, Allocator allocator);
 
@@ -111,6 +132,9 @@ unsafe public static void MemClear(void* destination, long size)
         [ThreadSafe]
         public static extern bool IsValidNativeContainerElementType(Type type);
 
+        [ThreadSafe]
+        internal static extern int GetScriptingTypeFlags(Type type);
+
         // @TODO : This is probably not the ideal place to have this?
         [ThreadSafe]
         internal static extern void LogError(string msg, string filename, int linenumber);
diff --git a/Runtime/Export/Unsafe/UnsafeUtility.cs b/Runtime/Export/Unsafe/UnsafeUtility.cs
index 4fa197badd..fdc5d18108 100644
--- a/Runtime/Export/Unsafe/UnsafeUtility.cs
+++ b/Runtime/Export/Unsafe/UnsafeUtility.cs
@@ -6,6 +6,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
+using Unity.Burst;
 
 namespace Unity.Collections.LowLevel.Unsafe
 {
@@ -70,34 +71,47 @@ internal static string GetReasonForValueTypeNonBlittable<T>() where T : struct
             return GetReasonForTypeNonBlittableImpl(t, t.Name);
         }
 
-        internal struct IsUnmanagedCache<T>
+        // Since burst would fail to compile managed types anyway, we can default to unmanaged and
+        // conditionally mark as managed in managed code paths
+        // These flags must be kept in sync with kScriptingTypeXXX flags in Scripting.cpp
+        const int kIsManaged = 0x01;
+        const int kIsNativeContainer = 0x02;
+
+        // Supports burst compatible invocation
+        internal struct TypeFlagsCache<T>
         {
-            internal static int value; // 0 == unknown, -1 false, 1 true
+            internal static readonly int flags;
+
+            static TypeFlagsCache()
+            {
+                Init(ref flags);
+            }
+
+            [BurstDiscard]
+            static void Init(ref int flags)
+            {
+                flags = GetScriptingTypeFlags(typeof(T));
+            }
         }
 
         public static bool IsUnmanaged<T>()
         {
-            int value = IsUnmanagedCache<T>.value;
-            if (value == 1)  // most common case
-                return true;
-            if (value == 0)
-                IsUnmanagedCache<T>.value = value = IsUnmanaged(typeof(T)) ? 1 : -1;
-            return value == 1;
+            return (TypeFlagsCache<T>.flags & kIsManaged) == 0;
         }
 
-        internal struct IsValidNativeContainerElementTypeCache<T>
+        public static bool IsNativeContainerType<T>()
         {
-            internal static int value; // 0 == unknown, -1 false, 1 true
+            return (TypeFlagsCache<T>.flags & kIsNativeContainer) != 0;
         }
 
+        // Keeping this to support Collections pre-2.0 and user defined containers. To support nested native containers,
+        // code will need switched to
+        // - checking IsUnmanaged (if constrained to struct instead of unmanaged)
+        // - checking IsNativeContainer
+        // - properly set up safety handles
         public static bool IsValidNativeContainerElementType<T>()
         {
-            int value = IsValidNativeContainerElementTypeCache<T>.value;
-            if (value == -1)  // most common case
-                return false;
-            if (value == 0)
-                IsValidNativeContainerElementTypeCache<T>.value = value = IsValidNativeContainerElementType(typeof(T)) ? 1 : -1;
-            return value == 1;
+            return TypeFlagsCache<T>.flags == 0;  // not managed, not a container
         }
 
         [StructLayout(LayoutKind.Sequential)]
diff --git a/Runtime/Jobs/Managed/IJob.cs b/Runtime/Jobs/Managed/IJob.cs
index dc7d73f9f3..3c55a81585 100644
--- a/Runtime/Jobs/Managed/IJob.cs
+++ b/Runtime/Jobs/Managed/IJob.cs
@@ -5,6 +5,9 @@
 using System;
 using Unity.Jobs.LowLevel.Unsafe;
 using Unity.Collections.LowLevel.Unsafe;
+using static Unity.Collections.LowLevel.Unsafe.BurstLike;
+using Unity.Burst;
+using System.Diagnostics;
 
 namespace Unity.Jobs
 {
@@ -18,24 +21,54 @@ public static class IJobExtensions
     {
         internal struct JobStruct<T> where T : struct, IJob
         {
-            public static readonly IntPtr jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
+            internal static readonly SharedStatic<IntPtr> jobReflectionData = SharedStatic<IntPtr>.GetOrCreate<JobStruct<T>>();
+
+            [BurstDiscard]
+            internal static unsafe void Initialize()
+            {
+                if (jobReflectionData.Data == IntPtr.Zero)
+                    jobReflectionData.Data = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
+            }
+
+            internal delegate void ExecuteJobFunction(ref T data, IntPtr additionalPtr, IntPtr bufferRangePatchData, ref JobRanges ranges, int jobIndex);
 
-            public delegate void ExecuteJobFunction(ref T data, IntPtr additionalPtr, IntPtr bufferRangePatchData, ref JobRanges ranges, int jobIndex);
             public static void Execute(ref T data, IntPtr additionalPtr, IntPtr bufferRangePatchData, ref JobRanges ranges, int jobIndex)
             {
                 data.Execute();
             }
         }
 
+        public static void EarlyJobInit<T>()
+            where T : struct, IJob
+        {
+            JobStruct<T>.Initialize();
+        }
+
+        [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        static void CheckReflectionDataCorrect(IntPtr reflectionData)
+        {
+            if (reflectionData == IntPtr.Zero)
+                throw new InvalidOperationException("Support for burst compiled calls to Schedule depends on the Jobs package.\n\nFor generic job types, please include [assembly: RegisterGenericJobType(typeof(MyJob<MyJobSpecialization>))] in your source file.");
+        }
+
+        static IntPtr GetReflectionData<T>()
+            where T : struct, IJob
+        {
+            JobStruct<T>.Initialize();
+            var reflectionData = JobStruct<T>.jobReflectionData.Data;
+            CheckReflectionDataCorrect(reflectionData);
+            return reflectionData;
+        }
+
         unsafe public static JobHandle Schedule<T>(this T jobData, JobHandle dependsOn = new JobHandle()) where T : struct, IJob
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), JobStruct<T>.jobReflectionData, dependsOn, ScheduleMode.Single);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), dependsOn, ScheduleMode.Single);
             return JobsUtility.Schedule(ref scheduleParams);
         }
 
         unsafe public static void Run<T>(this T jobData) where T : struct, IJob
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), JobStruct<T>.jobReflectionData, new JobHandle(), ScheduleMode.Run);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), new JobHandle(), ScheduleMode.Run);
             JobsUtility.Schedule(ref scheduleParams);
         }
     }
diff --git a/Runtime/Jobs/Managed/IJobFor.cs b/Runtime/Jobs/Managed/IJobFor.cs
index 969e4964df..2584daeea0 100644
--- a/Runtime/Jobs/Managed/IJobFor.cs
+++ b/Runtime/Jobs/Managed/IJobFor.cs
@@ -5,6 +5,9 @@
 using System;
 using Unity.Jobs.LowLevel.Unsafe;
 using Unity.Collections.LowLevel.Unsafe;
+using Unity.Burst;
+using static Unity.Collections.LowLevel.Unsafe.BurstLike;
+using System.Diagnostics;
 
 namespace Unity.Jobs
 {
@@ -18,7 +21,14 @@ public static class IJobForExtensions
     {
         internal struct ForJobStruct<T> where T : struct, IJobFor
         {
-            public static readonly IntPtr jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
+            internal static readonly SharedStatic<IntPtr> jobReflectionData = SharedStatic<IntPtr>.GetOrCreate<ForJobStruct<T>>();
+
+            [BurstDiscard]
+            internal static unsafe void Initialize()
+            {
+                if (jobReflectionData.Data == IntPtr.Zero)
+                    jobReflectionData.Data = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
+            }
 
             public delegate void ExecuteJobFunction(ref T data, IntPtr additionalPtr, IntPtr bufferRangePatchData, ref JobRanges ranges, int jobIndex);
 
@@ -40,21 +50,43 @@ public static unsafe void Execute(ref T jobData, IntPtr additionalPtr, IntPtr bu
             }
         }
 
+        public static void EarlyJobInit<T>()
+            where T : struct, IJobFor
+        {
+            ForJobStruct<T>.Initialize();
+        }
+
+        [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        private static void CheckReflectionDataCorrect(IntPtr reflectionData)
+        {
+            if (reflectionData == IntPtr.Zero)
+                throw new InvalidOperationException("Support for burst compiled calls to Schedule depends on the Jobs package.\n\nFor generic job types, please include [assembly: RegisterGenericJobType(typeof(MyJob<MyJobSpecialization>))] in your source file.");
+        }
+
+        private static IntPtr GetReflectionData<T>()
+            where T : struct, IJobFor
+        {
+            ForJobStruct<T>.Initialize();
+            var reflectionData = ForJobStruct<T>.jobReflectionData.Data;
+            CheckReflectionDataCorrect(reflectionData);
+            return reflectionData;
+        }
+
         unsafe public static JobHandle Schedule<T>(this T jobData, int arrayLength, JobHandle dependency) where T : struct, IJobFor
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ForJobStruct<T>.jobReflectionData, dependency, ScheduleMode.Single);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), dependency, ScheduleMode.Single);
             return JobsUtility.ScheduleParallelFor(ref scheduleParams, arrayLength, arrayLength);
         }
 
         unsafe public static JobHandle ScheduleParallel<T>(this T jobData, int arrayLength, int innerloopBatchCount, JobHandle dependency) where T : struct, IJobFor
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ForJobStruct<T>.jobReflectionData, dependency, ScheduleMode.Parallel);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), dependency, ScheduleMode.Parallel);
             return JobsUtility.ScheduleParallelFor(ref scheduleParams, arrayLength, innerloopBatchCount);
         }
 
         unsafe public static void Run<T>(this T jobData, int arrayLength) where T : struct, IJobFor
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ForJobStruct<T>.jobReflectionData, new JobHandle(), ScheduleMode.Run);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), new JobHandle(), ScheduleMode.Run);
             JobsUtility.ScheduleParallelFor(ref scheduleParams, arrayLength, arrayLength);
         }
     }
diff --git a/Runtime/Jobs/Managed/IJobParallelFor.cs b/Runtime/Jobs/Managed/IJobParallelFor.cs
index c0ff2dc0f1..c4ad8a0ecd 100644
--- a/Runtime/Jobs/Managed/IJobParallelFor.cs
+++ b/Runtime/Jobs/Managed/IJobParallelFor.cs
@@ -5,6 +5,9 @@
 using System;
 using Unity.Jobs.LowLevel.Unsafe;
 using Unity.Collections.LowLevel.Unsafe;
+using static Unity.Collections.LowLevel.Unsafe.BurstLike;
+using Unity.Burst;
+using System.Diagnostics;
 
 namespace Unity.Jobs
 {
@@ -18,7 +21,14 @@ public static class IJobParallelForExtensions
     {
         internal struct ParallelForJobStruct<T> where T : struct, IJobParallelFor
         {
-            public static readonly IntPtr jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
+            internal static readonly SharedStatic<IntPtr> jobReflectionData = SharedStatic<IntPtr>.GetOrCreate<ParallelForJobStruct<T>>();
+
+            [BurstDiscard]
+            internal static unsafe void Initialize()
+            {
+                if (jobReflectionData.Data == IntPtr.Zero)
+                    jobReflectionData.Data = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
+            }
 
             public delegate void ExecuteJobFunction(ref T data, IntPtr additionalPtr, IntPtr bufferRangePatchData, ref JobRanges ranges, int jobIndex);
 
@@ -40,15 +50,37 @@ public static unsafe void Execute(ref T jobData, IntPtr additionalPtr, IntPtr bu
             }
         }
 
+        public static void EarlyJobInit<T>()
+            where T : struct, IJobParallelFor
+        {
+            ParallelForJobStruct<T>.Initialize();
+        }
+
+        [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        private static void CheckReflectionDataCorrect(IntPtr reflectionData)
+        {
+            if (reflectionData == IntPtr.Zero)
+                throw new InvalidOperationException("Support for burst compiled calls to Schedule depends on the Jobs package.\n\nFor generic job types, please include [assembly: RegisterGenericJobType(typeof(MyJob<MyJobSpecialization>))] in your source file.");
+        }
+
+        private static IntPtr GetReflectionData<T>()
+            where T : struct, IJobParallelFor
+        {
+            ParallelForJobStruct<T>.Initialize();
+            var reflectionData = ParallelForJobStruct<T>.jobReflectionData.Data;
+            CheckReflectionDataCorrect(reflectionData);
+            return reflectionData;
+        }
+
         unsafe public static JobHandle Schedule<T>(this T jobData, int arrayLength, int innerloopBatchCount, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParallelFor
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ParallelForJobStruct<T>.jobReflectionData, dependsOn, ScheduleMode.Parallel);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), dependsOn, ScheduleMode.Parallel);
             return JobsUtility.ScheduleParallelFor(ref scheduleParams, arrayLength, innerloopBatchCount);
         }
 
         unsafe public static void Run<T>(this T jobData, int arrayLength) where T : struct, IJobParallelFor
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), ParallelForJobStruct<T>.jobReflectionData, new JobHandle(), ScheduleMode.Run);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), new JobHandle(), ScheduleMode.Run);
             JobsUtility.ScheduleParallelFor(ref scheduleParams, arrayLength, arrayLength);
         }
     }
diff --git a/Runtime/Jobs/Managed/IJobParallelForTransform.cs b/Runtime/Jobs/Managed/IJobParallelForTransform.cs
index 1f6cd847c2..e213a27057 100644
--- a/Runtime/Jobs/Managed/IJobParallelForTransform.cs
+++ b/Runtime/Jobs/Managed/IJobParallelForTransform.cs
@@ -8,6 +8,9 @@
 using Unity.Jobs.LowLevel.Unsafe;
 using Unity.Collections.LowLevel.Unsafe;
 using Unity.Jobs;
+using static Unity.Collections.LowLevel.Unsafe.BurstLike;
+using Unity.Burst;
+using System.Diagnostics;
 
 //@TODO: Move this into Runtime/Transform folder with the test of Transform component
 namespace UnityEngine.Jobs
@@ -22,13 +25,13 @@ public static class IJobParallelForTransformExtensions
     {
         internal struct TransformParallelForLoopStruct<T> where T : struct, IJobParallelForTransform
         {
-            static public IntPtr                    jobReflectionData;
+            internal static readonly SharedStatic<IntPtr> jobReflectionData = SharedStatic<IntPtr>.GetOrCreate<TransformParallelForLoopStruct<T>>();
 
-            public static IntPtr Initialize()
+            [BurstDiscard]
+            internal static unsafe void Initialize()
             {
-                if (jobReflectionData == IntPtr.Zero)
-                    jobReflectionData = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
-                return jobReflectionData;
+                if (jobReflectionData.Data == IntPtr.Zero)
+                    jobReflectionData.Data = JobsUtility.CreateJobReflectionData(typeof(T), (ExecuteJobFunction)Execute);
             }
 
             [StructLayout(LayoutKind.Sequential)]
@@ -83,21 +86,43 @@ public static unsafe void Execute(ref T jobData, System.IntPtr jobData2, System.
             }
         }
 
+        public static void EarlyJobInit<T>()
+            where T : struct, IJobParallelForTransform
+        {
+            TransformParallelForLoopStruct<T>.Initialize();
+        }
+
+        [Conditional("ENABLE_UNITY_COLLECTIONS_CHECKS")]
+        private static void CheckReflectionDataCorrect(IntPtr reflectionData)
+        {
+            if (reflectionData == IntPtr.Zero)
+                throw new InvalidOperationException("Support for burst compiled calls to Schedule depends on the Jobs package.\n\nFor generic job types, please include [assembly: RegisterGenericJobType(typeof(MyJob<MyJobSpecialization>))] in your source file.");
+        }
+
+        private static IntPtr GetReflectionData<T>()
+            where T : struct, IJobParallelForTransform
+        {
+            TransformParallelForLoopStruct<T>.Initialize();
+            var reflectionData = TransformParallelForLoopStruct<T>.jobReflectionData.Data;
+            CheckReflectionDataCorrect(reflectionData);
+            return reflectionData;
+        }
+
         unsafe static public JobHandle Schedule<T>(this T jobData, TransformAccessArray transforms, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParallelForTransform
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), TransformParallelForLoopStruct<T>.Initialize(), dependsOn, ScheduleMode.Parallel);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), dependsOn, ScheduleMode.Parallel);
             return JobsUtility.ScheduleParallelForTransform(ref scheduleParams, transforms.GetTransformAccessArrayForSchedule());
         }
 
         public static unsafe JobHandle ScheduleReadOnly<T>(this T jobData, TransformAccessArray transforms, int batchSize, JobHandle dependsOn = new JobHandle()) where T : struct, IJobParallelForTransform
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), TransformParallelForLoopStruct<T>.Initialize(), dependsOn, ScheduleMode.Parallel);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), dependsOn, ScheduleMode.Parallel);
             return JobsUtility.ScheduleParallelForTransformReadOnly(ref scheduleParams, transforms.GetTransformAccessArrayForSchedule(), batchSize);
         }
 
         public static unsafe void RunReadOnly<T>(this T jobData, TransformAccessArray transforms) where T : struct, IJobParallelForTransform
         {
-            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), TransformParallelForLoopStruct<T>.Initialize(), default, ScheduleMode.Run);
+            var scheduleParams = new JobsUtility.JobScheduleParameters(UnsafeUtility.AddressOf(ref jobData), GetReflectionData<T>(), default, ScheduleMode.Run);
             JobsUtility.ScheduleParallelForTransformReadOnly(ref scheduleParams, transforms.GetTransformAccessArrayForSchedule(), transforms.length);
         }
 
diff --git a/Runtime/Jobs/ScriptBindings/JobHandle.bindings.cs b/Runtime/Jobs/ScriptBindings/JobHandle.bindings.cs
index 9c5be3a345..3807988a2a 100644
--- a/Runtime/Jobs/ScriptBindings/JobHandle.bindings.cs
+++ b/Runtime/Jobs/ScriptBindings/JobHandle.bindings.cs
@@ -10,11 +10,14 @@
 namespace Unity.Jobs
 {
     [NativeType(Header = "Runtime/Jobs/ScriptBindings/JobsBindings.h")]
-    public struct JobHandle
+    public struct JobHandle : IEquatable<JobHandle>
     {
         [NativeDisableUnsafePtrRestriction]
         internal IntPtr  jobGroup;
         internal int     version;
+        internal int     debugVersion;
+        [NativeDisableUnsafePtrRestriction]
+        internal IntPtr  debugInfo;
 
         public void Complete()
         {
@@ -103,6 +106,31 @@ unsafe public static JobHandle CombineDependencies(NativeSlice<JobHandle> jobs)
 
         [NativeMethod(IsFreeFunction = true, IsThreadSafe = true)]
         public static extern bool CheckFenceIsDependencyOrDidSyncFence(JobHandle jobHandle, JobHandle dependsOn);
+
+        public bool Equals(JobHandle other)
+        {
+            return jobGroup == other.jobGroup && version == other.version;
+        }
+
+        public override bool Equals(Object obj)
+        {
+            return obj is JobHandle && this == (JobHandle)obj;
+        }
+
+        public static bool operator ==(JobHandle a, JobHandle b)
+        {
+            return a.jobGroup == b.jobGroup && a.version == b.version;
+        }
+
+        public static bool operator !=(JobHandle a, JobHandle b)
+        {
+            return !(a == b);
+        }
+
+        public override int GetHashCode()
+        {
+            return jobGroup.GetHashCode() ^ (version.GetHashCode() * 1610612741);
+        }
     }
 }
 
diff --git a/Runtime/Profiler/ScriptBindings/ProfilerCategory.cs b/Runtime/Profiler/ScriptBindings/ProfilerCategory.cs
index 63911a40ee..7746cbf5ee 100644
--- a/Runtime/Profiler/ScriptBindings/ProfilerCategory.cs
+++ b/Runtime/Profiler/ScriptBindings/ProfilerCategory.cs
@@ -67,6 +67,10 @@ public override string ToString()
         /// </summary>
         public static ProfilerCategory Physics => new ProfilerCategory(ProfilerUnsafeUtility.CategoryPhysics);
         /// <summary>
+        /// A ProfilerMarker that belongs to the Physics 2D system.
+        /// </summary>
+        public static ProfilerCategory Physics2D => new ProfilerCategory(ProfilerUnsafeUtility.CategoryPhysics2D);
+        /// <summary>
         /// A ProfilerMarker that belongs to the Animation system.
         /// </summary>
         public static ProfilerCategory Animation => new ProfilerCategory(ProfilerUnsafeUtility.CategoryAnimation);
@@ -125,6 +129,11 @@ public override string ToString()
 
         internal static ProfilerCategory Any => new ProfilerCategory(ProfilerUnsafeUtility.CategoryAny);
 
+        /// <summary>
+        /// GPU category.
+        /// </summary>
+        internal static ProfilerCategory GPU => new ProfilerCategory(ProfilerUnsafeUtility.CategoryGPU);
+
         /// <summary>
         /// Utility operator that simplifies usage of the ProfilerCategory with ProfilerUnsafeUtility.
         /// </summary>
diff --git a/Runtime/Profiler/ScriptBindings/ProfilerMarker.bindings.cs b/Runtime/Profiler/ScriptBindings/ProfilerMarker.bindings.cs
index 1cae853b4c..fa4af88194 100644
--- a/Runtime/Profiler/ScriptBindings/ProfilerMarker.bindings.cs
+++ b/Runtime/Profiler/ScriptBindings/ProfilerMarker.bindings.cs
@@ -17,6 +17,7 @@
 namespace Unity.Profiling
 {
     [UsedByNativeCode]
+    [IgnoredByDeepProfiler]
     [StructLayout(LayoutKind.Sequential)]
     public struct ProfilerMarker
     {
@@ -93,6 +94,7 @@ internal void GetName(ref string name)
         }
 
         [UsedByNativeCode]
+        [IgnoredByDeepProfiler]
         public struct AutoScope : IDisposable
         {
             [NativeDisableUnsafePtrRestriction]
diff --git a/Runtime/Profiler/ScriptBindings/ProfilerUnsafeUtility.bindings.cs b/Runtime/Profiler/ScriptBindings/ProfilerUnsafeUtility.bindings.cs
index 326343d9d8..d77acec10e 100644
--- a/Runtime/Profiler/ScriptBindings/ProfilerUnsafeUtility.bindings.cs
+++ b/Runtime/Profiler/ScriptBindings/ProfilerUnsafeUtility.bindings.cs
@@ -40,6 +40,7 @@ public readonly unsafe struct ProfilerCategoryDescription
 
     [NativeHeader("Runtime/Profiler/ScriptBindings/ProfilerUnsafeUtility.bindings.h")]
     [UsedByNativeCode]
+    [IgnoredByDeepProfiler]
     public static class ProfilerUnsafeUtility
     {
         // Built-in profiler categories.
@@ -65,6 +66,8 @@ public static class ProfilerUnsafeUtility
         public const ushort CategoryFileIO = 25;
         public const ushort CategoryInput = 30;
         public const ushort CategoryVirtualTexturing = 31;
+        internal const ushort CategoryGPU = 32;
+        public const ushort CategoryPhysics2D = 33;
         internal const ushort CategoryAny = 0xFFFF;
 
         [ThreadSafe]
diff --git a/Runtime/Profiler/ScriptBindings/ProfilerUtility.cs b/Runtime/Profiler/ScriptBindings/ProfilerUtility.cs
index c9c7270ac2..b6562d55c3 100644
--- a/Runtime/Profiler/ScriptBindings/ProfilerUtility.cs
+++ b/Runtime/Profiler/ScriptBindings/ProfilerUtility.cs
@@ -18,6 +18,7 @@ public enum MarkerFlags : ushort
         ScriptDeepProfiler = 1 << 6,
 
         AvailabilityEditor = 1 << 2,
+        AvailabilityNonDevelopment = 1 << 3,
 
         Warning = 1 << 4,
 
diff --git a/Runtime/Profiler/ScriptBindings/Sampler.bindings.cs b/Runtime/Profiler/ScriptBindings/Sampler.bindings.cs
index 2475c2dfde..2ffd613a84 100644
--- a/Runtime/Profiler/ScriptBindings/Sampler.bindings.cs
+++ b/Runtime/Profiler/ScriptBindings/Sampler.bindings.cs
@@ -96,18 +96,21 @@ public static CustomSampler Create(string name, bool collectGpuData = false)
         }
 
         [Conditional("ENABLE_PROFILER")]
+        [IgnoredByDeepProfiler]
         public void Begin()
         {
             ProfilerUnsafeUtility.BeginSample(m_Ptr);
         }
 
         [Conditional("ENABLE_PROFILER")]
+        [IgnoredByDeepProfiler]
         public void Begin(Object targetObject)
         {
             ProfilerUnsafeUtility.Internal_BeginWithObject(m_Ptr, targetObject);
         }
 
         [Conditional("ENABLE_PROFILER")]
+        [IgnoredByDeepProfiler]
         public void End()
         {
             ProfilerUnsafeUtility.EndSample(m_Ptr);
diff --git a/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj b/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj
index 00c01f5b68..f3b5ad991c 100644
--- a/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj
+++ b/Tools/Unity.CecilTools/Unity.CecilTools.gen.csproj
@@ -8,7 +8,6 @@
     <LangVersion>latest</LangVersion>
     <NoWarn>1071;1701</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <ResolveNuGetPackages>false</ResolveNuGetPackages>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CecilUtils.cs" />
diff --git a/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj b/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj
index 15f430f05f..68b9302ccd 100644
--- a/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj
+++ b/Tools/Unity.SerializationLogic/Unity.SerializationLogic.gen.csproj
@@ -8,7 +8,6 @@
     <LangVersion>latest</LangVersion>
     <NoWarn>1071;1701</NoWarn>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <ResolveNuGetPackages>false</ResolveNuGetPackages>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/artifacts/Stevedore/bee_bcfb/BeeAsALibrary/Bee.BeeDriver.dll b/artifacts/Stevedore/bee_bcfb/BeeAsALibrary/Bee.BeeDriver.dll
deleted file mode 100644
index bfeb6e2168..0000000000
Binary files a/artifacts/Stevedore/bee_bcfb/BeeAsALibrary/Bee.BeeDriver.dll and /dev/null differ